From c21feb251ebe185b37d7061f8cb7c051cbdb15e8 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 23 Feb 2022 14:13:52 +0000 Subject: 2 more spare stub entries --- generic/tcl.decls | 2 +- generic/tclDecls.h | 12 +++++++++--- generic/tclStubInit.c | 4 +++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/generic/tcl.decls b/generic/tcl.decls index cea6b93..01318dd 100644 --- a/generic/tcl.decls +++ b/generic/tcl.decls @@ -2111,7 +2111,7 @@ declare 579 { # ----- BASELINE -- FOR -- 8.5.0 ----- # -declare 668 { +declare 670 { void TclUnusedStubEntry(void) } diff --git a/generic/tclDecls.h b/generic/tclDecls.h index 7a76c4a..10e9fc8 100644 --- a/generic/tclDecls.h +++ b/generic/tclDecls.h @@ -3500,9 +3500,11 @@ EXTERN void Tcl_AppendPrintfToObj(Tcl_Obj *objPtr, /* Slot 665 is reserved */ /* Slot 666 is reserved */ /* Slot 667 is reserved */ +/* Slot 668 is reserved */ +/* Slot 669 is reserved */ #ifndef TclUnusedStubEntry_TCL_DECLARED #define TclUnusedStubEntry_TCL_DECLARED -/* 668 */ +/* 670 */ EXTERN void TclUnusedStubEntry(void); #endif @@ -4208,7 +4210,9 @@ typedef struct TclStubs { VOID *reserved665; VOID *reserved666; VOID *reserved667; - void (*tclUnusedStubEntry) (void); /* 668 */ + VOID *reserved668; + VOID *reserved669; + void (*tclUnusedStubEntry) (void); /* 670 */ } TclStubs; extern TclStubs *tclStubsPtr; @@ -6649,9 +6653,11 @@ extern TclStubs *tclStubsPtr; /* Slot 665 is reserved */ /* Slot 666 is reserved */ /* Slot 667 is reserved */ +/* Slot 668 is reserved */ +/* Slot 669 is reserved */ #ifndef TclUnusedStubEntry #define TclUnusedStubEntry \ - (tclStubsPtr->tclUnusedStubEntry) /* 668 */ + (tclStubsPtr->tclUnusedStubEntry) /* 670 */ #endif #endif /* defined(USE_TCL_STUBS) && !defined(USE_TCL_STUB_PROCS) */ diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 1fcd92b..3859995 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -1466,7 +1466,9 @@ TclStubs tclStubs = { NULL, /* 665 */ NULL, /* 666 */ NULL, /* 667 */ - TclUnusedStubEntry, /* 668 */ + NULL, /* 668 */ + NULL, /* 669 */ + TclUnusedStubEntry, /* 670 */ }; /* !END!: Do not edit above this line. */ -- cgit v0.12 From 21d713fe09d0989cd5661b02ae415537c7863826 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 23 Feb 2022 14:24:15 +0000 Subject: Fix [d282fcacd1]: signed integer overflow in ScanNumber() --- generic/tclBinary.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generic/tclBinary.c b/generic/tclBinary.c index 5d317fa..fdb7f59 100644 --- a/generic/tclBinary.c +++ b/generic/tclBinary.c @@ -2102,12 +2102,12 @@ ScanNumber( value = (long) (buffer[0] + (buffer[1] << 8) + (buffer[2] << 16) - + (((long)buffer[3]) << 24)); + + (((unsigned long)buffer[3]) << 24)); } else { value = (long) (buffer[3] + (buffer[2] << 8) + (buffer[1] << 16) - + (((long) buffer[0]) << 24)); + + (((unsigned long) buffer[0]) << 24)); } /* -- cgit v0.12 From 9f8ca234489c677193efb409fef485ce4774e8c6 Mon Sep 17 00:00:00 2001 From: "jan.nijtmans" Date: Wed, 23 Feb 2022 14:30:35 +0000 Subject: Fix [cb90038a63]: signed integer overflow during expr-34.22, expr-36.22 --- generic/tclExecute.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/generic/tclExecute.c b/generic/tclExecute.c index 97ac1f0..b96eab4 100644 --- a/generic/tclExecute.c +++ b/generic/tclExecute.c @@ -6286,7 +6286,8 @@ TEBCresume( (lResult * l2 != l1)) { lResult -= 1; } - lResult = l1 - l2*lResult; + lResult = (long)((unsigned long)l1 - + (unsigned long)l2*(unsigned long)lResult); goto longResultOfArithmetic; } break; @@ -8544,7 +8545,8 @@ ExecuteExtendedBinaryMathOp( && (wQuotient * w2 != w1)) { wQuotient -= (Tcl_WideInt) 1; } - wRemainder = w1 - w2*wQuotient; + wRemainder = (Tcl_WideInt)((Tcl_WideUInt)w1 - + (Tcl_WideUInt)w2*(Tcl_WideUInt)wQuotient); WIDE_RESULT(wRemainder); } -- cgit v0.12