mirror of
				https://github.com/python/cpython.git
				synced 2025-11-03 23:21:29 +00:00 
			
		
		
		
	gh-99537: Use Py_SETREF() function in C code (#99657)
Fix potential race condition in code patterns: * Replace "Py_DECREF(var); var = new;" with "Py_SETREF(var, new);" * Replace "Py_XDECREF(var); var = new;" with "Py_XSETREF(var, new);" * Replace "Py_CLEAR(var); var = new;" with "Py_XSETREF(var, new);" Other changes: * Replace "old = var; var = new; Py_DECREF(var)" with "Py_SETREF(var, new);" * Replace "old = var; var = new; Py_XDECREF(var)" with "Py_XSETREF(var, new);" * And remove the "old" variable.
This commit is contained in:
		
							parent
							
								
									3db0a21f73
								
							
						
					
					
						commit
						135ec7cefb
					
				
					 19 changed files with 34 additions and 76 deletions
				
			
		| 
						 | 
				
			
			@ -801,8 +801,7 @@ next_external_frame(PyFrameObject *frame)
 | 
			
		|||
{
 | 
			
		||||
    do {
 | 
			
		||||
        PyFrameObject *back = PyFrame_GetBack(frame);
 | 
			
		||||
        Py_DECREF(frame);
 | 
			
		||||
        frame = back;
 | 
			
		||||
        Py_SETREF(frame, back);
 | 
			
		||||
    } while (frame != NULL && is_internal_frame(frame));
 | 
			
		||||
 | 
			
		||||
    return frame;
 | 
			
		||||
| 
						 | 
				
			
			@ -828,8 +827,7 @@ setup_context(Py_ssize_t stack_level, PyObject **filename, int *lineno,
 | 
			
		|||
    if (stack_level <= 0 || is_internal_frame(f)) {
 | 
			
		||||
        while (--stack_level > 0 && f != NULL) {
 | 
			
		||||
            PyFrameObject *back = PyFrame_GetBack(f);
 | 
			
		||||
            Py_DECREF(f);
 | 
			
		||||
            f = back;
 | 
			
		||||
            Py_SETREF(f, back);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -168,8 +168,7 @@ builtin___build_class__(PyObject *self, PyObject *const *args, Py_ssize_t nargs,
 | 
			
		|||
            goto error;
 | 
			
		||||
        }
 | 
			
		||||
        if (winner != meta) {
 | 
			
		||||
            Py_DECREF(meta);
 | 
			
		||||
            meta = Py_NewRef(winner);
 | 
			
		||||
            Py_SETREF(meta, Py_NewRef(winner));
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    /* else: meta is not a class, so we cannot do the metaclass
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -8280,9 +8280,7 @@ merge_const_one(PyObject *const_cache, PyObject **obj)
 | 
			
		|||
        t = PyTuple_GET_ITEM(t, 1);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    Py_INCREF(t);
 | 
			
		||||
    Py_DECREF(*obj);
 | 
			
		||||
    *obj = t;
 | 
			
		||||
    Py_SETREF(*obj, Py_NewRef(t));
 | 
			
		||||
    return 1;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -353,16 +353,13 @@ _PyErr_NormalizeException(PyThreadState *tstate, PyObject **exc,
 | 
			
		|||
            if (fixed_value == NULL) {
 | 
			
		||||
                goto error;
 | 
			
		||||
            }
 | 
			
		||||
            Py_DECREF(value);
 | 
			
		||||
            value = fixed_value;
 | 
			
		||||
            Py_SETREF(value, fixed_value);
 | 
			
		||||
        }
 | 
			
		||||
        /* If the class of the instance doesn't exactly match the
 | 
			
		||||
           class of the type, believe the instance.
 | 
			
		||||
        */
 | 
			
		||||
        else if (inclass != type) {
 | 
			
		||||
            Py_INCREF(inclass);
 | 
			
		||||
            Py_DECREF(type);
 | 
			
		||||
            type = inclass;
 | 
			
		||||
            Py_SETREF(type, Py_NewRef(inclass));
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    *exc = type;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1354,8 +1354,7 @@ hamt_node_collision_assoc(PyHamtNode_Collision *self,
 | 
			
		|||
                }
 | 
			
		||||
 | 
			
		||||
                /* Replace the old value with the new value for the our key. */
 | 
			
		||||
                Py_DECREF(new_node->c_array[val_idx]);
 | 
			
		||||
                new_node->c_array[val_idx] = Py_NewRef(val);
 | 
			
		||||
                Py_SETREF(new_node->c_array[val_idx], Py_NewRef(val));
 | 
			
		||||
 | 
			
		||||
                return (PyHamtNode *)new_node;
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -718,8 +718,7 @@ _Py_HandleSystemExit(int *exitcode_p)
 | 
			
		|||
        /* The error code should be in the `code' attribute. */
 | 
			
		||||
        PyObject *code = PyObject_GetAttr(value, &_Py_ID(code));
 | 
			
		||||
        if (code) {
 | 
			
		||||
            Py_DECREF(value);
 | 
			
		||||
            value = code;
 | 
			
		||||
            Py_SETREF(value, code);
 | 
			
		||||
            if (value == Py_None)
 | 
			
		||||
                goto done;
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -198,8 +198,7 @@ sys_audit_tstate(PyThreadState *ts, const char *event,
 | 
			
		|||
        eventArgs = _Py_VaBuildValue_SizeT(argFormat, vargs);
 | 
			
		||||
        if (eventArgs && !PyTuple_Check(eventArgs)) {
 | 
			
		||||
            PyObject *argTuple = PyTuple_Pack(1, eventArgs);
 | 
			
		||||
            Py_DECREF(eventArgs);
 | 
			
		||||
            eventArgs = argTuple;
 | 
			
		||||
            Py_SETREF(eventArgs, argTuple);
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
    else {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -136,9 +136,7 @@ tb_next_set(PyTracebackObject *self, PyObject *new_next, void *Py_UNUSED(_))
 | 
			
		|||
        cursor = cursor->tb_next;
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    PyObject *old_next = (PyObject*)self->tb_next;
 | 
			
		||||
    self->tb_next = (PyTracebackObject *)Py_XNewRef(new_next);
 | 
			
		||||
    Py_XDECREF(old_next);
 | 
			
		||||
    Py_XSETREF(self->tb_next, (PyTracebackObject *)Py_XNewRef(new_next));
 | 
			
		||||
 | 
			
		||||
    return 0;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -533,8 +531,7 @@ display_source_line_with_margin(PyObject *f, PyObject *filename, int lineno, int
 | 
			
		|||
        PyObject *truncated;
 | 
			
		||||
        truncated = PyUnicode_Substring(lineobj, i, PyUnicode_GET_LENGTH(lineobj));
 | 
			
		||||
        if (truncated) {
 | 
			
		||||
            Py_DECREF(lineobj);
 | 
			
		||||
            lineobj = truncated;
 | 
			
		||||
            Py_SETREF(lineobj, truncated);
 | 
			
		||||
        } else {
 | 
			
		||||
            PyErr_Clear();
 | 
			
		||||
        }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue