[sr-dev] git:4.3:138a552c: cnxcc: more safety checks for call structure