From fccd80a7d35b9eefabcc384d5c9fe89d9545dd22 Mon Sep 17 00:00:00 2001 From: Aron Xu Date: Tue, 22 Sep 2015 16:23:21 +0800 Subject: Upstream post release cherry-picks --- ...x-a-self-assignment-issue-raised-by-clang.patch | 40 ++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 debian/patches/0013-Fix-a-self-assignment-issue-raised-by-clang.patch (limited to 'debian/patches/0013-Fix-a-self-assignment-issue-raised-by-clang.patch') diff --git a/debian/patches/0013-Fix-a-self-assignment-issue-raised-by-clang.patch b/debian/patches/0013-Fix-a-self-assignment-issue-raised-by-clang.patch new file mode 100644 index 0000000..5cc28b2 --- /dev/null +++ b/debian/patches/0013-Fix-a-self-assignment-issue-raised-by-clang.patch @@ -0,0 +1,40 @@ +From: Scott Graham +Date: Tue, 30 Jun 2015 10:47:16 +0800 +Subject: Fix a self assignment issue raised by clang + +For https://bugzilla.gnome.org/show_bug.cgi?id=751679 + +Also added a few newline cleanups +--- + xmlschemas.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/xmlschemas.c b/xmlschemas.c +index 0657b66..d47512f 100644 +--- a/xmlschemas.c ++++ b/xmlschemas.c +@@ -24186,6 +24186,7 @@ xmlSchemaValidateFacets(xmlSchemaAbstractCtxtPtr actxt, + else + goto pattern_and_enum; + } ++ + /* + * Whitespace handling is only of importance for string-based + * types. +@@ -24196,14 +24197,13 @@ xmlSchemaValidateFacets(xmlSchemaAbstractCtxtPtr actxt, + ws = xmlSchemaGetWhiteSpaceFacetValue(type); + } else + ws = XML_SCHEMA_WHITESPACE_COLLAPSE; ++ + /* + * If the value was not computed (for string or + * anySimpleType based types), then use the provided + * type. + */ +- if (val == NULL) +- valType = valType; +- else ++ if (val != NULL) + valType = xmlSchemaGetValType(val); + + ret = 0; -- cgit v1.2.3