Skip to content

Modify the string parsing logic to remove the potential "\0" problem #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iwangjie wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Modify the string parsing logic to remove the potential "\0" problem #306

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion src/main/java/com/github/tobato/fastdfs/domain/proto/mapper/FieldMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,15 @@ public Object getValue(byte[] bs, Charset charset) {
if (isDynamicField()) {
return (new String(bs, offsize, bs.length - offsize, charset)).trim();
}
return (new String(bs, offsize, size, charset)).trim();
String s = new String(bs, offsize, size, charset);
// C 风格：如果中间存在 '\0'，只取前面部分
int nullPos = s.indexOf('\0');
if (nullPos >= 0) {
s = s.substring(0, nullPos);
}
// 再看看是否还要 trim() 前后空格
s = s.trim();
return s;
} else if (long.class == field.getType()) {
return BytesUtil.buff2long(bs, offsize);
} else if (int.class == field.getType()) {
Expand Down