ox 2.14.6 → 2.14.7

data/ext/ox/parse.c

@@ -5,13 +5,16 @@
 
 #include <stdlib.h>
 #include <errno.h>
+#include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
 
 #include "ruby.h"
 #include "ox.h"
 #include "err.h"
 #include "attr.h"
+#include "intern.h"
 #include "helper.h"
 #include "special.h"
 
@@ -93,6 +96,30 @@ next_white(PInfo pi) {
     }
 }
 
+static void fix_newlines(char *buf) {
+#if HAVE_INDEX
+    if (NULL != index(buf, '\r')) {
+#endif
+	char	*s = buf;
+	char	*d = buf;
+
+	for (; '\0' != *s; s++) {
+	    if ('\r' == *s) {
+		if ('\n' == *(s + 1)) {
+		    continue;
+		}
+		*s = '\n';
+	    } else if (d < s) {
+		*d = *s;
+	    }
+	    d++;
+	}
+	*d = '\0';
+#if HAVE_INDEX
+    }
+#endif
+}
+
 static void
 mark_pi_cb(void *ptr) {
     if (NULL != ptr) {
@@ -211,31 +238,11 @@ ox_parse(char *xml, size_t len, ParseCallbacks pcb, char **endp, Options options
     return pi.obj;
 }
 
-static char*
-gather_content(const char *src, char *content, size_t len) {
-    for (; 0 < len; src++, content++, len--) {
-	switch (*src) {
-	case '?':
-	    if ('>' == *(src + 1)) {
-		*content = '\0';
-		return (char*)(src + 1);
-	    }
-	    *content = *src;
-	    break;
-	case '\0':
-	    return 0;
-	default:
-	    *content = *src;
-	    break;
-	}
-    }
-    return 0;
-}
-
 // Entered after the "<?" sequence. Ready to read the rest.
 static void
 read_instruction(PInfo pi) {
-    char		content[1024];
+    char		content[256];
+    char		*content_ptr;
     struct _attrStack	attrs;
     char		*attr_name;
     char		*attr_value;
@@ -243,7 +250,8 @@ read_instruction(PInfo pi) {
     char		*end;
     char		c;
     char		*cend;
-    int			attrs_ok = 1;
+    size_t		size;
+    bool		attrs_ok = true;
 
     *content = '\0';
     attr_stack_init(&attrs);
@@ -251,10 +259,33 @@ read_instruction(PInfo pi) {
 	return;
     }
     end = pi->s;
-    if (0 == (cend = gather_content(pi->s, content, sizeof(content) - 1))) {
-	set_error(&pi->err, "processing instruction content too large or not terminated", pi->str, pi->s);
-	return;
+    for (; true; pi->s++) {
+        switch (*pi->s) {
+        case '?':
+            if ('>' == *(pi->s + 1)) {
+		pi->s++;
+		goto DONE;
+            }
+            break;
+        case '\0':
+	    set_error(&pi->err, "processing instruction not terminated", pi->str, pi->s);
+	    return;
+        default:
+	    break;
+        }
     }
+DONE:
+    cend = pi->s;
+    size = cend - end - 1;
+    pi->s = end;
+    if (size < sizeof(content)) {
+	content_ptr = content;
+    } else {
+	content_ptr = ALLOC_N(char, size + 1);
+    }
+    memcpy(content_ptr, end, size);
+    content_ptr[size] = '\0';
+
     next_non_white(pi);
     c = *pi->s;
     *end = '\0'; // terminate name
@@ -274,7 +305,7 @@ read_instruction(PInfo pi) {
 	    end = pi->s;
 	    next_non_white(pi);
 	    if ('=' != *pi->s++) {
-		attrs_ok = 0;
+		attrs_ok = false;
 		break;
 	    }
 	    *end = '\0'; // terminate name
@@ -311,10 +342,13 @@ read_instruction(PInfo pi) {
 	if (attrs_ok) {
 	    pi->pcb->instruct(pi, target, attrs.head, 0);
 	} else {
-	    pi->pcb->instruct(pi, target, attrs.head, content);
+	    pi->pcb->instruct(pi, target, attrs.head, content_ptr);
 	}
     }
     attr_stack_cleanup(&attrs);
+    if (content_ptr != content) {
+	xfree(content_ptr);
+    }
 }
 
 static void
@@ -361,10 +395,10 @@ read_delimited(PInfo pi, char end) {
 // that. Ready to read the rest.
 static void
 read_doctype(PInfo pi) {
-    char	*docType;
+    char	*doctype;
 
     next_non_white(pi);
-    docType = pi->s;
+    doctype = pi->s;
     read_delimited(pi, '>');
     if (err_has(&pi->err)) {
 	return;
@@ -373,7 +407,8 @@ read_doctype(PInfo pi) {
     *pi->s = '\0';
     pi->s++;
     if (0 != pi->pcb->add_doctype) {
-	pi->pcb->add_doctype(pi, docType);
+	fix_newlines(doctype);
+	pi->pcb->add_doctype(pi, doctype);
     }
 }
 
@@ -409,6 +444,7 @@ read_comment(PInfo pi) {
     *end = '\0'; // in case the comment was blank
     pi->s = end + 3;
     if (0 != pi->pcb->add_comment) {
+	fix_newlines(comment);
 	pi->pcb->add_comment(pi, comment);
     }
 }
@@ -769,9 +805,11 @@ read_text(PInfo pi) {
     }
     *b = '\0';
     if (0 != alloc_buf) {
+	fix_newlines(alloc_buf);
 	pi->pcb->add_text(pi, alloc_buf, ('/' == *(pi->s + 1)));
 	xfree(alloc_buf);
     } else {
+	fix_newlines(buf);
 	pi->pcb->add_text(pi, buf, ('/' == *(pi->s + 1)));
     }
 }
@@ -838,9 +876,11 @@ read_reduced_text(PInfo pi) {
     }
     *b = '\0';
     if (0 != alloc_buf) {
+	fix_newlines(alloc_buf);
 	pi->pcb->add_text(pi, alloc_buf, ('/' == *(pi->s + 1)));
 	xfree(alloc_buf);
     } else {
+	fix_newlines(buf);
 	pi->pcb->add_text(pi, buf, ('/' == *(pi->s + 1)));
     }
 }
@@ -899,6 +939,7 @@ read_cdata(PInfo pi) {
     *end = '\0';
     pi->s = end + 3;
     if (0 != pi->pcb->add_cdata) {
+	fix_newlines(start);
 	pi->pcb->add_cdata(pi, start, end - start);
     }
 }