Changeset 926:69d55a534aff in freeDiameter for extensions/acl_wl

Timestamp:

Mar 3, 2013, 12:21:26 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Improve configuration parser of acl_wl extension, to avoid errors sent on stdout/stderr

Location:

extensions/acl_wl

Files:

• aw_conf.l (modified) (1 diff)
• aw_conf.y (modified) (1 diff)

extensions/acl_wl/aw_conf.l

@@ -93 +93 @@
                         }
 
+        /* No match */
+<*>[[:alnum:]]+         |       /* This rule is only useful to print a complete token in error messages */
+<*>.                    {
+                                TRACE_DEBUG_ERROR("Unrecognized text on line %d col %d: '%s'.\n", yylloc->first_line, yylloc->first_column, yytext);
+                                return LEX_ERROR; 
+                        }
+
 %%

extensions/acl_wl/aw_conf.y

@@ -127 +127 @@
                                 fqdn_added++;
                         }
+                        | conffile LEX_ERROR
+                        {
+                                yyerror(&yylloc, conffile, "An error occurred while parsing the configuration file");
+                                return EINVAL;
+                        }
                         ;