diff options
| author | Dennis Real <github@tildepipe.org> | 2012-03-31 18:43:47 +0200 |
|---|---|---|
| committer | Dennis Real <github@tildepipe.org> | 2012-03-31 18:43:47 +0200 |
| commit | 58dd2e303c5ee380527d92a3fa3d6baeeacb50a1 (patch) | |
| tree | 54204229407976231cf12cfb202de2a61ea19bed | |
| parent | cf6f0320c15abd753951990a963d5c94b180bbde (diff) | |
| parent | 82a976e0909e02ba8c25e4fd10d0e56a3e5c13ca (diff) | |
Merge branch 'master' of git://github.com/derf/feh
| -rw-r--r-- | src/imlib.c | 1 | ||||
| -rw-r--r-- | src/winwidget.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/imlib.c b/src/imlib.c index 9aa166f..4f7ff24 100644 --- a/src/imlib.c +++ b/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) { diff --git a/src/winwidget.c b/src/winwidget.c index ae34045..0a9adc8 100644 --- a/src/winwidget.c +++ b/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; |