This commit is contained in:
Rmys
2024-12-02 12:01:34 +03:00
parent 50e1b0a2ca
commit 1ebf172a1b
2 changed files with 35 additions and 0 deletions
@@ -0,0 +1,27 @@
From 2a770f61c060d19f7fe118c2a066306fa3e9ec3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Goudout?= <theo.goudout@mydatakeeper.fr>
Date: Thu, 1 Aug 2019 08:24:29 +0000
Subject: [PATCH] Fix assert fail when copying data from received message
---
src/message.cpp | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/message.cpp b/src/message.cpp
index 3f0cac4..1c4caab 100644
--- a/src/message.cpp
+++ b/src/message.cpp
@@ -350,7 +350,9 @@ void MessageIter::copy_data(MessageIter &to)
(
(DBusMessageIter *) & (to._iter),
from.type(),
- from.type() == DBUS_TYPE_VARIANT ? NULL : sig,
+ (from.type() == DBUS_TYPE_STRUCT || from.type() == DBUS_TYPE_DICT_ENTRY)
+ ? NULL
+ : sig,
(DBusMessageIter *) & (to_container._iter)
);
--
2.22.0
+8
View File
@@ -24,6 +24,7 @@
<Patch level="1">fix-writechar.patch</Patch>
<Patch level="0">gcc47.patch</Patch>
<Patch level="1">dbus-c++-template-operators.patch</Patch>
<Patch level="1">dbus-c++-0.9.0-copy_data_from_received_message.patch</Patch>
</Patches>
</Source>
@@ -57,6 +58,13 @@
</Package>
<History>
<Update release="7">
<Date>2024-12-02</Date>
<Version>0.9.0</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2022-09-05</Date>
<Version>0.9.0</Version>