Skip to content

Fix ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT in DataConverter #253

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

Merged
merged 3 commits into from
Jul 2, 2025
+73 −2
Merged

Fix ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT in DataConverter #253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87c230d
Fix ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT in DataConverter
Jun 30, 2025
ad57aa9
Merge branch 'main' into fix-icast-unsigned-shift
ic0ns Jun 30, 2025
19cbb27
Merge branch 'main' into fix-icast-unsigned-shift
TrueSkrillor Jul 2, 2025
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
4 changes: 2 additions & 2 deletions src/main/java/de/rub/nds/modifiablevariable/util/DataConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public static byte[] intToBytes(int value, int size) {
int shift = 0;
int finalPosition = size > Integer.BYTES ? size - Integer.BYTES : 0;
for (int i = size - 1; i >= finalPosition; i--) {
result[i] = (byte) (value >>> shift);
result[i] = (byte) ((value >>> shift) & 0xFF);
shift += 8;
}

Expand All @@ -192,7 +192,7 @@ public static byte[] longToBytes(long value, int size) {
int shift = 0;
int finalPosition = size > Long.BYTES ? size - Long.BYTES : 0;
for (int i = size - 1; i >= finalPosition; i--) {
result[i] = (byte) (value >>> shift);
result[i] = (byte) ((value >>> shift) & 0xFF);
shift += 8;
}

Expand Down
71 changes: 71 additions & 0 deletions src/test/java/de/rub/nds/modifiablevariable/util/DataConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1173,6 +1173,77 @@ void testIntegerReconversion() {
}
}

@Test
void testIntToBytesWithNegativeValues() {
// Test negative int values to ensure unsigned right shift is handled correctly
int negativeValue = -1;
byte[] result = DataConverter.intToBytes(negativeValue, 4);
assertArrayEquals(
new byte[] {(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF},
result,
"Negative -1 should produce all FF bytes");

// Test another negative value
negativeValue = -256; // 0xFFFFFF00
result = DataConverter.intToBytes(negativeValue, 4);
assertArrayEquals(
new byte[] {(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x00},
result,
"Negative -256 should produce correct bytes");

// Test with size larger than int
negativeValue = -1;
result = DataConverter.intToBytes(negativeValue, 6);
assertArrayEquals(
new byte[] {0x00, 0x00, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF},
result,
"Negative -1 with size 6 should be padded with zeros");
}

@Test
void testLongToBytesWithNegativeValues() {
// Test negative long values to ensure unsigned right shift is handled correctly
long negativeValue = -1L;
byte[] result = DataConverter.longToBytes(negativeValue, 8);
assertArrayEquals(
new byte[] {
(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF
},
result,
"Negative -1L should produce all FF bytes");

// Test another negative value
negativeValue = -256L; // 0xFFFFFFFFFFFFFF00
result = DataConverter.longToBytes(negativeValue, 8);
assertArrayEquals(
new byte[] {
(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0xFF,
(byte) 0xFF, (byte) 0xFF, (byte) 0xFF, (byte) 0x00
},
result,
"Negative -256L should produce correct bytes");

// Test with size larger than long
negativeValue = -1L;
result = DataConverter.longToBytes(negativeValue, 10);
assertArrayEquals(
new byte[] {
0x00,
0x00,
(byte) 0xFF,
(byte) 0xFF,
(byte) 0xFF,
(byte) 0xFF,
(byte) 0xFF,
(byte) 0xFF,
(byte) 0xFF,
(byte) 0xFF
},
result,
"Negative -1L with size 10 should be padded with zeros");
}

/** Test of indexOf method, of class DataConverter. */
@Test
void testIndexOf() {
Expand Down