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
875f29bb
Commit
875f29bb
authored
Oct 04, 2011
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix naïve heuristic in unicode slicing (followup to 1b4f886dc9e2)
parent
2b72f838
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
Objects/unicodeobject.c
Objects/unicodeobject.c
+15
-7
No files found.
Objects/unicodeobject.c
View file @
875f29bb
...
...
@@ -12258,7 +12258,8 @@ unicode_subscript(PyUnicodeObject* self, PyObject* item)
Py_ssize_t
start
,
stop
,
step
,
slicelength
,
cur
,
i
;
PyObject
*
result
;
void
*
src_data
,
*
dest_data
;
int
kind
;
int
src_kind
,
dest_kind
;
Py_UCS4
ch
,
max_char
;
if
(
PySlice_GetIndicesEx
(
item
,
PyUnicode_GET_LENGTH
(
self
),
&
start
,
&
stop
,
&
step
,
&
slicelength
)
<
0
)
{
...
...
@@ -12276,17 +12277,24 @@ unicode_subscript(PyUnicodeObject* self, PyObject* item)
return
PyUnicode_Substring
((
PyObject
*
)
self
,
start
,
start
+
slicelength
);
}
/* General (less optimized) case */
result
=
PyUnicode_New
(
slicelength
,
PyUnicode_MAX_CHAR_VALUE
(
self
));
/* General case */
max_char
=
127
;
src_kind
=
PyUnicode_KIND
(
self
);
src_data
=
PyUnicode_DATA
(
self
);
for
(
cur
=
start
,
i
=
0
;
i
<
slicelength
;
cur
+=
step
,
i
++
)
{
ch
=
PyUnicode_READ
(
src_kind
,
src_data
,
cur
);
if
(
ch
>
max_char
)
max_char
=
ch
;
}
result
=
PyUnicode_New
(
slicelength
,
max_char
);
if
(
result
==
NULL
)
return
NULL
;
kind
=
PyUnicode_KIND
(
self
);
src_data
=
PyUnicode_DATA
(
self
);
dest_kind
=
PyUnicode_KIND
(
result
);
dest_data
=
PyUnicode_DATA
(
result
);
for
(
cur
=
start
,
i
=
0
;
i
<
slicelength
;
cur
+=
step
,
i
++
)
{
Py_UCS4
ch
=
PyUnicode_READ
(
kind
,
src_data
,
cur
);
PyUnicode_WRITE
(
kind
,
dest_data
,
i
,
ch
);
Py_UCS4
ch
=
PyUnicode_READ
(
src_
kind
,
src_data
,
cur
);
PyUnicode_WRITE
(
dest_
kind
,
dest_data
,
i
,
ch
);
}
return
result
;
}
else
{
...
...
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