summaryrefslogtreecommitdiff
path: root/Python/errors.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2016-12-11 14:39:01 +0200
committerSerhiy Storchaka <storchaka@gmail.com>2016-12-11 14:39:01 +0200
commitd0b6fb7b0d6470bbda59e2d939ab8c9f6e77deea (patch)
tree0e285dd47c6bc5d835544b32597c975455491cad /Python/errors.c
parent64dd02151dd046bcd7c590413ff7f688005bcb80 (diff)
downloadcpython-d0b6fb7b0d6470bbda59e2d939ab8c9f6e77deea.tar.gz
Issue #28512: Fixed setting the offset attribute of SyntaxError by
PyErr_SyntaxLocationEx() and PyErr_SyntaxLocationObject().
Diffstat (limited to 'Python/errors.c')
-rw-r--r--Python/errors.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/Python/errors.c b/Python/errors.c
index dd01448518..ebfb3fdf24 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -1009,16 +1009,15 @@ PyErr_SyntaxLocationObject(PyObject *filename, int lineno, int col_offset)
PyErr_Clear();
Py_DECREF(tmp);
}
+ tmp = NULL;
if (col_offset >= 0) {
tmp = PyLong_FromLong(col_offset);
if (tmp == NULL)
PyErr_Clear();
- else {
- if (_PyObject_SetAttrId(v, &PyId_offset, tmp))
- PyErr_Clear();
- Py_DECREF(tmp);
- }
}
+ if (_PyObject_SetAttrId(v, &PyId_offset, tmp ? tmp : Py_None))
+ PyErr_Clear();
+ Py_XDECREF(tmp);
if (filename != NULL) {
if (_PyObject_SetAttrId(v, &PyId_filename, filename))
PyErr_Clear();
@@ -1030,9 +1029,6 @@ PyErr_SyntaxLocationObject(PyObject *filename, int lineno, int col_offset)
Py_DECREF(tmp);
}
}
- if (_PyObject_SetAttrId(v, &PyId_offset, Py_None)) {
- PyErr_Clear();
- }
if (exc != PyExc_SyntaxError) {
if (!_PyObject_HasAttrId(v, &PyId_msg)) {
tmp = PyObject_Str(v);