修复Graphics2D的资源没释放问题

CHANGELOG.md

@@ -2,7 +2,7 @@
 # 🚀Changelog
 
 -------------------------------------------------------------------------------------------------------------
-# 5.8.27(2024-03-12)
+# 5.8.27(2024-03-15)
 
 ### 🐣新特性
 * 【extra 】      FreemarkerEngine修改默认版本参数
@@ -16,6 +16,7 @@
 * 【json  】      修复JSONUtil序列化和反序列化预期的结果不一致问题（pr#3507@Github）
 * 【http  】      修复CVE-2022-22885，HttpGlobalConfig可选关闭信任host（issue#2042@Github）
 * 【core  】      修复DateUtil.betweenYear闰年2月问题（issue#I97U3J@Gitee）
+* 【captcha】     修复Graphics2D的资源没释放问题（issue#I98PYN@Gitee）
 
 -------------------------------------------------------------------------------------------------------------
 # 5.8.26(2024-02-10)

hutool-captcha/src/main/java/cn/hutool/captcha/CircleCaptcha.java

@@ -71,11 +71,15 @@ public class CircleCaptcha extends AbstractCaptcha {
 		final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
 		final Graphics2D g = ImgUtil.createGraphics(image, ObjectUtil.defaultIfNull(this.background, Color.WHITE));
 
+		try{
 			// 随机画干扰圈圈
 			drawInterfere(g);
 
 			// 画字符串
 			drawString(g, code);
+		} finally {
+			g.dispose();
+		}
 
 		return image;
 	}

hutool-captcha/src/main/java/cn/hutool/captcha/GifCaptcha.java

@@ -171,6 +171,7 @@ public class GifCaptcha extends AbstractCaptcha {
 		BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
 		//或得图形上下文
 		Graphics2D g2d = image.createGraphics();
+		try{
 			//利用指定颜色填充背景
 			g2d.setColor(ObjectUtil.defaultIfNull(this.background, Color.WHITE));
 			g2d.fillRect(0, 0, width, height);
@@ -196,7 +197,9 @@ public class GifCaptcha extends AbstractCaptcha {
 				);//绘制椭圆边框
 				g2d.drawString(words[i] + "", x + (font.getSize() + m) * i, y);
 			}
+		} finally {
 			g2d.dispose();
+		}
 		return image;
 	}
 

hutool-captcha/src/main/java/cn/hutool/captcha/LineCaptcha.java

@@ -62,11 +62,15 @@ public class LineCaptcha extends AbstractCaptcha {
 		final BufferedImage image = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
 		final Graphics2D g = GraphicsUtil.createGraphics(image, ObjectUtil.defaultIfNull(this.background, Color.WHITE));
 
+		try {
 			// 干扰线
 			drawInterfere(g);
 
 			// 字符串
 			drawString(g, code);
+		} finally {
+			g.dispose();
+		}
 
 		return image;
 	}

hutool-captcha/src/main/java/cn/hutool/captcha/ShearCaptcha.java

@@ -73,6 +73,7 @@ public class ShearCaptcha extends AbstractCaptcha {
 		final BufferedImage image = new BufferedImage(this.width, this.height, BufferedImage.TYPE_INT_RGB);
 		final Graphics2D g = GraphicsUtil.createGraphics(image, ObjectUtil.defaultIfNull(this.background, Color.WHITE));
 
+		try{
 			// 画字符串
 			drawString(g, code);
 
@@ -80,6 +81,9 @@ public class ShearCaptcha extends AbstractCaptcha {
 			shear(g, this.width, this.height, ObjectUtil.defaultIfNull(this.background, Color.WHITE));
 			// 画干扰线
 			drawInterfere(g, 0, RandomUtil.randomInt(this.height) + 1, this.width, RandomUtil.randomInt(this.height) + 1, this.interfereCount, ImgUtil.randomColor());
+		} finally {
+			g.dispose();
+		}
 
 		return image;
 	}

hutool-core/src/main/java/cn/hutool/core/img/ImgUtil.java

@@ -1338,8 +1338,11 @@ public class ImgUtil {
 		final BufferedImage bimage = new BufferedImage(
 				img.getWidth(null), img.getHeight(null), imageType);
 		final Graphics2D bGr = GraphicsUtil.createGraphics(bimage, backgroundColor);
+		try{
 			bGr.drawImage(img, 0, 0, null);
+		} finally {
 			bGr.dispose();
+		}
 
 		return bimage;
 	}