Eliminate the malloc/free of the jmpbuf on every invocation of a

JPEGReadWriter2Plugin primitive. The jmpbuf can simply be included in the error_mgr2 struct.
OpenSmalltalk · Apr 14, 2020 · e06314b · e06314b
1 parent 2a79468
commit e06314b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/platforms/Cross/plugins/JPEGReadWriter2Plugin/Error.c b/platforms/Cross/plugins/JPEGReadWriter2Plugin/Error.c
@@ -5,7 +5,7 @@
 struct error_mgr2 {
   struct jpeg_error_mgr pub;	/* "public" fields */
 
-  jmp_buf *setjmp_buffer;	/* for return to caller */
+  jmp_buf setjmp_buffer;	/* for return to caller */
 };
 
 typedef struct error_mgr2 * error_ptr2;
@@ -20,5 +20,5 @@ void error_exit (j_common_ptr cinfo)
   error_ptr2 myerr = (error_ptr2) cinfo->err;
 
   /* Return control to the setjmp point */
-  longjmp(*myerr->setjmp_buffer, 1);
+  longjmp(myerr->setjmp_buffer, 1);
 }
diff --git a/platforms/Cross/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.h b/platforms/Cross/plugins/JPEGReadWriter2Plugin/JPEGReadWriter2Plugin.h
@@ -3,10 +3,11 @@
 #include "jpeglib.h"
 #include <setjmp.h>
 
+/* c.f. Error.c */
 struct error_mgr2 {
   struct jpeg_error_mgr pub;	/* "public" fields */
 
-  jmp_buf *setjmp_buffer;	/* for return to caller */
+  jmp_buf setjmp_buffer;	/* for return to caller */
 };
 
 typedef struct error_mgr2* error_ptr2;

diff --git a/platforms/Cross/plugins/JPEGReadWriter2Plugin/sqJPEGReadWriter2Plugin.c b/platforms/Cross/plugins/JPEGReadWriter2Plugin/sqJPEGReadWriter2Plugin.c
@@ -54,10 +54,9 @@ primJPEGWriteImageonByteArrayformqualityprogressiveJPEGerrorMgrWriteScanlines(
 	error_ptr2 pjerr = (error_ptr2)jpegErrorMgr2Struct;
 
 	pcinfo->err = jpeg_std_error(&pjerr->pub);
-	pjerr->setjmp_buffer = (jmp_buf *) malloc(sizeof(jmp_buf));
 	pjerr->pub.error_exit = error_exit;
 
-	if (setjmp(*pjerr->setjmp_buffer)) {
+	if (setjmp(pjerr->setjmp_buffer)) {
 		jpeg_destroy_compress(pcinfo);
 
 		*destinationSizePtr = 0;
@@ -134,7 +133,6 @@ primJPEGWriteImageonByteArrayformqualityprogressiveJPEGerrorMgrWriteScanlines(
 		jpeg_finish_compress(pcinfo);
 		jpeg_destroy_compress(pcinfo);
 	}
-	free(pjerr->setjmp_buffer);
 }
 
 void
@@ -154,10 +152,9 @@ primJPEGReadImagefromByteArrayonFormdoDitheringerrorMgrReadScanlines(
 
 	int ok = 1;
 	pcinfo->err = jpeg_std_error(&pjerr->pub);
-	pjerr->setjmp_buffer = (jmp_buf *) malloc(sizeof(jmp_buf));
 	pjerr->pub.error_exit = error_exit;
 
-	if (setjmp(*pjerr->setjmp_buffer)) {
+	if (setjmp(pjerr->setjmp_buffer)) {
 		jpeg_destroy_decompress(pcinfo);
 		ok = 0;
 	}
@@ -283,7 +280,6 @@ primJPEGReadImagefromByteArrayonFormdoDitheringerrorMgrReadScanlines(
 		jpeg_finish_decompress(pcinfo);
 		jpeg_destroy_decompress(pcinfo);
 	}
-	free(pjerr->setjmp_buffer);
 }
 
 void
@@ -297,10 +293,9 @@ primJPEGReadHeaderfromByteArraysizeerrorMgrReadHeader(
 	error_ptr2 pjerr = (error_ptr2)jpegErrorMgr2Struct;
 
 	pcinfo->err = jpeg_std_error(&pjerr->pub);
-	pjerr->setjmp_buffer = (jmp_buf *) malloc(sizeof(jmp_buf));
 	pjerr->pub.error_exit = error_exit;
 
-	if (setjmp(*pjerr->setjmp_buffer)) {
+	if (setjmp(pjerr->setjmp_buffer)) {
 		jpeg_destroy_decompress(pcinfo);
 		sourceSize = 0;
 	}
@@ -310,5 +305,4 @@ primJPEGReadHeaderfromByteArraysizeerrorMgrReadHeader(
 		jpeg_mem_src(pcinfo, source, sourceSize);
 		jpeg_read_header(pcinfo, TRUE);
 	}
-	free(pjerr->setjmp_buffer);
 }