about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-03-03 02:42:21 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2017-03-03 02:42:21 +0000
commit9595b0c55e6b5f819a6e7fbd6208ee97da64670f (patch)
treef80866ddd9d99b656663d32bea19fde4187bff27
parent1bfe4b2163210689494e2dc632388279aa7c59d6 (diff)
downloadnetpbm-mirror-9595b0c55e6b5f819a6e7fbd6208ee97da64670f.tar.gz
netpbm-mirror-9595b0c55e6b5f819a6e7fbd6208ee97da64670f.tar.xz
netpbm-mirror-9595b0c55e6b5f819a6e7fbd6208ee97da64670f.zip
Handle memory allocation failure
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2908 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--generator/ppmpat.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/generator/ppmpat.c b/generator/ppmpat.c
index d9dbd247..96c2853d 100644
--- a/generator/ppmpat.c
+++ b/generator/ppmpat.c
@@ -140,7 +140,11 @@ parseColorOpt(const char ** const colorText,
     for (colorCount = 0; colorText[colorCount] != NULL; ++colorCount)
         ;
 
-    MALLOCARRAY_NOFAIL(inColor, colorCount);
+    MALLOCARRAY(inColor, colorCount);
+
+    if (!inColor)
+        pm_error("Failed to allocate table space for %u colors "
+                 "specified by -color", colorCount);
 
     for (i = 0; i < colorCount; ++i)
         inColor[i] = ppm_parsecolor(colorText[i], PPM_MAXMAXVAL);