@@ -140,7 +140,7 @@ struct _is {
 PyAPI_FUNC(struct _is*) _PyInterpreterState_LookUpID(PY_INT64_T);
 
 PyAPI_FUNC(int) _PyInterpreterState_IDInitref(struct _is *);
-PyAPI_FUNC(void) _PyInterpreterState_IDIncref(struct _is *);
+PyAPI_FUNC(int) _PyInterpreterState_IDIncref(struct _is *);
 PyAPI_FUNC(void) _PyInterpreterState_IDDecref(struct _is *);
 
 
 
@@ -0,0 +1,5 @@
+_PyInterpreterState_IDIncref() now calls _PyInterpreterState_IDInitref() and
+always increments id_refcount. Previously, calling
+_xxsubinterpreters.get_current() could create an id_refcount inconsistency
+when a _xxsubinterpreters.InterpreterID object was deallocated. Patch by
+Victor Stinner.
@@ -23,15 +23,21 @@ newinterpid(PyTypeObject *cls, int64_t id, int force)
         }
     }
 
+    if (interp != NULL) {
+        if (_PyInterpreterState_IDIncref(interp) < 0) {
+            return NULL;
+        }
+    }
+
     interpid *self = PyObject_New(interpid, cls);
     if (self == NULL) {
+        if (interp != NULL) {
+            _PyInterpreterState_IDDecref(interp);
+        }
         return NULL;
     }
     self->id = id;
 
-    if (interp != NULL) {
-        _PyInterpreterState_IDIncref(interp);
-    }
     return self;
 }
 
 
@@ -473,24 +473,25 @@ _PyInterpreterState_IDInitref(PyInterpreterState *interp)
 }
 
 
-void
+int
 _PyInterpreterState_IDIncref(PyInterpreterState *interp)
 {
-    if (interp->id_mutex == NULL) {
-        return;
+    if (_PyInterpreterState_IDInitref(interp) < 0) {
+        return -1;
     }
+
     PyThread_acquire_lock(interp->id_mutex, WAIT_LOCK);
     interp->id_refcount += 1;
     PyThread_release_lock(interp->id_mutex);
+    return 0;
 }
 
 
 void
 _PyInterpreterState_IDDecref(PyInterpreterState *interp)
 {
-    if (interp->id_mutex == NULL) {
-        return;
-    }
+    assert(interp->id_mutex != NULL);
+
     struct _gilstate_runtime_state *gilstate = &_PyRuntime.gilstate;
     PyThread_acquire_lock(interp->id_mutex, WAIT_LOCK);
     assert(interp->id_refcount != 0);
Original file line number	Diff line number	Diff line change
`@@ -23,15 +23,21 @@ newinterpid(PyTypeObject *cls, int64_t id, int force)`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
	`26`	`+ if (interp != NULL) {`
	`27`	`+ if (_PyInterpreterState_IDIncref(interp) < 0) {`
	`28`	`+ return NULL;`
	`29`	`+ }`
	`30`	`+ }`
	`31`	`+`
`26`	`32`	`interpid *self = PyObject_New(interpid, cls);`
`27`	`33`	`if (self == NULL) {`
	`34`	`+ if (interp != NULL) {`
	`35`	`+ _PyInterpreterState_IDDecref(interp);`
	`36`	`+ }`
`28`	`37`	`return NULL;`
`29`	`38`	`}`
`30`	`39`	`self->id = id;`
`31`	`40`
`32`		`- if (interp != NULL) {`
`33`		`- _PyInterpreterState_IDIncref(interp);`
`34`		`- }`
`35`	`41`	`return self;`
`36`	`42`	`}`
`37`	`43`
Original file line number	Diff line number	Diff line change
`@@ -473,24 +473,25 @@ _PyInterpreterState_IDInitref(PyInterpreterState *interp)`
`473`	`473`	`}`
`474`	`474`
`475`	`475`
`476`		`-void`
	`476`	`+int`
`477`	`477`	`_PyInterpreterState_IDIncref(PyInterpreterState *interp)`
`478`	`478`	`{`
`479`		`- if (interp->id_mutex == NULL) {`
`480`		`- return;`
	`479`	`+ if (_PyInterpreterState_IDInitref(interp) < 0) {`
	`480`	`+ return -1;`
`481`	`481`	`}`
	`482`	`+`
`482`	`483`	`PyThread_acquire_lock(interp->id_mutex, WAIT_LOCK);`
`483`	`484`	`interp->id_refcount += 1;`
`484`	`485`	`PyThread_release_lock(interp->id_mutex);`
	`486`	`+ return 0;`
`485`	`487`	`}`
`486`	`488`
`487`	`489`
`488`	`490`	`void`
`489`	`491`	`_PyInterpreterState_IDDecref(PyInterpreterState *interp)`
`490`	`492`	`{`
`491`		`- if (interp->id_mutex == NULL) {`
`492`		`- return;`
`493`		`- }`
	`493`	`+ assert(interp->id_mutex != NULL);`
	`494`	`+`
`494`	`495`	`struct _gilstate_runtime_state *gilstate = &_PyRuntime.gilstate;`
`495`	`496`	`PyThread_acquire_lock(interp->id_mutex, WAIT_LOCK);`
`496`	`497`	`assert(interp->id_refcount != 0);`