Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

bpo-43950: Distinguish errors happening on character offset decoding (GH-27217)

This commit is contained in:
Batuhan Taskaya 2021-07-20 18:42:12 +03:00 committed by GitHub
parent 4868b94c60
commit fbc349ff79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Parser/pegen.c
View File

@ -402,7 +402,7 @@ _PyPegen_byte_offset_to_character_offset(PyObject *line, Py_ssize_t col_offset)
{ {
const char *str = PyUnicode_AsUTF8(line); const char *str = PyUnicode_AsUTF8(line);
if (!str) { if (!str) {
return 0; return -1;
} }
Py_ssize_t len = strlen(str); Py_ssize_t len = strlen(str);
if (col_offset > len + 1) { if (col_offset > len + 1) {
@ -411,7 +411,7 @@ _PyPegen_byte_offset_to_character_offset(PyObject *line, Py_ssize_t col_offset)
assert(col_offset >= 0); assert(col_offset >= 0);
PyObject *text = PyUnicode_DecodeUTF8(str, col_offset, "replace"); PyObject *text = PyUnicode_DecodeUTF8(str, col_offset, "replace");
if (!text) { if (!text) {
return 0; return -1;
} }
Py_ssize_t size = PyUnicode_GET_LENGTH(text); Py_ssize_t size = PyUnicode_GET_LENGTH(text);
Py_DECREF(text); Py_DECREF(text);
@ -499,9 +499,17 @@ _PyPegen_raise_error_known_location(Parser *p, PyObject *errtype,
if (p->tok->encoding != NULL) { if (p->tok->encoding != NULL) {
col_number = _PyPegen_byte_offset_to_character_offset(error_line, col_offset); col_number = _PyPegen_byte_offset_to_character_offset(error_line, col_offset);
end_col_number = end_col_number > 0 ? if (col_number < 0) {
_PyPegen_byte_offset_to_character_offset(error_line, end_col_offset) : goto error;
end_col_number; }
if (end_col_number > 0) {
Py_ssize_t end_col_offset = _PyPegen_byte_offset_to_character_offset(error_line, end_col_number);
if (end_col_offset < 0) {
goto error;
} else {
end_col_number = end_col_offset;
}
}
} }
tmp = Py_BuildValue("(OiiNii)", p->tok->filename, lineno, col_number, error_line, end_lineno, end_col_number); tmp = Py_BuildValue("(OiiNii)", p->tok->filename, lineno, col_number, error_line, end_lineno, end_col_number);
if (!tmp) { if (!tmp) {

10
Python/traceback.c
View File

@ -745,7 +745,17 @@ tb_displayline(PyTracebackObject* tb, PyObject *f, PyObject *filename, int linen
// Convert the utf-8 byte offset to the actual character offset so we print the right number of carets. // Convert the utf-8 byte offset to the actual character offset so we print the right number of carets.
assert(source_line); assert(source_line);
Py_ssize_t start_offset = _PyPegen_byte_offset_to_character_offset(source_line, start_col_byte_offset); Py_ssize_t start_offset = _PyPegen_byte_offset_to_character_offset(source_line, start_col_byte_offset);
if (start_offset < 0) {
err = ignore_source_errors() < 0;
goto done;
}
Py_ssize_t end_offset = _PyPegen_byte_offset_to_character_offset(source_line, end_col_byte_offset); Py_ssize_t end_offset = _PyPegen_byte_offset_to_character_offset(source_line, end_col_byte_offset);
if (end_offset < 0) {
err = ignore_source_errors() < 0;
goto done;
}
Py_ssize_t left_end_offset = -1; Py_ssize_t left_end_offset = -1;
Py_ssize_t right_start_offset = -1; Py_ssize_t right_start_offset = -1;