gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 00:30:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

more static analyser fixups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36843 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2013-07-06 07:14:45 +00:00
parent a24b7a4b52
commit a36a66209b
5 changed files with 34 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -2,6 +2,10 @@
* Source/cifframe.m: Fix possible incorrect free of non-malloc'ed * Source/cifframe.m: Fix possible incorrect free of non-malloc'ed
memory. memory.
* Source/NSHost.m: fix uninitialised data warning
* Source/NSMethodSignature.m: fix uninitialised variable
* Source/NSPropertyList.m: avoid static analyser warning
* Tools/gdomap.c: fix uninitialised data warning
2013-07-05 Richard Frith-Macdonald <rfm@gnu.org> 2013-07-05 Richard Frith-Macdonald <rfm@gnu.org>

1
Source/NSHost.m
View file

@ -191,6 +191,7 @@ static id null = nil;
{ {
NSString *addr; NSString *addr;
memset((void*)&in, '\0', sizeof(in));
memcpy((void*)&in.s_addr, (const void*)ptr, entry->h_length); memcpy((void*)&in.s_addr, (const void*)ptr, entry->h_length);
addr = [NSString stringWithUTF8String: (char*)inet_ntoa(in)]; addr = [NSString stringWithUTF8String: (char*)inet_ntoa(in)];
[addresses addObject: addr]; [addresses addObject: addr];

6
Source/NSMethodSignature.m
View file

@ -76,7 +76,11 @@ next_arg(const char *typePtr, NSArgumentInfo *info, char *outTypes)
BOOL flag; BOOL flag;
BOOL negative = NO; BOOL negative = NO;
if (info == 0) if (0 == typePtr)
{
return 0;
}
if (0 == info)
{ {
info = &local; info = &local;
} }

8
Source/NSPropertyList.m
View file

@ -1133,14 +1133,10 @@ static id parsePlItem(pldata* pld)
len--; len--;
// Allow for quoted values. // Allow for quoted values.
if (ptr[0] == '"' && len > 1) if (len > 2 && '"' == ptr[0] && '"' == ptr[len - 1])
{ {
len--; len -= 2;
ptr++; ptr++;
if (ptr[len - 1] == '"')
{
len--;
}
} }
if (type == 'I') if (type == 'I')
{ {

27
Tools/gdomap.c
View file

@ -2085,7 +2085,7 @@ init_probe()
int broadcast = 0; int broadcast = 0;
int elen = 0; int elen = 0;
struct in_addr *other = 0; struct in_addr *other = 0;
struct in_addr sin; struct in_addr sin { 0 };
int high = 0; int high = 0;
int low = 0; int low = 0;
unsigned long net = 0; unsigned long net = 0;
@ -2567,6 +2567,13 @@ handle_read(int desc)
int r; int r;
ri = getRInfo(desc, 0); ri = getRInfo(desc, 0);
if (0 == ri)
{
snprintf(ebuf, sizeof(ebuf),
"request not found on descriptor %d", desc);
gdomap_log(LOG_DEBUG);
return;
}
ptr = ri->buf.b; ptr = ri->buf.b;
while (ri->pos < GDO_REQ_SIZE && done == 0) while (ri->pos < GDO_REQ_SIZE && done == 0)
@ -2619,6 +2626,13 @@ handle_recv()
int r; int r;
ri = getRInfo(udp_desc, 0); ri = getRInfo(udp_desc, 0);
if (0 == ri)
{
snprintf(ebuf, sizeof(ebuf),
"request not found on descriptor %d", udp_desc);
gdomap_log(LOG_DEBUG);
return;
}
addr = &(ri->addr); addr = &(ri->addr);
ptr = ri->buf.b; ptr = ri->buf.b;
@ -3674,8 +3688,8 @@ tryWrite(int desc, int tim, unsigned char* dat, int len)
* On error - return non-zero with reason in 'errno' * On error - return non-zero with reason in 'errno'
*/ */
static int static int
tryHost(unsigned char op, unsigned char len, const unsigned char* name, tryHost(unsigned char op, unsigned char len, const unsigned char *name,
int ptype, struct sockaddr_in* addr, unsigned short* p, uptr*v) int ptype, struct sockaddr_in *addr, unsigned short *p, uptr *v)
{ {
int desc = socket(AF_INET, SOCK_STREAM, 0); int desc = socket(AF_INET, SOCK_STREAM, 0);
int e = 0; int e = 0;
@ -3835,7 +3849,10 @@ int ptype, struct sockaddr_in* addr, unsigned short* p, uptr*v)
#endif #endif
return 5; return 5;
} }
*v = b; if (0 != v)
{
*v = b;
}
} }
/* /*
* Special case for GDO_NAMES - allocate buffer and read list. * Special case for GDO_NAMES - allocate buffer and read list.
@ -4031,7 +4048,7 @@ nameServer(const char* name, const char* host, int op, int ptype, struct sockadd
if (multi) if (multi)
{ {
unsigned short num; unsigned short num;
struct in_addr* b; struct in_addr *b;
/* /*
* A host name of '*' is a special case which should do lookup on * A host name of '*' is a special case which should do lookup on