external/libetonyek/0001-allow-0-size-message.patch.1 | 30 ++++++++++++++++++
external/libetonyek/UnpackedTarball_libetonyek.mk | 1
2 files changed, 31 insertions(+)
New commits:
commit 7f60fafe3b54e2cc86d996b3211be7e82fb478a2
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri May 28 08:49:48 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 28 11:28:30 2021 +0200
crashtesting: backport assert downgrade
Change-Id: I6d813cd9996633b207e30c2f1fff707810396153
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116315
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/external/libetonyek/0001-allow-0-size-message.patch.1
b/external/libetonyek/0001-allow-0-size-message.patch.1
new file mode 100644
index 000000000000..62e584b815a0
--- /dev/null
+++ b/external/libetonyek/0001-allow-0-size-message.patch.1
@@ -0,0 +1,30 @@
+From 54762245feee35ce6885f7443da8f8443fccd5b5 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtar...@redhat.com>
+Date: Wed, 26 May 2021 20:39:41 +0200
+Subject: [PATCH] allow 0-size message
+
+It likely means the input is broken, but there is no need to reject it.
+Let's just produce a dummy, empty message.
+
+Change-Id: I03a1e9827f21f6a0ce69d7e16dfcf2e9a0f2d44f
+---
+ src/lib/IWAMessage.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/lib/IWAMessage.cpp b/src/lib/IWAMessage.cpp
+index c01b1b6..9456444 100644
+--- a/src/lib/IWAMessage.cpp
++++ b/src/lib/IWAMessage.cpp
+@@ -42,7 +42,8 @@ IWAMessage::IWAMessage(const RVNGInputStreamPtr_t &input,
unsigned long length)
+ : m_input(input)
+ , m_fields()
+ {
+- assert(length > 0);
++ if (length == 0)
++ return;
+
+ parse(length);
+ }
+--
+2.31.1
+
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk
b/external/libetonyek/UnpackedTarball_libetonyek.mk
index de8c0dcd1cc5..81a3fa5b870a 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -22,6 +22,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
external/libetonyek/warnings.patch \
external/libetonyek/0001-fix-build-with-MSVC.patch.1 \
external/libetonyek/0002-fix-build-with-MSVC.patch.1 \
+ external/libetonyek/0001-allow-0-size-message.patch.1 \
))
ifneq ($(OS),MACOSX)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
