From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Sun, 16 Mar 2025 08:18:25 +0000 (+0400)
Subject: util: annotate non-null arguments for virGDBusCallMethod()
X-Git-Tag: v11.2.0-rc1~118
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ebdcec7dc9b528338e2e5179845c680d831bf2de;p=thirdparty%2Flibvirt.git

util: annotate non-null arguments for virGDBusCallMethod()

Helps avoid/debug a potential SEGV if conn is NULL, since gio will not
set the "gerror" in that case and we will crash later at:
  virReportError(VIR_ERR_DBUS_SERVICE, "%s", gerror->message);

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/util/virgdbus.h b/src/util/virgdbus.h
index dfe6138112..65e7ba7be4 100644
--- a/src/util/virgdbus.h
+++ b/src/util/virgdbus.h
@@ -54,7 +54,11 @@ virGDBusCallMethod(GDBusConnection *conn,
                    const char *objectPath,
                    const char *ifaceName,
                    const char *method,
-                   GVariant *data);
+                   GVariant *data)
+    ATTRIBUTE_NONNULL(1)
+    ATTRIBUTE_NONNULL(6)
+    ATTRIBUTE_NONNULL(7)
+    ATTRIBUTE_NONNULL(8);
 
 int
 virGDBusCallMethodWithFD(GDBusConnection *conn,
@@ -67,7 +71,12 @@ virGDBusCallMethodWithFD(GDBusConnection *conn,
                          const char *ifaceName,
                          const char *method,
                          GVariant *data,
-                         GUnixFDList *dataFD);
+                         GUnixFDList *dataFD)
+    ATTRIBUTE_NONNULL(1)
+    ATTRIBUTE_NONNULL(7)
+    ATTRIBUTE_NONNULL(8)
+    ATTRIBUTE_NONNULL(9);
+
 
 int
 virGDBusIsServiceEnabled(const char *name);