Merge pull request #988 from darshan-hpc/snyder/fix-regex-parsing

shanedsnyder · web-flow · commit 13233ad06613 · 2024-10-02T12:32:38.000-05:00
BUG: fix darshan-runtime config parsing leading to infinite loops
diff --git a/darshan-runtime/lib/darshan-config.c b/darshan-runtime/lib/darshan-config.c
@@ -299,16 +299,18 @@ void darshan_parse_config_env(struct darshan_config *cfg)
                     continue;
                 }
                 ret = regcomp(&regex->regex, token, REG_EXTENDED);
-                if(ret)
+                if(!ret)
+                {
+                    LL_APPEND(cfg->app_exclusion_list, regex);
+                }
+                else
                 {
                     darshan_core_fprintf(stderr, "darshan library warning: "\
                         "unable to compile Darshan config DARSHAN_APP_EXCLUDE "\
                         "regex %s\n", token);
                     free(regex->regex_str);
                     free(regex);
-                    continue;
                 }
-                LL_APPEND(cfg->app_exclusion_list, regex);
             }
             token = strtok(NULL, ",");
         }
@@ -332,16 +334,18 @@ void darshan_parse_config_env(struct darshan_config *cfg)
                     continue;
                 }
                 ret = regcomp(&regex->regex, token, REG_EXTENDED);
-                if(ret)
+                if(!ret)
+                {
+                    LL_APPEND(cfg->app_inclusion_list, regex);
+                }
+                else
                 {
                     darshan_core_fprintf(stderr, "darshan library warning: "\
                         "unable to compile Darshan config DARSHAN_APP_INCLUDE "\
                         "regex %s\n", token);
                     free(regex->regex_str);
                     free(regex);
-                    continue;
                 }
-                LL_APPEND(cfg->app_inclusion_list, regex);
             }
             token = strtok(NULL, ",");
         }
@@ -578,16 +582,18 @@ void darshan_parse_config_file(struct darshan_config *cfg)
                             break;
                         }
                         ret = regcomp(&regex->regex, token, REG_EXTENDED);
-                        if(ret)
+                        if(!ret)
+                        {
+                            LL_APPEND(cfg->app_exclusion_list, regex);
+                        }
+                        else
                         {
                             darshan_core_fprintf(stderr, "darshan library warning: "\
                                 "unable to compile Darshan config %s regex %s\n",
                                 key, token);
                             free(regex->regex_str);
                             free(regex);
-                            continue;
                         }
-                        LL_APPEND(cfg->app_exclusion_list, regex);
                         token = strtok(NULL, ",");
                     }
                 }
@@ -609,16 +615,18 @@ void darshan_parse_config_file(struct darshan_config *cfg)
                             break;
                         }
                         ret = regcomp(&regex->regex, token, REG_EXTENDED);
-                        if(ret)
+                        if(!ret)
+                        {
+                            LL_APPEND(cfg->app_inclusion_list, regex);
+                        }
+                        else
                         {
                             darshan_core_fprintf(stderr, "darshan library warning: "\
                                 "unable to compile Darshan config %s regex %s\n",
                                 key, token);
                             free(regex->regex_str);
                             free(regex);
-                            continue;
                         }
-                        LL_APPEND(cfg->app_inclusion_list, regex);
                         token = strtok(NULL, ",");
                     }
                 }
@@ -723,16 +731,18 @@ void darshan_parse_config_file(struct darshan_config *cfg)
                             }
                             regex->mod_flags = tmp_mod_flags;
                             ret = regcomp(&regex->regex, token, REG_EXTENDED);
-                            if(ret)
+                            if(!ret)
+                            {
+                                LL_APPEND(cfg->rec_exclusion_list, regex);
+                            }
+                            else
                             {
                                 darshan_core_fprintf(stderr, "darshan library warning: "\
                                     "unable to compile Darshan config %s regex %s\n",
                                     key, token);
                                 free(regex->regex_str);
                                 free(regex);
-                                continue;
                             }
-                            LL_APPEND(cfg->rec_exclusion_list, regex);
                             token = strtok(NULL, ",");
                         }
                     }
@@ -760,16 +770,18 @@ void darshan_parse_config_file(struct darshan_config *cfg)
                             }
                             regex->mod_flags = tmp_mod_flags;
                             ret = regcomp(&regex->regex, token, REG_EXTENDED);
-                            if(ret)
+                            if(!ret)
+                            {
+                                LL_APPEND(cfg->rec_inclusion_list, regex);
+                            }
+                            else
                             {
                                 darshan_core_fprintf(stderr, "darshan library warning: "\
                                     "unable to compile Darshan config %s regex %s\n",
                                     key, token);
                                 free(regex->regex_str);
                                 free(regex);
-                                continue;
                             }
-                            LL_APPEND(cfg->rec_inclusion_list, regex);
                             token = strtok(NULL, ",");
                         }
                     }

Original file line number	Diff line number	Diff line change
`@@ -299,16 +299,18 @@ void darshan_parse_config_env(struct darshan_config *cfg)`
`299`	`299`	`continue;`
`300`	`300`	`}`
`301`	`301`	`ret = regcomp(&regex->regex, token, REG_EXTENDED);`
`302`		`- if(ret)`
	`302`	`+ if(!ret)`
	`303`	`+ {`
	`304`	`+ LL_APPEND(cfg->app_exclusion_list, regex);`
	`305`	`+ }`
	`306`	`+ else`
`303`	`307`	`{`
`304`	`308`	`darshan_core_fprintf(stderr, "darshan library warning: "\`
`305`	`309`	`"unable to compile Darshan config DARSHAN_APP_EXCLUDE "\`
`306`	`310`	`"regex %s\n", token);`
`307`	`311`	`free(regex->regex_str);`
`308`	`312`	`free(regex);`
`309`		`- continue;`
`310`	`313`	`}`
`311`		`- LL_APPEND(cfg->app_exclusion_list, regex);`
`312`	`314`	`}`
`313`	`315`	`token = strtok(NULL, ",");`
`314`	`316`	`}`
`@@ -332,16 +334,18 @@ void darshan_parse_config_env(struct darshan_config *cfg)`
`332`	`334`	`continue;`
`333`	`335`	`}`
`334`	`336`	`ret = regcomp(&regex->regex, token, REG_EXTENDED);`
`335`		`- if(ret)`
	`337`	`+ if(!ret)`
	`338`	`+ {`
	`339`	`+ LL_APPEND(cfg->app_inclusion_list, regex);`
	`340`	`+ }`
	`341`	`+ else`
`336`	`342`	`{`
`337`	`343`	`darshan_core_fprintf(stderr, "darshan library warning: "\`
`338`	`344`	`"unable to compile Darshan config DARSHAN_APP_INCLUDE "\`
`339`	`345`	`"regex %s\n", token);`
`340`	`346`	`free(regex->regex_str);`
`341`	`347`	`free(regex);`
`342`		`- continue;`
`343`	`348`	`}`
`344`		`- LL_APPEND(cfg->app_inclusion_list, regex);`
`345`	`349`	`}`
`346`	`350`	`token = strtok(NULL, ",");`
`347`	`351`	`}`
`@@ -578,16 +582,18 @@ void darshan_parse_config_file(struct darshan_config *cfg)`
`578`	`582`	`break;`
`579`	`583`	`}`
`580`	`584`	`ret = regcomp(&regex->regex, token, REG_EXTENDED);`
`581`		`- if(ret)`
	`585`	`+ if(!ret)`
	`586`	`+ {`
	`587`	`+ LL_APPEND(cfg->app_exclusion_list, regex);`
	`588`	`+ }`
	`589`	`+ else`
`582`	`590`	`{`
`583`	`591`	`darshan_core_fprintf(stderr, "darshan library warning: "\`
`584`	`592`	`"unable to compile Darshan config %s regex %s\n",`
`585`	`593`	`key, token);`
`586`	`594`	`free(regex->regex_str);`
`587`	`595`	`free(regex);`
`588`		`- continue;`
`589`	`596`	`}`
`590`		`- LL_APPEND(cfg->app_exclusion_list, regex);`
`591`	`597`	`token = strtok(NULL, ",");`
`592`	`598`	`}`
`593`	`599`	`}`
`@@ -609,16 +615,18 @@ void darshan_parse_config_file(struct darshan_config *cfg)`
`609`	`615`	`break;`
`610`	`616`	`}`
`611`	`617`	`ret = regcomp(&regex->regex, token, REG_EXTENDED);`
`612`		`- if(ret)`
	`618`	`+ if(!ret)`
	`619`	`+ {`
	`620`	`+ LL_APPEND(cfg->app_inclusion_list, regex);`
	`621`	`+ }`
	`622`	`+ else`
`613`	`623`	`{`
`614`	`624`	`darshan_core_fprintf(stderr, "darshan library warning: "\`
`615`	`625`	`"unable to compile Darshan config %s regex %s\n",`
`616`	`626`	`key, token);`
`617`	`627`	`free(regex->regex_str);`
`618`	`628`	`free(regex);`
`619`		`- continue;`
`620`	`629`	`}`
`621`		`- LL_APPEND(cfg->app_inclusion_list, regex);`
`622`	`630`	`token = strtok(NULL, ",");`
`623`	`631`	`}`
`624`	`632`	`}`
`@@ -723,16 +731,18 @@ void darshan_parse_config_file(struct darshan_config *cfg)`
`723`	`731`	`}`
`724`	`732`	`regex->mod_flags = tmp_mod_flags;`
`725`	`733`	`ret = regcomp(&regex->regex, token, REG_EXTENDED);`
`726`		`- if(ret)`
	`734`	`+ if(!ret)`
	`735`	`+ {`
	`736`	`+ LL_APPEND(cfg->rec_exclusion_list, regex);`
	`737`	`+ }`
	`738`	`+ else`
`727`	`739`	`{`
`728`	`740`	`darshan_core_fprintf(stderr, "darshan library warning: "\`
`729`	`741`	`"unable to compile Darshan config %s regex %s\n",`
`730`	`742`	`key, token);`
`731`	`743`	`free(regex->regex_str);`
`732`	`744`	`free(regex);`
`733`		`- continue;`
`734`	`745`	`}`
`735`		`- LL_APPEND(cfg->rec_exclusion_list, regex);`
`736`	`746`	`token = strtok(NULL, ",");`
`737`	`747`	`}`
`738`	`748`	`}`
`@@ -760,16 +770,18 @@ void darshan_parse_config_file(struct darshan_config *cfg)`
`760`	`770`	`}`
`761`	`771`	`regex->mod_flags = tmp_mod_flags;`
`762`	`772`	`ret = regcomp(&regex->regex, token, REG_EXTENDED);`
`763`		`- if(ret)`
	`773`	`+ if(!ret)`
	`774`	`+ {`
	`775`	`+ LL_APPEND(cfg->rec_inclusion_list, regex);`
	`776`	`+ }`
	`777`	`+ else`
`764`	`778`	`{`
`765`	`779`	`darshan_core_fprintf(stderr, "darshan library warning: "\`
`766`	`780`	`"unable to compile Darshan config %s regex %s\n",`
`767`	`781`	`key, token);`
`768`	`782`	`free(regex->regex_str);`
`769`	`783`	`free(regex);`
`770`		`- continue;`
`771`	`784`	`}`
`772`		`- LL_APPEND(cfg->rec_inclusion_list, regex);`
`773`	`785`	`token = strtok(NULL, ",");`
`774`	`786`	`}`
`775`	`787`	`}`