summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAron Budea <aron.budea@collabora.com>2024-01-17 02:54:34 +1030
committerAron Budea <aron.budea@collabora.com>2024-01-18 00:42:16 +0100
commit5d52d7dcdf07e5d117e9854af5956b2e93ad3e46 (patch)
tree3e50e69f79ac58c42cf025c685faf03657ce1b44
parenttdf#159243 fix packaging of Noto fonts/fix Armenian UI on macOS (diff)
downloadcore-5d52d7dcdf07e5d117e9854af5956b2e93ad3e46.tar.gz
core-5d52d7dcdf07e5d117e9854af5956b2e93ad3e46.zip
silence use-after-free warning in mdds for gcc12.3 in optimized build
Follow-up to e7c4166f1e150b10bc2ac52e93f8ad7503db09dc as GCC 12.3 seems to be affected, too. Change-Id: I8e5ba9be64625ffd21d43e627996a9ea8602ce9e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/162181 Tested-by: Jenkins Reviewed-by: Aron Budea <aron.budea@collabora.com>
-rw-r--r--external/mdds/gcc-12-silence-use-after-free.patch.14
1 files changed, 2 insertions, 2 deletions
diff --git a/external/mdds/gcc-12-silence-use-after-free.patch.1 b/external/mdds/gcc-12-silence-use-after-free.patch.1
index 3f8dd0afe0f3..94f7ba979e61 100644
--- a/external/mdds/gcc-12-silence-use-after-free.patch.1
+++ b/external/mdds/gcc-12-silence-use-after-free.patch.1
@@ -28,13 +28,13 @@ diff -ur mdds.org/include/mdds/node.hpp mdds/include/mdds/node.hpp
{
- --p->refcount;
- if (!p->refcount)
-+#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ < 3 && !defined __clang__
++#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ <= 3 && !defined __clang__
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wuse-after-free"
+#endif
+ if(--p->refcount == 0)
delete p;
-+#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ < 3 && !defined __clang__
++#if defined __GNUC__ && __GNUC__ == 12 && __GNUC_MINOR__ <= 3 && !defined __clang__
+#pragma GCC diagnostic pop
+#endif
}