qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update. 

* nscd/hstcache.c (cache_addhst): Fix two scenarios which lead to
	memory leaks.
This commit is contained in:
Ulrich Drepper 2004-07-27 01:14:37 +00:00
parent f3285f86f5
commit 490998a5f2
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
2004-07-26 Ulrich Drepper <drepper@redhat.com> 2004-07-26 Ulrich Drepper <drepper@redhat.com>
* nscd/hstcache.c (cache_addhst): Fix two scenarios which lead to
memory leaks.
* sysdeps/unix/sysv/linux/ifreq.c (__ifreq): Assign pointer for * sysdeps/unix/sysv/linux/ifreq.c (__ifreq): Assign pointer for
new buffer at the right time. new buffer at the right time.
Reported by Jakub Bogusz <qboosh@pld-linux.org>. Reported by Jakub Bogusz <qboosh@pld-linux.org>.

29
nscd/hstcache.c
View File

@ -199,6 +199,17 @@ cache_addhst (struct database *db, int fd, request_header *req, void *key,
unnecessarily let the receiver wait. */ unnecessarily let the receiver wait. */
written = TEMP_FAILURE_RETRY (write (fd, data, total)); written = TEMP_FAILURE_RETRY (write (fd, data, total));
/* If the record contains more than one IP address (used for
load balancing etc) don't cache the entry. This is something
the current cache handling cannot handle and it is more than
questionable whether it is worthwhile complicating the cache
handling just for handling such a special case. */
if (!add_addr && hst->h_addr_list[1] != NULL)
{
free (data);
return;
}
addr_list_type = (hst->h_length == NS_INADDRSZ addr_list_type = (hst->h_length == NS_INADDRSZ
? GETHOSTBYADDR : GETHOSTBYADDRv6); ? GETHOSTBYADDR : GETHOSTBYADDRv6);
@ -208,13 +219,9 @@ cache_addhst (struct database *db, int fd, request_header *req, void *key,
/* Now get the lock to safely insert the records. */ /* Now get the lock to safely insert the records. */
pthread_rwlock_rdlock (&db->lock); pthread_rwlock_rdlock (&db->lock);
/* First add all the aliases. If the record contains more than /* First add all the aliases. */
one IP address (used for load balancing etc) don't cache the assert (add_addr || hst->h_addr_list[1] == NULL);
entry. This is something the current cache handling cannot if (!add_addr)
handle and it is more than questionable whether it is
worthwhile complicating the cache handling just for handling
such a special case. */
if (!add_addr && hst->h_addr_list[1] == NULL)
for (cnt = 0; cnt < h_aliases_cnt; ++cnt) for (cnt = 0; cnt < h_aliases_cnt; ++cnt)
{ {
if (addr_list_type == GETHOSTBYADDR) if (addr_list_type == GETHOSTBYADDR)
@ -232,7 +239,7 @@ cache_addhst (struct database *db, int fd, request_header *req, void *key,
for (cnt = 0; cnt < h_addr_list_cnt; ++cnt) for (cnt = 0; cnt < h_addr_list_cnt; ++cnt)
{ {
cache_add (addr_list_type, addresses, hst->h_length, data, total, cache_add (addr_list_type, addresses, hst->h_length, data, total,
data, 0, t, db, owner); data, cnt + 1 == h_addr_list_cnt, t, db, owner);
addresses += hst->h_length; addresses += hst->h_length;
} }
@ -247,9 +254,11 @@ cache_addhst (struct database *db, int fd, request_header *req, void *key,
/* Avoid adding names if more than one address is available. See /* Avoid adding names if more than one address is available. See
above for more info. */ above for more info. */
if (!add_addr && hst->h_addr_list[1] == NULL) if (!add_addr)
{ {
/* If necessary add the key for this request. */ /* If necessary add the key for this request.
Note: hst->h_addr_list[1] == NULL. */
if (req->type == GETHOSTBYNAME || req->type == GETHOSTBYNAMEv6) if (req->type == GETHOSTBYNAME || req->type == GETHOSTBYNAMEv6)
{ {
if (addr_list_type == GETHOSTBYADDR) if (addr_list_type == GETHOSTBYADDR)