commit 254fceac120114abd575da7095e81394eafa008f
author Corentin Wallez <cwallez@chromium.org> Tue Aug 25 19:11:07 2015
committer Corentin Wallez <cwallez@chromium.org> Tue Aug 25 21:20:24 2015
tree 234f862db6bc4423f1b2ee3a4985876e47fb307d
parent 47a878c65d3589e1d0c2cd2ed956c0469627eef3

Fix two leaks and a delete vs delete[] reported by ASAN

BUG=angleproject:1137

Change-Id: Ic654b79aa56ae0c0a24097b85ab48f5af53ca1f7
Reviewed-on: https://chromium-review.googlesource.com/295154
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Tested-by: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/renderer/gl/glx/DisplayGLX.cpp

diff --git a/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp b/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
index 1b82c2c..4c14474 100644
--- a/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
+++ b/src/libANGLE/renderer/gl/glx/DisplayGLX.cpp
@@ -385,6 +385,9 @@
         int id = configs.add(config);
         configIdToGLXConfig[id] = glxConfig;
     }
+
+    XFree(glxConfigs);
+
     return configs;
 }
 

src/tests/gl_tests/MipmapTest.cpp

diff --git a/src/tests/gl_tests/MipmapTest.cpp b/src/tests/gl_tests/MipmapTest.cpp
index 0578f9c..9f4a496 100644
--- a/src/tests/gl_tests/MipmapTest.cpp
+++ b/src/tests/gl_tests/MipmapTest.cpp
@@ -141,10 +141,10 @@
         glDeleteTextures(1, &mOffscreenTexture2D);
         glDeleteTextures(1, &mOffscreenTextureCube);
 
-        delete mLevelZeroBlueInitData;
-        delete mLevelZeroWhiteInitData;
-        delete mLevelOneInitData;
-        delete mLevelTwoInitData;
+        SafeDeleteArray(mLevelZeroBlueInitData);
+        SafeDeleteArray(mLevelZeroWhiteInitData);
+        SafeDeleteArray(mLevelOneInitData);
+        SafeDeleteArray(mLevelTwoInitData);
 
         ANGLETest::TearDown();
     }

util/x11/X11Window.cpp

diff --git a/util/x11/X11Window.cpp b/util/x11/X11Window.cpp
index 42913a8..68324b7 100644
--- a/util/x11/X11Window.cpp
+++ b/util/x11/X11Window.cpp
@@ -305,6 +305,8 @@
         angle::Sleep(10);
     }
 
+    delete timer;
+
     return true;
 }