mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-02-04 17:15:50 +00:00
Code Issues Releases Activity

If perform-actual-lookups is enabled, getservbyname() matches an entry

Browse Source 
even when proto is not valid.

Submitted by:	Michael Bushkov <bushman__at__rsu.ru>
This commit is contained in:
Hajimu UMEMOTO 2006-05-05 15:01:25 +00:00
parent 84ec8649b6
commit f28aa72448
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=158310
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
usr.sbin/cached/agents/services.c
View File

@ -144,20 +144,18 @@ services_lookup_func(const char *key, size_t key_size, char **buffer,
switch (lookup_type) {
case nss_lt_name:
size = key_size - sizeof(enum nss_lookup_type) + 1;
name = (char *)malloc(size);
size = key_size - sizeof(enum nss_lookup_type);
name = (char *)malloc(size + 1);
assert(name != NULL);
memset(name, 0, size);
memcpy(name, key + sizeof(enum nss_lookup_type), size - 1);
memset(name, 0, size + 1);
memcpy(name, key + sizeof(enum nss_lookup_type), size);
size2 = strlen(name) + 1;
if (size2 < size) {
proto = strchr(name, '\0');
if (strrchr(name, '\0') > proto)
++proto ;
else
proto = NULL;
}
if (size2 < size)
proto = name + size2;
else
proto = NULL;
break;
case nss_lt_id:
if (key_size < sizeof(enum nss_lookup_type) +
@ -169,7 +167,7 @@ services_lookup_func(const char *key, size_t key_size, char **buffer,
memcpy(&port, key + sizeof(enum nss_lookup_type),
sizeof(int));
size = key_size - sizeof(enum nss_lookup_type) + sizeof(int);
size = key_size - sizeof(enum nss_lookup_type) - sizeof(int);
if (size > 0) {
proto = (char *)malloc(size + 1);
assert(proto != NULL);

22
usr.sbin/nscd/agents/services.c
View File

@ -144,20 +144,18 @@ services_lookup_func(const char *key, size_t key_size, char **buffer,
switch (lookup_type) {
case nss_lt_name:
size = key_size - sizeof(enum nss_lookup_type) + 1;
name = (char *)malloc(size);
size = key_size - sizeof(enum nss_lookup_type);
name = (char *)malloc(size + 1);
assert(name != NULL);
memset(name, 0, size);
memcpy(name, key + sizeof(enum nss_lookup_type), size - 1);
memset(name, 0, size + 1);
memcpy(name, key + sizeof(enum nss_lookup_type), size);
size2 = strlen(name) + 1;
if (size2 < size) {
proto = strchr(name, '\0');
if (strrchr(name, '\0') > proto)
++proto ;
else
proto = NULL;
}
if (size2 < size)
proto = name + size2;
else
proto = NULL;
break;
case nss_lt_id:
if (key_size < sizeof(enum nss_lookup_type) +
@ -169,7 +167,7 @@ services_lookup_func(const char *key, size_t key_size, char **buffer,
memcpy(&port, key + sizeof(enum nss_lookup_type),
sizeof(int));
size = key_size - sizeof(enum nss_lookup_type) + sizeof(int);
size = key_size - sizeof(enum nss_lookup_type) - sizeof(int);
if (size > 0) {
proto = (char *)malloc(size + 1);
assert(proto != NULL);