X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=render%2Fcolor.c;h=939098ea4c5271d816e1ed54ac7151f39e6bda81;hb=03d42b5d8253ad2de94df20b12b9fb22ce51eb3d;hp=c25707205256a69e027dd8175e81a4a1c6d99248;hpb=8ebf2b6a3f095a7404bac3a2867355f33c1582d4;p=chaz%2Fopenbox

diff --git a/render/color.c b/render/color.c
index c2570720..939098ea 100644
--- a/render/color.c
+++ b/render/color.c
@@ -58,9 +58,11 @@ color_rgb *color_new(int r, int g, int b)
 
 void color_free(color_rgb *c)
 {
-    if (c->gc != None)
-        XFreeGC(ob_display, c->gc);
-    g_free(c);
+    if (c != NULL) {
+        if (c->gc != None)
+            XFreeGC(ob_display, c->gc);
+        g_free(c);
+    }
 }
 
 void reduce_depth(pixel32 *data, XImage *im)
@@ -87,7 +89,7 @@ void reduce_depth(pixel32 *data, XImage *im)
                 data += im->width;
                 p32 += im->width;
             } 
-        } else im->data = data;
+        } else im->data = (char*) data;
         break;
     case 16:
         for (y = 0; y < im->height; y++) {