summaryrefslogtreecommitdiff
path: root/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2015-08-25 22:26:52 +0200
committerRaphaël Hertzog <hertzog@debian.org>2015-08-25 22:26:52 +0200
commit3b14c3fd6410716d407178e48972b1c1bea48c29 (patch)
tree232c9c894b45099f211728742569111738b17e16 /debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch
parentedefea9d480751896e380c7bfc92517c9e39039d (diff)
downloadlibxml2-3b14c3fd6410716d407178e48972b1c1bea48c29.tar.gz
Revert "Remove no-longer-needed upstream patches"
This reverts commit 4a5e25fad6693afda89b3826f73e83d826618863.
Diffstat (limited to 'debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch')
-rw-r--r--debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch34
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch b/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch
new file mode 100644
index 0000000..b910c3a
--- /dev/null
+++ b/debian/patches/0015-xmllint-pretty-crashed-without-following-numeric-arg.patch
@@ -0,0 +1,34 @@
+From: Tim Galeckas <tim@galeckas.com>
+Date: Thu, 29 Aug 2013 16:44:33 +0800
+Subject: xmllint --pretty crashed without following numeric argument
+
+https://bugzilla.gnome.org/show_bug.cgi?id=674789
+
+We need to check for NULL argument before calling atoi()
+---
+ xmllint.c | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/xmllint.c b/xmllint.c
+index 92e6b03..d69722c 100644
+--- a/xmllint.c
++++ b/xmllint.c
+@@ -3388,11 +3388,13 @@ main(int argc, char **argv) {
+ (!strcmp(argv[i], "--pretty"))) {
+ i++;
+ #ifdef LIBXML_OUTPUT_ENABLED
+- format = atoi(argv[i]);
+- if (format == 1) {
+- noblanks++;
+- xmlKeepBlanksDefault(0);
+- }
++ if (argv[i] != NULL) {
++ format = atoi(argv[i]);
++ if (format == 1) {
++ noblanks++;
++ xmlKeepBlanksDefault(0);
++ }
++ }
+ #endif /* LIBXML_OUTPUT_ENABLED */
+ }
+ #ifdef LIBXML_READER_ENABLED