From 4ca940a010e203480e6b9aa6a466f11b6c3c9792 Mon Sep 17 00:00:00 2001 From: giraffedata Date: Fri, 11 Aug 2017 01:50:18 +0000 Subject: Fix incorrect use of setjmp/longjmp git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3041 9d0c8265-081b-0410-96cb-a4ca84ce46f8 --- lib/libppmcolor.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'lib/libppmcolor.c') diff --git a/lib/libppmcolor.c b/lib/libppmcolor.c index 9a1ee5c1..3378e076 100644 --- a/lib/libppmcolor.c +++ b/lib/libppmcolor.c @@ -539,15 +539,14 @@ openColornameFile(const char * const fileName, if (setjmp(jmpbuf) != 0) { pm_asprintf(errorP, "Failed to open color name file"); - pm_setjmpbuf(origJmpbufP); - pm_longjmp(); } else { + pm_setjmpbufsave(&jmpbuf, &origJmpbufP); + *filePP = pm_openColornameFile(fileName, mustOpen); *errorP = NULL; /* Would have longjmped if there were a problem */ - - pm_setjmpbuf(origJmpbufP); } + pm_setjmpbuf(origJmpbufP); } @@ -733,7 +732,7 @@ ppm_readcolordict(const char * const fileName, if (error) { pm_errormsg("%s", error); pm_strfree(error); - ppm_freecolorhash(cht); + pm_longjmp(); } else { if (chtP) *chtP = cht; -- cgit 1.4.1