Fix bug: -camo, -anticamo without -color assertion failure because of incorrect

check for user-specified color table.


git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3107 9d0c8265-081b-0410-96cb-a4ca84ce46f8

1 files changed, 2 insertions, 1 deletions

diff --git a/generator/ppmpat.c b/generator/ppmpat.c
index f1452fc7..908c200f 100644
--- a/generator/ppmpat.c
+++ b/generator/ppmpat.c
@@ -581,6 +581,7 @@ camoFill(pixel **         const pixels,
     pixel color;
 
     if (colorTableP->count > 0) {
+        assert(colorTableP->index < colorTableP->count);
         color = colorTableP->color[colorTableP->index];
         nextColorBg(colorTableP);
     } else if (antiflag)
@@ -650,7 +651,7 @@ camo(pixel **     const pixels,
 
     clearBackgroundCamo(pixels, cols, rows, maxval, colorTableP, antiflag);
 
-    if (colorTableP) {
+    if (colorTableP->count > 0) {
         assert(colorTableP->count > 1);
         colorTableP->index = 1;  /* Foreground colors start at 1 */
     }