From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 10 Dec 2013 02:04:16 +0000 (+0100)
Subject: bus: empty gvariant arrays should at least get size 1
X-Git-Tag: v209~1071
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=224a1ed4c152c394d42b8a6fd78159af400d5df3

bus: empty gvariant arrays should at least get size 1
---

diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index 32af8609b..4488e7b6b 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -1894,9 +1894,7 @@ _public_ int sd_bus_message_open_container(
 }
 
 static size_t determine_word_size(size_t sz, size_t extra) {
-        if (sz <= 0 && extra == 0)
-                return 0;
-        else if (sz + extra <= 0xFF)
+        if (sz + extra <= 0xFF)
                 return 1;
         else if (sz + extra*2 <= 0xFFFF)
                 return 2;