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
89f2ce45
Commit
89f2ce45
authored
Oct 02, 2011
by
Victor Stinner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
unicode_convert_wchar_to_ucs4() cannot fail
parent
21a91190
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
10 deletions
+4
-10
Objects/unicodeobject.c
Objects/unicodeobject.c
+4
-10
No files found.
Objects/unicodeobject.c
View file @
89f2ce45
...
...
@@ -590,7 +590,7 @@ PyUnicode_New(Py_ssize_t size, Py_UCS4 maxchar)
This function assumes that unicode can hold one more code point than wstr
characters for a terminating null character. */
static
int
static
void
unicode_convert_wchar_to_ucs4
(
const
wchar_t
*
begin
,
const
wchar_t
*
end
,
PyUnicodeObject
*
unicode
)
{
...
...
@@ -757,6 +757,7 @@ find_maxchar_surrogates(const wchar_t *begin, const wchar_t *end,
{
const
wchar_t
*
iter
;
assert
(
num_surrogates
!=
NULL
&&
maxchar
!=
NULL
);
if
(
num_surrogates
==
NULL
||
maxchar
==
NULL
)
{
PyErr_SetString
(
PyExc_SystemError
,
"unexpected NULL arguments to "
...
...
@@ -903,11 +904,7 @@ _PyUnicode_Ready(PyObject *obj)
_PyUnicode_STATE
(
unicode
).
kind
=
PyUnicode_4BYTE_KIND
;
_PyUnicode_UTF8
(
unicode
)
=
NULL
;
_PyUnicode_UTF8_LENGTH
(
unicode
)
=
0
;
if
(
unicode_convert_wchar_to_ucs4
(
_PyUnicode_WSTR
(
unicode
),
end
,
unicode
)
<
0
)
{
assert
(
0
&&
"ConvertWideCharToUCS4 failed"
);
return
-
1
;
}
unicode_convert_wchar_to_ucs4
(
_PyUnicode_WSTR
(
unicode
),
end
,
unicode
);
PyObject_FREE
(
_PyUnicode_WSTR
(
unicode
));
_PyUnicode_WSTR
(
unicode
)
=
NULL
;
_PyUnicode_WSTR_LENGTH
(
unicode
)
=
0
;
...
...
@@ -1081,10 +1078,7 @@ PyUnicode_FromUnicode(const Py_UNICODE *u, Py_ssize_t size)
#if SIZEOF_WCHAR_T == 2
/* This is the only case which has to process surrogates, thus
a simple copy loop is not enough and we need a function. */
if
(
unicode_convert_wchar_to_ucs4
(
u
,
u
+
size
,
unicode
)
<
0
)
{
Py_DECREF
(
unicode
);
return
NULL
;
}
unicode_convert_wchar_to_ucs4
(
u
,
u
+
size
,
unicode
);
#else
assert
(
num_surrogates
==
0
);
Py_MEMCPY
(
PyUnicode_4BYTE_DATA
(
unicode
),
u
,
size
*
4
);
...
...
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