From b73bc3a85500092e0601b079ec90aca2cc896ed9 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Mon, 17 Aug 2020 12:29:16 +0100 Subject: [PATCH] Ensure magick buffer+file checks use consistent min length guard 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. --- libvips/foreign/magickload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvips/foreign/magickload.c b/libvips/foreign/magickload.c index bfb26566..e94d2226 100644 --- a/libvips/foreign/magickload.c +++ b/libvips/foreign/magickload.c @@ -256,7 +256,7 @@ G_DEFINE_TYPE( VipsForeignLoadMagickBuffer, vips_foreign_load_magick_buffer, static gboolean 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