Merge pull request #460 from mouse07410/copilot/fix-complex-threshold-variable

Move complex_threshold from global to arg_t structure

Author: mouse07410

ChangeLog

@@ -1,5 +1,12 @@
 1.3.2:
 	FIXES:
+	* Moved complex_threshold from global variable to arg_t structure field.
+	  Applications linking to libasn1compiler no longer need to define their own
+	  version of the global complex_threshold variable. The variable is now properly
+	  encapsulated within the compiler's argument structure and passed through the
+	  asn1_compile() function. Default threshold value remains 4. Added test case
+	  for -fcomplex-threshold flag validation.
+	  (Severity: low; Security impact: none)
 	* Fixed JER OPEN TYPE decoder to comply with ITU-T X.697 Clause 41. The decoder
 	  was incorrectly attempting to parse CHOICE-style key wrappers and consuming
 	  parent SEQUENCE delimiters, causing "Unexpected JSON key" and "Out of defined

asn1c/asn1c.c

@@ -84,7 +84,7 @@ is_integer(const char *str, long *out_val) {
 static void usage(const char *av0); /* Print the Usage screen and exit */
 static int importStandardModules(asn1p_t *asn, const char *skeletons_dir);
 
-int complex_threshold = 4;  /* threshold after which complex_level is true (DIRTY HACK) */
+
 
 int
 main(int ac, char **av) {
@@ -105,6 +105,7 @@ main(int ac, char **av) {
     int ch;                         /* Command line character */
     int i;                          /* Index in some loops */
     int exit_code = 0;              /* Exit code */
+    int complex_threshold = 4;      /* Threshold for switching structures to ptrs */
 
     /*
      * Process command-line options.
@@ -492,7 +493,8 @@ main(int ac, char **av) {
      * of another language.
      */
     if(asn1_compile(asn, skeletons_dir, destdir ? destdir : "",
-                    asn1_compiler_flags, ac + optind, optind, av - optind)) {
+                    asn1_compiler_flags, ac + optind, optind, av - optind,
+                    complex_threshold)) {
         exit_code = EX_SOFTWARE;
     }
 

libasn1compiler/asn1c_C.c

@@ -4426,7 +4426,6 @@ emit_include_dependencies(arg_t *arg) {
 	return 0;
 }
 
-extern int complex_threshold; // defined in asn1c/asn1c.c - need fixing
 /*
  * Check if it is better to make this type indirectly accessed via
  * a pointer.
@@ -4516,10 +4515,11 @@ expr_break_recursion(arg_t *arg, asn1p_expr_t *expr) {
 			/* If the terminal has 4 or more complex members, use indirection
 			 * to avoid excessive nesting and potential circular dependencies
 			 * that might not be caught by simple recursion detection.
-			 * This threshold is chosen to avoid breaking existing test expectations
+			 * This threshold is configurable via -fcomplex-threshold flag
+			 * (default: 4) and is chosen to avoid breaking existing test expectations
 			 * while still handling deeply nested structures like F1AP's SRSConfig.
 			 */
-			if(complex_members >= complex_threshold) {
+			if(complex_members >= arg->complex_threshold) {
 				expr->marker.flags |= EM_INDIRECT;
 				expr->marker.flags |= EM_UNRECURSE;
 				return 1;

libasn1compiler/asn1compiler.c

@@ -16,7 +16,7 @@ static void asn1c_mark_ioc_table_dependencies(arg_t *arg, asn1p_ioc_table_t *ioc
 
 int
 asn1_compile(asn1p_t *asn, const char *datadir, const char *destdir, enum asn1c_flags flags,
-		int argc, int optc, char **argv) {
+		int argc, int optc, char **argv, int complex_threshold) {
 	arg_t arg_s = {0};
 	arg_t *arg = &arg_s;
 	asn1p_module_t *mod;
@@ -35,6 +35,7 @@ asn1_compile(asn1p_t *asn, const char *datadir, const char *destdir, enum asn1c_
 	arg->logger_cb = default_logger_cb;
 	arg->flags = flags;
 	arg->asn = asn;
+	arg->complex_threshold = complex_threshold;
 
 	/*
 	 * If -flist-deps is specified, list dependencies and exit

libasn1compiler/asn1compiler.h

@@ -144,7 +144,7 @@ enum asn1c_flags {
  * Compile the ASN.1 specification.
  */
 int asn1_compile(asn1p_t *asn, const char *datadir, const char *destdir, enum asn1c_flags,
-	int argc, int optc, char **argv);
+	int argc, int optc, char **argv, int complex_threshold);
 
 void asn1c_debug_type_naming(asn1p_t *asn, enum asn1c_flags,
                              char **asn_type_names);