commit b883a848b82932e7c7b90893e6e30bfff2bcaeb7
author The Android Automerger <android-build@android.com> Tue Nov 08 06:53:16 2011 -0800
committer The Android Automerger <android-build@android.com> Tue Nov 08 06:53:16 2011 -0800
tree 9181794a0482b5c2b087e309cf51562c1a7cef8d
parent f29f8cc311744dce60f67e17b420c4653ebaeb62
parent 6228253428a9ee79f0e6fd054f215ef7570d601f

merge in ics-release history after reset to master

src/ports/SkImageRef_ashmem.cpp

diff --git a/src/ports/SkImageRef_ashmem.cpp b/src/ports/SkImageRef_ashmem.cpp
index 539d768..6686d2c 100644
--- a/src/ports/SkImageRef_ashmem.cpp
+++ b/src/ports/SkImageRef_ashmem.cpp
@@ -86,6 +86,7 @@
             if (err) {
                 SkDebugf("------ ashmem_set_prot_region(%d) failed %d %d\n",
                          fd, err, errno);
+                close(fd);
                 return false;
             }
             
@@ -93,6 +94,7 @@
             if (-1 == (long)addr) {
                 SkDebugf("---------- mmap failed for imageref_ashmem size=%d err=%d\n",
                          size, errno);
+                close(fd);
                 return false;
             }