Fix bug: crash on non-palette image

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

2 files changed, 6 insertions, 3 deletions

diff --git a/converter/ppm/ppmtobmp.c b/converter/ppm/ppmtobmp.c
index d12e5788..684b3f22 100644
--- a/converter/ppm/ppmtobmp.c
+++ b/converter/ppm/ppmtobmp.c
@@ -505,7 +505,7 @@ bmpEncode(FILE *           const ifP,
 
     if (nbyte != (BMPlenfileheader(class)
                   + BMPleninfoheader(class)
-                  + BMPlencolormap(class, bpp, -1)))
+                  + BMPlencolormap(class, bpp, 0)))
         pm_error(er_internal, "BmpEncode 1");
 
     nbyte += BMPwritebits(ifP, x, y, colortype, bpp, pixels, maxval,
@@ -564,7 +564,7 @@ bmpEncodePbm(FILE *           const ifP,
 
     if (nbyte != (BMPlenfileheader(class)
                   + BMPleninfoheader(class)
-                  + BMPlencolormap(class, 1, -1)))
+                  + BMPlencolormap(class, 1, 0)))
         pm_error(er_internal, "bmpEncodePBM 1");
    
     for (row = 0; row < rows; ++row){
diff --git a/doc/HISTORY b/doc/HISTORY
index f2401ce2..042a5bac 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -8,7 +8,10 @@ not yet  BJH  Release 10.55.00
 
               libnetpbm: pm_system(): fix bug - program always takes
               Standard Input from invoker's Standard Input when you don't
-              supply a Standard Output accepter.
+              supply a Standard Output accepter.  Broken in 10.40.00.
+
+              ppmtopbm: fix bug: crash ("internal error") on image without
+              palette (e.g. black and white).  Broken in 10.54.
 
 11.03.30 BJH  Release 10.54.00