From: anthony <anthony@git.imagemagick.org>
Date: Wed, 12 May 2010 07:24:03 +0000 (+0000)
Subject: bug fix
X-Git-Tag: 7.0.1-0~9481
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e108a3fd07919343dc9e3b7720da59ef5c4c5c55;p=imagemagick

bug fix
---

diff --git a/magick/morphology.c b/magick/morphology.c
index b5b77198b..4f6b4c668 100644
--- a/magick/morphology.c
+++ b/magick/morphology.c
@@ -427,8 +427,12 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string)
   const char
     *p;
 
+  unsigned long
+    kernel_number;
+
   p = kernel_string;
   kernel = last_kernel = NULL;
+  kernel_number = 0;
 
   while ( GetMagickToken(p,NULL,token),  *token != '\0' ) {
 
@@ -441,16 +445,18 @@ MagickExport KernelInfo *AcquireKernelInfo(const char *kernel_string)
       else /* otherwise a user defined kernel array */
         new_kernel = ParseNamedKernel(p);
 
-      if ( last_kernel == (KernelInfo *) NULL ) {
-        /* first kernel: initialize the kernel list */
-        if ( new_kernel == (KernelInfo *) NULL )
-          return((KernelInfo *) NULL);
-        kernel = last_kernel = new_kernel;
+      /* Error handling -- this is not proper error handling! */
+      if ( new_kernel == (KernelInfo *) NULL ) {
+        fprintf(stderr, "Failed to parse kernel number #%lu\n", kernel_number);
+        if ( kernel != (KernelInfo *) NULL )
+          kernel=DestroyKernelInfo(kernel);
+        return((KernelInfo *) NULL);
       }
+
+      /* initialise or append the kernel list */
+      if ( last_kernel == (KernelInfo *) NULL )
+        kernel = last_kernel = new_kernel;
       else {
-        /* append kernel to end of the list */
-        if ( new_kernel == (KernelInfo *) NULL )
-          return(DestroyKernelInfo(kernel));
         last_kernel->next = new_kernel;
         last_kernel = new_kernel;
       }