← Back to branch summary

~ubuntu-branches/ubuntu/utopic/libxml2/utopic

« back to all changes in this revision

Viewing changes to debian/patches/0003-Fix-an-error-in-xmlCleanupParser.patch

  • Committer: Package Import Robot
  • Author(s): Aron Xu, Christian Svensson, Daniel Schepler, Helmut Grohne, Adam Conrad, Matthias Klose, Aron Xu
  • Date: 2014-07-09 05:40:15 UTC
  • mto: This revision was merged to the branch mainline in revision 75.
  • Revision ID: package-import@ubuntu.com-20140709054015-rdnfjxrf3zvmw6l7
http://bugs.debian.org/742350
http://bugs.debian.org/738080
http://bugs.debian.org/753005
http://bugs.debian.org/747309
[ Christian Svensson ]
* Do not build-depend on readline (Closes: #742350)

[ Daniel Schepler ]
* Patch to bootstrap without python (Closes: #738080)

[ Helmut Grohne ]
* Drop unneeded B-D on perl and binutils (Closes: #753005)

[ Adam Conrad ]
* Actually run dh_autoreconf, which the old/new mixed rules file misses.

[ Matthias Klose ]
* Add patch to fix python multiarch issue
* Allow the package to cross-build by tweaking B-Ds on python
* Set PYTHON_LIBS for cross builds

[ Aron Xu ]
* Use correct $CC
* Configure udeb without python
* New round of cherry-picking upstream fixes
  - Includes fixes for CVE-2014-0191 (Closes: #747309).
* Call prename with -vf
* Require python-all-dev (>= 2.7.5-5~)
* Bump std-ver: 3.9.4 -> 3.9.5, no change

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/0003-Fix-an-error-in-xmlCleanupParser.patch
 
1
From: Alexander Pastukhov <pastuchov@yandex.ru>
 
2
Date: Tue, 23 Apr 2013 05:02:11 +0000
 
3
Subject: Fix an error in xmlCleanupParser
 
4
 
 
5
https://bugzilla.gnome.org/show_bug.cgi?id=698582
 
6
 
 
7
xmlCleanupParser calls xmlCleanupGlobals() and then
 
8
xmlResetLastError() but the later reallocate the global
 
9
data freed by previous call. Just swap the two calls.
 
10
---
 
11
 parser.c |    2 +-
 
12
 1 file changed, 1 insertion(+), 1 deletion(-)
 
13
 
 
14
diff --git a/parser.c b/parser.c
 
15
index ee429f3..b9df6d8 100644
 
16
--- a/parser.c
 
17
+++ b/parser.c
 
18
@@ -14763,8 +14763,8 @@ xmlCleanupParser(void) {
 
19
     xmlSchemaCleanupTypes();
 
20
     xmlRelaxNGCleanupTypes();
 
21
 #endif
 
22
-    xmlCleanupGlobals();
 
23
     xmlResetLastError();
 
24
+    xmlCleanupGlobals();
 
25
     xmlCleanupThreads(); /* must be last if called not from the main thread */
 
26
     xmlCleanupMemory();
 
27
     xmlParserInitialized = 0;