summaryrefslogtreecommitdiff
path: root/render/color.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-04-13 02:26:56 +0000
committerDana Jansens <danakj@orodu.net>2003-04-13 02:26:56 +0000
commitc2bb32dcd1539796f0c8da49d3df3468553ad256 (patch)
tree7fea6dd16f13197ef8239ecdf20bab79e370b40f /render/color.c
parentfd5784c082de724b9ccde01977eac1e27a121201 (diff)
dont fux self in color_free if the color is NULL
Diffstat (limited to 'render/color.c')
-rw-r--r--render/color.c10
1 files changed, 6 insertions, 4 deletions
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++) {