Changeset 1415 for trunk

Timestamp:

Apr 21, 2009 8:20:32 PM (15 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• lang/tcl/tests/encode.test (modified) (1 diff)
• src/core/RpEncode.cc (modified) (3 diffs)

trunk/lang/tcl/tests/encode.test

@@ -309 +309 @@
 } {0 -hi}
 
+test encode-4.0 {is binary (isxml) test with invalid XML characters} {
+    list [catch {Rappture::encoding::is binary "formfeed \f"} msg] $msg
+} {0 yes}
+test encode-4.1 {is binary (isxml) test with invalid XML characters} {
+    list [catch {Rappture::encoding::is binary "backspace \b"} msg] $msg
+} {0 yes}
+test encode-4.2 {is binary (isxml) test with invalid XML characters} {
+    list [catch {Rappture::encoding::is binary "vertical tab \v"} msg] $msg
+} {0 yes}
+test encode-4.3 {is binary (isxml) test with invalid XML characters} {
+    list [catch {Rappture::encoding::is binary "high-order bit \x80"} msg] $msg
+} {0 yes}
+test encode-4.4 {is binary (isxml) test with invalid XML characters} {
+    list [catch {Rappture::encoding::is binary "high-order bit \xFF"} msg] $msg
+} {0 yes}
+test encode-4.5 {is binary (isxml) test with invalid XML characters} {
+    list [catch {Rappture::encoding::is binary "NUL \0"} msg] $msg
+} {0 yes}
+test encode-4.6 {is binary (isxml) test with invalid XML characters} {
+    list [catch {Rappture::encoding::is binary "BEL \a"} msg] $msg
+} {0 yes}
+test encode-4.7 {is binary (isxml) test with valid XML characters} {
+    list [catch {Rappture::encoding::is binary "tab/cr/nl \t\r\n "} msg] $msg
+} {0 no}
+test encode-4.8 {is binary (isxml) test with valid XML characters} {
+    list [catch {
+        set string "\t\r\n"
+        for { set i 0x20 } { $i <= 0x7F } { incr i } {
+            append string [format %c $i]
+        }
+        Rappture::encoding::is binary $string
+    } msg] $msg
+} {0 no}
+
+test encode-4.8 {is binary (isxml) test with all characters} {
+    list [catch {
+        set result {}
+        for { set i 0 } { $i <= 0xFF } { incr i } {
+            set string [format %c $i]
+            if { ![Rappture::encoding::is binary $string] } {
+                lappend result $i
+            }
+        }
+        set result
+    } msg] $msg
+} {0 {9 10 13 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127}}
+
 
 ::tcltest::cleanupTests

trunk/src/core/RpEncode.cc

@@ -16 +16 @@
 #include <cstring>
 
+
 /**********************************************************************/
 // FUNCTION: Rappture::encoding::isbinary()
 /// isbinary checks to see if given string is binary.
+
 /**
  * Checks to see if any of size characters in *buf are binary
@@ -26 +28 @@
  */
 
+/* 
+ * Valid XML (ASCII encoded) characters 0-127:
+ * 
+ *      0x9 (\t) 0xA (\n) 0xD (\r) and
+ *      0x20 (space) through 0x7F (del)
+ *
+ * This isn't for UTF-8, only ASCII.  We don't allow high-order bit
+ * characters for ASCII editors.
+ */
+static unsigned char _xmlchars[256] = {
+    /*     -  0  1  2  3  4  5  6  7  8  9  A  B  C  D  E  F */
+    /*00*/    0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 0, 0,
+    /*10*/    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /*20*/    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /*30*/    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /*40*/    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /*50*/    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /*60*/    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /*70*/    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+    /*80*/    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    /*90*/    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    /*A0*/    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    /*B0*/    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    /*C0*/    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    /*E0*/    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    /*F0*/    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
+/* 
+ * This routine is misnamed "isBinary". By definition, all strings are binary,
+ * even the ones with just letters or digits.  It's really a test if the
+ * string can be used by XML verbatim and if it can be read by the usual ASCII
+ * editors (the reason high-order bit characters are disallowed).  [Note we
+ * aren't checking if entity replacements are necessary.]
+ *
+ * The "is*" routines should be moved somewhere else since they really don't
+ * have anything to do with encoding/decoding.
+ */
 bool
 Rappture::encoding::isBinary(const char* buf, int size)
 {
     if (buf == NULL) {
-        return 0;
+        return false;                   /* Really should let this segfault. */
     }
     if (size < 0) {
         size = strlen(buf);
     }
-    const char *cp, *endPtr;
-    for (cp = buf, endPtr = buf + size; cp < endPtr; cp++) {
-        if (((*cp >= '\000') && (*cp <= '\010')) ||
-            ((*cp >= '\013') && (*cp <= '\014')) ||
-            ((*cp >= '\016') && (*cp <= '\037')) ||
-            ((*cp >= '\177') && (*cp <= '\377')) ) {
-            // data is binary
-            return true;
-        }
+    const unsigned char *cp, *endPtr;
+    for (cp = (const unsigned char *)buf, endPtr = cp + size; cp < endPtr; 
+         cp++) {
+        if (!_xmlchars[*cp]) {
+            return true;                
+        }
     }
     return false;
@@ -52 +89 @@
 {
     if (buf == NULL) {
-        return 0;
+        return false;                   /* Really should let this segfault. */
     }
     if (size < 0) {