Skip to content

Commit 5d18650

Browse files
committed
Merge remote-tracking branch 'origin/GT-3460_ryanmkurtz_dividezero'
2 parents bdb52bd + e767141 commit 5d18650

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

Ghidra/Framework/Generic/src/main/java/ghidra/util/NumericUtilities.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ public final static long bigIntegerToUnsignedLong(BigInteger value) {
250250
* @return aligned value
251251
*/
252252
public static long getUnsignedAlignedValue(long unsignedValue, long alignment) {
253-
if (unsignedValue % alignment == 0) {
253+
if (alignment == 0 || unsignedValue % alignment == 0) {
254254
return unsignedValue;
255255
}
256256
boolean negative = unsignedValue < 0;

Ghidra/Framework/Generic/src/test/java/ghidra/util/NumericUtilitiesTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ public void testGetUnsignedAlignedValue() {
310310
assertEquals(0, NumericUtilities.getUnsignedAlignedValue(0, 5));
311311
assertEquals(5, NumericUtilities.getUnsignedAlignedValue(3, 5));
312312
assertEquals(0xa, NumericUtilities.getUnsignedAlignedValue(8, 5));
313+
assertEquals(0xa, NumericUtilities.getUnsignedAlignedValue(0xa, 0));
313314

314315
}
315316

0 commit comments

Comments
 (0)