Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
aports
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
alpine
aports
Commits
70b3b188
Commit
70b3b188
authored
6 years ago
by
Milan P. Stanić
Committed by
Natanael Copa
6 years ago
Browse files
Options
Downloads
Patches
Plain Diff
main/libxml2: fix null pointer dereference
ref
#10034
bump pkgrel
parent
254b378a
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
main/libxml2/APKBUILD
+4
-2
4 additions, 2 deletions
main/libxml2/APKBUILD
main/libxml2/fix-null-pointer-dereference.patch
+36
-0
36 additions, 0 deletions
main/libxml2/fix-null-pointer-dereference.patch
with
40 additions
and
2 deletions
main/libxml2/APKBUILD
+
4
−
2
View file @
70b3b188
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
pkgname
=
libxml2
pkgname
=
libxml2
pkgver
=
2.9.9
pkgver
=
2.9.9
pkgrel
=
0
pkgrel
=
1
pkgdesc
=
"XML parsing library, version 2"
pkgdesc
=
"XML parsing library, version 2"
url
=
"http://www.xmlsoft.org/"
url
=
"http://www.xmlsoft.org/"
arch
=
"all"
arch
=
"all"
...
@@ -14,6 +14,7 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils
...
@@ -14,6 +14,7 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-utils
py-
$pkgname
:_py py2-
$pkgname
:_py py3-
$pkgname
:_py"
py-
$pkgname
:_py py2-
$pkgname
:_py py3-
$pkgname
:_py"
options
=
"!strip"
options
=
"!strip"
source
=
"http://xmlsoft.org/sources/
$pkgname
-
$pkgver
.tar.gz
source
=
"http://xmlsoft.org/sources/
$pkgname
-
$pkgver
.tar.gz
fix-null-pointer-dereference.patch
"
"
builddir
=
"
$srcdir
/
$pkgname
-
$pkgver
"
builddir
=
"
$srcdir
/
$pkgname
-
$pkgver
"
...
@@ -108,4 +109,5 @@ utils() {
...
@@ -108,4 +109,5 @@ utils() {
mv
"
$pkgdir
"
/usr/bin
"
$subpkgdir
"
/usr/
mv
"
$pkgdir
"
/usr/bin
"
$subpkgdir
"
/usr/
}
}
sha512sums
=
"cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810 libxml2-2.9.9.tar.gz"
sha512sums
=
"cb7784ba4e72e942614e12e4f83f4ceb275f3d738b30e3b5c1f25edf8e9fa6789e854685974eed95b362049dbf6c8e7357e0327d64c681ed390534ac154e6810 libxml2-2.9.9.tar.gz
83074e582cdba8bedff40fc653731ad18ca357bde8f1420e2e8a2a38998b951aebcb73ca5d51859be3b4d9bc1a0308836ca2bb612269edbc61b9dd6ebc7fdb2a fix-null-pointer-dereference.patch"
This diff is collapsed.
Click to expand it.
main/libxml2/fix-null-pointer-dereference.patch
0 → 100644
+
36
−
0
View file @
70b3b188
From 2c8dc7158a3b7b028454abcb6f162c4da28ed80b Mon Sep 17 00:00:00 2001
From: Nick Wellnhofer <wellnhofer@aevum.de>
Date: Mon, 25 Feb 2019 12:00:50 +0100
Subject: [PATCH] Fix null pointer dereference in xmlTextReaderReadOuterXml
Fix a regression caused by commit 39fbfb4f. If xmlTextReaderReadOuterXml
is called on a pristine xmlReader, the current node is NULL and must not
be dereferenced. Move the call to xmlTextReaderExpand to the start of
the function to make sure that we have a valid node.
Fixes #43.
---
xmlreader.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/xmlreader.c b/xmlreader.c
index cd1fb5fe..b8e98287 100644
--- a/xmlreader.c
+++ b/xmlreader.c
@@ -1759,11 +1759,11 @@
xmlTextReaderReadOuterXml(xmlTextReaderPtr reader ATTRIBUTE_UNUSED)
xmlBufferPtr buff;
xmlDocPtr doc;
- node = reader->node;
- doc = node->doc;
if (xmlTextReaderExpand(reader) == NULL) {
return NULL;
}
+ node = reader->node;
+ doc = node->doc;
/* XXX: Why is the node copied? */
if (node->type == XML_DTD_NODE) {
node = (xmlNodePtr) xmlCopyDtd((xmlDtdPtr) node);
--
2.18.1
This diff is collapsed.
Click to expand it.
Milan P. Stanić
@mps
mentioned in issue
#10034 (closed)
·
5 years ago
mentioned in issue
#10034 (closed)
mentioned in issue #10034
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment