SF.net SVN: alleg:[15441] allegro/branches/5.1/src/opengl/ogl_display.c

[<tj...@us...>]

Revision: 15441
          http://alleg.svn.sourceforge.net/alleg/?rev=15441&view=rev
Author:   tjaden
Date:     2012-03-13 11:25:22 +0000 (Tue, 13 Mar 2012)
Log Message:
-----------
ogl: Fix null pointer dereference if backbuffer creation fails.
Reported by Max Savenkov.

Modified Paths:
--------------
    allegro/branches/5.1/src/opengl/ogl_display.c

Modified: allegro/branches/5.1/src/opengl/ogl_display.c
===================================================================
--- allegro/branches/5.1/src/opengl/ogl_display.c	2012-03-13 11:24:53 UTC (rev 15440)
+++ allegro/branches/5.1/src/opengl/ogl_display.c	2012-03-13 11:25:22 UTC (rev 15441)
@@ -484,7 +484,12 @@
    al_set_new_bitmap_flags(ALLEGRO_VIDEO_BITMAP);
    backbuffer = _al_ogl_create_bitmap(disp, disp->w, disp->h);
    al_restore_state(&backup);
-   
+
+   if (!backbuffer) {
+      ALLEGRO_DEBUG("Backbuffer bitmap creation failed.\n");
+      return NULL;
+   }
+
    backbuffer->w = disp->w;
    backbuffer->h = disp->h;
    backbuffer->cl = 0;
@@ -492,11 +497,6 @@
    backbuffer->cr_excl = disp->w;
    backbuffer->cb_excl = disp->h;
 
-   if (!backbuffer) {
-      ALLEGRO_DEBUG("Backbuffer bitmap creation failed.\n");
-      return NULL;
-   }
-   
    ALLEGRO_TRACE_CHANNEL_LEVEL("display", 1)(
       "Created backbuffer bitmap (actual format: %s)\n",
       _al_format_name(backbuffer->format));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.