diff options
| author | Elliott Hughes <enh@google.com> | 2017-08-07 23:26:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-08-07 23:26:20 +0000 |
| commit | 85ec116a3244979d3a67aff0b61064f7fa8f106f (patch) | |
| tree | 28ab0829b28bbdbbb51c83d6c54390ecf95e819e | |
| parent | d010cccebaa716788ac92261a62e681c1d054a5b (diff) | |
| parent | e1b95886e206794050a4c204afd2a21ef926e888 (diff) | |
| download | libunwind-85ec116a3244979d3a67aff0b61064f7fa8f106f.tar.gz | |
Avoid double-free/double-fclose on error. am: 332513d0d2 am: 6c5b3c3fed am: 8d222cd40c
am: e1b95886e2
Change-Id: I0e8ccab4919e422d344ed34fce8bb3b81b1d1378
| -rw-r--r-- | src/dwarf/Gfind_proc_info-lsb.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/dwarf/Gfind_proc_info-lsb.c b/src/dwarf/Gfind_proc_info-lsb.c index 7862ef70..77ed3d09 100644 --- a/src/dwarf/Gfind_proc_info-lsb.c +++ b/src/dwarf/Gfind_proc_info-lsb.c @@ -257,7 +257,11 @@ load_debug_frame (const char *file, char **buf, size_t *bufsize, newname = malloc (strlen (linkbuf) + strlen (debugdir) + strlen (file) + 9); if (basedir == NULL || newname == NULL) - goto file_error; + { + free (basedir); + free (newname); + goto load_debug_frame_error; + } p = strrchr (file, '/'); if (p != NULL) @@ -299,11 +303,12 @@ load_debug_frame (const char *file, char **buf, size_t *bufsize, /* An error reading image file. Release resources and return error code */ file_error: - free(stringtab); - free(sec_hdrs); - free(linkbuf); - free(*buf); - fclose(f); + free (stringtab); + free (sec_hdrs); + fclose (f); +load_debug_frame_error: + free (linkbuf); + free (*buf); return 1; } |