From 3e2040433fa298328913302eac5aba76942aba47 Mon Sep 17 00:00:00 2001 From: Ilya Shipitsin Date: Wed, 12 Sep 2018 12:53:01 +0500 Subject: [PATCH] MagickCore/annotate.c: remove unneeded check line 631: if ((width <= image->columns) || (s == (char *) NULL)) so, "s" cannot be NULL --- MagickCore/annotate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MagickCore/annotate.c b/MagickCore/annotate.c index 9e203b192..df08da93f 100644 --- a/MagickCore/annotate.c +++ b/MagickCore/annotate.c @@ -630,7 +630,7 @@ MagickExport ssize_t FormatMagickCaption(Image *image,DrawInfo *draw_info, width=(size_t) floor(metrics->width+draw_info->stroke_width+0.5); if ((width <= image->columns) || (s == (char *) NULL)) continue; - if ((s != (char *) NULL) && (GetUTFOctets(s) == 1)) + if (GetUTFOctets(s) == 1) { *s='\n'; p=s; -- 2.40.0