← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/0009-Catch-malloc-error-and-exit-accordingly.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/0009-Catch-malloc-error-and-exit-accordingly.patch
 
1
From: Daniel Veillard <veillard@redhat.com>
 
2
Date: Thu, 11 Jul 2013 15:41:22 +0800
 
3
Subject: Catch malloc error and exit accordingly
 
4
 
 
5
As pointed privately by Bill Parker <wp02855@gmail.com>
 
6
---
 
7
 xmllint.c |    4 ++++
 
8
 1 file changed, 4 insertions(+)
 
9
 
 
10
diff --git a/xmllint.c b/xmllint.c
 
11
index c0196ab..4d464e4 100644
 
12
--- a/xmllint.c
 
13
+++ b/xmllint.c
 
14
@@ -3090,6 +3090,10 @@ static void usage(const char *name) {
 
15
 static void registerNode(xmlNodePtr node)
 
16
 {
 
17
     node->_private = malloc(sizeof(long));
 
18
+    if (node->_private == NULL) {
 
19
+        fprintf(stderr, "Out of memory in xmllint:registerNode()\n");
 
20
+       exit(XMLLINT_ERR_MEM);
 
21
+    }
 
22
     *(long*)node->_private = (long) 0x81726354;
 
23
     nbregister++;
 
24
 }