Move check of is_number earlier in the logic to fail early (7531cd4a) · Commits · IVAS Codec Public Collaboration / IVAS Codec

apps/encoder.c

+9 −13

Original line number	Diff line number	Diff line
		@@ -1354,12 +1354,20 @@ static bool parseCmdlIVAS_enc(
		arg->inputFormat = IVAS_ENC_INPUT_SBA;

		/* SBA configuration */
		if ( i < argc - 4 )
		if ( i < argc - 4
		#ifdef IMPROVE_CMDLINE_ROBUSTNESS
		&& is_number(argv[i]) && sscanf( argv[i], "%d", &tmp ) > 0
		#endif
		)
		{
		#ifndef IMPROVE_CMDLINE_ROBUSTNESS
		if ( sscanf( argv[i], "%d", &tmp ) > 0 )
		{
		#endif
		i++;
		#ifndef IMPROVE_CMDLINE_ROBUSTNESS
		}
		#endif
		}
		else
		{
		@@ -1384,19 +1392,7 @@ static bool parseCmdlIVAS_enc(
		arg->inputFormatConfig.sba.order = IVAS_ENC_SBA_HOA3;
		break;
		default:

		#ifdef IMPROVE_CMDLINE_ROBUSTNESS
		if ( is_number( argv[i - 1] ) )
		{
		fprintf( stderr, "Error: Wrong SBA order specified!\n\n" );
		}
		else
		{
		fprintf( stderr, "Error: SBA order specified must be a number!\n\n" );
		}
		#else
		fprintf( stderr, "Error: Wrong SBA order specified!\n\n" );
		#endif
		usage_enc();
		return false;
		}