Fix uninitialized variable

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

2 files changed, 13 insertions, 3 deletions

diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c
index 981ce6ce..23bd7d66 100644
--- a/converter/other/pnmtopng.c
+++ b/converter/other/pnmtopng.c
@@ -1474,9 +1474,14 @@ computeUnsortedAlphaPalette(FILE *           const ifP,
     int row;
     xel * xelrow;
     unsigned int alphaColorPairCnt;
+        /* Number of different alpha/color pairs we've seen so far as we
+           iterate through the image.
+        */
 
     cht = ppm_colorhisttocolorhash(chv, colors);
 
+    /* We have not seen any alphas of any color yet. */
+    alphaColorPairCnt = 0;
     for (colorIndex = 0; colorIndex < colors; ++colorIndex) {
         alphasOfColor[colorIndex] = NULL;
         alphasOfColorCnt[colorIndex] = 0;
diff --git a/doc/HISTORY b/doc/HISTORY
index f843ba6a..703acb9d 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -20,9 +20,14 @@ not yet  BJH  Release 10.94.00
               of the time with -nomix.  Broken since Netpbm 10.49 (December
               2009).
 
-              pnmtopng: fix incorrect transparency in output.  Introduced
-              after Netpbm 10.35 (August 2006) but not after Netpbm 10.47
-              (June 2009).
+              pnmtopng: fix incorrect transparency in output when requesting
+              transparency.  Introduced after Netpbm 10.35 (August 2006) but
+              not after Netpbm 10.47 (June 2009).
+
+              pnmtopng: fix buffer overrun or bogus "too many color/
+              transparency pairs" failure when requesting transparency.
+              Introduced after Netpbm 10.26 (January 2005) but not after
+              Netpbm 10.35 (August 2006).
 
               libnetpbm: pm_system: Fix bug: standard input feeder process
               repositions unrelated files.  Always broken (pm_system was new