]> granicus.if.org Git - imagemagick/commitdiff
MagickCore/constitute.c: resolve possible null pointer dereference
authorIlya Shipitsin <chipitsine@gmail.com>
Thu, 30 Aug 2018 06:55:46 +0000 (11:55 +0500)
committerDirk Lemstra <dirk@lemstra.org>
Thu, 30 Aug 2018 09:08:17 +0000 (11:08 +0200)
found by cppcheck

[MagickCore/constitute.c:1074] -> [MagickCore/constitute.c:1071]: (warning) Either the condition 'image!=(Image*)NULL' is redundant or there is possible null pointer dereference: image.

MagickCore/constitute.c

index 637cb1afb837b2b319ad9ed4cd373bbe52eaa2ef..0bcd2140aba1e2a5c09b64bf66628aaf28604fcb 100644 (file)
@@ -1068,10 +1068,10 @@ MagickExport MagickBooleanType WriteImage(const ImageInfo *image_info,
   */
   assert(image_info != (ImageInfo *) NULL);
   assert(image_info->signature == MagickCoreSignature);
+  assert(image != (Image *) NULL);
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
       image_info->filename);
-  assert(image != (Image *) NULL);
   assert(image->signature == MagickCoreSignature);
   assert(exception != (ExceptionInfo *) NULL);
   sans_exception=AcquireExceptionInfo();