summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2013-08-11 12:02:30 +0200
committerMikael Magnusson <mikachu@gmail.com>2013-08-11 12:04:13 +0200
commit937ba3c7e791111bd94153866545dd9bb8334c7f (patch)
tree9a25dc48471b6e1a2da0dbeb113e902539277ec1
parentf55caaf6a003c8e9dece297e0e1aca89a1ee99ef (diff)
Fix use after free in error message
-rw-r--r--obrender/image.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/obrender/image.c b/obrender/image.c
index 0164a8c8..8ff9bf10 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.