pythoncapi
diff --git a/‎Modules/_ctypes/_ctypes.c‎
Lines changed: 37 additions & 18 deletions b/‎Modules/_ctypes/_ctypes.c‎
Lines changed: 37 additions & 18 deletions
diff --git a/‎Modules/_ctypes/callbacks.c‎
Lines changed: 3 additions & 2 deletions b/‎Modules/_ctypes/callbacks.c‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎Modules/_decimal/_decimal.c‎
Lines changed: 13 additions & 6 deletions b/‎Modules/_decimal/_decimal.c‎
Lines changed: 13 additions & 6 deletions
diff --git a/‎Modules/_pickle.c‎
Lines changed: 1 addition & 2 deletions b/‎Modules/_pickle.c‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎Modules/_sqlite/connection.c‎
Lines changed: 2 additions & 1 deletion b/‎Modules/_sqlite/connection.c‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎Modules/_sqlite/statement.c‎
Lines changed: 1 addition & 2 deletions b/‎Modules/_sqlite/statement.c‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎Modules/itertoolsmodule.c‎
Lines changed: 6 additions & 3 deletions b/‎Modules/itertoolsmodule.c‎
Lines changed: 6 additions & 3 deletions
diff --git a/‎Modules/main.c‎
Lines changed: 3 additions & 1 deletion b/‎Modules/main.c‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎Modules/signalmodule.c‎
Lines changed: 1 addition & 2 deletions b/‎Modules/signalmodule.c‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎Modules/socketmodule.c‎
Lines changed: 5 additions & 3 deletions b/‎Modules/socketmodule.c‎
Lines changed: 5 additions & 3 deletions
@@ -440,8 +440,11 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
         return NULL;
 
     /* keep this for bw compatibility */
-    if (PyDict_GetItemString(result->tp_dict, "_abstract_"))
+    PyObject *abstract = PyDict_GetItemRefString(result->tp_dict, "_abstract_");
+    if (abstract) {
+        Py_DECREF(abstract);
         return (PyObject *)result;
+    }
 
     dict = (StgDictObject *)_PyObject_CallNoArg((PyObject *)&PyCStgDict_Type);
     if (!dict) {
@@ -464,7 +467,7 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
 
     dict->paramfunc = StructUnionType_paramfunc;
 
-    fields = PyDict_GetItemString((PyObject *)dict, "_fields_");
+    fields = PyDict_GetItemRefString((PyObject *)dict, "_fields_");
     if (!fields) {
         StgDictObject *basedict = PyType_stgdict((PyObject *)result->tp_base);
 
@@ -482,8 +485,10 @@ StructUnionType_new(PyTypeObject *type, PyObject *args, PyObject *kwds, int isSt
 
     if (-1 == PyObject_SetAttrString((PyObject *)result, "_fields_", fields)) {
         Py_DECREF(result);
+        Py_DECREF(fields);
         return NULL;
     }
+    Py_DECREF(fields);
     return (PyObject *)result;
 }
 
@@ -987,10 +992,11 @@ PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     stgdict->paramfunc = PyCPointerType_paramfunc;
     stgdict->flags |= TYPEFLAG_ISPOINTER;
 
-    proto = PyDict_GetItemString(typedict, "_type_"); /* Borrowed ref */
+    proto = PyDict_GetItemRefString(typedict, "_type_");
     Py_DECREF(typedict);
     if (proto && -1 == PyCPointerType_SetProto(stgdict, proto)) {
         Py_DECREF((PyObject *)stgdict);
+        Py_DECREF(proto);
         return NULL;
     }
 
@@ -1014,8 +1020,10 @@ PyCPointerType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
         }
         if (stgdict->format == NULL) {
             Py_DECREF((PyObject *)stgdict);
+            Py_DECREF(proto);
             return NULL;
         }
+        Py_DECREF(proto);
     }
 
     /* create the new instance (which is a class,
@@ -2298,47 +2306,50 @@ make_funcptrtype_dict(StgDictObject *stgdict)
     stgdict->getfunc = NULL;
     stgdict->ffi_type_pointer = ffi_type_pointer;
 
-    ob = PyDict_GetItemString((PyObject *)stgdict, "_flags_");
+    ob = PyDict_GetItemRefString((PyObject *)stgdict, "_flags_");
     if (!ob || !PyLong_Check(ob)) {
+        Py_XDECREF(ob);
         PyErr_SetString(PyExc_TypeError,
             "class must define _flags_ which must be an integer");
         return -1;
     }
     stgdict->flags = PyLong_AS_LONG(ob) | TYPEFLAG_ISPOINTER;
+    Py_DECREF(ob);
 
     /* _argtypes_ is optional... */
-    ob = PyDict_GetItemString((PyObject *)stgdict, "_argtypes_");
+    ob = PyDict_GetItemRefString((PyObject *)stgdict, "_argtypes_");
     if (ob) {
         converters = converters_from_argtypes(ob);
-        if (!converters)
+        if (!converters) {
+            Py_DECREF(ob);
             goto error;
-        Py_INCREF(ob);
+        }
         stgdict->argtypes = ob;
         stgdict->converters = converters;
     }
 
-    ob = PyDict_GetItemString((PyObject *)stgdict, "_restype_");
+    ob = PyDict_GetItemRefString((PyObject *)stgdict, "_restype_");
     if (ob) {
         if (ob != Py_None && !PyType_stgdict(ob) && !PyCallable_Check(ob)) {
+            Py_DECREF(ob);
             PyErr_SetString(PyExc_TypeError,
                 "_restype_ must be a type, a callable, or None");
             return -1;
         }
-        Py_INCREF(ob);
         stgdict->restype = ob;
         stgdict->checker = PyObject_GetAttrString(ob, "_check_retval_");
         if (stgdict->checker == NULL)
             PyErr_Clear();
     }
 /* XXX later, maybe.
-    ob = PyDict_GetItemString((PyObject *)stgdict, "_errcheck_");
+    ob = PyDict_GetItemRefString((PyObject *)stgdict, "_errcheck_");
     if (ob) {
         if (!PyCallable_Check(ob)) {
             PyErr_SetString(PyExc_TypeError,
                 "_errcheck_ must be callable");
+            Py_DECREF(ob);
             return -1;
         }
-        Py_INCREF(ob);
         stgdict->errcheck = ob;
     }
 */
@@ -3546,7 +3557,11 @@ PyCFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
        like that.
     */
 /*
-    if (kwds && PyDict_GetItemString(kwds, "options")) {
+    if (kwds) {
+        PyObject *options = PyDict_GetItemRefString(kwds, "options");
+        if (options) {
+            Py_DECREF(options);
+        }
         ...
     }
 */
@@ -4181,7 +4196,7 @@ _init_pos_args(PyObject *self, PyTypeObject *type,
     }
 
     dict = PyType_stgdict((PyObject *)type);
-    fields = PyDict_GetItemString((PyObject *)dict, "_fields_");
+    fields = PyDict_GetItemRefString((PyObject *)dict, "_fields_");
     if (fields == NULL)
         return index;
 
@@ -4192,14 +4207,13 @@ _init_pos_args(PyObject *self, PyTypeObject *type,
         PyObject *name, *val;
         int res;
         if (!pair)
-            return -1;
+            goto error;
         name = PySequence_GetItem(pair, 0);
         if (!name) {
             Py_DECREF(pair);
-            return -1;
+            goto error;
         }
         val = PyTuple_GetItemRef(args, i + index);
-        Py_DECREF(val);
         if (kwds) {
             PyObject *existing = PyDict_GetItemRef(kwds, name);
             if (existing) {
@@ -4209,17 +4223,22 @@ _init_pos_args(PyObject *self, PyTypeObject *type,
                 Py_DECREF(existing);
                 Py_DECREF(pair);
                 Py_DECREF(name);
-                return -1;
+                Py_DECREF(val);
+                goto error;
             }
         }
 
         res = PyObject_SetAttr(self, name, val);
+        Py_DECREF(val);
         Py_DECREF(pair);
         Py_DECREF(name);
         if (res == -1)
-            return -1;
+            goto error;
     }
     return index + dict->length;
+error:
+    Py_DECREF(fields);
+    return -1;
 }
 
 static int
 
@@ -108,9 +108,10 @@ TryAddRef(StgDictObject *dict, CDataObject *obj)
 {
     IUnknown *punk;
 
-    if (NULL == PyDict_GetItemString((PyObject *)dict, "_needs_com_addref_"))
+    PyObject *add_ref = PyDict_GetItemRefString((PyObject *)dict, "_needs_com_addref_");
+    if (NULL == add_ref)
         return;
-
+    Py_DECREF(add_ref);
     punk = *(IUnknown **)obj->b_ptr;
     if (punk)
         punk->lpVtbl->AddRef(punk);
 
@@ -3125,22 +3125,29 @@ dec_format(PyObject *dec, PyObject *args)
                 "optional argument must be a dict");
             goto finish;
         }
-        if ((dot = PyDict_GetItemString(override, "decimal_point"))) {
-            if ((dot = PyUnicode_AsUTF8String(dot)) == NULL) {
+        PyObject *tmp;
+        if ((dot = PyDict_GetItemRefString(override, "decimal_point"))) {
+            if ((tmp = PyUnicode_AsUTF8String(dot)) == NULL) {
                 goto finish;
             }
+            Py_DECREF(dot);
+            dot = tmp;
             spec.dot = PyBytes_AS_STRING(dot);
         }
-        if ((sep = PyDict_GetItemString(override, "thousands_sep"))) {
-            if ((sep = PyUnicode_AsUTF8String(sep)) == NULL) {
+        if ((sep = PyDict_GetItemRefString(override, "thousands_sep"))) {
+            if ((tmp = PyUnicode_AsUTF8String(sep)) == NULL) {
                 goto finish;
             }
+            Py_DECREF(sep);
+            sep = tmp;
             spec.sep = PyBytes_AS_STRING(sep);
         }
-        if ((grouping = PyDict_GetItemString(override, "grouping"))) {
-            if ((grouping = PyUnicode_AsUTF8String(grouping)) == NULL) {
+        if ((grouping = PyDict_GetItemRefString(override, "grouping"))) {
+            if ((tmp = PyUnicode_AsUTF8String(grouping)) == NULL) {
                 goto finish;
             }
+            Py_DECREF(grouping);
+            grouping = tmp;
             spec.grouping = PyBytes_AS_STRING(grouping);
         }
         if (mpd_validate_lconv(&spec) < 0) {
 
@@ -218,10 +218,9 @@ _Pickle_InitState(PickleState *st)
     builtins = PyEval_GetBuiltins();
     if (builtins == NULL)
         goto error;
-    st->getattr = PyDict_GetItemString(builtins, "getattr");
+    st->getattr = PyDict_GetItemRefString(builtins, "getattr");
     if (st->getattr == NULL)
         goto error;
-    Py_INCREF(st->getattr);
 
     copyreg = PyImport_ImportModule("copyreg");
     if (!copyreg)
 
@@ -1458,7 +1458,7 @@ pysqlite_connection_iterdump(pysqlite_Connection* self, PyObject* args)
         goto finally;
     }
 
-    pyfn_iterdump = PyDict_GetItemString(module_dict, "_iterdump");
+    pyfn_iterdump = PyDict_GetItemRefString(module_dict, "_iterdump");
     if (!pyfn_iterdump) {
         PyErr_SetString(pysqlite_OperationalError, "Failed to obtain _iterdump() reference");
         goto finally;
@@ -1473,6 +1473,7 @@ pysqlite_connection_iterdump(pysqlite_Connection* self, PyObject* args)
     retval = PyObject_CallObject(pyfn_iterdump, args);
 
 finally:
+    Py_XDECREF(pyfn_iterdump);
     Py_XDECREF(args);
     Py_XDECREF(module);
     return retval;
 
@@ -281,8 +281,7 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para
 
             binding_name++; /* skip first char (the colon) */
             if (PyDict_CheckExact(parameters)) {
-                current_param = PyDict_GetItemString(parameters, binding_name);
-                Py_XINCREF(current_param);
+                current_param = PyDict_GetItemRefString(parameters, binding_name);
             } else {
                 current_param = PyMapping_GetItemString(parameters, binding_name);
             }
 
@@ -4351,16 +4351,20 @@ zip_longest_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     Py_ssize_t i;
     PyObject *ittuple;  /* tuple of iterators */
     PyObject *result;
-    PyObject *fillvalue = Py_None;
+    PyObject *fillvalue;
     Py_ssize_t tuplesize;
 
     if (kwds != NULL && PyDict_CheckExact(kwds) && PyDict_GET_SIZE(kwds) > 0) {
-        fillvalue = PyDict_GetItemString(kwds, "fillvalue");
+        fillvalue = PyDict_GetItemRefString(kwds, "fillvalue");
         if (fillvalue == NULL || PyDict_GET_SIZE(kwds) > 1) {
+            Py_XDECREF(fillvalue);
             PyErr_SetString(PyExc_TypeError,
                 "zip_longest() got an unexpected keyword argument");
             return NULL;
         }
+    } else {
+        fillvalue = Py_None;
+        Py_INCREF(fillvalue);
     }
 
     /* args must be a tuple */
@@ -4407,7 +4411,6 @@ zip_longest_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
     lz->tuplesize = tuplesize;
     lz->numactive = tuplesize;
     lz->result = result;
-    Py_INCREF(fillvalue);
     lz->fillvalue = fillvalue;
     return (PyObject *)lz;
 }
 
@@ -501,7 +501,7 @@ pymain_sys_path_add_path0(PyInterpreterState *interp, PyObject *path0)
     PyObject *sys_path;
     PyObject *sysdict = interp->sysdict;
     if (sysdict != NULL) {
-        sys_path = PyDict_GetItemString(sysdict, "path");
+        sys_path = PyDict_GetItemRefString(sysdict, "path");
     }
     else {
         sys_path = NULL;
@@ -512,8 +512,10 @@ pymain_sys_path_add_path0(PyInterpreterState *interp, PyObject *path0)
     }
 
     if (PyList_Insert(sys_path, 0, path0)) {
+        Py_DECREF(sys_path);
         goto error;
     }
+    Py_DECREF(sys_path);
     return 0;
 
 error:
 
@@ -1325,10 +1325,9 @@ PyInit__signal(void)
          goto finally;
 #endif
 
-    x = IntHandler = PyDict_GetItemString(d, "default_int_handler");
+    x = IntHandler = PyDict_GetItemRefString(d, "default_int_handler");
     if (!x)
         goto finally;
-    Py_INCREF(IntHandler);
 
     _Py_atomic_store_relaxed(&Handlers[0].tripped, 0);
     for (i = 1; i < NSIG; i++) {
 
@@ -358,9 +358,11 @@ remove_unusable_flags(PyObject *m)
             break;
         }
         else {
-            if (PyDict_GetItemString(
-                    dict,
-                    win_runtime_flags[i].flag_name) != NULL) {
+            PyObject *flag = PyDict_GetItemRefString(
+                dict,
+                win_runtime_flags[i].flag_name);
+            if (flag != NULL) {
+                Py_DECREF(flag);
                 PyDict_DelItemString(
                     dict,
                     win_runtime_flags[i].flag_name);
Original file line number	Diff line number	Diff line change
`@@ -3125,22 +3125,29 @@ dec_format(PyObject dec, PyObject args)`
`3125`	`3125`	`"optional argument must be a dict");`
`3126`	`3126`	`goto finish;`
`3127`	`3127`	`}`
`3128`		`- if ((dot = PyDict_GetItemString(override, "decimal_point"))) {`
`3129`		`- if ((dot = PyUnicode_AsUTF8String(dot)) == NULL) {`
	`3128`	`+ PyObject *tmp;`
	`3129`	`+ if ((dot = PyDict_GetItemRefString(override, "decimal_point"))) {`
	`3130`	`+ if ((tmp = PyUnicode_AsUTF8String(dot)) == NULL) {`
`3130`	`3131`	`goto finish;`
`3131`	`3132`	`}`
	`3133`	`+ Py_DECREF(dot);`
	`3134`	`+ dot = tmp;`
`3132`	`3135`	`spec.dot = PyBytes_AS_STRING(dot);`
`3133`	`3136`	`}`
`3134`		`- if ((sep = PyDict_GetItemString(override, "thousands_sep"))) {`
`3135`		`- if ((sep = PyUnicode_AsUTF8String(sep)) == NULL) {`
	`3137`	`+ if ((sep = PyDict_GetItemRefString(override, "thousands_sep"))) {`
	`3138`	`+ if ((tmp = PyUnicode_AsUTF8String(sep)) == NULL) {`
`3136`	`3139`	`goto finish;`
`3137`	`3140`	`}`
	`3141`	`+ Py_DECREF(sep);`
	`3142`	`+ sep = tmp;`
`3138`	`3143`	`spec.sep = PyBytes_AS_STRING(sep);`
`3139`	`3144`	`}`
`3140`		`- if ((grouping = PyDict_GetItemString(override, "grouping"))) {`
`3141`		`- if ((grouping = PyUnicode_AsUTF8String(grouping)) == NULL) {`
	`3145`	`+ if ((grouping = PyDict_GetItemRefString(override, "grouping"))) {`
	`3146`	`+ if ((tmp = PyUnicode_AsUTF8String(grouping)) == NULL) {`
`3142`	`3147`	`goto finish;`
`3143`	`3148`	`}`
	`3149`	`+ Py_DECREF(grouping);`
	`3150`	`+ grouping = tmp;`
`3144`	`3151`	`spec.grouping = PyBytes_AS_STRING(grouping);`
`3145`	`3152`	`}`
`3146`	`3153`	`if (mpd_validate_lconv(&spec) < 0) {`
Original file line number	Diff line number	Diff line change
`@@ -281,8 +281,7 @@ void pysqlite_statement_bind_parameters(pysqlite_Statement* self, PyObject* para`
`281`	`281`
`282`	`282`	`binding_name++; /* skip first char (the colon) */`
`283`	`283`	`if (PyDict_CheckExact(parameters)) {`
`284`		`- current_param = PyDict_GetItemString(parameters, binding_name);`
`285`		`- Py_XINCREF(current_param);`
	`284`	`+ current_param = PyDict_GetItemRefString(parameters, binding_name);`
`286`	`285`	`} else {`
`287`	`286`	`current_param = PyMapping_GetItemString(parameters, binding_name);`
`288`	`287`	`}`
Original file line number	Diff line number	Diff line change
`@@ -501,7 +501,7 @@ pymain_sys_path_add_path0(PyInterpreterState interp, PyObject path0)`
`501`	`501`	`PyObject *sys_path;`
`502`	`502`	`PyObject *sysdict = interp->sysdict;`
`503`	`503`	`if (sysdict != NULL) {`
`504`		`- sys_path = PyDict_GetItemString(sysdict, "path");`
	`504`	`+ sys_path = PyDict_GetItemRefString(sysdict, "path");`
`505`	`505`	`}`
`506`	`506`	`else {`
`507`	`507`	`sys_path = NULL;`
`@@ -512,8 +512,10 @@ pymain_sys_path_add_path0(PyInterpreterState interp, PyObject path0)`
`512`	`512`	`}`
`513`	`513`
`514`	`514`	`if (PyList_Insert(sys_path, 0, path0)) {`
	`515`	`+ Py_DECREF(sys_path);`
`515`	`516`	`goto error;`
`516`	`517`	`}`
	`518`	`+ Py_DECREF(sys_path);`
`517`	`519`	`return 0;`
`518`	`520`
`519`	`521`	`error:`