Fix memory leak when JpegEncode returns an error.

wiredfool · wiredfool · commit 789631c60c37 · 2025-05-13T23:31:09.000+02:00
diff --git a/src/libImaging/JpegEncode.c b/src/libImaging/JpegEncode.c
@@ -131,6 +131,7 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                     break;
                 default:
                     state->errcode = IMAGING_CODEC_CONFIG;
+                    jpeg_destroy_compress(&context->cinfo);
                     return -1;
             }
 
@@ -161,6 +162,7 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {
                                 /* Would subsample the green and blue
                                    channels, which doesn't make sense */
                                 state->errcode = IMAGING_CODEC_CONFIG;
+                                jpeg_destroy_compress(&context->cinfo);
                                 return -1;
                         }
                         jpeg_set_colorspace(&context->cinfo, JCS_RGB);

Original file line number	Diff line number	Diff line change
`@@ -131,6 +131,7 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {`
`131`	`131`	`break;`
`132`	`132`	`default:`
`133`	`133`	`state->errcode = IMAGING_CODEC_CONFIG;`
	`134`	`+ jpeg_destroy_compress(&context->cinfo);`
`134`	`135`	`return -1;`
`135`	`136`	`}`
`136`	`137`
`@@ -161,6 +162,7 @@ ImagingJpegEncode(Imaging im, ImagingCodecState state, UINT8 *buf, int bytes) {`
`161`	`162`	`/* Would subsample the green and blue`
`162`	`163`	`channels, which doesn't make sense */`
`163`	`164`	`state->errcode = IMAGING_CODEC_CONFIG;`
	`165`	`+ jpeg_destroy_compress(&context->cinfo);`
`164`	`166`	`return -1;`
`165`	`167`	`}`
`166`	`168`	`jpeg_set_colorspace(&context->cinfo, JCS_RGB);`