Commita640a60

authored

gh-121652: Handleallocate_weakref returning NULL (#121653)

The `allocate_weakref` may return NULL when out of memory. We need tohandle that case and propagate the error.

1 parenta183474 commita640a60Copy full SHA for a640a60

File tree

-0

lines changed

-0

lines changed

Lines changed: 7 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -426,13 +426,20 @@ get_or_create_weakref(PyTypeObject type, PyObject obj, PyObject *callback)`
`426`	`426`	`returnbasic_ref;`
`427`	`427`	`}`
`428`	`428`	`PyWeakReference*newref=allocate_weakref(type,obj,callback);`
	`429`	`+if (newref==NULL) {`
	`430`	`+UNLOCK_WEAKREFS(obj);`
	`431`	`+returnNULL;`
	`432`	`+ }`
`429`	`433`	`insert_weakref(newref,list);`
`430`	`434`	`UNLOCK_WEAKREFS(obj);`
`431`	`435`	`returnnewref;`
`432`	`436`	`}`
`433`	`437`	`else {`
`434`	`438`	`// We may not be able to safely allocate inside the lock`
`435`	`439`	`PyWeakReference*newref=allocate_weakref(type,obj,callback);`
	`440`	`+if (newref==NULL) {`
	`441`	`+returnNULL;`
	`442`	`+ }`
`436`	`443`	`LOCK_WEAKREFS(obj);`
`437`	`444`	`insert_weakref(newref,list);`
`438`	`445`	`UNLOCK_WEAKREFS(obj);`

Comments

(0)