diff --git a/ChangeLog b/ChangeLog
index 2b090d65..37386e75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 29 12:16:41 CEST 2006 Daniel Veillard <daniel@veillard.com>
+
+	* libxslt/transform.c: Charles Hardin pointed an OOM condition where
+	  a NULL pointer could be dereferenced, closes #336394
+
 Fri Mar 10 12:49:18 CET 2006 Daniel Veillard <daniel@veillard.com>
 
 	* libexslt/crypto.c libexslt/date.c libexslt/saxon.c
diff --git a/libxslt/transform.c b/libxslt/transform.c
index caf41bc8..423e2a7b 100644
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -638,7 +638,8 @@ xsltCopyTextString(xsltTransformContextPtr ctxt, xmlNodePtr target,
 	    return(xsltAddTextString(ctxt, target->last, string, len));
 	}
 	copy = xmlNewTextLen(string, len);
-	copy->name = xmlStringTextNoenc;
+	if (copy != NULL)
+	    copy->name = xmlStringTextNoenc;
     } else {
 	if ((target != NULL) && (target->last != NULL) &&
 	    (target->last->type == XML_TEXT_NODE) &&