sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

check return from spng_get_text()

Browse Source 
it'll fail for no text elements rather than returning 0
This commit is contained in:
John Cupitt 2020-06-18 11:09:37 +01:00
parent b7a285e84b
commit 94b137d526
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libvips/foreign/spngload.c
View File

@ -192,7 +192,6 @@ vips_foreign_load_png_set_header( VipsForeignLoadPng *png, VipsImage *image )
{ {
double xres, yres; double xres, yres;
struct spng_iccp iccp; struct spng_iccp iccp;
struct spng_text *text;
struct spng_exif exif; struct spng_exif exif;
struct spng_phys phys; struct spng_phys phys;
guint32 n_text; guint32 n_text;
@ -232,16 +231,20 @@ vips_foreign_load_png_set_header( VipsForeignLoadPng *png, VipsImage *image )
vips_image_set_blob_copy( image, vips_image_set_blob_copy( image,
VIPS_META_ICC_NAME, iccp.profile, iccp.profile_len ); VIPS_META_ICC_NAME, iccp.profile, iccp.profile_len );
spng_get_text( png->ctx, NULL, &n_text ); if( !spng_get_text( png->ctx, NULL, &n_text ) ) {
text = VIPS_ARRAY( VIPS_OBJECT( png ), n_text, struct spng_text ); struct spng_text *text;
if( !spng_get_text( png->ctx, text, &n_text ) ) {
guint32 i;
for( i = 0; i < n_text; i++ ) text = VIPS_ARRAY( VIPS_OBJECT( png ),
/* .text is always a null-terminated C string. n_text, struct spng_text );
*/ if( !spng_get_text( png->ctx, text, &n_text ) ) {
vips_foreign_load_png_set_text( image, guint32 i;
i, text[i].keyword, text[i].text );
for( i = 0; i < n_text; i++ )
/* .text is always a null-terminated C string.
*/
vips_foreign_load_png_set_text( image,
i, text[i].keyword, text[i].text );
}
} }
if( !spng_get_exif( png->ctx, &exif ) ) if( !spng_get_exif( png->ctx, &exif ) )