[Expat-checkins] expat/lib xmlparse.c,1.50,1.51

[kwaclaw@users.sourceforge.net]

Update of /cvsroot/expat/expat/lib
In directory usw-pr-cvs1:/tmp/cvs-serv19827

Modified Files:
	xmlparse.c 
Log Message:
Applied modified version of patch #578161.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- xmlparse.c	9 Jul 2002 20:25:10 -0000	1.50
+++ xmlparse.c	9 Jul 2002 20:58:04 -0000	1.51
@@ -163,6 +163,7 @@
   const XML_Char *notation;
   char open;
   char is_param;
+  char is_internal;  /* true if declared in internal subset outside of any PE */
 } ENTITY;
 
 typedef struct {
@@ -223,14 +224,19 @@
   HASH_TABLE prefixes;
   STRING_POOL pool;
   STRING_POOL entityValuePool;
[...997 lines suppressed...]
+    newE->is_param = oldE->is_param;
+    newE->is_internal = oldE->is_internal;
   }
   return 1;
 }
@@ -5074,8 +5165,7 @@
   XML_Content *ret;
   XML_Content *cpos;
   XML_Char * str;
-  int allocsize = (dtd.scaffCount * sizeof(XML_Content)
-                   + (dtd.contentStringLen * sizeof(XML_Char)));
+  int allocsize = dtd.scaffCount * sizeof(XML_Content) + (dtd.contentStringLen * sizeof(XML_Char));
 
   ret = MALLOC(allocsize);
   if (!ret)
@@ -5111,3 +5201,4 @@
   }
   return ret;
 }  /* End getElementType */
+