← Back to branch summary

~ubuntu-branches/ubuntu/wily/libxml2/wily

« back to all changes in this revision

Viewing changes to tree.c

  • Committer: Package Import Robot
  • Author(s): Aron Xu
  • Date: 2015-09-22 16:31:48 UTC
  • mfrom: (43.2.12 sid)
  • Revision ID: package-import@ubuntu.com-20150922163148-di6xmyfvb20jmtq2
Tags: 2.9.2+zdfsg1-4
http://bugs.debian.org/754424
http://bugs.debian.org/781232
http://bugs.debian.org/798642
http://bugs.debian.org/768089
http://bugs.debian.org/766884
http://bugs.debian.org/782782
http://bugs.debian.org/783010
* Revert everything in N'ACKed NMU revert to 2.9.1.
  - Resolving regression, Closes: #754424
  - Drop the following NMU, not needed in 2.9.2, Closes: #781232
  - Drop not approved patch for GNOME #746048
* Revert icu dbg drop, but don't hardcode version,
  thanks Matthias Klose <doko>, Closes: #798642
* Cherry pick upstream post release patches:
  - Fix for regression triggered by CVE-2014-3660, Closes: #768089
  - Fix for the spurious ID already defined error, Closes: #766884
  - Fix for CVE-2015-1819, Closes: #782782
  - Fix for GNOME #744980, Closes: #783010
  - Several fixes for memory related issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tree.c
2799
2799
        if(tree->type == XML_ELEMENT_NODE) {
2800
2800
            prop = tree->properties;
2801
2801
            while (prop != NULL) {
 
2802
                if (prop->atype == XML_ATTRIBUTE_ID) {
 
2803
                    xmlRemoveID(tree->doc, prop);
 
2804
                }
 
2805
 
2802
2806
                prop->doc = doc;
2803
2807
                xmlSetListDoc(prop->children, doc);
 
2808
 
 
2809
                if (xmlIsID(doc, tree, prop)) {
 
2810
                    xmlChar *idVal = xmlNodeListGetString(doc, prop->children,
 
2811
                                                          1);
 
2812
                    xmlAddID(NULL, doc, idVal, prop);
 
2813
                }
 
2814
 
2804
2815
                prop = prop->next;
2805
2816
            }
2806
2817
        }