diff options
| -rw-r--r-- | converter/ppm/ppmtoxpm.c | 4 | ||||
| -rw-r--r-- | doc/HISTORY | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/converter/ppm/ppmtoxpm.c b/converter/ppm/ppmtoxpm.c index ff47359b..38d99972 100644 --- a/converter/ppm/ppmtoxpm.c +++ b/converter/ppm/ppmtoxpm.c @@ -636,8 +636,10 @@ main(int argc, char *argv[]) { if (cmdline.hexonly) colornameHash = NULL; + else if (cmdline.rgb) + ppm_readcolornamefile(cmdline.rgb, TRUE, &colornameHash, &colornames); else - ppm_readcolornamefile(cmdline.rgb, FALSE, &colornameHash, &colornames); + ppm_readcolornamefile(NULL, FALSE, &colornameHash, &colornames); /* Now generate the character-pixel colormap table. */ genCmap(chv, ncolors, maxval, diff --git a/doc/HISTORY b/doc/HISTORY index b32ab0ae..fbcfb122 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -40,10 +40,14 @@ not yet BJH Release 10.63.00 middle of the AND mask. Always broken (program was new in Netpbm 9.3 (June 2000)). + ppmtoxpm: fix bug: ignores inability to open the specified color + dictionary file (-rgb) and just doesn't use color names. + Introduced in Netpbm 10.15 (April 2003). + libnetpbm: fix bug: ppm_freecolornames() has wild pointer dereference when the color name table was generated empty because the color dictionary file was not openable. ppmtoxpm - suffers from this. + suffers from this. Broken in 10.15 (April 2003). sparc64 pbmtog3: fix bug that causes crash due to unaligned memory access. |