diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2012-09-25 02:30:27 -0700 |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2012-09-25 02:30:27 -0700 |
| commit | 67b7b98a479a5703a5707b6ea0cf81d3e0b441ea (patch) | |
| tree | 159bf3e8c217bfb7bf16ac7bccc3e73dde62399a /Modules/_csv.c | |
| parent | 9bb56a66c548e84012de141e4665ea39701c1e5f (diff) | |
| download | cpython-git-67b7b98a479a5703a5707b6ea0cf81d3e0b441ea.tar.gz | |
Issue #16013: Fix CSV Reader parsing issue with ending quote characters. Patch by Serhiy Storchaka.
Diffstat (limited to 'Modules/_csv.c')
| -rw-r--r-- | Modules/_csv.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Modules/_csv.c b/Modules/_csv.c index 6c564d727b..88d4f9774f 100644 --- a/Modules/_csv.c +++ b/Modules/_csv.c @@ -759,9 +759,13 @@ Reader_iternext(ReaderObj *self) lineobj = PyIter_Next(self->input_iter); if (lineobj == NULL) { /* End of input OR exception */ - if (!PyErr_Occurred() && self->field_len != 0) - PyErr_Format(error_obj, - "newline inside string"); + if (!PyErr_Occurred() && (self->field_len != 0 || + self->state == IN_QUOTED_FIELD)) { + if (self->dialect->strict) + PyErr_SetString(error_obj, "unexpected end of data"); + else if (parse_save_field(self) >= 0) + break; + } return NULL; } if (!PyUnicode_Check(lineobj)) { |