From 7bd747389d3463b00919fd21dfb21d31feb2c3f8 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Wed, 19 Mar 2003 07:58:39 +0000 Subject: [PATCH] initialize texture to NULL if theres no textures. use g_memdup to copy it --- render/render.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/render/render.c b/render/render.c index 51c3a9be..b048bcec 100644 --- a/render/render.c +++ b/render/render.c @@ -141,6 +141,7 @@ Appearance *appearance_new(SurfaceType type, int numtex) out->textures = numtex; out->xftdraw = NULL; if (numtex) out->texture = g_new(Texture, numtex); + else out->texture = NULL; out->pixmap = None; switch (type) { @@ -191,10 +192,8 @@ Appearance *appearance_copy(Appearance *orig) break; } copy->textures = orig->textures; - if (orig->textures) { - copy->texture = malloc(orig->textures * sizeof(Texture)); - memcpy(copy->texture, orig->texture, orig->textures * sizeof(Texture)); - } else copy->texture = NULL; + copy->texture = g_memdup(orig->texture, + orig->textures * sizeof(Texture)); copy->pixmap = None; copy->xftdraw = NULL; return copy; -- 2.39.2