commit e4502b86dda440fd2d55649aa72b32444b3f749b
author Aart Bik <ajcbik@google.com> Wed May 25 22:00:19 2016 +0000
committer android-build-merger <android-build-merger@google.com> Wed May 25 22:00:19 2016 +0000
tree c06e09260676f3784dc7f6fa08b8427dfeeae35f
parent b263f358bae61dc0b8433b4c87c0af2b0920d8a3
parent c2f1b7f6ec2de6c0d50177e366240bb85f6d48b2

Merge "Fix resource leaks."
am: c2f1b7f6ec

* commit 'c2f1b7f6ec2de6c0d50177e366240bb85f6d48b2':
  Fix resource leaks.

Change-Id: I221c57081d3f94fd91f57e90373db36727f873e1

libdex/SysUtil.cpp

diff --git a/libdex/SysUtil.cpp b/libdex/SysUtil.cpp
index 5650be5..634e94f 100644
--- a/libdex/SysUtil.cpp
+++ b/libdex/SysUtil.cpp
@@ -126,6 +126,7 @@
     if (read(fd, memPtr, length) < 0) {
         ALOGW("read(fd=%d, start=%d, length=%d) failed: %s", (int) length,
             fd, (int) start, strerror(errno));
+        free(memPtr);
         return -1;
     }
 

libdex/sha1.cpp

diff --git a/libdex/sha1.cpp b/libdex/sha1.cpp
index e1a7a04..d594934 100644
--- a/libdex/sha1.cpp
+++ b/libdex/sha1.cpp
@@ -388,6 +388,7 @@
             }
         }
     } while (s);
+    fclose(checkfile);
     return found;
 }