add null check

This commit is contained in:
Looly 2020-11-19 13:41:00 +08:00
parent 556c728389
commit 055c9b6bd6
3 changed files with 9 additions and 1 deletions

View File

@ -3,13 +3,14 @@
-------------------------------------------------------------------------------------------------------------
# 5.5.2 (2020-11-18)
# 5.5.2 (2020-11-19)
### 新特性
* 【crypto 】 KeyUtil增加重载AES构造增加重载issue#I25NNZ@Gitee
* 【json 】 JSONUtil增加toList重载issue#1228@Github
* 【core 】 新增CollStreamUtilissue#1228@Github
* 【extra 】 新增Rhino表达式执行引擎pr#1229@Github
* 【crypto 】 增加判空issue#1230@Github
### Bug修复
* 【cron 】 修复CronTimer可能死循环的问题issue#1224@Github

View File

@ -1,5 +1,7 @@
package cn.hutool.core.codec;
import cn.hutool.core.lang.Assert;
/**
* BCD码Binary-Coded Decimal亦称二进码十进数或二-十进制代码<br>
* BCD码这种编码形式利用了四个位元来储存一个十进制的数码使二进制和十进制之间的转换得以快捷的进行<br>
@ -58,6 +60,7 @@ public class BCD {
* @return BCD
*/
public static byte[] ascToBcd(byte[] ascii) {
Assert.notNull(ascii, "Ascii must be not null!");
return ascToBcd(ascii, ascii.length);
}
@ -68,6 +71,7 @@ public class BCD {
* @return BCD
*/
public static byte[] ascToBcd(byte[] ascii, int ascLength) {
Assert.notNull(ascii, "Ascii must be not null!");
byte[] bcd = new byte[ascLength / 2];
int j = 0;
for (int i = 0; i < (ascLength + 1) / 2; i++) {
@ -83,6 +87,7 @@ public class BCD {
* @return ASCII字符串
*/
public static String bcdToStr(byte[] bytes) {
Assert.notNull(bytes, "Bcd bytes must be not null!");
char[] temp = new char[bytes.length * 2];
char val;

View File

@ -4,6 +4,7 @@ import cn.hutool.core.codec.BCD;
import cn.hutool.core.codec.Base64;
import cn.hutool.core.io.IORuntimeException;
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.HexUtil;
import cn.hutool.core.util.StrUtil;
@ -301,6 +302,7 @@ public abstract class AbstractAsymmetricCrypto<T extends AbstractAsymmetricCrypt
* @since 4.1.0
*/
public byte[] decryptFromBcd(String data, KeyType keyType, Charset charset) {
Assert.notNull(data, "Bcd string must be not null!");
final byte[] dataBytes = BCD.ascToBcd(StrUtil.bytes(data, charset));
return decrypt(dataBytes, keyType);
}