mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-11-28 17:23:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

[project @ 2004-05-02 14:49:28 by joty]

Browse Source 
Corrupted PNG files will no longer result in assert() calling.  See
test suite at http://www.schaik.com/pngsuite/pngsuite.html.

svn path=/import/netsurf/; revision=815
This commit is contained in:
John Tytgat 2004-05-02 14:49:28 +00:00
parent 51bea40b9a
commit f310036536
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
riscos/png.c
View File

@ -48,7 +48,10 @@ void nspng_create(struct content *c, const char *params[])
if (setjmp(png_jmpbuf(c->data.png.png))) { if (setjmp(png_jmpbuf(c->data.png.png))) {
png_destroy_read_struct(&c->data.png.png, png_destroy_read_struct(&c->data.png.png,
&c->data.png.info, 0); &c->data.png.info, 0);
assert(0); LOG(("Failed to set callbacks"));
c->data.png.png = NULL;
c->data.png.info = NULL;
return;
} }
png_set_progressive_read_fn(c->data.png.png, c, png_set_progressive_read_fn(c->data.png.png, c,
@ -61,7 +64,10 @@ void nspng_process_data(struct content *c, char *data, unsigned long size)
if (setjmp(png_jmpbuf(c->data.png.png))) { if (setjmp(png_jmpbuf(c->data.png.png))) {
png_destroy_read_struct(&c->data.png.png, png_destroy_read_struct(&c->data.png.png,
&c->data.png.info, 0); &c->data.png.info, 0);
assert(0); LOG(("Failed to process data"));
c->data.png.png = NULL;
c->data.png.info = NULL;
return;
} }
LOG(("data %p, size %li", data, size)); LOG(("data %p, size %li", data, size));
@ -219,6 +225,9 @@ void end_callback(png_structp png, png_infop info)
int nspng_convert(struct content *c, unsigned int width, unsigned int height) int nspng_convert(struct content *c, unsigned int width, unsigned int height)
{ {
if (c->data.png.png == NULL || c->data.png.info == NULL)
return 1;
png_destroy_read_struct(&c->data.png.png, &c->data.png.info, 0); png_destroy_read_struct(&c->data.png.png, &c->data.png.info, 0);
c->title = xcalloc(100, 1); c->title = xcalloc(100, 1);