SF: Fix Klockwork errors.

Resolve klockwork errors in frameworks/native to avoid buffer overflow and memory leaks. Change-Id: I7af17047538e621c872377090cea5b96f0924883
OpenSEMC · Jul 7, 2014 · f17754a · f17754a
1 parent a31051e
commit f17754a
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp
@@ -879,7 +879,9 @@ status_t Surface::lock(
 
         { // scope for the lock
             Mutex::Autolock lock(mMutex);
-            mSlots[backBufferSlot].dirtyRegion = newDirtyRegion;
+            if (backBufferSlot >= 0) {
+               mSlots[backBufferSlot].dirtyRegion = newDirtyRegion;
+            }
         }
 
         if (inOutDirtyBounds) {

diff --git a/libs/gui/SurfaceControl.cpp b/libs/gui/SurfaceControl.cpp
@@ -180,7 +180,10 @@ status_t SurfaceControl::writeSurfaceToParcel(
     if (control != NULL) {
         bp = control->mGraphicBufferProducer;
     }
-    return parcel->writeStrongBinder(bp->asBinder());
+    if (bp != NULL) {
+        return parcel->writeStrongBinder(bp->asBinder());
+    }
+    return NO_INIT;
 }
 
 sp<Surface> SurfaceControl::getSurface() const

diff --git a/libs/ui/Region.cpp b/libs/ui/Region.cpp
@@ -783,7 +783,9 @@ SharedBuffer const* Region::getSharedBuffer(size_t* count) const {
         size_t numRects = isRect() ? 1 : mStorage.size() - 1;
         count[0] = numRects;
     }
-    sb->acquire();
+    if (sb != NULL) {
+       sb->acquire();
+    }
     return sb;
 }
 

diff --git a/services/surfaceflinger/DisplayHardware/HWComposer.cpp b/services/surfaceflinger/DisplayHardware/HWComposer.cpp
@@ -667,6 +667,8 @@ status_t HWComposer::createWorkList(int32_t id, size_t numLayers) {
             size_t size = sizeofHwcLayerList(mHwc, numLayers);
             free(disp.list);
             disp.list = (hwc_display_contents_1_t*)malloc(size);
+            if(disp.list == NULL)
+                return NO_MEMORY;
             disp.capacity = numLayers;
         }
         if (hwcHasApiVersion(mHwc, HWC_DEVICE_API_VERSION_1_1)) {