Attachment 314863 Details for Bug 459830 – New patch for RHEL-4 reusing the owner field

[patch] New patch for RHEL-4 reusing the owner field

libxml2-2.6.16-billion_laught-2.patch (text/plain), 8.05 KB, created by Daniel Veillard on 2008-08-23 10:23:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Veillard

Created: 2008-08-23 10:23:32 UTC

Size: 8.05 KB

patch

obsolete

>Index: include/libxml/parser.h
>===================================================================
>--- include/libxml/parser.h	(revision 3771)
>+++ include/libxml/parser.h	(working copy)
>@@ -297,6 +297,7 @@ struct _xmlParserCtxt {
>      */
>     xmlError          lastError;
>     xmlParserMode     parseMode;    /* the parser mode */
>+    unsigned long    nbentities;    /* number of entities references */
> };
> 
> /**
>Index: parserInternals.c
>===================================================================
>--- parserInternals.c	(revision 3771)
>+++ parserInternals.c	(working copy)
>@@ -1670,6 +1670,7 @@ xmlInitParserCtxt(xmlParserCtxtPtr ctxt)
>     ctxt->depth = 0;
>     ctxt->charset = XML_CHAR_ENCODING_UTF8;
>     ctxt->catalogs = NULL;
>+    ctxt->nbentities = 0;
>     xmlInitNodeInfoSeq(&ctxt->node_seq);
>     return(0);
> }
>--- entities.c.orig	2004-11-05 16:37:00.000000000 +0100
>+++ entities.c	2008-08-23 12:09:22.000000000 +0200
>@@ -92,7 +92,7 @@ xmlEntitiesErr(xmlParserErrors code, con
> static void xmlFreeEntity(xmlEntityPtr entity) {
>     if (entity == NULL) return;
> 
>-    if ((entity->children) && (entity->owner == 1) &&
>+    if ((entity->children) && (entity->owner != 0) &&
> 	(entity == (xmlEntityPtr) entity->children->parent))
> 	xmlFreeNodeList(entity->children);
>     if (entity->name != NULL)
>--- parser.c.orig	2006-04-23 11:39:15.000000000 +0200
>+++ parser.c	2008-08-23 11:54:57.000000000 +0200
>@@ -2174,7 +2174,7 @@ xmlStringLenDecodeEntities(xmlParserCtxt
> 	return(NULL);
>     last = str + len;
> 
>-    if (ctxt->depth > 40) {
>+    if ((ctxt->depth > 40) || (ctxt->nbentities >= 500000)) {
> 	xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
> 	return(NULL);
>     }
>@@ -2212,6 +2212,11 @@ xmlStringLenDecodeEntities(xmlParserCtxt
> 			"String decoding Entity Reference: %.30s\n",
> 			str);
> 	    ent = xmlParseStringEntityRef(ctxt, &str);
>+	    if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)
>+	        goto int_error;
>+	    ctxt->nbentities++;
>+	    if (ent != NULL)
>+	        ctxt->nbentities += ent->owner;
> 	    if ((ent != NULL) &&
> 		(ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) {
> 		if (ent->content != NULL) {
>@@ -2258,6 +2263,11 @@ xmlStringLenDecodeEntities(xmlParserCtxt
> 		xmlGenericError(xmlGenericErrorContext,
> 			"String decoding PE Reference: %.30s\n", str);
> 	    ent = xmlParseStringPEReference(ctxt, &str);
>+	    if (ctxt->lastError.code == XML_ERR_ENTITY_LOOP)
>+	        goto int_error;
>+	    ctxt->nbentities++;
>+	    if (ent != NULL)
>+	        ctxt->nbentities += ent->owner;
> 	    if (ent != NULL) {
> 		xmlChar *rep;
> 
>@@ -2294,6 +2304,9 @@ xmlStringLenDecodeEntities(xmlParserCtxt
> 
> mem_error:
>     xmlErrMemory(ctxt, NULL);
>+int_error:
>+    if (buffer != NULL)
>+        xmlFree(buffer);
>     return(NULL);
> }
> 
>@@ -3100,6 +3113,9 @@ xmlParseAttValueComplex(xmlParserCtxtPtr
> 		}
> 	    } else {
> 		ent = xmlParseEntityRef(ctxt);
>+		ctxt->nbentities++;
>+		if (ent != NULL)
>+		    ctxt->nbentities += ent->owner;
> 		if ((ent != NULL) &&
> 		    (ent->etype == XML_INTERNAL_PREDEFINED_ENTITY)) {
> 		    if (len > buf_size - 10) {
>@@ -4342,6 +4358,7 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt
>     int isParameter = 0;
>     xmlChar *orig = NULL;
>     int skipped;
>+    unsigned long oldnbent = ctxt->nbentities;
>     
>     /* GROW; done in the caller */
>     if (CMP8(CUR_PTR, '<', '!', 'E', 'N', 'T', 'I', 'T', 'Y')) {
>@@ -4551,6 +4568,11 @@ xmlParseEntityDecl(xmlParserCtxtPtr ctxt
> 		}
> 	    }
>             if (cur != NULL) {
>+	        if ((cur->owner != 0) || (cur->children == NULL)) {
>+		    cur->owner = ctxt->nbentities - oldnbent;
>+		    if (cur->owner ==  0)
>+		        cur->owner = 1;
>+		}
> 	        if (cur->orig != NULL)
> 		    xmlFree(orig);
> 		else
>@@ -5927,6 +5949,11 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> 	if (ent == NULL) return;
> 	if (!ctxt->wellFormed)
> 	    return;
>+	ctxt->nbentities++;
>+	if (ctxt->nbentities >= 500000) {
>+	    xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
>+	    return;
>+	}
> 	if ((ent->name != NULL) && 
> 	    (ent->etype != XML_INTERNAL_PREDEFINED_ENTITY)) {
> 	    xmlNodePtr list = NULL;
>@@ -5976,7 +6003,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> 			    (ent->children == NULL)) {
> 			    ent->children = list;
> 			    ent->last = list;
>-			    ent->owner = 1;
>+			    if (ent->owner == 0)
>+				ent->owner = 1;
> 			    list->parent = (xmlNodePtr) ent;
> 			} else {
> 			    xmlFreeNodeList(list);
>@@ -5985,6 +6013,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> 			xmlFreeNodeList(list);
> 		    }
> 		} else {
>+		    unsigned long oldnbent = ctxt->nbentities;
> 		    /*
> 		     * 4.3.2: An internal general parsed entity is well-formed
> 		     * if its replacement text matches the production labeled
>@@ -6007,6 +6036,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> 			ret = xmlParseBalancedChunkMemoryInternal(ctxt,
> 					   value, user_data, &list);
> 			ctxt->depth--;
>+
> 		    } else if (ent->etype ==
> 			       XML_EXTERNAL_GENERAL_PARSED_ENTITY) {
> 			ctxt->depth++;
>@@ -6019,6 +6049,11 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> 			xmlErrMsgStr(ctxt, XML_ERR_INTERNAL_ERROR,
> 				     "invalid entity type found\n", NULL);
> 		    }
>+		    if ((ent->owner != 0) || (ent->children == NULL)) {
>+			ent->owner = ctxt->nbentities - oldnbent;
>+			if (ent->owner == 0)
>+			    ent->owner = 1;
>+		    }
> 		    if (ret == XML_ERR_ENTITY_LOOP) {
> 			xmlFatalErr(ctxt, XML_ERR_ENTITY_LOOP, NULL);
> 			return;
>@@ -6037,7 +6072,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> 				    (ctxt->parseMode == XML_PARSE_READER)) {
> 				    list->parent = (xmlNodePtr) ent;
> 				    list = NULL;
>-				    ent->owner = 1;
>+				    if (ent->owner == 0)
>+					ent->owner = 1;
> 				} else {
> 				    ent->owner = 0;
> 				    while (list != NULL) {
>@@ -6054,7 +6090,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> #endif /* LIBXML_LEGACY_ENABLED */
> 				}
> 			    } else {
>-				ent->owner = 1;
>+			        if (ent->owner == 0)
>+				    ent->owner = 1;
> 				while (list != NULL) {
> 				    list->parent = (xmlNodePtr) ent;
> 				    if (list->next == NULL)
>@@ -6075,6 +6112,7 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> 		    }
> 		}
> 	    }
>+	    ctxt->nbentities += ent->owner;
> 	    if ((ctxt->sax != NULL) && (ctxt->sax->reference != NULL) &&
> 		(ctxt->replaceEntities == 0) && (!ctxt->disableSAX)) {
> 		/*
>@@ -6176,7 +6214,8 @@ xmlParseReference(xmlParserCtxtPtr ctxt)
> 				break;
> 			    cur = next;
> 			}
>-			ent->owner = 1;
>+			if (ent->owner == 0)
>+			    ent->owner = 1;
> #ifdef LIBXML_LEGACY_ENABLED
> 			if (ent->etype == XML_EXTERNAL_GENERAL_PARSED_ENTITY)			      
> 			  xmlAddEntityReference(ent, firstChild, nw);
>@@ -11035,7 +11074,7 @@ xmlParseCtxtExternalEntity(xmlParserCtxt
> 
>     if (ctx == NULL) return(-1);
> 
>-    if (ctx->depth > 40) {
>+    if ((ctx->depth > 40) || (ctx->nbentities >= 500000)) {
> 	return(XML_ERR_ENTITY_LOOP);
>     }
> 
>@@ -11220,7 +11259,8 @@ xmlParseExternalEntityPrivate(xmlDocPtr 
>     xmlChar start[4];
>     xmlCharEncoding enc;
> 
>-    if (depth > 40) {
>+    if ((depth > 40) ||
>+        ((oldctxt != NULL) && (oldctxt->nbentities >= 500000))) {
> 	return(XML_ERR_ENTITY_LOOP);
>     }
> 
>@@ -11363,6 +11403,7 @@ xmlParseExternalEntityPrivate(xmlDocPtr 
>     oldctxt->node_seq.maximum = ctxt->node_seq.maximum;
>     oldctxt->node_seq.length = ctxt->node_seq.length;
>     oldctxt->node_seq.buffer = ctxt->node_seq.buffer;
>+    oldctxt->nbentities += ctxt->nbentities;
>     ctxt->node_seq.maximum = 0;
>     ctxt->node_seq.length = 0;
>     ctxt->node_seq.buffer = NULL;
>@@ -11463,7 +11504,7 @@ xmlParseBalancedChunkMemoryInternal(xmlP
>     int size;
>     xmlParserErrors ret = XML_ERR_OK;
> 
>-    if (oldctxt->depth > 40) {
>+    if ((oldctxt->depth > 40) || (oldctxt->nbentities >= 500000)) {
> 	return(XML_ERR_ENTITY_LOOP);
>     }
> 
>@@ -11587,6 +11628,7 @@ xmlParseBalancedChunkMemoryInternal(xmlP
>         ctxt->myDoc->last = last;
>     }
> 	
>+    oldctxt->nbentities += ctxt->nbentities;
>     ctxt->sax = oldsax;
>     ctxt->dict = NULL;
>     ctxt->attsDefault = NULL;
>@@ -12883,6 +12925,7 @@ xmlCtxtReset(xmlParserCtxtPtr ctxt)
>     ctxt->depth = 0;
>     ctxt->charset = XML_CHAR_ENCODING_UTF8;
>     ctxt->catalogs = NULL;
>+    ctxt->nbentities = 0;
>     xmlInitNodeInfoSeq(&ctxt->node_seq);
> 
>     if (ctxt->attsDefault != NULL) {

Actions: View | Diff

Attachments on bug 459830: 314849 | 314860 | 314862 | 314863 | 314908