diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-08-20 16:23:04 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2023-08-20 16:23:04 +0000 |
| commit | cacc48b5dc3fe179980070a26cd9da03308708d6 (patch) | |
| tree | 56de20cc2eea2bd05e689c5ef1528bd143a43f47 | |
| parent | 0625b9c35ba5ee745846387db8a0857190263d5d (diff) | |
| download | netpbm-mirror-cacc48b5dc3fe179980070a26cd9da03308708d6.tar.gz netpbm-mirror-cacc48b5dc3fe179980070a26cd9da03308708d6.tar.xz netpbm-mirror-cacc48b5dc3fe179980070a26cd9da03308708d6.zip | |
Release 11.03.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@4606 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | analyzer/pgmtexture.c | 8 | ||||
| -rw-r--r-- | doc/HISTORY | 8 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 14 insertions, 4 deletions
diff --git a/analyzer/pgmtexture.c b/analyzer/pgmtexture.c index 5af51bf5..06db12f2 100644 --- a/analyzer/pgmtexture.c +++ b/analyzer/pgmtexture.c @@ -915,6 +915,8 @@ main (int argc, const char ** argv) { pm_proginit(&argc, argv); + d = 1; + argn = 1; /* Check for flags. */ @@ -942,11 +944,13 @@ main (int argc, const char ** argv) { if ( argn != argc ) pm_usage( usage ); - d = 1; - grays = pgm_readpgm(ifP, &cols, &rows, &maxval); pm_close (ifP); + if (maxval > PGM_MAXMAXVAL) + pm_error("Maxval %u is too high. We can handle only up to %u", + maxval, PGM_MAXMAXVAL); + /* Determine the number of different gray scales (not maxval) */ for (i = 0; i <= PGM_MAXMAXVAL; ++i) tone[i] = -1; diff --git a/doc/HISTORY b/doc/HISTORY index 6afec411..be97732d 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,7 +4,13 @@ Netpbm. CHANGE HISTORY -------------- -not yet BJH Release 11.03.03 +23.08.20 BJH Release 11.03.04 + + pgmtexture: Fix buffer overflow with maxval > 255. Always + broken. Maxvals > 255 were possible starting in Netpbm 9.0 + (April 2000). + +23.08.18 BJH Release 11.03.03 ppmfade: fix "file not found" crash for most fade modes. Introduced in Netpbm 10.98 (March 2022). diff --git a/version.mk b/version.mk index 9076e495..c1f267cc 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 11 NETPBM_MINOR_RELEASE = 3 -NETPBM_POINT_RELEASE = 3 +NETPBM_POINT_RELEASE = 4 |