diff options
| author | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
|---|---|---|
| committer | Ole Loots <ole@monochrom.net> | 2013-01-31 19:28:26 +0100 |
| commit | 0703404654d2a40cacae2d94c6e0e22ca28b4acf (patch) | |
| tree | bfdbe1e8952814f73a6b0e190ae0a77fd0cfc7bd /image | |
| parent | 54f719aa960159c5b1978846223732c9669ca7fa (diff) | |
| parent | 89856f55929907642013e45435b9d18cd1fafe36 (diff) | |
| download | netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.gz netsurf-0703404654d2a40cacae2d94c6e0e22ca28b4acf.tar.bz2 | |
Merge branch 'master' into mono/removing-windom-dependencymono/removing-windom-dependency
Conflicts:
atari/toolbar.c
Diffstat (limited to 'image')
| -rw-r--r-- | image/png.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/image/png.c b/image/png.c index 23c755825..2a8334693 100644 --- a/image/png.c +++ b/image/png.c @@ -502,7 +502,8 @@ png_cache_convert_error: free((png_bytep *) row_pointers); - bitmap_modified((struct bitmap *)bitmap); + if (bitmap != NULL) + bitmap_modified((struct bitmap *)bitmap); return (struct bitmap *)bitmap; } |