Commit f50062b4 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Apply 02_changeset_r50_http_support_2.patch from Debian

parent ac1616c8

ChangeLog

+3 −0
Original line number Diff line number Diff line 
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.

src/imlib.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}