Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## Unreleased

### Fixes

- Fix potential app launch hang caused by the SentrySDK (#6181) Fixed by removing the call to `_dyld_get_image_header` on the main thread.

## 8.56.0

### Features
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,6 @@ typedef struct SentryCrash_MonitorContext {
const char *cpuArchitecture;
int cpuType;
int cpuSubType;
int binaryCPUType;
int binaryCPUSubType;
const char *processName;
int processID;
int parentProcessID;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,6 @@
const char *cpuArchitecture;
int cpuType;
int cpuSubType;
int binaryCPUType;
int binaryCPUSubType;
const char *processName;
int processID;
int parentProcessID;
Expand Down Expand Up @@ -499,7 +497,6 @@

NSBundle *mainBundle = [NSBundle mainBundle];
NSDictionary *infoDict = [mainBundle infoDictionary];
const struct mach_header *header = _dyld_get_image_header(0);

#if SENTRY_HOST_IOS
g_systemData.systemName = "iOS";
Expand Down Expand Up @@ -559,8 +556,6 @@
g_systemData.cpuArchitecture = getCurrentCPUArch();
g_systemData.cpuType = sentrycrashsysctl_int32ForName("hw.cputype");
g_systemData.cpuSubType = sentrycrashsysctl_int32ForName("hw.cpusubtype");
g_systemData.binaryCPUType = header->cputype;
g_systemData.binaryCPUSubType = header->cpusubtype;
g_systemData.processName = cString([NSProcessInfo processInfo].processName);
g_systemData.processID = [NSProcessInfo processInfo].processIdentifier;
g_systemData.parentProcessID = getppid();
Expand Down Expand Up @@ -610,8 +605,6 @@
COPY_REFERENCE(cpuArchitecture);
COPY_REFERENCE(cpuType);
COPY_REFERENCE(cpuSubType);
COPY_REFERENCE(binaryCPUType);
COPY_REFERENCE(binaryCPUSubType);
COPY_REFERENCE(processName);
COPY_REFERENCE(processID);
COPY_REFERENCE(parentProcessID);
Expand Down
2 changes: 0 additions & 2 deletions Sources/SentryCrash/Recording/SentryCrash.m
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,6 @@ - (NSDictionary *)systemInfo
COPY_STRING(cpuArchitecture);
COPY_PRIMITIVE(cpuType);
COPY_PRIMITIVE(cpuSubType);
COPY_PRIMITIVE(binaryCPUType);
COPY_PRIMITIVE(binaryCPUSubType);
COPY_STRING(processName);
COPY_PRIMITIVE(processID);
COPY_PRIMITIVE(parentProcessID);
Expand Down
4 changes: 0 additions & 4 deletions Sources/SentryCrash/Recording/SentryCrashReport.c
Original file line number Diff line number Diff line change
Expand Up @@ -1565,10 +1565,6 @@ writeSystemInfo(const SentryCrashReportWriter *const writer, const char *const k
writer->addIntegerElement(writer, SentryCrashField_CPUType, monitorContext->System.cpuType);
writer->addIntegerElement(
writer, SentryCrashField_CPUSubType, monitorContext->System.cpuSubType);
writer->addIntegerElement(
writer, SentryCrashField_BinaryCPUType, monitorContext->System.binaryCPUType);
writer->addIntegerElement(
writer, SentryCrashField_BinaryCPUSubType, monitorContext->System.binaryCPUSubType);
writer->addStringElement(
writer, SentryCrashField_ProcessName, monitorContext->System.processName);
writer->addIntegerElement(
Expand Down
2 changes: 0 additions & 2 deletions Sources/SentryCrash/Recording/SentryCrashReportFields.h
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@
#define SentryCrashField_CPUArch "cpu_arch"
#define SentryCrashField_CPUType "cpu_type"
#define SentryCrashField_CPUSubType "cpu_subtype"
#define SentryCrashField_BinaryCPUType "binary_cpu_type"
#define SentryCrashField_BinaryCPUSubType "binary_cpu_subtype"
#define SentryCrashField_DeviceAppHash "device_app_hash"
#define SentryCrashField_Executable "CFBundleExecutable"
#define SentryCrashField_ExecutablePath "CFBundleExecutablePath"
Expand Down
Loading