1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index c793e07b3ad..e3096b5f968 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -653,7 +653,12 @@ delete_framebuffer_cb(GLuint id, void *data, void *userData)
     */
    /*assert(fb->RefCount == 1);*/
    fb->RefCount = 0;
-   fb->Delete(fb);
+
+   /* NOTE: Delete should always be defined but there are two reports
+    * of it being NULL (bugs 13507, 14293).  Work-around for now.
+    */
+   if (fb->Delete)
+      fb->Delete(fb);
 }
 
 /**