...

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 132ad5c3a06879952ab61cffcb1ed89a195bcd6d..e6f3709d4e5a466a126626149ef2ff1147aab5ab 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -3172,7 +3172,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;