diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-16 09:20:37 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-12-16 09:20:37 (GMT) |
| commit | 7412df76287c6bb7de3d7277b35b2435b368a9e5 (patch) | |
| tree | bf01ca09f119e0a46a048fda518a99561b4e0f8c | |
| parent | 4fd7e9f423333817282585809e4f2ebcffd2146b (diff) | |
| parent | c47479ba6c67cf43f292330459141c46ecc8186b (diff) | |
| download | tcl-7412df76287c6bb7de3d7277b35b2435b368a9e5.zip tcl-7412df76287c6bb7de3d7277b35b2435b368a9e5.tar.gz tcl-7412df76287c6bb7de3d7277b35b2435b368a9e5.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclBasic.c | 12 | ||||
| -rw-r--r-- | generic/tclHash.c | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c index 29392d2..45a430f 100644 --- a/generic/tclBasic.c +++ b/generic/tclBasic.c @@ -4001,7 +4001,9 @@ Tcl_CreateMathFunc( data->proc = proc; data->numArgs = numArgs; data->argTypes = (Tcl_ValueType *)ckalloc(numArgs * sizeof(Tcl_ValueType)); - memcpy(data->argTypes, argTypes, numArgs * sizeof(Tcl_ValueType)); + if ((numArgs > 0) && (argTypes != NULL)) { + memcpy(data->argTypes, argTypes, numArgs * sizeof(Tcl_ValueType)); + } data->clientData = clientData; Tcl_DStringInit(&bigName); @@ -8299,15 +8301,15 @@ ExprRandFunc( * take into consideration the thread this interp is running in. */ - iPtr->randSeed = TclpGetClicks() + (PTR2INT(Tcl_GetCurrentThread())<<12); + iPtr->randSeed = TclpGetClicks() + PTR2UINT(Tcl_GetCurrentThread())*4093U; /* * Make sure 1 <= randSeed <= (2^31) - 2. See below. */ - iPtr->randSeed &= 0x7FFFFFFF; - if ((iPtr->randSeed == 0) || (iPtr->randSeed == 0x7FFFFFFF)) { - iPtr->randSeed ^= 123459876; + iPtr->randSeed &= 0x7FFFFFFFL; + if ((iPtr->randSeed == 0) || (iPtr->randSeed == 0x7FFFFFFFL)) { + iPtr->randSeed ^= 123459876L; } } diff --git a/generic/tclHash.c b/generic/tclHash.c index df1036b..fa30cee 100644 --- a/generic/tclHash.c +++ b/generic/tclHash.c @@ -35,7 +35,7 @@ */ #define RANDOM_INDEX(tablePtr, i) \ - ((((i)*1103515245L) >> (tablePtr)->downShift) & (tablePtr)->mask) + ((((i)*1103515245UL) >> (tablePtr)->downShift) & (tablePtr)->mask) /* * Prototypes for the array hash key methods. |