From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 18 Aug 2007 10:24:57 +0000 (+0200)
Subject: viewer.c: Fix a segfault when resizing the window.
X-Git-Url: https://git.octo.it/?p=libopano.git;a=commitdiff_plain;h=e8d9022f32f7fedb8de1c86231d5db506ba8411f

viewer.c: Fix a segfault when resizing the window.
---

diff --git a/src/viewer.c b/src/viewer.c
index 7516db2..3494d19 100644
--- a/src/viewer.c
+++ b/src/viewer.c
@@ -134,13 +134,13 @@ static int draw_window (const ui_image_t *img)
   if ((ximage != NULL) && ((img->width != ximage->width) || (img->height != ximage->height)))
   {
     free (ximage->data);
+    ximage->data = NULL;
     XDestroyImage (ximage);
     ximage = NULL;
   }
 
   if (ximage == NULL)
   {
-    char *data;
     ximage = XCreateImage(disp_g, visual_g, depth_g, ZPixmap, 0,
 	NULL, img->width, img->height,
 	8, 0);
@@ -149,8 +149,7 @@ static int draw_window (const ui_image_t *img)
 
     ximage->byte_order= MSBFirst;
 
-    data = (char *) malloc (img->width * img->height * depth_g / 8);
-    ximage->data = data;
+    ximage->data = (char *) malloc (img->width * img->height * depth_g / 8);
     if (ximage->data == NULL)
     {
       XDestroyImage (ximage);