From c07eb6b33813e41d98d4210dbca18e5de8c8fad6 Mon Sep 17 00:00:00 2001
From: David Sommerseth <davids@redhat.com>
Date: Wed, 13 May 2009 18:30:58 +0200
Subject: Avoid segfault if XPATH_NODESET do not contain any data

---
 src/dmixml.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/dmixml.c b/src/dmixml.c
index 65f5e07..dbca0c3 100644
--- a/src/dmixml.c
+++ b/src/dmixml.c
@@ -228,7 +228,12 @@ char *dmixml_GetXPathContent(char *buf, size_t buflen, xmlXPathObject *xpo, int
 
         case XPATH_NODESET:
                 if( (xpo->nodesetval != NULL) && (xpo->nodesetval->nodeNr >= (idx+1)) ) {
-                        strncpy(buf, dmixml_GetContent(xpo->nodesetval->nodeTab[idx]), buflen-1);
+                        char *str = dmixml_GetContent(xpo->nodesetval->nodeTab[idx]);
+                        if( str != NULL ) {
+                                strncpy(buf, str, buflen-1);
+                        } else {
+                                memset(buf, 0, buflen);
+                        }
                 }
                 break;
 
-- 
cgit