From 44d4e3255c5a2e6c6517c06e8eb3e88eaa20d657 Mon Sep 17 00:00:00 2001
From: Michael Drake <tlsa@netsurf-browser.org>
Date: Fri, 27 Dec 2013 16:36:05 +0000
Subject: Prevent attempt to concatinate string with null.

---
 src/core/text.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/core/text.c b/src/core/text.c
index e36050e..3b726fd 100644
--- a/src/core/text.c
+++ b/src/core/text.c
@@ -491,14 +491,18 @@ dom_exception walk_logic_adjacent_text(dom_text *text,
 			return err;
 		}
 
-		err = dom_string_concat(*ret, data, &tmp);
-		dom_string_unref(data);
-		dom_string_unref(*ret);
-		if (err != DOM_NO_ERR) {
-			return err;
-		}
+		if (*ret != NULL) {
+			err = dom_string_concat(*ret, data, &tmp);
+			dom_string_unref(data);
+			dom_string_unref(*ret);
+			if (err != DOM_NO_ERR) {
+				return err;
+			}
 
-		*ret = tmp;
+			*ret = tmp;
+		} else {
+			*ret = data;
+		}
 	} else {
 			dom_node_internal *tn;
 			err = dom_node_remove_child(node->parent, node,
-- 
cgit v1.2.3