commit ee4cab282c7b3b499146e0d05796d29b7fc7bbf1
author Radek Krejci <rkrejci@cesnet.cz> Wed Jul 17 17:07:47 2019 +0200
committer Radek Krejci <rkrejci@cesnet.cz> Wed Jul 17 17:07:47 2019 +0200
tree ee6da3405c3764645a08220ebc89bb5b35508b71
parent 355bf4f6ee8e57e595961ac9b57fb2877b47ebb7

data tree FEATURE support for anydata

Defined and supported in XML parser.

src/xml.c

diff --git a/src/xml.c b/src/xml.c
index 95b0e64..8a70445 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -562,40 +562,52 @@
     /* parse */
     while (in[offset]) {
         if (in[offset] == '&') {
-            if (!buf) {
-                /* it is necessary to modify the input, so we will need a dynamically allocated buffer */
-                goto getbuffer;
-            }
+            if (output) {
+                if (!buf) {
+                    /* it is necessary to modify the input, so we will need a dynamically allocated buffer */
+                    goto getbuffer;
+                }
 
-            if (offset) {
-                /* store what we have so far */
-                BUFSIZE_CHECK(ctx, buf, size, len, offset);
-                memcpy(&buf[len], in, offset);
-                len += offset;
-                in += offset;
-                offset = 0;
+                if (offset) {
+                    /* store what we have so far */
+                    BUFSIZE_CHECK(ctx, buf, size, len, offset);
+                    memcpy(&buf[len], in, offset);
+                    len += offset;
+                    in += offset;
+                    offset = 0;
+                }
+                /* process reference */
+                /* we will need 4 bytes at most since we support only the predefined
+                 * (one-char) entities and character references */
+                BUFSIZE_CHECK(ctx, buf, size, len, 4);
             }
-            /* process reference */
-            /* we will need 4 bytes at most since we support only the predefined
-             * (one-char) entities and character references */
-            BUFSIZE_CHECK(ctx, buf, size, len, 4);
             ++offset;
             if (in[offset] != '#') {
                 /* entity reference - only predefined references are supported */
                 if (!strncmp(&in[offset], "lt;", 3)) {
-                    buf[len++] = '<';
+                    if (output) {
+                        buf[len++] = '<';
+                    }
                     in += 4; /* &lt; */
                 } else if (!strncmp(&in[offset], "gt;", 3)) {
-                    buf[len++] = '>';
+                    if (output) {
+                        buf[len++] = '>';
+                    }
                     in += 4; /* &gt; */
                 } else if (!strncmp(&in[offset], "amp;", 4)) {
-                    buf[len++] = '&';
+                    if (output) {
+                        buf[len++] = '&';
+                    }
                     in += 5; /* &amp; */
                 } else if (!strncmp(&in[offset], "apos;", 5)) {
-                    buf[len++] = '\'';
+                    if (output) {
+                        buf[len++] = '\'';
+                    }
                     in += 6; /* &apos; */
                 } else if (!strncmp(&in[offset], "quot;", 5)) {
-                    buf[len++] = '\"';
+                    if (output) {
+                        buf[len++] = '\"';
+                    }
                     in += 6; /* &quot; */
                 } else {
                     LOGVAL(ctx, LY_VLOG_LINE, &context->line, LYVE_SYNTAX,
@@ -632,7 +644,12 @@
                                          LY_VCODE_INSTREXP_len(&in[offset]), &in[offset], ";"),
                                   error);
                 ++offset;
-                rc = lyxml_pututf8(&buf[len], n, &u);
+                if (output) {
+                    rc = lyxml_pututf8(&buf[len], n, &u);
+                } else {
+                    char utf8[4];
+                    rc = lyxml_pututf8(&utf8[0], n, &u);
+                }
                 LY_CHECK_ERR_GOTO(rc, LOGVAL(ctx, LY_VLOG_LINE, &context->line, LYVE_SYNTAX,
                                              "Invalid character reference \"%.*s\" (0x%08x).", 12, p, n),
                                   error);
@@ -758,11 +775,12 @@
         (*buffer_size) = size;
         (*output) = buf;
         (*dynamic) = 1;
-    } else {
+        (*length) = len;
+    } else if (output) {
         (*output) = (char*)start;
         (*dynamic) = 0;
+        (*length) = len;
     }
-    (*length) = len;
 
     if (context->status == LYXML_ATTRIBUTE) {
         /* skip whitespaces after the value */