diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2021-07-13 23:18:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-13 23:18:28 (GMT) |
| commit | bb260c2a212aee2a7d7a32bf5208fd554bf72713 (patch) | |
| tree | cfdd7bdb3afba63d966183bdf5dad5573fb08030 | |
| parent | 425756abdc03263ab3a52b068befd1ddb16c2dd2 (diff) | |
| download | cpython-bb260c2a212aee2a7d7a32bf5208fd554bf72713.zip cpython-bb260c2a212aee2a7d7a32bf5208fd554bf72713.tar.gz cpython-bb260c2a212aee2a7d7a32bf5208fd554bf72713.tar.bz2 | |
[3.10] bpo-44630: Fix assertion errors in csv module (GH-27127) (GH-27129)
Fix incorrect handling of exceptions when interpreting dialect objects in
the csv module. Not clearing exceptions between calls to
PyObject_GetAttrString() causes assertion failures in pydebug mode (or with
assertions enabled).
Add a minimal test that would've caught this (passing None as dialect, or
any object that isn't a csv.Dialect subclass, which the csv module allows
and caters to, even though it is not documented.) In pydebug mode, the test
triggers the assertion failure in the old code.
Contributed-By: T. Wouters [Google]
(cherry picked from commit 0093876328afa330224c9d887c18dee0b3117852)
Co-authored-by: T. Wouters <thomas@python.org>
Automerge-Triggered-By: GH:gpshead
| -rw-r--r-- | Lib/test/test_csv.py | 6 | ||||
| -rw-r--r-- | Modules/_csv.c | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Lib/test/test_csv.py b/Lib/test/test_csv.py index 225f5c7..18b86aa 100644 --- a/Lib/test/test_csv.py +++ b/Lib/test/test_csv.py @@ -458,9 +458,15 @@ class TestDialectRegistry(unittest.TestCase): class testUni(csv.excel): delimiter = "\u039B" + class unspecified(): + # A class to pass as dialect but with no dialect attributes. + pass + csv.register_dialect('testC', testC) try: self.compare_dialect_123("1,2,3\r\n") + self.compare_dialect_123("1,2,3\r\n", dialect=None) + self.compare_dialect_123("1,2,3\r\n", dialect=unspecified) self.compare_dialect_123("1\t2\t3\r\n", testA) self.compare_dialect_123("1:2:3\r\n", dialect=testB()) self.compare_dialect_123("1|2|3\r\n", dialect='testC') diff --git a/Modules/_csv.c b/Modules/_csv.c index 78855b8..3109fd1 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -421,9 +421,14 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) Py_XINCREF(skipinitialspace); Py_XINCREF(strict); if (dialect != NULL) { -#define DIALECT_GETATTR(v, n) \ - if (v == NULL) \ - v = PyObject_GetAttrString(dialect, n) +#define DIALECT_GETATTR(v, n) \ + do { \ + if (v == NULL) { \ + v = PyObject_GetAttrString(dialect, n); \ + if (v == NULL) \ + PyErr_Clear(); \ + } \ + } while (0) DIALECT_GETATTR(delimiter, "delimiter"); DIALECT_GETATTR(doublequote, "doublequote"); DIALECT_GETATTR(escapechar, "escapechar"); @@ -432,7 +437,6 @@ dialect_new(PyTypeObject *type, PyObject *args, PyObject *kwargs) DIALECT_GETATTR(quoting, "quoting"); DIALECT_GETATTR(skipinitialspace, "skipinitialspace"); DIALECT_GETATTR(strict, "strict"); - PyErr_Clear(); } /* check types and convert to C values */ |