From abe4de70896c37a5f763f821a3800b99411333aa Mon Sep 17 00:00:00 2001 From: Jayathirth Rao D V Date: Fri, 24 May 2024 13:47:36 +0530 Subject: [PATCH 1/2] 8332866: Crash in ImageIO JPEG decoding when MEM_STATS in enabled --- src/java.desktop/share/native/libjavajpeg/imageioJPEG.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c index 85476f0f2e6cf..73bad012d1013 100644 --- a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c +++ b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c @@ -666,8 +666,6 @@ static void imageio_reset(JNIEnv *env, static void imageio_dispose(j_common_ptr info) { if (info != NULL) { - free(info->err); - info->err = NULL; if (info->is_decompressor) { j_decompress_ptr dinfo = (j_decompress_ptr) info; free(dinfo->src); @@ -678,6 +676,8 @@ static void imageio_dispose(j_common_ptr info) { cinfo->dest = NULL; } jpeg_destroy(info); + free(info->err); + info->err = NULL; free(info); } } From 69e9d1c7464da2918052a167ccfd3476e193d68d Mon Sep 17 00:00:00 2001 From: Jayathirth Rao D V Date: Tue, 4 Jun 2024 10:38:43 +0530 Subject: [PATCH 2/2] Update copyright year --- src/java.desktop/share/native/libjavajpeg/imageioJPEG.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c index 73bad012d1013..4e2ba2a35c5d3 100644 --- a/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c +++ b/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2023, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2024, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it