sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

Fix the snprintf checks, and fix a typo in pointer indirection.

Browse Source 
These fixes are needed for a working getaddrinfo etc. replacement.
Fixes from Wayne Davison <wayned@samba.org> from rsync.
Jeremy.
(This used to be commit 494bf6293b)
This commit is contained in:
Jeremy Allison 2007-11-02 14:23:10 -07:00
parent a45c91ec6a
commit 753983d7e7
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source3/lib/replace/getaddrinfo.c
View File

@ -222,7 +222,7 @@ static int getaddr_info_name(const char *node,
} }
for(pptr = hp->h_addr_list; *pptr; pptr++) { for(pptr = hp->h_addr_list; *pptr; pptr++) {
struct in_addr ip = *(struct in_addr *)pptr; struct in_addr ip = *(struct in_addr *)*pptr;
struct addrinfo *ai = alloc_entry(hints, ip, port); struct addrinfo *ai = alloc_entry(hints, ip, port);
if (!ai) { if (!ai) {
@ -407,7 +407,7 @@ static int gethostnameinfo(const struct sockaddr *sa,
if (ret == 0) { if (ret == 0) {
/* Name looked up successfully. */ /* Name looked up successfully. */
ret = snprintf(node, nodelen, "%s", hp->h_name); ret = snprintf(node, nodelen, "%s", hp->h_name);
if (ret == -1 || ret > nodelen) { if (ret < 0 || (size_t)ret >= nodelen) {
return EAI_MEMORY; return EAI_MEMORY;
} }
if (flags & NI_NOFQDN) { if (flags & NI_NOFQDN) {
@ -428,7 +428,7 @@ static int gethostnameinfo(const struct sockaddr *sa,
} }
p = inet_ntoa(((struct sockaddr_in *)sa)->sin_addr); p = inet_ntoa(((struct sockaddr_in *)sa)->sin_addr);
ret = snprintf(node, nodelen, "%s", p); ret = snprintf(node, nodelen, "%s", p);
if (ret == -1 || ret > nodelen) { if (ret < 0 || (size_t)ret >= nodelen) {
return EAI_MEMORY; return EAI_MEMORY;
} }
return 0; return 0;
@ -449,7 +449,7 @@ static int getservicenameinfo(const struct sockaddr *sa,
if (se && se->s_name) { if (se && se->s_name) {
/* Service name looked up successfully. */ /* Service name looked up successfully. */
ret = snprintf(service, servicelen, "%s", se->s_name); ret = snprintf(service, servicelen, "%s", se->s_name);
if (ret == -1 || ret > servicelen) { if (ret < 0 || (size_t)ret >= servicelen) {
return EAI_MEMORY; return EAI_MEMORY;
} }
return 0; return 0;
@ -457,7 +457,7 @@ static int getservicenameinfo(const struct sockaddr *sa,
/* Otherwise just fall into the numeric service code... */ /* Otherwise just fall into the numeric service code... */
} }
ret = snprintf(service, servicelen, "%d", port); ret = snprintf(service, servicelen, "%d", port);
if (ret == -1 || ret > servicelen) { if (ret < 0 || (size_t)ret >= servicelen) {
return EAI_MEMORY; return EAI_MEMORY;
} }
return 0; return 0;