summaryrefslogtreecommitdiff
path: root/image/png.c
diff options
context:
space:
mode:
authorJohn Mark Bell <jmb@netsurf-browser.org>2010-05-01 11:36:44 +0000
committerJohn Mark Bell <jmb@netsurf-browser.org>2010-05-01 11:36:44 +0000
commit48ba03d6ca518592ca02a3a72debbbb33e86cc11 (patch)
tree610540da96277d4b7cbe01c786a051e07d8b24a3 /image/png.c
parent227780f653e5b89a67d90505a853305fe07af2ce (diff)
downloadnetsurf-48ba03d6ca518592ca02a3a72debbbb33e86cc11.tar.gz
netsurf-48ba03d6ca518592ca02a3a72debbbb33e86cc11.tar.bz2
Remove erroneous assertion: there may be no bitmap object if there was no PNG data.
svn path=/trunk/netsurf/; revision=10540
Diffstat (limited to 'image/png.c')
-rw-r--r--image/png.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/image/png.c b/image/png.c
index 5f01b2387..fc6e745a6 100644
--- a/image/png.c
+++ b/image/png.c
@@ -267,6 +267,15 @@ bool nspng_convert(struct content *c)
assert(c->data.png.png != NULL);
assert(c->data.png.info != NULL);
+ if (c->data.png.bitmap == NULL) {
+ union content_msg_data msg_data;
+
+ msg_data.error = messages_get("PNGError");
+ content_broadcast(c, CONTENT_MSG_ERROR, msg_data);
+ c->status = CONTENT_STATUS_ERROR;
+ return false;
+ }
+
data = content__get_source_data(c, &size);
png_destroy_read_struct(&c->data.png.png, &c->data.png.info, 0);