summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/imlib.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 763afbb..cbb72c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Sat Oct 1 08:05:06 EDT 2005 Richard Lowe <richlowe@richlowe.net>
+ * (imlib.c): Fix double free in feh_http_load_image
+ when using builtin HTTP support.
Sat Oct 1 07:25:00 EDT 2005 Richard Lowe <richlowe@richlowe.net>
* (imlib.c): Fix http grabbing via wget, wget --cache 0 is no longer valid
and treats the 0 as another URL. Debian bug #330912.
diff --git a/src/imlib.c b/src/imlib.c
index a217da3..3d829ce 100644
--- a/src/imlib.c
+++ b/src/imlib.c
@@ -556,8 +556,8 @@ feh_http_load_image(char *url)
if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
{
weprintf("url: wget failed to load URL %s\n", url);
- free(tmpname);
free(newurl);
+ free(tmpname);
D_RETURN(4, NULL);
}
if (opt.wget_timestamp)
@@ -568,10 +568,10 @@ feh_http_load_image(char *url)
tmpname);
system(cmd);
}
+ free(newurl);
}
}
- free(newurl);
D_RETURN(4, tmpname);
}