From 8dad158ae63a486c20a940adc9f3396ce62b78c9 Mon Sep 17 00:00:00 2001 From: LBJ-the-GOAT <66319139+LBJ-the-GOAT@users.noreply.github.com> Date: Mon, 26 Apr 2021 04:55:47 +0800 Subject: [PATCH] fix: resolve LGTM alerts (PR #1162) * fix LGTM alerts * Update jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java * Update Smali.java Co-authored-by: tobias Co-authored-by: skylot <118523+skylot@users.noreply.github.com> --- .../main/java/jadx/gui/device/debugger/BreakpointManager.java | 2 +- .../src/main/java/jadx/gui/device/debugger/smali/Smali.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java index 23f172b07..f7d2ff71a 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java +++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/BreakpointManager.java @@ -166,7 +166,7 @@ public class BreakpointManager { @Override public int hashCode() { - return (int) (31 * codeOffset + 31 * cls.hashCode() + 31 * mth.hashCode()); + return Objects.hash(codeOffset, cls, mth); } @Override diff --git a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java b/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java index a153437d2..a7e1749fa 100644 --- a/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java +++ b/jadx-gui/src/main/java/jadx/gui/device/debugger/smali/Smali.java @@ -660,8 +660,8 @@ public class Smali { private void formatByteCode(StringBuilder smali, byte[] bytes) { int maxLen = Math.min(bytes.length, 4 * 2); // limit to 4 units StringBuilder inHex = new StringBuilder(); - for (int i = 0; i < maxLen; i++) { - int temp = ((bytes[i++] & 0xff) << 8) | (bytes[i] & 0xff); + for (int i = 0; i < maxLen - 1; i += 2) { + int temp = ((bytes[i] & 0xff) << 8) | (bytes[i + 1] & 0xff); inHex.append(String.format("%04x ", temp)); } smali.append(String.format(FMT_BYTECODE_COL, inHex));