diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:02:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 08:02:54 (GMT) |
| commit | fbded00b0df5ba7663bddc8e5842a3a118a3c0b3 (patch) | |
| tree | 177a650ba4346331586d7cd597020dc2cc137351 /compat | |
| parent | 438776e3d48779417a7f9cfc6eaf0bb58d7d6cca (diff) | |
| parent | 149d8cbb2ebdf3cdc3e40abff9ff7eb8c647715a (diff) | |
| download | git-fbded00b0df5ba7663bddc8e5842a3a118a3c0b3.zip git-fbded00b0df5ba7663bddc8e5842a3a118a3c0b3.tar.gz git-fbded00b0df5ba7663bddc8e5842a3a118a3c0b3.tar.bz2 | |
Merge branch 'rs/win32-syslog-leakfix' into maint
Memory leak in an error codepath has been plugged.
* rs/win32-syslog-leakfix:
win32: plug memory leak on realloc() failure in syslog()
Diffstat (limited to 'compat')
| -rw-r--r-- | compat/win32/syslog.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compat/win32/syslog.c b/compat/win32/syslog.c index 6c7c9b6..161978d 100644 --- a/compat/win32/syslog.c +++ b/compat/win32/syslog.c @@ -43,8 +43,10 @@ void syslog(int priority, const char *fmt, ...) va_end(ap); while ((pos = strstr(str, "%1")) != NULL) { + char *oldstr = str; str = realloc(str, st_add(++str_len, 1)); if (!str) { + free(oldstr); warning_errno("realloc failed"); return; } |