From fd9de710f5fb72a36c963d560391cc12fef0aa9b Mon Sep 17 00:00:00 2001
From: Brian Paul <brian.paul@tungstengraphics.com>
Date: Mon, 12 Sep 2005 23:18:21 +0000
Subject: added a return upon out-of-memory, remove a needless assignment

---
 src/mesa/drivers/x11/xm_api.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index 8972f57d94..53ee56e46c 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -1,6 +1,6 @@
 /*
  * Mesa 3-D graphics library
- * Version:  6.3
+ * Version:  6.5
  *
  * Copyright (C) 1999-2005  Brian Paul   All Rights Reserved.
  *
@@ -616,6 +616,7 @@ xmesa_alloc_back_buffer( XMesaBuffer b, GLuint width, GLuint height )
 #endif
 	 if (!b->backxrb->ximage) {
 	    _mesa_warning(NULL, "alloc_back_buffer: XCreateImage failed.");
+            return;
 	 }
          b->backxrb->ximage->data = (char *) MALLOC( b->backxrb->ximage->height
                                         * b->backxrb->ximage->bytes_per_line );
@@ -626,7 +627,6 @@ xmesa_alloc_back_buffer( XMesaBuffer b, GLuint width, GLuint height )
          }
       }
       b->backxrb->pixmap = None;
-      b->backxrb->ximage = b->backxrb->ximage;
    }
    else if (b->db_mode == BACK_PIXMAP) {
       if (!width)
-- 
cgit v1.2.3