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

Ensure magick buffer+file checks use consistent min length guard

Browse Source 
Prevents a zero-length buffer from crashing GetImageMagick

It looks like the fix for magick7 in #1642 is also now required
for magick6 as the assertion appears to have been backported.
This commit is contained in:
Lovell Fuller 2020-08-17 12:29:16 +01:00 committed by John Cupitt
parent cdcf63f8e5
commit b73bc3a855
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libvips/foreign/magickload.c
View File

@ -256,7 +256,7 @@ G_DEFINE_TYPE( VipsForeignLoadMagickBuffer, vips_foreign_load_magick_buffer,
static gboolean static gboolean
vips_foreign_load_magick_buffer_is_a_buffer( const void *buf, size_t len ) vips_foreign_load_magick_buffer_is_a_buffer( const void *buf, size_t len )
{ {
return( magick_ismagick( (const unsigned char *) buf, len ) ); return( len > 10 && magick_ismagick( (const unsigned char *) buf, len ) );
} }
/* Unfortunately, libMagick does not support header-only reads very well. See /* Unfortunately, libMagick does not support header-only reads very well. See