(no commit message)

diff --git a/MagickCore/string.c b/MagickCore/string.c
index d0d7bfe771fdd3aa8fa0fb447eda25c1648caf98..7c07e79e23b1da6c3c46ef0c0fcd629a05b96674 100644 (file)
--- a/MagickCore/string.c
+++ b/MagickCore/string.c
@@ -2257,8 +2257,11 @@ MagickExport char **StringToArgv(const char *text,int *argc)
 %
 %    o count: returns number of arguments in returned array
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
-MagickExport double *StringToArrayOfDoubles(const char *string,ssize_t *count)
+MagickExport double *StringToArrayOfDoubles(const char *string,ssize_t *count,
+  ExceptionInfo *exception)
 {
   char
     *q;
@@ -2300,7 +2303,8 @@ MagickExport double *StringToArrayOfDoubles(const char *string,ssize_t *count)
   *count=i;
   array=(double *) AcquireQuantumMemory((size_t) i,sizeof(*array));
   if (array == (double *) NULL)
-    ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
+    (void) ThrowMagickException(exception,GetMagickModule(),ResourceLimitError,
+      "MemoryAllocationFailed","`%s'","");
   /*
     Fill in the floating point values.
   */

diff --git a/MagickCore/string_.h b/MagickCore/string_.h
index ed0e7a474e8a7ab8ebc5735da057e50021de0d26..d06edfdc419e74152c74280c8ef906a396af73af 100644 (file)
--- a/MagickCore/string_.h
+++ b/MagickCore/string_.h
@@ -59,7 +59,7 @@ extern MagickExport const char
 
 extern MagickExport double
   InterpretSiPrefixValue(const char *restrict,char **restrict),
-  *StringToArrayOfDoubles(const char *,ssize_t *);
+  *StringToArrayOfDoubles(const char *,ssize_t *,ExceptionInfo *);
 
 extern MagickExport int
   CompareStringInfo(const StringInfo *,const StringInfo *),