#17954 Fix breakpad compilation with gcc-13

conan-io · Jan 29, 2025 · 9649377 · 9649377
1 parent a9b270f
commit 9649377
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/recipes/breakpad/all/conandata.yml b/recipes/breakpad/all/conandata.yml
@@ -7,3 +7,4 @@ patches:
     - patch_file: "patches/0001-Use_conans_lss.patch"
     - patch_file: "patches/0002-Remove-hardcoded-fpic.patch"
     - patch_file: "patches/0003-Fix-gcc11-compilation.patch"
+    - patch_file: "patches/0004-Fix-gcc13-compilation.patch"
diff --git a/recipes/breakpad/all/patches/0004-Fix-gcc13-compilation.patch b/recipes/breakpad/all/patches/0004-Fix-gcc13-compilation.patch
@@ -0,0 +1,20 @@
+--- 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>
+
+--- a/src/processor/exploitability_linux.cc
++++ b/src/processor/exploitability_linux.cc
+@@ -516,7 +516,6 @@
+            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;