diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2012-11-30 14:27:35 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2012-11-30 14:27:35 +0200 |
| commit | 71157f7f5f2fb9bf0fe588135485a8dcec322786 (patch) | |
| tree | 45a0fd2d2aa49e87955e31ff313ad4d0b008c494 /regexec.c | |
| parent | d3699b66e430f40943242dcc2b2687e871207471 (diff) | |
| parent | 242ee720a6387f87e05d3eb8e30d2c7061cbf8ef (diff) | |
| download | egawk-71157f7f5f2fb9bf0fe588135485a8dcec322786.tar.gz egawk-71157f7f5f2fb9bf0fe588135485a8dcec322786.tar.bz2 egawk-71157f7f5f2fb9bf0fe588135485a8dcec322786.zip | |
Merge branch 'master' into array-iface
Diffstat (limited to 'regexec.c')
| -rw-r--r-- | regexec.c | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -375,7 +375,7 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, const char *str; int rval; int len = length1 + length2; - int free_str = 0; + char *s = NULL; if (BE (length1 < 0 || length2 < 0 || stop < 0 || len < length1, 0)) return -2; @@ -384,7 +384,7 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, if (length2 > 0) if (length1 > 0) { - char *s = re_malloc (char, len); + s = re_malloc (char, len); if (BE (s == NULL, 0)) return -2; @@ -395,7 +395,6 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, memcpy (s + length1, string2, length2); #endif str = s; - free_str = 1; } else str = string2; @@ -403,8 +402,7 @@ re_search_2_stub (bufp, string1, length1, string2, length2, start, range, regs, str = string1; rval = re_search_stub (bufp, str, len, start, range, stop, regs, ret_len); - if (free_str) - re_free ((char *) str); + re_free (s); return rval; } |