-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
breakpad: backport fixes to support gcc-13 (#26479)
* #17954 Fix breakpad compilation with gcc-13 * Apply patch from upstream instead of disabling -Werror See: https://chromium.googlesource.com/breakpad/breakpad/+/30c7f3cfc11cdbf93a12efbe9d46c66d9785879e%5E%21/
- Loading branch information
1 parent
07c7f74
commit 281c563
Showing
3 changed files
with
36 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
10 changes: 10 additions & 0 deletions
10
recipes/breakpad/all/patches/0004-Fix-gcc13-compilation.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
--- a/src/client/linux/handler/minidump_descriptor.h | ||
+++ b/src/client/linux/handler/minidump_descriptor.h | ||
@@ -30,6 +30,7 @@ | ||
#ifndef CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_ | ||
#define CLIENT_LINUX_HANDLER_MINIDUMP_DESCRIPTOR_H_ | ||
|
||
+#include <cstdint> | ||
#include <assert.h> | ||
#include <sys/types.h> | ||
|
24 changes: 24 additions & 0 deletions
24
recipes/breakpad/all/patches/0005-Apply-upstream-fixes.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
--- a/src/processor/exploitability_linux.cc | ||
+++ b/src/processor/exploitability_linux.cc | ||
@@ -516,18 +516,17 @@ | ||
raw_bytes_tmpfile); | ||
FILE* objdump_fp = popen(cmd, "r"); | ||
if (!objdump_fp) { | ||
- fclose(objdump_fp); | ||
unlink(raw_bytes_tmpfile); | ||
BPLOG(ERROR) << "Failed to call objdump."; | ||
return false; | ||
} | ||
- if (fread(objdump_output_buffer, 1, buffer_len, objdump_fp) <= 0) { | ||
- fclose(objdump_fp); | ||
+ if (fread(objdump_output_buffer, 1, buffer_len, objdump_fp) != buffer_len) { | ||
+ pclose(objdump_fp); | ||
unlink(raw_bytes_tmpfile); | ||
BPLOG(ERROR) << "Failed to read objdump output."; | ||
return false; | ||
} | ||
- fclose(objdump_fp); | ||
+ pclose(objdump_fp); | ||
unlink(raw_bytes_tmpfile); | ||
return true; | ||
} |