https://github.com/python/cpython/commit/a00221e5a70e54a281ba0e2cff8d85cd37ae305f
commit: a00221e5a70e54a281ba0e2cff8d85cd37ae305f
branch: main
author: AN Long <[email protected]>
committer: kumaraditya303 <[email protected]>
date: 2024-10-11T23:25:36+05:30
summary:
gh-116738: Make `_csv` module thread-safe (#118344)
files:
M Modules/_csv.c
diff --git a/Modules/_csv.c b/Modules/_csv.c
index 913560ce4a0ee3..1a4dc3f1f55ace 100644
--- a/Modules/_csv.c
+++ b/Modules/_csv.c
@@ -14,6 +14,7 @@ module instead.
#endif
#include "Python.h"
+#include "pycore_pyatomic_ft_wrappers.h"
#include <stddef.h> // offsetof()
#include <stdbool.h>
@@ -34,7 +35,7 @@ typedef struct {
PyTypeObject *dialect_type;
PyTypeObject *reader_type;
PyTypeObject *writer_type;
- long field_limit; /* max parsed field size */
+ Py_ssize_t field_limit; /* max parsed field size */
PyObject *str_write;
} _csvstate;
@@ -706,10 +707,11 @@ parse_grow_buff(ReaderObj *self)
static int
parse_add_char(ReaderObj *self, _csvstate *module_state, Py_UCS4 c)
{
- if (self->field_len >= module_state->field_limit) {
+ Py_ssize_t field_limit =
FT_ATOMIC_LOAD_SSIZE_RELAXED(module_state->field_limit);
+ if (self->field_len >= field_limit) {
PyErr_Format(module_state->error_obj,
- "field larger than field limit (%ld)",
- module_state->field_limit);
+ "field larger than field limit (%zd)",
+ field_limit);
return -1;
}
if (self->field_len == self->field_size && !parse_grow_buff(self))
@@ -1659,20 +1661,20 @@ _csv_field_size_limit_impl(PyObject *module, PyObject
*new_limit)
/*[clinic end generated code: output=f2799ecd908e250b input=cec70e9226406435]*/
{
_csvstate *module_state = get_csv_state(module);
- long old_limit = module_state->field_limit;
+ Py_ssize_t old_limit =
FT_ATOMIC_LOAD_SSIZE_RELAXED(module_state->field_limit);
if (new_limit != NULL) {
if (!PyLong_CheckExact(new_limit)) {
PyErr_Format(PyExc_TypeError,
"limit must be an integer");
return NULL;
}
- module_state->field_limit = PyLong_AsLong(new_limit);
- if (module_state->field_limit == -1 && PyErr_Occurred()) {
- module_state->field_limit = old_limit;
+ Py_ssize_t new_limit_value = PyLong_AsSsize_t(new_limit);
+ if (new_limit_value == -1 && PyErr_Occurred()) {
return NULL;
}
+ FT_ATOMIC_STORE_SSIZE_RELAXED(module_state->field_limit,
new_limit_value);
}
- return PyLong_FromLong(old_limit);
+ return PyLong_FromSsize_t(old_limit);
}
static PyType_Slot error_slots[] = {
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
