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

* commit 'e5571a0ff8217a6fe1b3defdb22295596e36c280':
  imgdiff: fix file descriptor leak
This commit is contained in:
Tao Bao
2015-09-08 17:54:19 +00:00
committed by Android Git Automerger
+9 -1
View File
@@ -628,7 +628,15 @@ unsigned char* MakePatch(ImageChunk* src, ImageChunk* tgt, size_t* size) {
} }
char ptemp[] = "/tmp/imgdiff-patch-XXXXXX"; 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); int r = bsdiff(src->data, src->len, &(src->I), tgt->data, tgt->len, ptemp);
if (r != 0) { if (r != 0) {