Better fix than r19761

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@19763 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Mar 25, 2014 · abdc145 · abdc145
1 parent dcb3428
commit abdc145
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/SimulationRuntime/c/util/utility.c b/SimulationRuntime/c/util/utility.c
@@ -59,26 +59,26 @@ extern int OpenModelica_regexImpl(const char* str, const char* re, const int max
   int nmatch=0,i,rc,res;
   int flags = (extended ? REG_EXTENDED : 0) | (sensitive ? REG_ICASE : 0) | (maxn ? 0 : REG_NOSUB);
 #if !defined(_MSC_VER)
-  if (maxn < 1) {
-    return 0;
-  }
-  regmatch_t matches[maxn];
+  regmatch_t matches[maxn < 1 ? 1 : maxn];
 #else
   /* Stupid compiler */
   regmatch_t *matches;
-  if (maxn < 1) {
-    return 0;
-  }
   matches = (regmatch_t*)malloc(maxn*sizeof(regmatch_t));
   assert(matches != NULL);
 #endif
   memset(&myregex, 1, sizeof(regex_t));
   rc = regcomp(&myregex, re, flags);
+  if (rc && maxn == 0) {
+#if defined(_MSC_VER)
+    free(matches);
+#endif
+    return 0;
+  }
   if (rc) {
     char err_buf[2048] = {0};
     int len = 0;
     len += snprintf(err_buf+len,2040-len,"Failed to compile regular expression: %s with error: ", re);
-    regerror(rc, &myregex, err_buf+len, 2048-len);
+    len += regerror(rc, &myregex, err_buf+len, 2048-len);
     regfree(&myregex);
     if (maxn) {
       outMatches[0] = mystrdup(err_buf);