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

* net.cc (dup_servent_ptr): Detect old Windows 95 misaligned structure and

Browse Source 
realign appropriately.
This commit is contained in:
Christopher Faylor 2001-09-16 02:56:58 +00:00
parent 1d1c6baa7b
commit d595839939
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
Sat Sep 15 22:54:49 2001 Christopher Faylor <cgf@cygnus.com>
* net.cc (dup_servent_ptr): Detect old Windows 95 misaligned structure
and realign appropriately.
Sat Sep 15 00:28:40 2001 Christopher Faylor <cgf@cygnus.com> Sat Sep 15 00:28:40 2001 Christopher Faylor <cgf@cygnus.com>
* Makefile.in: Generate libcygwin.a during the link pass rather than as * Makefile.in: Generate libcygwin.a during the link pass rather than as

20
winsup/cygwin/net.cc
View File

@ -932,6 +932,15 @@ free_servent_ptr (struct servent *&p)
} }
} }
#pragma pack(push,2)
struct pservent
{
char *s_name;
char **s_aliases;
short s_port;
char *s_proto;
};
#pragma pack(pop)
static struct servent * static struct servent *
dup_servent_ptr (struct servent *src) dup_servent_ptr (struct servent *src)
{ {
@ -947,10 +956,17 @@ dup_servent_ptr (struct servent *src)
dst->s_port = src->s_port; dst->s_port = src->s_port;
if (src->s_name && !(dst->s_name = strdup (src->s_name))) if (src->s_name && !(dst->s_name = strdup (src->s_name)))
goto out; goto out;
if (src->s_proto && !(dst->s_proto = strdup (src->s_proto)))
goto out;
if (src->s_aliases && !(dst->s_aliases = dup_char_list (src->s_aliases))) if (src->s_aliases && !(dst->s_aliases = dup_char_list (src->s_aliases)))
goto out; goto out;
char *s_proto;
if (IsBadReadPtr (src->s_proto, sizeof (src->s_proto))
&& !IsBadReadPtr (((pservent *) src)->s_proto, sizeof (src->s_proto)))
s_proto = ((pservent *)src)->s_proto;
else
s_proto = src->s_proto;
if (s_proto && !(dst->s_proto = strdup (s_proto)))
goto out;
debug_printf ("servent: copied %s", dst->s_name); debug_printf ("servent: copied %s", dst->s_name);