gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-23 09:04:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix dereferencing null pointer

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@32543 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-03-13 10:14:11 +00:00
parent 9ea5861683
commit 53882ca6d3
1 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
Source/ObjectiveC2/runtime.c
View file

@ -722,49 +722,77 @@ method_getName(Method method)
unsigned
method_getNumberOfArguments(Method method)
{
const char *types = method->method_types;
unsigned int count = 0;
while ('\0' != *types)
if (0 == method)
{
types = skip_argspec(types);
count++;
return 0;
}
else
{
unsigned int count = 0;
const char *types = method->method_types;
while ('\0' != *types)
{
types = skip_argspec(types);
count++;
}
return count - 1;
}
return count - 1;
}
void
method_getReturnType(Method method, char *dst, size_t dst_len)
{
//TODO: Coped and pasted code. Factor it out.
const char *types = method->method_types;
size_t length = lengthOfTypeEncoding(types);
if (length < dst_len)
if (0 == method)
{
memcpy(dst, types, length);
dst[length] = '\0';
if (dst_len > 0)
{
dst[0] = '\0';
}
}
else
{
memcpy(dst, types, dst_len);
//TODO: Coped and pasted code. Factor it out.
const char *types = method->method_types;
size_t length = lengthOfTypeEncoding(types);
if (length < dst_len)
{
memcpy(dst, types, length);
dst[length] = '\0';
}
else if (dst_len > 0)
{
memcpy(dst, types, dst_len);
}
}
}
const char *
method_getTypeEncoding(Method method)
{
if (0 == method)
{
return 0;
}
return method->method_types;
}
IMP
method_setImplementation(Method method, IMP imp)
{
IMP old = (IMP) method->method_imp;
if (0 == method)
{
return (IMP)0;
}
else
{
IMP old = (IMP) method->method_imp;
method->method_imp = (objc_imp_gnu) old;
objc_updateDtableForClassContainingMethod(method);
return old;
method->method_imp = (objc_imp_gnu) old;
objc_updateDtableForClassContainingMethod(method);
return old;
}
}
id