From de1d3e17aff864a58cb7f6da6efff7b7bde6182a Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@redhat.com>
Date: Fri, 1 Sep 2023 09:40:51 +1000
Subject: Ensure possible NULL pointer values dealt with defensively

Coverity scanning shows a couple of locations where a NULL
pointer dereference could happen; updated code to ensure it
cannot.
---
 pcp/Instance.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'pcp')

diff --git a/pcp/Instance.c b/pcp/Instance.c
index e70e7b70..1515dfe6 100644
--- a/pcp/Instance.c
+++ b/pcp/Instance.c
@@ -62,10 +62,12 @@ static void Instance_writeField(const Row* super, RichString* str, RowField fiel
    const Settings* settings = super->host->settings;
    DynamicColumn* column = Hashtable_get(settings->dynamicColumns, field);
    PCPDynamicColumn* cp = (PCPDynamicColumn*) column;
-   const pmDesc* descp = Metric_desc(cp->id);
+   if (!cp)
+      return;
 
    pmAtomValue atom;
    pmAtomValue *ap = &atom;
+   const pmDesc* descp = Metric_desc(cp->id);
    if (!Metric_instance(cp->id, instid, this->offset, ap, descp->type))
       ap = NULL;
 
-- 
cgit v1.2.3