commit 834096146820160e3d192b76075ae372c060d165
author Elliott Hughes <enh@google.com> Mon Aug 07 23:28:25 2017 +0000
committer android-build-merger <android-build-merger@google.com> Mon Aug 07 23:28:25 2017 +0000
tree 28ab0829b28bbdbbb51c83d6c54390ecf95e819e
parent 6011d9a4faed754660fb7080dd9433d2dc033887
parent 85ec116a3244979d3a67aff0b61064f7fa8f106f

Avoid double-free/double-fclose on error. am: 332513d0d2 am: 6c5b3c3fed am: 8d222cd40c am: e1b95886e2
am: 85ec116a32

Change-Id: I6e0ac3d3bd9cc300c56eea42875aa96e508552d3

src/dwarf/Gfind_proc_info-lsb.c

diff --git a/src/dwarf/Gfind_proc_info-lsb.c b/src/dwarf/Gfind_proc_info-lsb.c
index 7862ef7..77ed3d0 100644
--- a/src/dwarf/Gfind_proc_info-lsb.c
+++ b/src/dwarf/Gfind_proc_info-lsb.c
@@ -257,7 +257,11 @@
       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 @@
 
 /* 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;
 }