Changeset 301

Timestamp:

25/07/07 10:28:33 (16 months ago)

Author:

smoku

Message:

Reverted r301:302 changes. Let the parser be permissive. Refs #112

Files:

• trunk/sx/callback.c (modified) (4 diffs)

trunk/sx/callback.c

@@ -21 +21 @@
 #include "sx.h"
 
-/* check for unescaped predefined entities */
-int _sx_check_unescaped_entities(char *str, int len) {
-    char *c;
-    int ret = 0;
-
-    if(len > 0) str = strndup(str, len);
-
-    if(strchr(str, '<')) ret = 1;
-    if(strchr(str, '>')) ret = 1;
-    if(strchr(str, '\'')) ret = 1;
-    if(strchr(str, '"')) ret = 1;
-    if((c = strchr(str, '&'))
-         && strcmp("&lt;",c) && strcmp("&gt;",c) && strcmp("&amp;",c)
-         && strcmp("&apos;",c) && strcmp("&quot;",c)) ret = 1;
-
-    if(len > 0) free(str);
-    return ret;
-}
-
 /** primary expat callbacks */
 void _sx_element_start(void *arg, const char *name, const char **atts) {
     sx_t s = (sx_t) arg;
-    sx_error_t sxe;
     char buf[1024];
     char *uri, *elem, *prefix;
@@ -116 +96 @@
         }
 
-        if(_sx_check_unescaped_entities((char *) attr[1], -1)) {
-            _sx_gen_error(sxe, SX_ERR_STREAM, "Stream error", "Unescaped predefined entity");
-            _sx_event(s, event_ERROR, (void *) &sxe);
-            _sx_error(s, stream_err_RESTRICTED_XML, NULL);
-            s->fail = 1;
-            return;
-        }
-
         /* add it */
         nad_append_attr(s->nad, ns, elem, (char *) attr[1]);
@@ -153 +125 @@
 void _sx_cdata(void *arg, const char *str, int len) {
     sx_t s = (sx_t) arg;
-    sx_error_t sxe;
 
     if(s->fail) return;
@@ -160 +131 @@
     if(s->nad == NULL)
         return;
-
-    if(_sx_check_unescaped_entities((char *) str, len)) {
-        _sx_gen_error(sxe, SX_ERR_STREAM, "Stream error", "Unescaped predefined entity");
-        _sx_event(s, event_ERROR, (void *) &sxe);
-        _sx_error(s, stream_err_RESTRICTED_XML, NULL);
-        s->fail = 1;
-        return;
-    }
 
     /* go */