Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
2ddf5a19
Commit
2ddf5a19
authored
May 10, 2017
by
Xiang Zhang
Committed by
GitHub
May 10, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-30281: Fix the default value for stop in PySlice_Unpack() (#1480)
parent
305ccbe2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
Doc/c-api/slice.rst
Doc/c-api/slice.rst
+1
-1
Objects/sliceobject.c
Objects/sliceobject.c
+5
-3
Python/ceval.c
Python/ceval.c
+1
-1
No files found.
Doc/c-api/slice.rst
View file @
2ddf5a19
...
...
@@ -75,7 +75,7 @@ Slice Objects
Extract the start, stop and step data members from a slice object as
C integers. Silently reduce values larger than ``PY_SSIZE_T_MAX`` to
``PY_SSIZE_T_MAX``, silently boost the start and stop values less than
``
-PY_SSIZE_T_MAX-1`` to ``-PY_SSIZE_T_MAX-1
``, and silently boost the step
``
PY_SSIZE_T_MIN`` to ``PY_SSIZE_T_MIN
``, and silently boost the step
values less than ``-PY_SSIZE_T_MAX`` to ``-PY_SSIZE_T_MAX``.
Return ``-1`` on error, ``0`` on success.
...
...
Objects/sliceobject.c
View file @
2ddf5a19
...
...
@@ -197,6 +197,8 @@ PySlice_Unpack(PyObject *_r,
PySliceObject
*
r
=
(
PySliceObject
*
)
_r
;
/* this is harder to get right than you might think */
Py_BUILD_ASSERT
(
PY_SSIZE_T_MIN
+
1
<=
-
PY_SSIZE_T_MAX
);
if
(
r
->
step
==
Py_None
)
{
*
step
=
1
;
}
...
...
@@ -217,14 +219,14 @@ PySlice_Unpack(PyObject *_r,
}
if
(
r
->
start
==
Py_None
)
{
*
start
=
*
step
<
0
?
PY_SSIZE_T_MAX
-
1
:
0
;
;
*
start
=
*
step
<
0
?
PY_SSIZE_T_MAX
:
0
;
}
else
{
if
(
!
_PyEval_SliceIndex
(
r
->
start
,
start
))
return
-
1
;
}
if
(
r
->
stop
==
Py_None
)
{
*
stop
=
*
step
<
0
?
-
PY_SSIZE_T_MAX
:
PY_SSIZE_T_MAX
;
*
stop
=
*
step
<
0
?
PY_SSIZE_T_MIN
:
PY_SSIZE_T_MAX
;
}
else
{
if
(
!
_PyEval_SliceIndex
(
r
->
stop
,
stop
))
return
-
1
;
...
...
@@ -258,7 +260,7 @@ PySlice_AdjustIndices(Py_ssize_t length,
*
stop
=
(
step
<
0
)
?
-
1
:
0
;
}
}
else
if
(
*
stop
>=
length
)
{
else
if
(
*
stop
>=
length
)
{
*
stop
=
(
step
<
0
)
?
length
-
1
:
length
;
}
...
...
Python/ceval.c
View file @
2ddf5a19
...
...
@@ -4889,7 +4889,7 @@ do_call_core(PyObject *func, PyObject *callargs, PyObject *kwdict)
/* Extract a slice index from a PyLong or an object with the
nb_index slot defined, and store in *pi.
Silently reduce values larger than PY_SSIZE_T_MAX to PY_SSIZE_T_MAX,
and silently boost values less than
-PY_SSIZE_T_MAX-1 to -PY_SSIZE_T_MAX-1
.
and silently boost values less than
PY_SSIZE_T_MIN to PY_SSIZE_T_MIN
.
Return 0 on error, 1 on success.
*/
int
...
...
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