diff options
| author | Leon Scroggins III <scroggo@google.com> | 2015-01-15 16:56:41 -0500 |
|---|---|---|
| committer | Leon Scroggins <scroggo@google.com> | 2015-02-19 12:46:17 +0000 |
| commit | 0e1c7ef17722081497e0ae6757d02e649454646a (patch) | |
| tree | a2a9858bbd66ddd2411b6183812bd8c85635d213 | |
| parent | 135f5dc7b1302ba3cab48f4738d5ed1450bcb896 (diff) | |
| download | jpeg-0e1c7ef17722081497e0ae6757d02e649454646a.tar.gz | |
Fix bugs in jmem-ashmem.
If ashmem_set_prot_region fails, close the previously opened file.
If mmap fails, close the file and return -1.
BUG:18894965
Change-Id: I936b5c7395480249b1457e7dee566da6141fb023
(cherry picked from commit 3773c6ec2bcf603cfa2b16575022642b3e816297)
(cherry picked from commit a9ccf6f358d544eedc9432ca81da3d3c76b0e65a)
| -rw-r--r-- | jmem-ashmem.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/jmem-ashmem.c b/jmem-ashmem.c index 3a17b02..0c35715 100644 --- a/jmem-ashmem.c +++ b/jmem-ashmem.c @@ -121,6 +121,8 @@ LOCAL(int) get_ashmem(backing_store_ptr info, long total_bytes_needed) { char path[1024]; + // FIXME: Does this name need to be unique? What happens if two jpegs + // are being decoded simultaneously in the same process? snprintf(path, 1023, "%d.tmp.ashmem", getpid()); int fd = ashmem_create_region(path, total_bytes_needed); if (fd == -1) { @@ -128,9 +130,16 @@ get_ashmem(backing_store_ptr info, long total_bytes_needed) } int err = ashmem_set_prot_region(fd, PROT_READ | PROT_WRITE); if (err) { - return -1; + close(fd); + return -1; + } + void* addr = mmap(NULL, total_bytes_needed, PROT_READ | PROT_WRITE, + MAP_PRIVATE, fd, 0); + if (-1 == (long) addr) { + close(fd); + return -1; } - info->addr = mmap(NULL, total_bytes_needed, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); + info->addr = addr; info->size = total_bytes_needed; info->temp_file = fd; return fd; |