commit 282e5724674e8f2358eef57989bd0ce44ba7d6de
author Tao Bao <tbao@google.com> Tue Sep 08 17:57:58 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Sep 08 17:57:58 2015 +0000
tree b296a406719d8dd5cf7dd054c33647b3a8aa337a
parent f6dd99f5099c3a8a9bce27726772f72a57b613b8
parent d4547c1ddaf6ac4b13e9a160582f6baba44860b6

am d4547c1d: am e5571a0f: am 585a50ce: Merge "imgdiff: fix file descriptor leak"

* commit 'd4547c1ddaf6ac4b13e9a160582f6baba44860b6':
  imgdiff: fix file descriptor leak

applypatch/imgdiff.cpp

diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp
index 4d83ffb..50cabbe 100644
--- a/applypatch/imgdiff.cpp
+++ b/applypatch/imgdiff.cpp
@@ -628,7 +628,15 @@
   }
 
   char ptemp[] = "/tmp/imgdiff-patch-XXXXXX";
-  mkstemp(ptemp);
+  int fd = mkstemp(ptemp);
+
+  if (fd == -1) {
+    printf("MakePatch failed to create a temporary file: %s\n",
+           strerror(errno));
+    return NULL;
+  }
+  close(fd); // temporary file is created and we don't need its file
+             // descriptor
 
   int r = bsdiff(src->data, src->len, &(src->I), tgt->data, tgt->len, ptemp);
   if (r != 0) {