mirrors/bitcoinj
1
0
Fork 0
mirror of https://github.com/bitcoinj/bitcoinj.git synced 2025-01-18 21:32:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

ByteUtils: check range of values supplied to write helpers for the Java Unsigned Integer API

Browse Source 
These checks uncovered various uses of illegal values (now fixed).
They should help this won't happen in future.
This commit is contained in:
Andreas Schildbach 2023-03-21 16:52:39 +01:00
parent 2aa764d403
commit 504b67c186
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/main/java/org/bitcoinj/base/internal/ByteUtils.java
View File

@ -36,6 +36,8 @@ import static org.bitcoinj.base.internal.Preconditions.checkArgument;
* from {@code org.bitcoinj.core.Utils}.
*/
public class ByteUtils {
/** Maximum unsigned value that can be expressed by 16 bits. */
public static final int MAX_UNSIGNED_SHORT = Short.toUnsignedInt((short) -1);
/** Maximum unsigned value that can be expressed by 32 bits. */
public static final long MAX_UNSIGNED_INTEGER = Integer.toUnsignedLong(-1);
@ -114,6 +116,8 @@ public class ByteUtils {
* @throws BufferOverflowException if the value doesn't fit the remaining buffer
*/
public static ByteBuffer writeInt16LE(int val, ByteBuffer buf) throws BufferOverflowException {
checkArgument(val >= 0 && val <= MAX_UNSIGNED_SHORT, () ->
"value out of range: " + val);
return buf.order(ByteOrder.LITTLE_ENDIAN).putShort((short) val);
}
@ -145,6 +149,8 @@ public class ByteUtils {
* @throws BufferOverflowException if the value doesn't fit the remaining buffer
*/
public static ByteBuffer writeInt16BE(int val, ByteBuffer buf) throws BufferOverflowException {
checkArgument(val >= 0 && val <= MAX_UNSIGNED_SHORT, () ->
"value out of range: " + val);
return buf.order(ByteOrder.BIG_ENDIAN).putShort((short) val);
}
@ -191,6 +197,8 @@ public class ByteUtils {
* @throws BufferOverflowException if the value doesn't fit the remaining buffer
*/
public static ByteBuffer writeInt32LE(long val, ByteBuffer buf) throws BufferOverflowException {
checkArgument(val >= 0 && val <= MAX_UNSIGNED_INTEGER, () ->
"value out of range: " + val);
return buf.order(ByteOrder.LITTLE_ENDIAN).putInt((int) val);
}
@ -222,6 +230,8 @@ public class ByteUtils {
* @throws BufferOverflowException if the value doesn't fit the remaining buffer
*/
public static ByteBuffer writeInt32BE(long val, ByteBuffer buf) throws BufferOverflowException {
checkArgument(val >= 0 && val <= MAX_UNSIGNED_INTEGER, () ->
"value out of range: " + val);
return buf.order(ByteOrder.BIG_ENDIAN).putInt((int) val);
}