merge 8.6

1 files changed, 17 insertions, 12 deletions

diff --git a/generic/tclBinary.c b/generic/tclBinary.c
index a050122..ce816d9 100644
--- a/generic/tclBinary.c
+++ b/generic/tclBinary.c
@@ -3173,7 +3173,7 @@ BinaryDecode64(
 		if (c == '=' && i > 1) {
 		    value <<= 6;
 		    cut++;
-		} else if (!strict && TclIsSpaceProc(c)) {
+		} else if (!strict) {
 		    i--;
 		} else {
 		    goto bad64;
@@ -3197,7 +3197,7 @@ BinaryDecode64(
 		if (i) {
 		    cut++;
 		}
-	    } else if (strict || !TclIsSpaceProc(c)) {
+	    } else if (strict) {
 		goto bad64;
 	    } else {
 		i--;
@@ -3217,11 +3217,6 @@ BinaryDecode64(
 	    if (strict) {
 		goto bad64;
 	    }
-	    for (; data < dataend; data++) {
-		if (!TclIsSpaceProc(*data)) {
-		    goto bad64;
-		}
-	    }
 	}
     }
     Tcl_SetByteArrayLength(resultObj, cursor - begin - cut);
@@ -3229,11 +3224,21 @@ BinaryDecode64(
     return TCL_OK;
 
   bad64:
-    Tcl_SetObjResult(interp, Tcl_ObjPrintf(
-	    "invalid base64 character \"%c\" at position %d",
-	    (char) c, (int) (data - datastart - 1)));
-    TclDecrRefCount(resultObj);
-    return TCL_ERROR;
+    {
+	/* The decoder is byte-oriented. If we saw a byte that's not a
+	 * valid member of the base64 alphabet, it could be the lead byte
+	 * of a multi-byte character. */
+	Tcl_UniChar ch;
+
+	/* Safe because we know data is NUL-terminated */
+	TclUtfToUniChar((const char *)(data - 1), &ch);
+
+	Tcl_SetObjResult(interp, Tcl_ObjPrintf(
+		"invalid base64 character \"%c\" at position %d", ch,
+		(int) (data - datastart - 1)));
+	TclDecrRefCount(resultObj);
+	return TCL_ERROR;
+    }
 }
 
 /*