commit 31529ff7918ce891fba9a660d0a861eb313ea554
author Romain Guy <romainguy@google.com> Fri Sep 17 10:26:31 2010 -0700
committer Romain Guy <romainguy@google.com> Fri Sep 17 10:26:31 2010 -0700
tree 8be25943daf28a7e39af5d87d389abf1e986dd5a
parent a977120681904ee6309f3e90f51c6cc43615c007

Correctly free memory.

Change-Id: I08fcbfa7d27ae413e0a8e8ca6ea305c8530a72c1

libs/hwui/Line.h

diff --git a/libs/hwui/Line.h b/libs/hwui/Line.h
index 48e18eb..75f3321e 100644
--- a/libs/hwui/Line.h
+++ b/libs/hwui/Line.h
@@ -74,8 +74,8 @@
 
     ~Line() {
         delete mPatch;
-        delete mXDivs;
-        delete mYDivs;
+        delete[] mXDivs;
+        delete[] mYDivs;
 
         glDeleteTextures(1, &mTexture);
     }

libs/hwui/Patch.cpp

diff --git a/libs/hwui/Patch.cpp b/libs/hwui/Patch.cpp
index 0a6eca3..ca0a0b1 100644
--- a/libs/hwui/Patch.cpp
+++ b/libs/hwui/Patch.cpp
@@ -34,7 +34,7 @@
 }
 
 Patch::~Patch() {
-    delete vertices;
+    delete[] vertices;
 }
 
 ///////////////////////////////////////////////////////////////////////////////

libs/hwui/Program.cpp

diff --git a/libs/hwui/Program.cpp b/libs/hwui/Program.cpp
index 6528d91..2e1b9a0 100644
--- a/libs/hwui/Program.cpp
+++ b/libs/hwui/Program.cpp
@@ -46,10 +46,9 @@
         GLint infoLen = 0;
         glGetProgramiv(id, GL_INFO_LOG_LENGTH, &infoLen);
         if (infoLen > 1) {
-            char* log = (char*) malloc(sizeof(char) * infoLen);
-            glGetProgramInfoLog(id, infoLen, 0, log);
+            GLchar log[infoLen];
+            glGetProgramInfoLog(id, infoLen, 0, &log[0]);
             LOGE("Error while linking shaders: %s", log);
-            delete log;
         }
         glDeleteShader(vertexShader);
         glDeleteShader(fragmentShader);