...

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index e6f3709d4e5a466a126626149ef2ff1147aab5ab..d7b835ebd20931b3c603c9842915ce22795006f5 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -3273,7 +3273,7 @@ MagickExport MagickBooleanType DrawImage(Image *image,const DrawInfo *draw_info,
                     continue;
                   break;
                 }
-                if ((size_t) (q-p-4+1) <= 0)
+                if ((q == (char *) NULL) || (p == (char *) NULL) || ((q-4) < p))
                   {
                     status=MagickFalse;
                     break;