From f50062b40bbe0cba72eec0f84dd4fbdbece3baed Mon Sep 17 00:00:00 2001 From: Daniel Friesel Date: Fri, 5 Feb 2010 18:04:02 +0100 Subject: Apply 02_changeset_r50_http_support_2.patch from Debian --- ChangeLog | 3 +++ src/imlib.c | 4 ++-- 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 + * (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 * (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); } -- cgit v1.2.3