st/mesa: add null pointer check in st_renderbuffer_delete()
authorBrian Paul <brianp@vmware.com>
Mon, 3 Dec 2012 15:30:04 +0000 (08:30 -0700)
committerBrian Paul <brianp@vmware.com>
Mon, 3 Dec 2012 18:30:42 +0000 (11:30 -0700)
In my testing I haven't found any cases where we get a null context
pointer, but it might still be possible.  Check for null just to be safe.

Note: This is a candidate for the stable branches.

src/mesa/state_tracker/st_cb_fbo.c

index 04907c9f7deca77ff1db82c278fe3013c075536d..ae280bfa9735f72702549bb05fbfcbd5cff6b04c 100644 (file)
@@ -228,10 +228,10 @@ static void
 st_renderbuffer_delete(struct gl_context *ctx, struct gl_renderbuffer *rb)
 {
    struct st_renderbuffer *strb = st_renderbuffer(rb);
-   struct st_context *st = st_context(ctx);
-   struct pipe_context *pipe = st->pipe;
-
-   pipe_surface_release(pipe, &strb->surface);
+   if (ctx) {
+      struct st_context *st = st_context(ctx);
+      pipe_surface_release(st->pipe, &strb->surface);
+   }
    pipe_resource_reference(&strb->texture, NULL);
    free(strb->data);
    _mesa_delete_renderbuffer(ctx, rb);