diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2021-10-21 17:43:56 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2021-10-22 12:03:18 +0200 |
| commit | de0581c77228eb00ff84a3996bfd252d6928a056 (patch) | |
| tree | f4e8bb344cda6b61cd1352aa1361d7d692fc02e5 /external | |
| parent | 7ec1ef958855ba7ebff4d3bc623f454015ec5a5c (diff) | |
Make external/breakpad/ubsan.patch apply again
(It apparently silently broke with something like
ff673ce838a5538b1432daf9007c047f6455a5ba "update breakpad to the current
chrome_m90 snapshot" and nobody doing ASan/UBSan builds with --enable-breakpad
in the meantime.)
Change-Id: Ic955e1725d2493d849b460a09dfa0238815e2c8d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124033
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/breakpad/ubsan.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/external/breakpad/ubsan.patch b/external/breakpad/ubsan.patch index f4204516eed4..29790b4c02d1 100644 --- a/external/breakpad/ubsan.patch +++ b/external/breakpad/ubsan.patch @@ -9,13 +9,13 @@ }; } // namespace google_breakpad ---- src/common/memory.h -+++ src/common/memory.h +--- src/common/memory_allocator.h ++++ src/common/memory_allocator.h @@ -75,6 +75,7 @@ if (!bytes) return NULL; + bytes = (bytes + (__BIGGEST_ALIGNMENT__ - 1)) & ~(__BIGGEST_ALIGNMENT__ - 1); if (current_page_ && page_size_ - page_offset_ >= bytes) { - uint8_t *const ret = current_page_ + page_offset_; + uint8_t* const ret = current_page_ + page_offset_; page_offset_ += bytes; |