From ed04f7871bab3cb07e47e42fe4d9ebe5b02281a2 Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Sat, 8 Aug 2009 17:01:18 -0700
Subject: don't memset ashmem region, especially before they're mmapped

---
 modules/gralloc/gralloc.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gralloc')

diff --git a/modules/gralloc/gralloc.cpp b/modules/gralloc/gralloc.cpp
index d936cd3..404d8b8 100644
--- a/modules/gralloc/gralloc.cpp
+++ b/modules/gralloc/gralloc.cpp
@@ -300,6 +300,7 @@ try_ashmem:
                     fd = -1;
                 }
                 //LOGD_IF(!err, "allocating pmem size=%d, offset=%d", size, offset);
+                memset((char*)base + offset, 0, size);
             }
         } else {
             if ((usage & GRALLOC_USAGE_HW_2D) == 0) {
@@ -329,7 +330,6 @@ try_ashmem:
         hnd->base = int(base)+offset;
         hnd->lockState = lockState;
         *pHandle = hnd;
-        memset((void*)hnd->base, 0, size);
     }
     
     LOGE_IF(err, "gralloc failed err=%s", strerror(-err));
-- 
cgit v1.1