Fix crash in OpenGL pyramid example if context creation fails

Initialize context pointers to null so that we don't delete uninitialized junk later. See wxWidgets#16910. Closes wxWidgets#233
yangjidong · Feb 26, 2016 · e2fb055 · e2fb055
1 parent 5ab459e
commit e2fb055
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp
@@ -552,6 +552,7 @@ wxIMPLEMENT_CLASS(wxGLContext, wxObject);
 wxGLContext::wxGLContext(wxGLCanvas *win,
                          const wxGLContext *other,
                          const wxGLContextAttrs *ctxAttrs)
+    : m_glContext(NULL)
 {
     const int* contextAttribs = NULL;
     bool needsARB = false;
@@ -614,7 +615,10 @@ wxGLContext::wxGLContext(wxGLCanvas *win,
 wxGLContext::~wxGLContext()
 {
     // note that it's ok to delete the context even if it's the current one
-    wglDeleteContext(m_glContext);
+    if ( m_glContext )
+    {
+        wglDeleteContext(m_glContext);
+    }
 }
 
 bool wxGLContext::SetCurrent(const wxGLCanvas& win) const

diff --git a/src/osx/glcanvas_osx.cpp b/src/osx/glcanvas_osx.cpp
@@ -359,6 +359,7 @@ wxGLAttributes& wxGLAttributes::Defaults()
 wxGLContext::wxGLContext(wxGLCanvas *win,
                          const wxGLContext *other,
                          const wxGLContextAttrs *ctxAttrs)
+    : m_glContext(NULL)
 {
     const int* contextAttribs = NULL;
     int ctxSize = 0;

diff --git a/src/unix/glx11.cpp b/src/unix/glx11.cpp
@@ -454,6 +454,7 @@ wxIMPLEMENT_CLASS(wxGLContext, wxObject);
 wxGLContext::wxGLContext(wxGLCanvas *win,
                          const wxGLContext *other,
                          const wxGLContextAttrs *ctxAttrs)
+    : m_glContext(NULL)
 {
     const int* contextAttribs = NULL;
     Bool x11Direct = True;