...

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index d4cb7c8cbe21f973571146bb8256b21dda68594d..26e665f9ec94c1721ba20ff4143e0edccc22feb8 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -1491,13 +1491,13 @@ MagickExport MagickBooleanType DrawClipPath(Image *image,
 static Image *DrawClippingMask(Image *image,const DrawInfo *draw_info,
   const char *id,const char *clip_path,ExceptionInfo *exception)
 {
+  DrawInfo
+    *clone_info;
+
   Image
     *clip_mask,
     *separate_mask;
 
-  DrawInfo
-    *clone_info;
-
   MagickStatusType
     status;
 
@@ -2201,6 +2201,8 @@ static char *GetNodeByURL(const char *primitive,const char *url)
   /*
     Find and return node by ID.
   */
+  if (primitive == (const char *) NULL)
+    return((char *) NULL);
   token=AcquireString(primitive);
   extent=strlen(token)+MagickPathExtent;
   length=0;