gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Source/GSFFIInvocation.m (GSFFIInvocationCallback): Cast

Browse source 
invocation to access ivars correctly. Check validReturn.


git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/branches/freeze-1_6_0@16008 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Adam Fedor 2003-02-19 03:45:20 +00:00
parent bf0753443e
commit 853114cb50
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2003-02-18 Adam Fedor <fedor@gnu.org>
* Source/GSFFIInvocation.m (GSFFIInvocationCallback): Cast
invocation to access ivars correctly. Check validReturn.
2003-02-18 Tom Koelman <tkoelman@xs4all.nl>
* Source/NSProcessInfo.m (_gnu_process_args): If argv is 0 (e.g.

9
Source/GSFFIInvocation.m
View file

@ -41,6 +41,8 @@ typedef struct _NSInvocation_t {
/* Function that implements the actual forwarding */
typedef void (*ffi_closure_fun) (ffi_cif*,void*,void**,void*);
typedef void (*f_fun) ();
void GSFFIInvocationCallback(ffi_cif*, void*, void **, void*);
/*
@ -267,7 +269,7 @@ GSFFIInvokeWithTargetAndImp(NSInvocation *_inv, id anObject, IMP imp)
NSInvocation_t *inv = (NSInvocation_t*)_inv;
/* Do it */
ffi_call(inv->_cframe, imp, (inv->_retval),
ffi_call(inv->_cframe, (f_fun)imp, (inv->_retval),
((cifframe_t *)inv->_cframe)->values);
/* Don't decode the return value here (?) */
@ -412,10 +414,11 @@ GSFFIInvocationCallback(ffi_cif *cif, void *retp, void **args, void *user)
this since the return value (retp) really belongs to the closure
not the invocation so it will be demallocd at the end of this call
*/
if ([sig methodReturnType] && *[sig methodReturnType] == _C_ID)
if ([sig methodReturnType] && *[sig methodReturnType] == _C_ID
&& ((NSInvocation_t *)invocation)->_validReturn == YES)
{
AUTORELEASE(*(id *)retp);
invocation->_validReturn = NO;
((NSInvocation_t *)invocation)->_validReturn = NO;
}
/* We need to (re)encode the return type for it's trip back. */