Handle TclVarHashCreateVar() returning NULL

jan.nijtmans · jan.nijtmans · commit 80e4e6f9536c · 2025-04-16T10:02:54.000Z
diff --git a/generic/itclCmd.c b/generic/itclCmd.c
@@ -1860,10 +1860,9 @@ Itcl_AddComponentCmd(
             Tcl_GetString(ivPtr->namePtr));
     hPtr = Tcl_CreateHashEntry(&contextIoPtr->objectVariables,
             (char *)ivPtr, &isNew);
-    if (isNew) {
+    if (hPtr && isNew) {
 	Itcl_PreserveVar(varPtr);
-        Tcl_SetHashValue(hPtr, varPtr);
-    } else {
+	Tcl_SetHashValue(hPtr, varPtr);
     }
     return result;
 }
diff --git a/generic/itclMigrate2TclCore.c b/generic/itclMigrate2TclCore.c
@@ -67,7 +67,9 @@ Tcl_NewNamespaceVar(
 
     varPtr = TclVarHashCreateVar(&((Namespace *)nsPtr)->varTable,
             varName, &isNew);
-    TclSetVarNamespaceVar(varPtr);
+    if (varPtr) {
+	TclSetVarNamespaceVar(varPtr);
+    }
     return (Tcl_Var)varPtr;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1860,10 +1860,9 @@ Itcl_AddComponentCmd(`
`1860`	`1860`	`Tcl_GetString(ivPtr->namePtr));`
`1861`	`1861`	`hPtr = Tcl_CreateHashEntry(&contextIoPtr->objectVariables,`
`1862`	`1862`	`(char *)ivPtr, &isNew);`
`1863`		`- if (isNew) {`
	`1863`	`+ if (hPtr && isNew) {`
`1864`	`1864`	`Itcl_PreserveVar(varPtr);`
`1865`		`- Tcl_SetHashValue(hPtr, varPtr);`
`1866`		`- } else {`
	`1865`	`+ Tcl_SetHashValue(hPtr, varPtr);`
`1867`	`1866`	`}`
`1868`	`1867`	`return result;`
`1869`	`1868`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,9 @@ Tcl_NewNamespaceVar(`
`67`	`67`
`68`	`68`	`varPtr = TclVarHashCreateVar(&((Namespace *)nsPtr)->varTable,`
`69`	`69`	`varName, &isNew);`
`70`		`- TclSetVarNamespaceVar(varPtr);`
	`70`	`+ if (varPtr) {`
	`71`	`+ TclSetVarNamespaceVar(varPtr);`
	`72`	`+ }`
`71`	`73`	`return (Tcl_Var)varPtr;`
`72`	`74`	`}`
`73`	`75`