From b751fd5b7f06580b4a242cdddf475e3f2c121501 Mon Sep 17 00:00:00 2001
From: Kris De Gussem <kris.degussem@gmail.com>
Date: Fri, 20 Dec 2013 16:12:24 +0100
Subject: add null check

(bzr r12854)
---
 src/xml/quote.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/xml/quote.cpp')

diff --git a/src/xml/quote.cpp b/src/xml/quote.cpp
index c9e001d05..02c12dfb0 100644
--- a/src/xml/quote.cpp
+++ b/src/xml/quote.cpp
@@ -23,13 +23,15 @@ size_t
 xml_quoted_strlen(char const *val)
 {
     size_t ret = 0;
-    for (; *val != '\0'; val++) {
-        switch (*val) {
-            case '"': ret += sizeof("&quot;") - 1; break;
-            case '&': ret += sizeof("&amp;") - 1; break;
-            case '<': ret += sizeof("&lt;") - 1; break;
-            case '>': ret += sizeof("&gt;") - 1; break;
-            default: ++ret; break;
+    if (val != NULL) {
+        for (; *val != '\0'; val++) {
+            switch (*val) {
+                case '"': ret += sizeof("&quot;") - 1; break;
+                case '&': ret += sizeof("&amp;") - 1; break;
+                case '<': ret += sizeof("&lt;") - 1; break;
+                case '>': ret += sizeof("&gt;") - 1; break;
+                default: ++ret; break;
+            }
         }
     }
     return ret;
-- 
cgit v1.2.3