← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/0017-Fix-a-potential-NULL-dereference-in-tree-code.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
  • mfrom: (43.2.6 sid)
  • Revision ID: package-import@ubuntu.com-20140709054015-1q7dyagza4p2gkm0
Tags: 2.9.1+dfsg1-4
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/0017-Fix-a-potential-NULL-dereference-in-tree-code.patch
 
1
From: Daniel Veillard <veillard@redhat.com>
 
2
Date: Wed, 11 Sep 2013 15:11:27 +0800
 
3
Subject: Fix a potential NULL dereference in tree code
 
4
 
 
5
https://bugzilla.gnome.org/show_bug.cgi?id=707750
 
6
 
 
7
Also reported by Gaurav, simple fix to check the pointer before
 
8
dereference
 
9
---
 
10
 tree.c |    3 ++-
 
11
 1 file changed, 2 insertions(+), 1 deletion(-)
 
12
 
 
13
diff --git a/tree.c b/tree.c
 
14
index 7e5af26..efc3ca2 100644
 
15
--- a/tree.c
 
16
+++ b/tree.c
 
17
@@ -9780,7 +9780,8 @@ leave_node:
 
18
            if (clone->parent != NULL)
 
19
                clone->parent->last = clone;
 
20
            clone = clone->parent;
 
21
-           parentClone = clone->parent;
 
22
+           if (clone != NULL)
 
23
+               parentClone = clone->parent;
 
24
            /*
 
25
            * Process parent --> next;
 
26
            */