[Bf-blender-cvs] [00f732f] master: Fix T44266: win32 delete's malloc'd memory

Campbell Barton noreply at git.blender.org
Sat Apr 4 22:54:54 CEST 2015


Commit: 00f732f268d32f661a0b75e7f98d9924ca0fd4b7
Author: Campbell Barton
Date:   Sun Apr 5 06:53:34 2015 +1000
Branches: master
https://developer.blender.org/rB00f732f268d32f661a0b75e7f98d9924ca0fd4b7

Fix T44266: win32 delete's malloc'd memory

===================================================================

M	intern/ghost/intern/GHOST_ContextWGL.cpp

===================================================================

diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp
index 0557374..d155e68 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -120,9 +120,9 @@ GHOST_ContextWGL::~GHOST_ContextWGL()
 #endif
 
 #ifndef NDEBUG
-	delete m_dummyRenderer;
-	delete m_dummyVendor;
-	delete m_dummyVersion;
+	free(m_dummyRenderer);
+	free(m_dummyVendor);
+	free(m_dummyVersion);
 #endif
 }
 
@@ -393,9 +393,9 @@ void GHOST_ContextWGL::initContextWGLEW(PIXELFORMATDESCRIPTOR &preferredPFD)
 	// the following are not technially WGLEW, but they also require a context to work
 
 #ifndef NDEBUG
-	delete m_dummyRenderer;
-	delete m_dummyVendor;
-	delete m_dummyVersion;
+	free(m_dummyRenderer);
+	free(m_dummyVendor);
+	free(m_dummyVersion);
 
 	m_dummyRenderer = _strdup(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
 	m_dummyVendor   = _strdup(reinterpret_cast<const char *>(glGetString(GL_VENDOR)));




More information about the Bf-blender-cvs mailing list