Changeset 22405 in vbox for trunk/src/libs/libxml2-2.6.30/parser.c

Timestamp:

Aug 24, 2009 8:33:02 AM (15 years ago)

Author:

vboxsync

Message:

libxml2: fixes from upstream

File:

• trunk/src/libs/libxml2-2.6.30/parser.c (modified) (6 diffs)

trunk/src/libs/libxml2-2.6.30/parser.c

@@ -4735 +4735 @@
             xmlFatalErrMsg(ctxt, XML_ERR_NAME_REQUIRED,
                            "Name expected in NOTATION declaration\n");
-            return(ret);
+            xmlFreeEnumeration(ret);
+            return(NULL);
         }
         cur = xmlCreateEnumeration(name);
-        if (cur == NULL) return(ret);
+        if (cur == NULL) {
+            xmlFreeEnumeration(ret);
+            return(NULL);
+        }
         if (last == NULL) ret = last = cur;
         else {
@@ -4748 +4752 @@
     if (RAW != ')') {
         xmlFatalErr(ctxt, XML_ERR_NOTATION_NOT_FINISHED, NULL);
-        if ((last != NULL) && (last != ret))
-            xmlFreeEnumeration(last);
-        return(ret);
+        xmlFreeEnumeration(ret);
+        return(NULL);
     }
     NEXT;
@@ -4791 +4794 @@
         cur = xmlCreateEnumeration(name);
         xmlFree(name);
-        if (cur == NULL) return(ret);
+        if (cur == NULL) {
+            xmlFreeEnumeration(ret);
+            return(NULL);
+        }
         if (last == NULL) ret = last = cur;
         else {
@@ -5189 +5195 @@
     xmlChar type = 0;
 
+    if (ctxt->depth > 128) {
+        xmlFatalErrMsgInt(ctxt, XML_ERR_ELEMCONTENT_NOT_FINISHED,
+                "xmlParseElementChildrenContentDecl : depth %d too deep\n",
+                          ctxt->depth);
+        return(NULL);
+    }
+
     SKIP_BLANKS;
     GROW;
@@ -5197 +5210 @@
         NEXT;
         SKIP_BLANKS;
+        ctxt->depth++;
         cur = ret = xmlParseElementChildrenContentDecl(ctxt, inputid);
+        ctxt->depth--;
         SKIP_BLANKS;
         GROW;
@@ -5327 +5342 @@
             NEXT;
             SKIP_BLANKS;
+            ctxt->depth++;
             last = xmlParseElementChildrenContentDecl(ctxt, inputid);
+            ctxt->depth--;
             SKIP_BLANKS;
         } else {