about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--analyzer/pgmtexture.c2
-rw-r--r--converter/ppm/ppmtompeg/Makefile2
-rw-r--r--doc/HISTORY8
-rw-r--r--version.mk3
4 files changed, 11 insertions, 4 deletions
diff --git a/analyzer/pgmtexture.c b/analyzer/pgmtexture.c
index d14ba547..07317336 100644
--- a/analyzer/pgmtexture.c
+++ b/analyzer/pgmtexture.c
@@ -928,7 +928,7 @@ main (int argc, const char ** argv) {
 
     FILE * ifP;
     gray ** grays;
-    unsigned int tone[PGM_MAXMAXVAL];
+    unsigned int tone[PGM_MAXMAXVAL+1];
     unsigned int r0, r45, r90;
     unsigned int d;
     unsigned int x, y;
diff --git a/converter/ppm/ppmtompeg/Makefile b/converter/ppm/ppmtompeg/Makefile
index 49317287..a1004fdd 100644
--- a/converter/ppm/ppmtompeg/Makefile
+++ b/converter/ppm/ppmtompeg/Makefile
@@ -56,7 +56,7 @@ ifeq ($(OMIT_NETWORK),y)
 else
   MP_OTHER_OBJS += parallel.o psocket.o
 endif
-ifeq ($(MSVCRT),y)
+ifeq ($(MSVCRT),Y)
   MP_OTHER_OBJS += gethostname_win32.o
 else
   MP_OTHER_OBJS += gethostname.o
diff --git a/doc/HISTORY b/doc/HISTORY
index 00848b9d..2f2c1c3d 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,14 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+14.02.24 BJH  Release 10.65.05
+
+              pgmtexture: fix buffer overflow.  Always broken.  (Program
+              was added in primordial Netpbm in 1991).
+
+              Windows build: fix Ppmtompeg build failure in non-Cygwin build
+              due to missing sys/utsname.h.
+
 14.02.09 BJH  Release 10.65.04
 
               ppmrelief: fix out-of-bound values in output.  Always broken.
diff --git a/version.mk b/version.mk
index 1196de08..0b16ea8d 100644
--- a/version.mk
+++ b/version.mk
@@ -1,4 +1,3 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 65
-NETPBM_POINT_RELEASE = 3
-
+NETPBM_POINT_RELEASE = 5