1 files changed, 17 insertions, 22 deletions

diff --git a/generic/tclUtil.c b/generic/tclUtil.c
index 7c08b74..7543852 100644
--- a/generic/tclUtil.c
+++ b/generic/tclUtil.c
@@ -1549,7 +1549,8 @@ Tcl_Merge(
 {
 #define LOCAL_SIZE 64
     char localFlags[LOCAL_SIZE];
-    int i, bytesNeeded = 0;
+    int i;
+    size_t bytesNeeded = 0;
     char *result, *dst, *flagPtr = NULL;
 
     /*
@@ -1575,12 +1576,6 @@ Tcl_Merge(
     for (i = 0; i < argc; i++) {
 	flagPtr[i] = ( i ? TCL_DONT_QUOTE_HASH : 0 );
 	bytesNeeded += TclScanElement(argv[i], -1, &flagPtr[i]);
-	if (bytesNeeded < 0) {
-	    Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
-	}
-    }
-    if (bytesNeeded > INT_MAX - argc + 1) {
-	Tcl_Panic("max size for a Tcl value (%d bytes) exceeded", INT_MAX);
     }
     bytesNeeded += argc;
 
@@ -1902,7 +1897,8 @@ Tcl_ConcatObj(
     int objc,			/* Number of objects to concatenate. */
     Tcl_Obj *const objv[])	/* Array of objects to concatenate. */
 {
-    int i, elemLength, needSpace = 0, bytesNeeded = 0;
+    int i, needSpace = 0;
+    size_t bytesNeeded = 0, elemLength;
     const char *element;
     Tcl_Obj *objPtr, *resPtr;
 
@@ -1913,13 +1909,14 @@ Tcl_ConcatObj(
      */
 
     for (i = 0;  i < objc;  i++) {
-	int length;
+	size_t length;
 
 	objPtr = objv[i];
 	if (TclListObjIsCanonical(objPtr)) {
 	    continue;
 	}
-	TclGetStringFromObj(objPtr, &length);
+	TclGetString(objPtr);
+	length = objPtr->length;
 	if (length > 0) {
 	    break;
 	}
@@ -1956,11 +1953,9 @@ Tcl_ConcatObj(
      */
 
     for (i = 0;  i < objc;  i++) {
-	element = TclGetStringFromObj(objv[i], &elemLength);
+	element = TclGetString(objv[i]);
+	elemLength = objv[i]->length;
 	bytesNeeded += elemLength;
-	if (bytesNeeded < 0) {
-	    break;
-	}
     }
 
     /*
@@ -1974,9 +1969,10 @@ Tcl_ConcatObj(
     Tcl_SetObjLength(resPtr, 0);
 
     for (i = 0;  i < objc;  i++) {
-	int trim;
+	size_t trim;
 
-	element = TclGetStringFromObj(objv[i], &elemLength);
+	element = TclGetString(objv[i]);
+	elemLength = objv[i]->length;
 
 	/*
 	 * Trim away the leading whitespace.
@@ -2627,10 +2623,9 @@ TclDStringAppendObj(
     Tcl_DString *dsPtr,
     Tcl_Obj *objPtr)
 {
-    int length;
-    char *bytes = TclGetStringFromObj(objPtr, &length);
+    char *bytes = TclGetString(objPtr);
 
-    return Tcl_DStringAppend(dsPtr, bytes, length);
+    return Tcl_DStringAppend(dsPtr, bytes, objPtr->length);
 }
 
 char *
@@ -2874,11 +2869,11 @@ Tcl_DStringGetResult(
     Tcl_DString *dsPtr)		/* Dynamic string that is to become the result
 				 * of interp. */
 {
-    int length;
-    char *bytes = TclGetStringFromObj(Tcl_GetObjResult(interp), &length);
+    Tcl_Obj *obj = Tcl_GetObjResult(interp);
+    char *bytes = TclGetString(obj);
 
     Tcl_DStringFree(dsPtr);
-    Tcl_DStringAppend(dsPtr, bytes, length);
+    Tcl_DStringAppend(dsPtr, bytes, obj->length);
     Tcl_ResetResult(interp);
 }