Merge changes Iaad9c95e,Iccd9c95e

[samplevnf.git] / VNFs / DPPD-PROX / cfgfile.c

diff --git a/VNFs/DPPD-PROX/cfgfile.c b/VNFs/DPPD-PROX/cfgfile.c
index 80a9093..b15fc0a 100644 (file)
--- a/VNFs/DPPD-PROX/cfgfile.c
+++ b/VNFs/DPPD-PROX/cfgfile.c
@@ -188,13 +188,18 @@ static struct cfg_section *cfg_check_section(char *buffer, struct cfg_section *p
        if (*pend == '\0') {
                return NULL;
        }
-       /* only numeric characters are valid for section index
-          (currently, variables not checked!) */
-       if (pend[0] != '$') {
-               for (len = 0; pend[len] != '\0'; ++len) {
-                       if (strchr(valid, pend[len]) == NULL) {
-                               return NULL;
-                       }
+
+       /* only numeric characters are valid for section index */
+       char val[MAX_CFG_STRING_LEN];
+       if (pend[0] == '$') {
+               if (parse_vars(val, sizeof(val), pend))
+                       return NULL;
+       } else
+               strncpy(val, pend, sizeof(val));
+
+       for (len = 0; val[len] != '\0'; ++len) {
+               if (strchr(valid, val[len]) == NULL) {
+                       return NULL;
                }
        }