navigine/jq
1
0 Fork 0
mirror of https://github.com/jqlang/jq.git synced 2026-10-30 10:06:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix use after free in f_strptime

Browse Source
This commit is contained in:
David Tolnay authored and Nicolas Williams committed 2015-06-19 00:34:27 -05:00
1 parent 1146b8b84a
commit b04cd6aada
1 file changed
+4 -2
Download Patch File Download Diff File Expand all files Collapse all files
builtin.c
+4 -2
View File
@@ -1056,13 +1056,15 @@ static jv f_strptime(jq_state *jq, jv a, jv b) {
jv_free(b); jv_free(b);
return e; return e;
} }
jv_free(a);
jv_free(b); jv_free(b);
if (tm.tm_wday == 0 && tm.tm_yday == 0 && my_mktime(&tm) == (time_t)-2) if (tm.tm_wday == 0 && tm.tm_yday == 0 && my_mktime(&tm) == (time_t)-2) {
jv_free(a);
return jv_invalid_with_msg(jv_string("strptime/1 not supported on this platform")); return jv_invalid_with_msg(jv_string("strptime/1 not supported on this platform"));
}
jv r = tm2jv(&tm); jv r = tm2jv(&tm);
if (*end != '\0') if (*end != '\0')
r = jv_array_append(r, jv_string(end)); r = jv_array_append(r, jv_string(end));
jv_free(a); // must come after `*end` because `end` is a pointer into `a`'s string
return r; return r;
} }
#else #else