about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2020-09-06 02:05:34 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2020-09-06 02:05:34 +0000
commitdb7f1f84a11ada4ae51933036060d41f7962dfbb (patch)
tree0dba8e3eb0f7d9319294912abf316b2e76a7b19c
parent824a67ae0460af3e5e21ee9977e58d1bb69912e6 (diff)
downloadnetpbm-mirror-db7f1f84a11ada4ae51933036060d41f7962dfbb.tar.gz
netpbm-mirror-db7f1f84a11ada4ae51933036060d41f7962dfbb.tar.xz
netpbm-mirror-db7f1f84a11ada4ae51933036060d41f7962dfbb.zip
Remove setjmp when done with it to avoid hyperjump there for every subsequent pm_error
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3942 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--converter/other/jpeg2000/libjasper/base/jas_stream.c2
-rw-r--r--doc/HISTORY5
2 files changed, 6 insertions, 1 deletions
diff --git a/converter/other/jpeg2000/libjasper/base/jas_stream.c b/converter/other/jpeg2000/libjasper/base/jas_stream.c
index 20336fd7..a4b3a27c 100644
--- a/converter/other/jpeg2000/libjasper/base/jas_stream.c
+++ b/converter/other/jpeg2000/libjasper/base/jas_stream.c
@@ -415,9 +415,11 @@ jas_stream_t *jas_stream_tmpfile()
         if (rc == 0) {
             pm_setjmpbuf(&jmpbuf);
             *obj = pm_tmpfile_fd();
+            pm_setjmpbuf(NULL);
         } else {
             /* pm_tmpfile_fd() threw an error */
             jas_stream_destroy(stream);
+            pm_setjmpbuf(NULL);
             return 0;
         }
     }
diff --git a/doc/HISTORY b/doc/HISTORY
index c5aff7a1..c21ca042 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -13,6 +13,8 @@ not yet  BJH  Release 10.92.00
               don't attempt any normalization - leave image as is.  (Previous
               version produces all black with -keephues).
 
+              pgmtopbm: Add -randomseed.
+
               pamfunc: Fix always wrong output with -not.  Always broken.
               (-not was new in Netpbm 10.40 (September 2007)).
 
@@ -26,7 +28,8 @@ not yet  BJH  Release 10.92.00
               pbmtext: Fix double-free crash with -font .  Introduced in
               Netpbm 10.91 (June 2020).
 
-              pgmtopbm: Add -randomseed.
+              jpeg2ktopam: Fix crash whenever the program fails.  Broken in
+              Netpbm 10.42 (March 2008).
 
               pcdovtoppm: Fix some garbage from the conversion from csh to sh
               in Netpbm 9.12 (March 2001) in conversion from csh arrays that