[sr-dev] git:master:6985a295: cnxcc: more safety checks for call structure