JehanneOS
/
newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* net.cc (cygwin_getservbyname): Return (possibly NULL) return value of dup_ent 

rather than assuming that tls buffer is valid.
(cygwin_getservbyport): Ditto.
(cygwin_gethostbyname): Ditto.
(cygwin_gethostbyaddr): Ditto.
This commit is contained in:
Christopher Faylor 2005-04-06 05:48:55 +00:00
parent 85da703991
commit 4ef6a27a5a
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2005-04-06 Christopher Faylor <cgf@timesys.com>
* net.cc (cygwin_getservbyname): Return (possibly NULL) return value of
dup_ent rather than assuming that tls buffer is valid.
(cygwin_getservbyport): Ditto.
(cygwin_gethostbyname): Ditto.
(cygwin_gethostbyaddr): Ditto.
2005-04-05 Christopher Faylor <cgf@timesys.com> 2005-04-05 Christopher Faylor <cgf@timesys.com>
* cygtls.cc (_cygtls::remove): Don't free or close stuff if we're being * cygtls.cc (_cygtls::remove): Don't free or close stuff if we're being

24
winsup/cygwin/net.cc
View File

@ -890,9 +890,9 @@ cygwin_getservbyname (const char *name, const char *proto)
|| (proto != NULL && check_null_str_errno (proto))) || (proto != NULL && check_null_str_errno (proto)))
return NULL; return NULL;
dup_ent (servent_buf, getservbyname (name, proto), t_servent); servent *res = (servent *) dup_ent (servent_buf, getservbyname (name, proto), t_servent);
syscall_printf ("%p = getservbyname (%s, %s)", _my_tls.locals.servent_buf, name, proto); syscall_printf ("%p = getservbyname (%s, %s)", res, name, proto);
return _my_tls.locals.servent_buf; return res;
} }
/* exported as getservbyport: standards? */ /* exported as getservbyport: standards? */
@ -903,9 +903,9 @@ cygwin_getservbyport (int port, const char *proto)
if (proto != NULL && check_null_str_errno (proto)) if (proto != NULL && check_null_str_errno (proto))
return NULL; return NULL;
dup_ent (servent_buf, getservbyport (port, proto), t_servent); servent *res = (servent *) dup_ent (servent_buf, getservbyport (port, proto), t_servent);
syscall_printf ("%p = getservbyport (%d, %s)", _my_tls.locals.servent_buf, port, proto); syscall_printf ("%p = getservbyport (%d, %s)", _my_tls.locals.servent_buf, port, proto);
return _my_tls.locals.servent_buf; return res;
} }
extern "C" int extern "C" int
@ -964,14 +964,15 @@ cygwin_gethostbyname (const char *name)
h = &tmp; h = &tmp;
} }
if (dup_ent (hostent_buf, h, t_hostent)) hostent *res = (hostent *) dup_ent (hostent_buf, h, t_hostent);
debug_printf ("h_name %s", _my_tls.locals.hostent_buf->h_name); if (res)
debug_printf ("h_name %s", res);
else else
{ {
debug_printf ("dup_ent failed for name %s", name); debug_printf ("dup_ent returned NULL for name %s, h %p", name, h);
set_host_errno (); set_host_errno ();
} }
return _my_tls.locals.hostent_buf; return res;
} }
/* exported as gethostbyaddr: standards? */ /* exported as gethostbyaddr: standards? */
@ -982,11 +983,12 @@ cygwin_gethostbyaddr (const char *addr, int len, int type)
if (__check_invalid_read_ptr_errno (addr, len)) if (__check_invalid_read_ptr_errno (addr, len))
return NULL; return NULL;
if (dup_ent (hostent_buf, gethostbyaddr (addr, len, type), t_hostent)) hostent *res = (hostent *) dup_ent (hostent_buf, gethostbyaddr (addr, len, type), t_hostent);
if (res)
debug_printf ("h_name %s", _my_tls.locals.hostent_buf->h_name); debug_printf ("h_name %s", _my_tls.locals.hostent_buf->h_name);
else else
set_host_errno (); set_host_errno ();
return _my_tls.locals.hostent_buf; return res;
} }
/* exported as accept: standards? */ /* exported as accept: standards? */