mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-03-05 23:20:32 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug reading string where null characters were included within content

Browse Source
This commit is contained in:
Collin Smith 2020-08-18 01:57:18 -07:00
parent 7667cfdff2
commit 3c56558e9c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/riiablo/io/BitInput.java
View File

@ -495,9 +495,9 @@ public class BitInput {
final byte[] dst = new byte[maxLen];
for (int i = 0; i < maxLen; i++) {
final byte b = dst[i] = (byte) readUnsigned(bits);
if (nullTerminated && b == '\0') break;
if (nullTerminated && b == '\0') maxLen = i;
}
return new String(dst);
return new String(dst, 0, maxLen);
}
}

5
core/src/com/riiablo/io/ByteInput.java
View File

@ -5,6 +5,7 @@ import io.netty.buffer.Unpooled;
import io.netty.util.CharsetUtil;
import java.nio.charset.Charset;
import java.util.Arrays;
import org.apache.commons.lang3.StringUtils;
import com.riiablo.util.DebugUtils;
@ -487,7 +488,9 @@ public class ByteInput {
assert aligned() : "not aligned";
try {
incrementBitsRead((long) len * Byte.SIZE);
return buffer.readCharSequence(len, CharsetUtil.US_ASCII).toString();
CharSequence charSequence = buffer.readCharSequence(len, CharsetUtil.US_ASCII);
charSequence = charSequence.subSequence(0, StringUtils.indexOf(charSequence, '\0'));
return charSequence.toString();
} catch (IndexOutOfBoundsException t) {
throw new EndOfInput(t);
}