Skip to content

Commit

Permalink
Fix equals to prevent null values (#388)
Browse files Browse the repository at this point in the history
Switch frame.getSourceFile().equals(String) around to test String against source file value instead of otherway around to prevent  failures when the value is null.
  • Loading branch information
Bentaii committed Feb 21, 2024
1 parent 1c421bf commit 858bcd0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions retrace/src/proguard/retrace/FrameRemapper.java
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ private void transformFieldInfo(FrameInfo obfuscatedFrame,
if (fieldInfo.matches(originalType))
{
originalFieldFrames.add(new FrameInfo(fieldInfo.originalClassName,
obfuscatedFrame.getSourceFile().equals("Unknown Source") ?
"Unknown Source".equals(obfuscatedFrame.getSourceFile()) ?
"Unknown Source" :
sourceFileName(fieldInfo.originalClassName),
obfuscatedFrame.getLineNumber(),
Expand Down Expand Up @@ -186,7 +186,7 @@ private void transformMethodInfo(FrameInfo obfuscatedFrame,
}

originalMethodFrames.add(new FrameInfo(methodInfo.originalClassName,
obfuscatedFrame.getSourceFile().equals("Unknown Source") ?
"Unknown Source".equals(obfuscatedFrame.getSourceFile()) ?
"Unknown Source" :
sourceFileName(methodInfo.originalClassName),
lineNumber,
Expand Down

0 comments on commit 858bcd0

Please sign in to comment.