Changeset 2961 for trunk

Timestamp:

Apr 10, 2012, 4:25:09 PM (13 years ago)

Author:

gah

Message:

don't decode unencoded-strings (converting utf-8 string inadvertantly)

File:

• trunk/lang/tcl/src/RpEncodeTclInterface.cc (modified) (1 diff)

trunk/lang/tcl/src/RpEncodeTclInterface.cc

@@ -278 +278 @@
 
     string = Tcl_GetStringFromObj(objv[last], &numBytes);
-    if (switches.flags == 0) {
-        if (strncmp(string, "@@RP-ENC:", 9) != 0) {
-            /* This string doesn't have a header, so it's not encoded. 
-             * Just return the string as-is. */
-            Tcl_SetObjResult(interp, objv[last]);
-            return TCL_OK;
-        }
+    if ((switches.flags == 0) && (strncmp(string, "@@RP-ENC:", 9) != 0)) {
+        /* This string doesn't have a header, so it's not encoded. 
+         * Just return the string as-is. */
+        Tcl_SetObjResult(interp, objv[last]);
+        return TCL_OK;
     }
     Rappture::Buffer buf(string, numBytes);