From: Mikael Magnusson Date: Sun, 11 Aug 2013 10:02:30 +0000 (+0200) Subject: Fix use after free in error message X-Git-Tag: release-3.5.1~12 X-Git-Url: http://git.openbox.org/?p=mikachu%2Fopenbox.git;a=commitdiff_plain;h=937ba3c7e791111bd94153866545dd9bb8334c7f;hp=f55caaf6a003c8e9dece297e0e1aca89a1ee99ef Fix use after free in error message --- diff --git a/obrender/image.c b/obrender/image.c index 0164a8c..8ff9bf1 100644 --- a/obrender/image.c +++ b/obrender/image.c @@ -652,10 +652,9 @@ RrImage* RrImageNewFromName(RrImageCache *cache, const gchar *name) } #endif - g_free(path); - if (!loaded) { g_message("Cannot load image \"%s\" from file \"%s\"", name, path); + g_free(path); #if defined(USE_LIBRSVG) DestroyRsvgLoader(rsvg_loader); #endif @@ -665,6 +664,8 @@ RrImage* RrImageNewFromName(RrImageCache *cache, const gchar *name) return NULL; } + g_free(path); + /* get an RrImage that contains an RrImageSet with this picture in it. the RrImage might be new, or reused if the picture was already in the cache.