Merge "Fix resource leaks."

c2f1b7f6 · Aart Bik · Gerrit Code Review · ef028e72 · f23d8797 · c2f1b7f6
Commit c2f1b7f6 authored 8 years ago by Aart Bik Committed by Gerrit Code Review 8 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

libdex/SysUtil.cpp libdex/SysUtil.cpp +1 -0

libdex/sha1.cpp libdex/sha1.cpp +1 -0

No files found.
--- a/libdex/SysUtil.cpp
+++ b/libdex/SysUtil.cpp
@@ -126,6 +126,7 @@ int sysFakeMapFile(int fd, MemMapping* pMap)
    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;
    }


--- a/libdex/sha1.cpp
+++ b/libdex/sha1.cpp
@@ -388,6 +388,7 @@ int verifyfile(char *fname)
            }
        }
    } while (s);
+    fclose(checkfile);
    return found;
 }