In php5-swig, handle NULLs as empty strings instead of crashing on them in substitute.

[xml-template] / php5-swig / xml-template.swig

diff --git a/php5-swig/xml-template.swig b/php5-swig/xml-template.swig
index 9c59ff802d3acd155a8559cfe56dcc865e34ee19..e39053c0e1f8a7a958c83023f79cb79f51cf1b13 100644 (file)
--- a/php5-swig/xml-template.swig
+++ b/php5-swig/xml-template.swig
@@ -76,10 +76,10 @@ Directive* convert_php_objects_to_directive(zval *obj)
                if (SWIG_ConvertPtr(obj, (void **)&doc, SWIGTYPE_p_XmlDocPtrWrapper, 0) < 0 || doc == NULL) {
                        return NULL;
                }
-               return new ReplaceInclude(xmlCopyDoc(doc->get()->ptr, 1));
+               return new ReplaceInclude(xmlCopyDoc((*doc)->ptr, 1));
        }
        case IS_NULL:
-               return NULL;
+               return new Replace { "" };
        default:
                printf("WARNING: Unknown type %d!\n", Z_TYPE_P(obj));
                break;
@@ -95,6 +95,14 @@ XmlDocPtrWrapper XML_Template_process_file(const std::string &input_filename, Di
        return XmlDocPtrWrapper(new XmlDocWrapper { ret });
 }
 
+XmlDocPtrWrapper XML_Template_process(XmlDocPtrWrapper doc, Directive *root_directive, bool clean)
+{
+       xmlDocPtr new_doc = xmlCopyDoc(doc->ptr, 1);
+       root_directive->process(xmlDocGetRootElement(new_doc), clean);
+       delete root_directive;
+       return XmlDocPtrWrapper(new XmlDocWrapper { new_doc });
+}
+
 namespace {
 
 int write_to_string(void *context, const char *buffer, int len)
@@ -126,5 +134,6 @@ std::string XML_Template_convert_doc_to_string(XmlDocPtrWrapper doc)
 }
 
 XmlDocPtrWrapper XML_Template_process_file(const std::string &input_filename, Directive *root_directive, bool clean);
+XmlDocPtrWrapper XML_Template_process(XmlDocPtrWrapper doc, Directive *root_directive, bool clean);
 std::string XML_Template_convert_doc_to_string(XmlDocPtrWrapper doc);