mirror of
https://git.freebsd.org/ports.git
synced 2025-06-19 19:50:31 -04:00
fde2530e82
Changelog: https://chromium.googlesource.com/chromium/src/+log/74.0.3729.169..75.0.3770.80?pretty=fuller&n=10000 Submitted by: Matthias Wolf <matthias@rheinwolf.de>
56 lines
1.6 KiB
C++
56 lines
1.6 KiB
C++
--- base/debug/debugger_posix.cc.orig 2019-06-04 18:55:15 UTC
|
|
+++ base/debug/debugger_posix.cc
|
|
@@ -87,7 +87,7 @@ bool BeingDebugged() {
|
|
KERN_PROC,
|
|
KERN_PROC_PID,
|
|
getpid()
|
|
-#if defined(OS_OPENBSD)
|
|
+#if defined(OS_BSD)
|
|
, sizeof(struct kinfo_proc),
|
|
0
|
|
#endif
|
|
@@ -95,33 +95,35 @@ bool BeingDebugged() {
|
|
|
|
// Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
|
|
// binary interfaces may change.
|
|
- struct kinfo_proc info;
|
|
- size_t info_size = sizeof(info);
|
|
+ struct kinfo_proc *info;
|
|
+ size_t info_size;
|
|
|
|
-#if defined(OS_OPENBSD)
|
|
if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0)
|
|
return -1;
|
|
|
|
+ info = (struct kinfo_proc *)malloc(info_size);
|
|
mib[5] = (info_size / sizeof(struct kinfo_proc));
|
|
-#endif
|
|
|
|
- int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0);
|
|
+ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0);
|
|
DCHECK_EQ(sysctl_result, 0);
|
|
if (sysctl_result != 0) {
|
|
is_set = true;
|
|
being_debugged = false;
|
|
- return being_debugged;
|
|
+ goto out;
|
|
}
|
|
|
|
// This process is being debugged if the P_TRACED flag is set.
|
|
is_set = true;
|
|
#if defined(OS_FREEBSD)
|
|
- being_debugged = (info.ki_flag & P_TRACED) != 0;
|
|
+ being_debugged = (info->ki_flag & P_TRACED) != 0;
|
|
#elif defined(OS_BSD)
|
|
- being_debugged = (info.p_flag & P_TRACED) != 0;
|
|
+ being_debugged = (info->p_flag & P_TRACED) != 0;
|
|
#else
|
|
- being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
|
|
+ being_debugged = (info->kp_proc.p_flag & P_TRACED) != 0;
|
|
#endif
|
|
+
|
|
+out:
|
|
+ free(info);
|
|
return being_debugged;
|
|
}
|
|
|