From 1792c495d1a575b0ad0b23f7aaba4562473990cb Mon Sep 17 00:00:00 2001
From: groundhog <“stupid_groundhog@163.com”>
Date: Tue, 29 Aug 2023 15:28:26 +0800
Subject: [PATCH] =?UTF-8?q?fix(CharSequenceUtil):=20=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=A4=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 前置判空，方式s.toString导致的NPE
---
 .../src/main/java/cn/hutool/core/text/CharSequenceUtil.java   | 2 +-
 .../src/test/java/cn/hutool/core/util/StrUtilTest.java        | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
index 9e1c38c9d..495fcc9e6 100755
--- a/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
+++ b/hutool-core/src/main/java/cn/hutool/core/text/CharSequenceUtil.java
@@ -1064,7 +1064,7 @@ public class CharSequenceUtil {
 			return null;
 		}
 		for (CharSequence checkStr : testStrs) {
-			if (str.toString().contains(checkStr)) {
+			if (null != checkStr && str.toString().contains(checkStr)) {
 				return checkStr.toString();
 			}
 		}
diff --git a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
index 03c4d1bae..558ae6b24 100755
--- a/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
+++ b/hutool-core/src/test/java/cn/hutool/core/util/StrUtilTest.java
@@ -412,6 +412,10 @@ public class StrUtilTest {
 		Assert.assertFalse(containsAny);
 		containsAny = StrUtil.containsAny("aaabbbccc", "d", "c");
 		Assert.assertTrue(containsAny);
+
+		// https://gitee.com/dromara/hutool/issues/I7WSYD
+		containsAny = StrUtil.containsAny("你好啊", "嗯", null);
+		Assert.assertFalse(containsAny);
 	}
 
 	@Test