From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 7 Nov 2013 16:11:25 +0000 (+0100)
Subject: bus: also check for NULL when appending trivial types
X-Git-Tag: v209~1547
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b3273dafc730e6973045f94a849553a9b5280d2d;ds=sidebyside

bus: also check for NULL when appending trivial types
---

diff --git a/src/libsystemd-bus/bus-message.c b/src/libsystemd-bus/bus-message.c
index 4b53a6c50..3f9baca80 100644
--- a/src/libsystemd-bus/bus-message.c
+++ b/src/libsystemd-bus/bus-message.c
@@ -1379,6 +1379,7 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
                 break;
 
         case SD_BUS_TYPE_BOOLEAN:
+
                 if (!p) {
                         r = -EINVAL;
                         goto fail;
@@ -1434,6 +1435,11 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
         }
 
         default:
+                if (!p) {
+                        r = -EINVAL;
+                        goto fail;
+                }
+
                 align = bus_type_get_alignment(type);
                 sz = bus_type_get_size(type);
                 break;