blob: bc18b34a20abeaa4049ea4b2e595b7406d839ad5 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
|
--- base/debug/stack_trace_posix.cc.orig 2021-04-14 18:40:48 UTC
+++ base/debug/stack_trace_posix.cc
@@ -35,7 +35,7 @@
#include <AvailabilityMacros.h>
#endif
-#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)
#include "base/debug/proc_maps_linux.h"
#endif
@@ -659,13 +659,21 @@ class SandboxSymbolizeHelper {
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
+#if defined(OS_BSD)
+ LOG(ERROR) << "Failed to read /proc/curproc/map";
+#else
LOG(ERROR) << "Failed to read /proc/self/maps";
+#endif
return false;
}
// Parses /proc/self/maps.
if (!ParseProcMaps(contents, ®ions_)) {
+#if defined(OS_BSD)
+ LOG(ERROR) << "Failed to parse the contents of /proc/curproc/map";
+#else
LOG(ERROR) << "Failed to parse the contents of /proc/self/maps";
+#endif
return false;
}
@@ -696,7 +704,11 @@ class SandboxSymbolizeHelper {
// Skip regions with empty file names.
continue;
}
+#if defined(OS_BSD)
+ if (region.path[0] == '-') {
+#else
if (region.path[0] == '[') {
+#endif
// Skip pseudo-paths, like [stack], [vdso], [heap], etc ...
continue;
}
|