← Back to branch summary

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

« back to all changes in this revision

Viewing changes to xpath.c

  • 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:
xpath.c
13512
13512
                int frame;
13513
13513
 
13514
13514
                frame = xmlXPathSetFrame(ctxt);
13515
 
                if (op->ch1 != -1)
 
13515
                if (op->ch1 != -1) {
13516
13516
                    total +=
13517
13517
                        xmlXPathCompOpEval(ctxt, &comp->steps[op->ch1]);
13518
 
                if (ctxt->valueNr < op->value) {
 
13518
                    if (ctxt->error != XPATH_EXPRESSION_OK) {
 
13519
                        xmlXPathPopFrame(ctxt, frame);
 
13520
                        return (total);
 
13521
                    }
 
13522
                }
 
13523
                if (ctxt->valueNr < ctxt->valueFrame + op->value) {
13519
13524
                    xmlGenericError(xmlGenericErrorContext,
13520
13525
                            "xmlXPathCompOpEval: parameter error\n");
13521
13526
                    ctxt->error = XPATH_INVALID_OPERAND;