From 0aaf688c2d39a9e7a4753ffd94a6bc7995eeed23 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 1 Sep 2014 21:50:54 +0200
Subject: command: make m_property_strdup_ro with NULL mean unavailable

This catches a few cases which basically call:

    m_property_strdup_ro(..., ..., NULL)

which would return NULL strings. This should generally be avoided
(although it's allowed due to reasons), and it seems most callers
actually intend this to mean M_PROPERTY_UNAVAILABLE.
---
 options/m_property.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/options/m_property.c b/options/m_property.c
index 015313036a..b5f9025617 100644
--- a/options/m_property.c
+++ b/options/m_property.c
@@ -442,6 +442,8 @@ int m_property_double_ro(int action, void *arg, double var)
 
 int m_property_strdup_ro(int action, void* arg, const char *var)
 {
+    if (!var)
+        return M_PROPERTY_UNAVAILABLE;
     switch (action) {
     case M_PROPERTY_GET:
         *(char **)arg = talloc_strdup(NULL, var);
-- 
cgit v1.2.3