Skip to content

Ghidra is a software reverse engineering (SRE) framework

GP-0: Fixing bit twiddling in GuidUtil.getVersionedGuidString() (Closes #9582)

Ryan Kurtzb0445ec10231
diff --git a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/GuidUtil.java b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/GuidUtil.java
index d68f043216..be5512724b 100644
--- a/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/GuidUtil.java
+++ b/Ghidra/Features/Base/src/main/java/ghidra/app/util/datatype/microsoft/GuidUtil.java
@@ -283,9 +283,9 @@ public class GuidUtil {
// retVal = retVal.toUpperCase();
guidString += " v";
- versionData[0] = (bytes[17] << 8) + bytes[16];
+ versionData[0] = (Byte.toUnsignedInt(bytes[17]) << 8) | Byte.toUnsignedInt(bytes[16]);
guidString += Integer.toString(versionData[0]) + ".";
- versionData[1] = (bytes[19] << 8) + bytes[18];
+ versionData[1] = (Byte.toUnsignedInt(bytes[19]) << 8) | Byte.toUnsignedInt(bytes[18]);
guidString += Integer.toString(versionData[1]);
if (validate && !NewGuid.isOKForGUID(bytes, 0)) {