From f6e2923059aa9c4e8bbb4fbdde2baa3ea55f645d Mon Sep 17 00:00:00 2001 From: giraffedata Date: Wed, 6 May 2020 01:45:08 +0000 Subject: Release 10.86.13 git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@3805 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- converter/pbm/pbmtonokia.c | 3 ++- doc/HISTORY | 6 ++++++ version.mk | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/converter/pbm/pbmtonokia.c b/converter/pbm/pbmtonokia.c index 73b62b96..80b0bd59 100644 --- a/converter/pbm/pbmtonokia.c +++ b/converter/pbm/pbmtonokia.c @@ -412,7 +412,8 @@ convertToNpm(bit ** const image, header[ 3] = 0; header[ 4] = len; header[ 5] = 0; - memcpy(&header[5], text, len); + if (text) + memcpy(&header[6], text, len); header[ 6 + len] = cols; header[ 7 + len] = rows; header[ 8 + len] = 1; diff --git a/doc/HISTORY b/doc/HISTORY index 46be044a..cae01a30 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,12 @@ Netpbm. CHANGE HISTORY -------------- +20.05.06 BJH Release 10.86.13 + + pbmtonokia: Fix incorrect output with -txt option. + + pbmtonokia: Fix incorrect output with newer compiler. + 20.03.26 BJH Release 10.86.12 Build: make deb: don't include empty Recommends; newer dpkg-deb diff --git a/version.mk b/version.mk index a7eccbe0..85d87780 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 86 -NETPBM_POINT_RELEASE = 12 +NETPBM_POINT_RELEASE = 13 -- cgit 1.4.1