Applied patch # 559910 - New SkippedEntityHandler

diff --git a/expat/lib/expat.h b/expat/lib/expat.h
index 057da14a43ad07099f62b5383b05b02938ce70e6..0696a95e7580d5ad6ae26cc941abd12dbefb094a 100644 (file)
--- a/expat/lib/expat.h
+++ b/expat/lib/expat.h
@@ -190,7 +190,7 @@ XML_ParserCreate_MM(const XML_Char *encoding,
    Added in Expat 1.95.3.
 */
 XMLPARSEAPI(int)
-XML_ParserReset(XML_Parser parser, const XML_Char *encodingName);
+XML_ParserReset(XML_Parser parser, const XML_Char *encoding);
 
 /* atts is array of name/value pairs, terminated by 0;
    names and values are 0 terminated.
@@ -366,6 +366,16 @@ typedef int (*XML_ExternalEntityRefHandler)(XML_Parser parser,
                                             const XML_Char *systemId,
                                             const XML_Char *publicId);
 
+/* This is called in two situations:
+   1) An entity reference is encountered for which no declaration
+      has been read *and* this is not an error.
+   2) An internal entity reference is read, but not expanded, because
+      XML_SetDefaultHandler has been called.
+*/
+typedef void (*XML_SkippedEntityHandler)(void *userData,
+                                         const XML_Char *entityName,
+                                         int is_parameter_entity);
+
 /* This structure is filled in by the XML_UnknownEncodingHandler to
    provide information to the parser about encodings that are unknown
    to the parser.
@@ -480,8 +490,8 @@ XML_SetEndCdataSectionHandler(XML_Parser parser,
                               XML_EndCdataSectionHandler end);
 
 /* This sets the default handler and also inhibits expansion of
-   internal entities.  The entity reference will be passed to the
-   default handler.
+   internal entities. These entity references will be passed to the
+   default handler, or to the skipped entity handler, if one is set.
 */
 XMLPARSEAPI(void)
 XML_SetDefaultHandler(XML_Parser parser,
@@ -544,6 +554,10 @@ XML_SetExternalEntityRefHandler(XML_Parser parser,
 XMLPARSEAPI(void)
 XML_SetExternalEntityRefHandlerArg(XML_Parser, void *arg);
 
+XMLPARSEAPI(void)
+XML_SetSkippedEntityHandler(XML_Parser parser,
+                               XML_SkippedEntityHandler handler);
+
 XMLPARSEAPI(void)
 XML_SetUnknownEncodingHandler(XML_Parser parser,
                              XML_UnknownEncodingHandler handler,

diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c
index b80dc9c9e7fa7e2a4fa10f4cda8fea4be0c45bf4..5776b80416fec1bc26a8c1a993c1c1da7a179a55 100644 (file)
--- a/expat/lib/xmlparse.c
+++ b/expat/lib/xmlparse.c
@@ -417,6 +417,7 @@ typedef struct {
   XML_NotStandaloneHandler m_notStandaloneHandler;
   XML_ExternalEntityRefHandler m_externalEntityRefHandler;
   void *m_externalEntityRefHandlerArg;
+  XML_SkippedEntityHandler m_skippedEntityHandler;
   XML_UnknownEncodingHandler m_unknownEncodingHandler;
   XML_ElementDeclHandler m_elementDeclHandler;
   XML_AttlistDeclHandler m_attlistDeclHandler;
@@ -500,6 +501,7 @@ typedef struct {
 #define externalEntityRefHandler (((Parser *)parser)->m_externalEntityRefHandler)
 #define externalEntityRefHandlerArg (((Parser *)parser)->m_externalEntityRefHandlerArg)
 #define internalEntityRefHandler (((Parser *)parser)->m_internalEntityRefHandler)
+#define skippedEntityHandler (((Parser *)parser)->m_skippedEntityHandler)
 #define unknownEncodingHandler (((Parser *)parser)->m_unknownEncodingHandler)
 #define elementDeclHandler (((Parser *)parser)->m_elementDeclHandler)
 #define attlistDeclHandler (((Parser *)parser)->m_attlistDeclHandler)
@@ -708,6 +710,7 @@ int parserInit(XML_Parser parser, const XML_Char *encodingName)
   notStandaloneHandler = NULL;
   externalEntityRefHandler = NULL;
   externalEntityRefHandlerArg = parser;
+  skippedEntityHandler = NULL;
   unknownEncodingHandler = NULL;
   elementDeclHandler = NULL;
   attlistDeclHandler = NULL;
@@ -798,6 +801,7 @@ XML_Parser XML_ExternalEntityParserCreate(XML_Parser oldParser,
   XML_EndNamespaceDeclHandler oldEndNamespaceDeclHandler = endNamespaceDeclHandler;
   XML_NotStandaloneHandler oldNotStandaloneHandler = notStandaloneHandler;
   XML_ExternalEntityRefHandler oldExternalEntityRefHandler = externalEntityRefHandler;
+  XML_SkippedEntityHandler oldSkippedEntityHandler = skippedEntityHandler;
   XML_UnknownEncodingHandler oldUnknownEncodingHandler = unknownEncodingHandler;
   XML_ElementDeclHandler oldElementDeclHandler = elementDeclHandler;
   XML_AttlistDeclHandler oldAttlistDeclHandler = attlistDeclHandler;
@@ -844,6 +848,7 @@ XML_Parser XML_ExternalEntityParserCreate(XML_Parser oldParser,
   endNamespaceDeclHandler = oldEndNamespaceDeclHandler;
   notStandaloneHandler = oldNotStandaloneHandler;
   externalEntityRefHandler = oldExternalEntityRefHandler;
+  skippedEntityHandler = oldSkippedEntityHandler;
   unknownEncodingHandler = oldUnknownEncodingHandler;
   elementDeclHandler = oldElementDeclHandler;
   attlistDeclHandler = oldAttlistDeclHandler;
@@ -1118,6 +1123,12 @@ void XML_SetExternalEntityRefHandlerArg(XML_Parser parser, void *arg)
     externalEntityRefHandlerArg = parser;
 }
 
+void XML_SetSkippedEntityHandler(XML_Parser parser,
+                                XML_SkippedEntityHandler handler)
+{
+  skippedEntityHandler = handler;
+}
+
 void XML_SetUnknownEncodingHandler(XML_Parser parser,
                                   XML_UnknownEncodingHandler handler,
                                   void *data)
@@ -1626,7 +1637,7 @@ doContent(XML_Parser parser,
        XML_Char ch = (XML_Char) XmlPredefinedEntityName(enc,
                                              s + enc->minBytesPerChar,
                                              next - enc->minBytesPerChar);
-       if (ch) {
+  if (ch) {
          if (characterDataHandler)
            characterDataHandler(handlerArg, &ch, 1);
          else if (defaultHandler)
@@ -1642,9 +1653,11 @@ doContent(XML_Parser parser,
        poolDiscard(&dtd.pool);
        if (!entity) {
          if (!hadExternalDoctype || dtd.standalone)
-           return XML_ERROR_UNDEFINED_ENTITY;
-         if (defaultHandler)                       
-           reportDefault(parser, enc, s, next);
+      return XML_ERROR_UNDEFINED_ENTITY;
+    if (skippedEntityHandler)
+      skippedEntityHandler(handlerArg, name, 0);
+    else if (defaultHandler)                       
+      reportDefault(parser, enc, s, next);
          break;
        }
        if (entity->open)
@@ -1655,8 +1668,11 @@ doContent(XML_Parser parser,
          if (entity->textPtr) {
            enum XML_Error result;
            OPEN_INTERNAL_ENTITY openEntity;
-           if (defaultHandler && !defaultExpandInternalEntities) {
-             reportDefault(parser, enc, s, next);  
+      if (!defaultExpandInternalEntities) {
+        if (skippedEntityHandler)
+          skippedEntityHandler(handlerArg, entity->name, 0);
+        else if (defaultHandler)
+          reportDefault(parser, enc, s, next);  
              break;
            }
            entity->open = 1;
@@ -1665,7 +1681,7 @@ doContent(XML_Parser parser,
            openEntity.entity = entity;
            openEntity.internalEventPtr = NULL;
            openEntity.internalEventEndPtr = NULL;
-           result = doContent(parser,
+      result = doContent(parser,
                               tagLevel,
                               internalEncoding,
                               (char *)entity->textPtr,
@@ -3417,6 +3433,8 @@ doProlog(XML_Parser parser,
        if (!entity) {
     if (!hadExternalDoctype || dtd.standalone)
            return XML_ERROR_UNDEFINED_ENTITY;
+    if (skippedEntityHandler)
+      skippedEntityHandler(handlerArg, name, 1);
     break; 
        }
        if (entity->open)
@@ -3782,6 +3800,8 @@ appendAttributeValue(XML_Parser parser, const ENCODING *enc, int isCdata,
              eventPtr = ptr;
            return XML_ERROR_UNDEFINED_ENTITY;
          }
+    if (skippedEntityHandler)
+      skippedEntityHandler(handlerArg, name, 0);
        }
        else if (entity->open) {
          if (enc == encoding)
@@ -3903,7 +3923,10 @@ enum XML_Error storeEntityValue(XML_Parser parser,
       /* in the internal subset, PE references are
          not allowed within markup declarations    */
       eventPtr = entityTextPtr;
-      result = XML_ERROR_SYNTAX;
+      if (prologState.documentEntity)
+        result = XML_ERROR_PARAM_ENTITY_REF;
+      else
+        result = XML_ERROR_SYNTAX;
       goto endEntityValue;
     case XML_TOK_NONE:
       result = XML_ERROR_NONE;