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
cc95b055
Commit
cc95b055
authored
Aug 14, 2006
by
Thomas Heller
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert the change that tries to zero out a closure's result storage
area because the size if unknown in source/callproc.c.
parent
d5d695bf
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
15 deletions
+5
-15
Modules/_ctypes/callbacks.c
Modules/_ctypes/callbacks.c
+5
-15
No files found.
Modules/_ctypes/callbacks.c
View file @
cc95b055
...
...
@@ -205,24 +205,14 @@ if (x == NULL) _AddTraceback(what, __FILE__, __LINE__ - 1), PyErr_Print()
result
=
PyObject_CallObject
(
callable
,
arglist
);
CHECK
(
"'calling callback function'"
,
result
);
#ifdef WORDS_BIGENDIAN
/* See the corresponding code in callproc.c, around line 961 */
if
(
restype
->
type
!=
FFI_TYPE_FLOAT
&&
restype
->
size
<
sizeof
(
ffi_arg
))
mem
=
(
char
*
)
mem
+
sizeof
(
ffi_arg
)
-
restype
->
size
;
#endif
/* The code that converts 'result' into C data is not executed when
'callable' returns Py_None, so we zero out the memory that will
receive the C return data to not return random data.
Cleaner would be to call 'setfunc' anyway and complain with
PyErr_WriteUnraisable(), but ctypes has always accepted a Py_None
return value for *any* 'restype' and it would probably break too
much code if this is changed now.
*/
memset
(
mem
,
0
,
restype
->
size
);
if
((
restype
!=
&
ffi_type_void
)
&&
result
&&
result
!=
Py_None
)
{
PyObject
*
keep
;
assert
(
setfunc
);
#ifdef WORDS_BIGENDIAN
/* See the corresponding code in callproc.c, around line 961 */
if
(
restype
->
type
!=
FFI_TYPE_FLOAT
&&
restype
->
size
<
sizeof
(
ffi_arg
))
mem
=
(
char
*
)
mem
+
sizeof
(
ffi_arg
)
-
restype
->
size
;
#endif
keep
=
setfunc
(
mem
,
result
,
0
);
CHECK
(
"'converting callback result'"
,
keep
);
/* keep is an object we have to keep alive so that the result
...
...
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