commit 17d42a1a27aa91c3bc7a8b551ecee68adb16c6b0
author Thiago Macieira <thiago.macieira@intel.com> Sun Feb 26 14:42:37 2017 -0800
committer Thiago Macieira <thiago.macieira@intel.com> Mon May 08 20:59:16 2017 -0700
tree 79a8cca816a8b8844332a4ca8943b93e5f57782c
parent c85bcf5431a683fcf8a86a6b5ec9cc3198ed6565

Validation: add UTF-8 validation support

This implements:
 - CborValidateUtf8

Signed-off-by: Thiago Macieira <thiago.macieira@intel.com>

src/cborvalidation.c

diff --git a/src/cborvalidation.c b/src/cborvalidation.c
index 7bbf344..0f28ce9 100644
--- a/src/cborvalidation.c
+++ b/src/cborvalidation.c
@@ -31,6 +31,7 @@
 #include "cbor.h"
 #include "cborinternal_p.h"
 #include "compilersupport_p.h"
+#include "utf8_p.h"
 
 #include <string.h>
 
@@ -227,6 +228,18 @@
 
 static CborError validate_value(CborValue *it, int flags, int recursionLeft);
 
+static inline CborError validate_utf8_string(const void *ptr, size_t n)
+{
+    const uint8_t *buffer = (const uint8_t *)ptr;
+    const uint8_t * const end = buffer + n;
+    while (buffer < end) {
+        uint32_t uc = get_utf8(&buffer, end);
+        if (uc == ~0U)
+            return CborErrorInvalidUtf8TextString;
+    }
+    return CborNoError;
+}
+
 static inline CborError validate_simple_type(uint8_t simple_type, int flags)
 {
     /* At current time, all known simple types are those from RFC 7049,
@@ -421,6 +434,12 @@
                 return err;
             if (!ptr)
                 break;
+
+            if (type == CborTextStringType && flags & CborValidateUtf8) {
+                err = validate_utf8_string(ptr, n);
+                if (err)
+                    return err;
+            }
         }
 
         return CborNoError;