commit 585a50cecbccf59666dd65e9fc4320eaa3511634
author Tao Bao <tbao@google.com> Tue Sep 08 17:40:27 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 08 17:40:27 2015 +0000
tree 1b1288f70cf8c534a2c171f39037cf5607480b25
parent f8c303f9c197ed9247dbc88a5bf392f1f2c65639
parent a91c66d7c13e0143f63f0ea9c1c74ce39aecd79e

Merge "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) {