Skip to content

Commit e13da21

Browse files
committed
deduplicate hex formatting of addresses and TombstoneParser
1 parent 1388b3c commit e13da21

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

sentry-android-core/src/main/java/io/sentry/android/core/internal/tombstone/TombstoneParser.java

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ public class TombstoneParser implements Closeable {
2525
private final InputStream tombstoneStream;
2626
private final Map<String, String> excTypeValueMap = new HashMap<>();
2727

28+
private static String formatHex(long value) {
29+
return String.format("0x%x", value);
30+
}
31+
2832
public TombstoneParser(@NonNull final InputStream tombstoneStream) {
2933
this.tombstoneStream = tombstoneStream;
3034

@@ -94,7 +98,7 @@ private static SentryStackTrace createStackTrace(@NonNull final TombstoneProtos.
9498
final SentryStackFrame stackFrame = new SentryStackFrame();
9599
stackFrame.setPackage(frame.getFileName());
96100
stackFrame.setFunction(frame.getFunctionName());
97-
stackFrame.setInstructionAddr(String.format("0x%x", frame.getPc()));
101+
stackFrame.setInstructionAddr(formatHex(frame.getPc()));
98102
frames.add(0, stackFrame);
99103
}
100104

@@ -108,7 +112,7 @@ private static SentryStackTrace createStackTrace(@NonNull final TombstoneProtos.
108112

109113
final Map<String, String> registers = new HashMap<>();
110114
for (TombstoneProtos.Register register : thread.getRegistersList()) {
111-
registers.put(register.getName(), String.format("0x%x", register.getU64()));
115+
registers.put(register.getName(), formatHex(register.getU64()));
112116
}
113117
stacktrace.setRegisters(registers);
114118

@@ -196,7 +200,7 @@ private DebugMeta createDebugMeta(@NonNull final TombstoneProtos.Tombstone tombs
196200
image.setCodeId(module.getBuildId());
197201
image.setCodeFile(module.getMappingName());
198202
image.setDebugId(module.getBuildId());
199-
image.setImageAddr(String.format("0x%x", module.getBeginAddress()));
203+
image.setImageAddr(formatHex(module.getBeginAddress()));
200204
image.setImageSize(module.getEndAddress() - module.getBeginAddress());
201205
image.setType("elf");
202206

0 commit comments

Comments
 (0)