Merge branch 'master' of git://anonscm.debian.org/debian-xml-sgml/libxml2

1 files changed, 0 insertions, 29 deletions

diff --git a/debian/patches/0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch b/debian/patches/0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch
deleted file mode 100644
index 22d206a..0000000
--- a/debian/patches/0027-Fix-xmlTextWriterWriteElement-when-a-null-content-is.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Daniel Veillard <veillard@redhat.com>
-Date: Sat, 8 Feb 2014 02:22:35 +0800
-Subject: Fix xmlTextWriterWriteElement when a null content is given
-
----
- xmlwriter.c |   10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/xmlwriter.c b/xmlwriter.c
-index d3f29f8..27209b9 100644
---- a/xmlwriter.c
-+++ b/xmlwriter.c
-@@ -2238,10 +2238,12 @@ xmlTextWriterWriteElement(xmlTextWriterPtr writer, const xmlChar * name,
-     if (count == -1)
-         return -1;
-     sum += count;
--    count = xmlTextWriterWriteString(writer, content);
--    if (count == -1)
--        return -1;
--    sum += count;
-+    if (content != NULL) {
-+	count = xmlTextWriterWriteString(writer, content);
-+	if (count == -1)
-+	    return -1;
-+	sum += count;
-+    }
-     count = xmlTextWriterEndElement(writer);
-     if (count == -1)
-         return -1;