Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
cython
Commits
4fd90184
Commit
4fd90184
authored
Mar 31, 2020
by
Stefan Behnel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoid relying on signed integer overflow in f-string joining helper function.
parent
65f69510
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
Cython/Utility/StringTools.c
Cython/Utility/StringTools.c
+6
-3
No files found.
Cython/Utility/StringTools.c
View file @
4fd90184
...
@@ -860,7 +860,7 @@ static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_co
...
@@ -860,7 +860,7 @@ static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_co
CYTHON_UNUSED
Py_UCS4
max_char
)
{
CYTHON_UNUSED
Py_UCS4
max_char
)
{
#if CYTHON_USE_UNICODE_INTERNALS && CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
#if CYTHON_USE_UNICODE_INTERNALS && CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS
PyObject
*
result_uval
;
PyObject
*
result_uval
;
int
result_ukind
;
int
result_ukind
,
kind_shift
;
Py_ssize_t
i
,
char_pos
;
Py_ssize_t
i
,
char_pos
;
void
*
result_udata
;
void
*
result_udata
;
#if CYTHON_PEP393_ENABLED
#if CYTHON_PEP393_ENABLED
...
@@ -868,14 +868,17 @@ static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_co
...
@@ -868,14 +868,17 @@ static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_co
result_uval
=
PyUnicode_New
(
result_ulength
,
max_char
);
result_uval
=
PyUnicode_New
(
result_ulength
,
max_char
);
if
(
unlikely
(
!
result_uval
))
return
NULL
;
if
(
unlikely
(
!
result_uval
))
return
NULL
;
result_ukind
=
(
max_char
<=
255
)
?
PyUnicode_1BYTE_KIND
:
(
max_char
<=
65535
)
?
PyUnicode_2BYTE_KIND
:
PyUnicode_4BYTE_KIND
;
result_ukind
=
(
max_char
<=
255
)
?
PyUnicode_1BYTE_KIND
:
(
max_char
<=
65535
)
?
PyUnicode_2BYTE_KIND
:
PyUnicode_4BYTE_KIND
;
kind_shift
=
(
result_ukind
==
PyUnicode_4BYTE_KIND
)
?
2
:
result_ukind
-
1
;
result_udata
=
PyUnicode_DATA
(
result_uval
);
result_udata
=
PyUnicode_DATA
(
result_uval
);
#else
#else
// Py 2.x/3.2 (pre PEP-393)
// Py 2.x/3.2 (pre PEP-393)
result_uval
=
PyUnicode_FromUnicode
(
NULL
,
result_ulength
);
result_uval
=
PyUnicode_FromUnicode
(
NULL
,
result_ulength
);
if
(
unlikely
(
!
result_uval
))
return
NULL
;
if
(
unlikely
(
!
result_uval
))
return
NULL
;
result_ukind
=
sizeof
(
Py_UNICODE
);
result_ukind
=
sizeof
(
Py_UNICODE
);
kind_shift
=
(
result_ukind
==
4
)
?
2
:
result_ukind
-
1
;
result_udata
=
PyUnicode_AS_UNICODE
(
result_uval
);
result_udata
=
PyUnicode_AS_UNICODE
(
result_uval
);
#endif
#endif
assert
(
kind_shift
==
2
||
kind_shift
==
1
||
kind_shift
==
0
);
char_pos
=
0
;
char_pos
=
0
;
for
(
i
=
0
;
i
<
value_count
;
i
++
)
{
for
(
i
=
0
;
i
<
value_count
;
i
++
)
{
...
@@ -888,12 +891,12 @@ static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_co
...
@@ -888,12 +891,12 @@ static PyObject* __Pyx_PyUnicode_Join(PyObject* value_tuple, Py_ssize_t value_co
ulength
=
__Pyx_PyUnicode_GET_LENGTH
(
uval
);
ulength
=
__Pyx_PyUnicode_GET_LENGTH
(
uval
);
if
(
unlikely
(
!
ulength
))
if
(
unlikely
(
!
ulength
))
continue
;
continue
;
if
(
unlikely
(
char_pos
+
ulength
<
0
))
if
(
unlikely
(
(
PY_SSIZE_T_MAX
>>
kind_shift
)
-
ulength
<
char_pos
))
goto
overflow
;
goto
overflow
;
ukind
=
__Pyx_PyUnicode_KIND
(
uval
);
ukind
=
__Pyx_PyUnicode_KIND
(
uval
);
udata
=
__Pyx_PyUnicode_DATA
(
uval
);
udata
=
__Pyx_PyUnicode_DATA
(
uval
);
if
(
!
CYTHON_PEP393_ENABLED
||
ukind
==
result_ukind
)
{
if
(
!
CYTHON_PEP393_ENABLED
||
ukind
==
result_ukind
)
{
memcpy
((
char
*
)
result_udata
+
char_pos
*
result_ukind
,
udata
,
(
size_t
)
(
ulength
*
result_ukind
));
memcpy
((
char
*
)
result_udata
+
(
char_pos
<<
kind_shift
),
udata
,
(
size_t
)
(
ulength
<<
kind_shift
));
}
else
{
}
else
{
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030300F0 || defined(_PyUnicode_FastCopyCharacters)
#if CYTHON_COMPILING_IN_CPYTHON && PY_VERSION_HEX >= 0x030300F0 || defined(_PyUnicode_FastCopyCharacters)
_PyUnicode_FastCopyCharacters
(
result_uval
,
char_pos
,
uval
,
0
,
ulength
);
_PyUnicode_FastCopyCharacters
(
result_uval
,
char_pos
,
uval
,
0
,
ulength
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment