diff --git a/CHANGELOG.md b/CHANGELOG.md index 6c1cdbeac..9149ea59c 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ # 🚀Changelog ------------------------------------------------------------------------------------------------------------- -# 5.8.22(2023-08-16) +# 5.8.22(2023-08-21) ### 🐣新特性 * 【core 】 NumberUtil.nullToZero增加重载(issue#I7PPD2@Gitee) @@ -22,6 +22,7 @@ * 【core 】 去除默认的ACCEPT_LANGUAGE(issue#3258@Github) * 【core 】 修复FieldsComparator比较结果不正确问题(issue#3259@Github) * 【core 】 修复Db.findAll全局忽略大小写无效问题(issue#I7T30Y@Gitee) +* 【core 】 修复Ipv4Util.getEndIpLong 取反符号导致数据越界(issue#I7U1OQ@Gitee) ------------------------------------------------------------------------------------------------------------- # 5.8.21(2023-07-29) diff --git a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java index ed990e71a..ba0251f95 100755 --- a/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/Ipv4Util.java @@ -407,7 +407,7 @@ public class Ipv4Util { */ public static Long getEndIpLong(String ip, int maskBit) { return getBeginIpLong(ip, maskBit) - + ~ipv4ToLong(getMaskByMaskBit(maskBit)); + + (0xffffffffL & ~ipv4ToLong(getMaskByMaskBit(maskBit))); } /**