diff options
author | Aron Xu <aron@debian.org> | 2015-09-21 22:55:08 +0800 |
---|---|---|
committer | Aron Xu <aron@debian.org> | 2015-09-21 22:55:08 +0800 |
commit | d548c999ade382febb424b26743b3c4d63159ae0 (patch) | |
tree | 232c9c894b45099f211728742569111738b17e16 /debian/patches/0044-xmlschemastypes-Fix-potential-array-overflow.patch | |
parent | d837811e969fac31afdf39c00ba579b33f6adeb6 (diff) | |
download | libxml2-d548c999ade382febb424b26743b3c4d63159ae0.tar.gz |
Revert "Restore all patches available in 2.9.1+dfsg1-5 in stretch, ensuring CVE-2014-3660 is fixed too."
This reverts commit 37f590756a23e167808f76f1389c36f0a2d39f11.
Diffstat (limited to 'debian/patches/0044-xmlschemastypes-Fix-potential-array-overflow.patch')
-rw-r--r-- | debian/patches/0044-xmlschemastypes-Fix-potential-array-overflow.patch | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/debian/patches/0044-xmlschemastypes-Fix-potential-array-overflow.patch b/debian/patches/0044-xmlschemastypes-Fix-potential-array-overflow.patch deleted file mode 100644 index b2824e5..0000000 --- a/debian/patches/0044-xmlschemastypes-Fix-potential-array-overflow.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Philip Withnall <philip.withnall@collabora.co.uk> -Date: Fri, 20 Jun 2014 21:37:21 +0100 -Subject: xmlschemastypes: Fix potential array overflow - -The year and month need validating before being put into the -MAX_DAYINMONTH macro. - -Coverity issue: #60436 - -https://bugzilla.gnome.org/show_bug.cgi?id=731990 ---- - xmlschemastypes.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/xmlschemastypes.c b/xmlschemastypes.c -index 7e1d54a..6e8bb70 100644 ---- a/xmlschemastypes.c -+++ b/xmlschemastypes.c -@@ -3854,7 +3854,8 @@ _xmlSchemaDateAdd (xmlSchemaValPtr dt, xmlSchemaValPtr dur) - tmon = 12; - tempdays += MAX_DAYINMONTH(tyr, tmon); - carry = -1; -- } else if (tempdays > (long) MAX_DAYINMONTH(r->year, r->mon)) { -+ } else if (VALID_YEAR(r->year) && VALID_MONTH(r->mon) && -+ tempdays > (long) MAX_DAYINMONTH(r->year, r->mon)) { - tempdays = tempdays - MAX_DAYINMONTH(r->year, r->mon); - carry = 1; - } else |