From 8d7d5764406a617aa786d5d9d0b7c6dc6067cdc7 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Sun, 2 Sep 2018 15:18:08 +0500 Subject: [PATCH] MagickWand/drawing-wand.c: resolve several null pointer dereferences found by cppcheck [MagickWand/drawing-wand.c:177] -> [MagickWand/drawing-wand.c:175]: (warning) Either the condition 'wand!=(DrawingWand*)NULL' is redundant or there is possible null pointer dereference: wand. [MagickWand/drawing-wand.c:4540] -> [MagickWand/drawing-wand.c:4538]: (warning) Either the condition 'wand!=(DrawingWand*)NULL' is redundant or there is possible null pointer dereference: wand. [MagickWand/drawing-wand.c:4682] -> [MagickWand/drawing-wand.c:4680]: (warning) Either the condition 'wand!=(DrawingWand*)NULL' is redundant or there is possible null pointer dereference: wand. --- MagickWand/drawing-wand.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/MagickWand/drawing-wand.c b/MagickWand/drawing-wand.c index a672fcdf3..ece88b636 100644 --- a/MagickWand/drawing-wand.c +++ b/MagickWand/drawing-wand.c @@ -172,9 +172,9 @@ static int MVGPrintf(DrawingWand *wand,const char *format,...) size_t extent; + assert(wand != (DrawingWand *) NULL); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",format); - assert(wand != (DrawingWand *) NULL); assert(wand->signature == MagickWandSignature); extent=20UL*MagickPathExtent; if (wand->mvg == (char *) NULL) @@ -4535,9 +4535,9 @@ WandExport void DrawSetBorderColor(DrawingWand *wand, WandExport MagickBooleanType DrawSetClipPath(DrawingWand *wand, const char *clip_mask) { + assert(wand != (DrawingWand *) NULL); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",clip_mask); - assert(wand != (DrawingWand *) NULL); assert(wand->signature == MagickWandSignature); assert(clip_mask != (const char *) NULL); if ((CurrentContext->clip_mask == (const char *) NULL) || @@ -4677,9 +4677,9 @@ WandExport void DrawSetClipUnits(DrawingWand *wand, WandExport MagickBooleanType DrawSetDensity(DrawingWand *wand, const char *density) { + assert(wand != (DrawingWand *) NULL); if (wand->debug != MagickFalse) (void) LogMagickEvent(WandEvent,GetMagickModule(),"%s",density); - assert(wand != (DrawingWand *) NULL); assert(wand->signature == MagickWandSignature); assert(density != (const char *) NULL); if ((CurrentContext->density == (const char *) NULL) || -- 2.40.0