From 144e7e40f05879d73bc3c84bed593175100b996c Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Thu, 7 May 2020 09:20:06 +0200 Subject: [PATCH] libnm: fix assertion in NML_IS_DBUS_OBJECT() Reported by coverity: >>> CID 210228: Null pointer dereferences (REVERSE_INULL) >>> Null-checking "dbobj" suggests that it may be null, but it has already been dereferenced on all paths leading to the check. Fixes: ce0e898fb476 ('libnm: refactor caching of D-Bus objects in NMClient') (cherry picked from commit 272f19108b8c6250697ab081e21191f9108d710d) --- libnm/nm-libnm-utils.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libnm/nm-libnm-utils.h b/libnm/nm-libnm-utils.h index 64ce81ad3b..b59ba5f036 100644 --- a/libnm/nm-libnm-utils.h +++ b/libnm/nm-libnm-utils.h @@ -671,7 +671,8 @@ NML_IS_DBUS_OBJECT (NMLDBusObject *dbobj) nm_assert ( !dbobj || ( NM_IS_REF_STRING (dbobj->dbus_path) && dbobj->ref_count > 0)); - nm_assert ( !dbobj->nmobj + nm_assert ( !dbobj + || !dbobj->nmobj || NM_IS_OBJECT (dbobj->nmobj) || NM_IS_CLIENT (dbobj->nmobj)); return !!dbobj;