From 7e152743beb2995911a1a99c808a5e52ede08d6d Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Fri, 2 Jun 2023 22:05:03 +0000 Subject: In TclAttemptInitStringRep(): Don't do a memcpy if attemptckalloc() fails --- generic/tclInt.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/generic/tclInt.h b/generic/tclInt.h index d40bbe5..7114d66 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -4516,9 +4516,9 @@ MODULE_SCOPE void TclDbInitNewObj(Tcl_Obj *objPtr, const char *file, TclInitEmptyStringRep(objPtr) \ ) : ( \ (objPtr)->bytes = (char *)attemptckalloc((len) + 1U), \ - memcpy((objPtr)->bytes, (bytePtr) ? (bytePtr) : &tclEmptyString, (len)), \ - (objPtr)->bytes[len] = '\0', \ - (objPtr)->length = (len) \ + (objPtr)->length = ((objPtr)->bytes) ? \ + (memcpy((objPtr)->bytes, (bytePtr) ? (bytePtr) : &tclEmptyString, (len)), \ + (objPtr)->bytes[len] = '\0', (len)) : (-1) \ )), (objPtr)->bytes) /* -- cgit v0.12