Skip to content
Browse files

Merge branch 'master' of git://github.com/derf/feh

  • Loading branch information...
2 parents cf6f032 + 82a976e commit 58dd2e303c5ee380527d92a3fa3d6baeeacb50a1 @reald reald committed Mar 31, 2012
Showing with 2 additions and 0 deletions.
  1. +1 −0 src/imlib.c
  2. +1 −0 src/winwidget.c
View
1 src/imlib.c
@@ -305,6 +305,7 @@ static char *feh_magick_load_image(char *filename)
if (!WIFEXITED(status) || (WEXITSTATUS(status) != 0)) {
close(fd);
unlink(sfn);
+ free(sfn);
sfn = NULL;
if (!opt.quiet) {
View
1 src/winwidget.c
@@ -42,6 +42,7 @@ static winwidget winwidget_allocate(void)
winwidget ret = NULL;
ret = emalloc(sizeof(_winwidget));
+ memset(ret, 0, sizeof(_winwidget));
ret->win = 0;
ret->w = 0;

0 comments on commit 58dd2e3

Please sign in to comment.
Something went wrong with that request. Please try again.