[Expat-checkins] expat/lib xmlparse.c,1.161,1.162

[Karl Waclawek]

Update of /cvsroot/expat/expat/lib
In directory sc8-pr-cvs17:/tmp/cvs-serv11285

Modified Files:
	xmlparse.c 
Log Message:
Fix for issue #1785430.

Index: xmlparse.c
===================================================================
RCS file: /cvsroot/expat/expat/lib/xmlparse.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -d -r1.161 -r1.162
--- xmlparse.c	8 May 2007 02:25:35 -0000	1.161
+++ xmlparse.c	3 Sep 2007 16:34:40 -0000	1.162
@@ -3782,15 +3782,17 @@
 #endif /* XML_DTD */
       dtd->hasParamEntityRefs = XML_TRUE;
       if (startDoctypeDeclHandler) {
+        XML_Char *pubId;
         if (!XmlIsPublicId(enc, s, next, eventPP))
           return XML_ERROR_PUBLICID;
-        doctypePubid = poolStoreString(&tempPool, enc,
-                                       s + enc->minBytesPerChar,
-                                       next - enc->minBytesPerChar);
-        if (!doctypePubid)
+        pubId = poolStoreString(&tempPool, enc,
+                                s + enc->minBytesPerChar,
+                                next - enc->minBytesPerChar);
+        if (!pubId)
           return XML_ERROR_NO_MEMORY;
-        normalizePublicId((XML_Char *)doctypePubid);
+        normalizePublicId(pubId);
         poolFinish(&tempPool);
+        doctypePubid = pubId;
         handleDefault = XML_FALSE;
         goto alreadyChecked;
       }