diff options
| author | Jeremy Compostella <jeremy.compostella@intel.com> | 2015-09-08 19:15:09 +0200 |
|---|---|---|
| committer | Jeremy Compostella <jeremy.compostella@intel.com> | 2015-09-08 19:15:09 +0200 |
| commit | a91c66d7c13e0143f63f0ea9c1c74ce39aecd79e (patch) | |
| tree | 1b1288f70cf8c534a2c171f39037cf5607480b25 /applypatch/imgdiff.cpp | |
| parent | f8c303f9c197ed9247dbc88a5bf392f1f2c65639 (diff) | |
| download | android_bootable_recovery-a91c66d7c13e0143f63f0ea9c1c74ce39aecd79e.tar.gz android_bootable_recovery-a91c66d7c13e0143f63f0ea9c1c74ce39aecd79e.tar.bz2 android_bootable_recovery-a91c66d7c13e0143f63f0ea9c1c74ce39aecd79e.zip | |
imgdiff: fix file descriptor leak
mkstemp() allocates a file description that is never released. If
MakePatch() is called too many time, imgdiff reaches the Operating
System EMFILE (too many open files) limit.
Change-Id: Icbe1399f6f6d32cfa1830f879cacf7d75bbd9fc3
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>
Signed-off-by: Gaelle Nassiet <gaellex.nassiet@intel.com>
Diffstat (limited to 'applypatch/imgdiff.cpp')
| -rw-r--r-- | applypatch/imgdiff.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/applypatch/imgdiff.cpp b/applypatch/imgdiff.cpp index 4d83ffb2..50cabbe6 100644 --- a/applypatch/imgdiff.cpp +++ b/applypatch/imgdiff.cpp @@ -628,7 +628,15 @@ unsigned char* MakePatch(ImageChunk* src, ImageChunk* tgt, size_t* size) { } 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) { |