OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-web, openpkg-src Date: 10-Oct-2002 16:53:53
Branch: HEAD Handle: 2002101015535201
Added files:
openpkg-src/libxml libxml.patch
Modified files:
openpkg-src/libxml libxml.spec
openpkg-web news.txt
Log:
fix segfaulting with a vendor-based patch
Summary:
Revision Changes Path
1.1 +55 -0 openpkg-src/libxml/libxml.patch
1.38 +3 -1 openpkg-src/libxml/libxml.spec
1.1743 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
Index: openpkg-src/libxml/libxml.patch
============================================================
$ cvs update -p -r1.1 libxml.patch
This patch is from CVS and fixes a seg fault due to some bad memory
management. This will be fixed in the next release.
--- valid.c.orig Wed Oct 9 12:03:48 2002
+++ valid.c Wed Oct 9 12:06:17 2002
@@ -4551,9 +4551,9 @@
xmlElementPtr elemDecl, int warn, xmlNodePtr parent) {
int ret = 1;
#ifndef LIBXML_REGEXP_ENABLED
- xmlNodePtr last = NULL;
+ xmlNodePtr last = NULL, last = NULL, tmp;
#endif
- xmlNodePtr repl = NULL, cur, tmp;
+ xmlNodePtr cur;
xmlElementContentPtr cont;
const xmlChar *name;
@@ -4571,6 +4571,9 @@
} else {
xmlRegExecCtxtPtr exec;
+ ctxt->nodeMax = 0;
+ ctxt->nodeNr = 0;
+ ctxt->nodeTab = NULL;
exec = xmlRegNewExecCtxt(elemDecl->contModel, NULL, NULL);
if (exec != NULL) {
cur = child;
@@ -4762,9 +4765,11 @@
expr[0] = 0;
xmlSnprintfElementContent(expr, 5000, cont, 1);
list[0] = 0;
+#ifndef LIBXML_REGEXP_ENABLED
if (repl != NULL)
xmlSnprintfElements(list, 5000, repl, 1);
else
+#endif /* LIBXML_REGEXP_ENABLED */
xmlSnprintfElements(list, 5000, child, 1);
if (name != NULL) {
@@ -4797,7 +4802,6 @@
#ifndef LIBXML_REGEXP_ENABLED
done:
-#endif
/*
* Deallocate the copy if done, and free up the validation stack
*/
@@ -4811,6 +4815,7 @@
xmlFree(ctxt->vstateTab);
ctxt->vstateTab = NULL;
}
+#endif
ctxt->nodeMax = 0;
ctxt->nodeNr = 0;
if (ctxt->nodeTab != NULL) {
Index: openpkg-src/libxml/libxml.spec
============================================================
$ cvs diff -u -r1.37 -r1.38 libxml.spec
--- openpkg-src/libxml/libxml.spec 27 Sep 2002 08:57:36 -0000 1.37
+++ openpkg-src/libxml/libxml.spec 10 Oct 2002 14:53:53 -0000 1.38
@@ -33,10 +33,11 @@
Group: SGML
License: LGPL
Version: 2.4.25
-Release: 20020927
+Release: 20021010
# list of sources
Source0: ftp://xmlsoft.org/libxml2-%{version}.tar.gz
+Patch0: libxml.patch
# build information
Prefix: %{l_prefix}
@@ -54,6 +55,7 @@
%prep
%setup -q -n libxml2-%{version}
+ %patch -p0
%build
CC="%{l_cc}" \
Index: openpkg-web/news.txt
============================================================
$ cvs diff -u -r1.1742 -r1.1743 news.txt
--- openpkg-web/news.txt 10 Oct 2002 14:52:09 -0000 1.1742
+++ openpkg-web/news.txt 10 Oct 2002 14:53:52 -0000 1.1743
@@ -1,3 +1,4 @@
+10-Oct-2002: Upgraded package: P<libxml-2.4.25-20021010>
10-Oct-2002: Upgraded package: P<amd-6.0.8-20021010>
10-Oct-2002: Upgraded package: P<inn-2.3.3-20021010>
10-Oct-2002: Upgraded package: P<file-3.39-20021010>
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
