From e341bd5ec2cc4f47632b03fd76368cfeae645351 Mon Sep 17 00:00:00 2001 From: bwcx_jzy Date: Tue, 12 Sep 2023 17:23:54 +0800 Subject: [PATCH] fix base64 NPE verification --- .../src/main/java/cn/hutool/core/codec/Base64.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java b/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java index 249c9e588..def62a6e6 100755 --- a/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java +++ b/hutool-core/src/main/java/cn/hutool/core/codec/Base64.java @@ -30,6 +30,9 @@ public class Base64 { * @return 编码后的bytes */ public static byte[] encode(byte[] arr, boolean lineSep) { + if (arr == null) { + return null; + } return lineSep ? java.util.Base64.getMimeEncoder().encode(arr) : java.util.Base64.getEncoder().encode(arr); @@ -137,6 +140,9 @@ public class Base64 { * @return 被加密后的字符串 */ public static String encode(byte[] source) { + if (source == null) { + return null; + } return java.util.Base64.getEncoder().encodeToString(source); } @@ -148,6 +154,9 @@ public class Base64 { * @since 5.5.2 */ public static String encodeWithoutPadding(byte[] source) { + if (source == null) { + return null; + } return java.util.Base64.getEncoder().withoutPadding().encodeToString(source); } @@ -159,6 +168,9 @@ public class Base64 { * @since 3.0.6 */ public static String encodeUrlSafe(byte[] source) { + if (source == null) { + return null; + } return java.util.Base64.getUrlEncoder().withoutPadding().encodeToString(source); }