diff options
| author | Christopher Faylor <me@cgf.cx> | 2001-12-03 20:09:33 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2001-12-03 20:09:33 +0000 |
| commit | 7543995b74deea91ce4d3f793f240c2d0c6c1b1f (patch) | |
| tree | a0bef4b7742140b9ae4a3768fb88bca020586965 /winsup/cygwin/net.cc | |
| parent | 6dfcb5a3a9bb858d36c9ab0545ac5ea8726897ba (diff) | |
| download | cygnal-7543995b74deea91ce4d3f793f240c2d0c6c1b1f.tar.gz cygnal-7543995b74deea91ce4d3f793f240c2d0c6c1b1f.tar.bz2 cygnal-7543995b74deea91ce4d3f793f240c2d0c6c1b1f.zip | |
* net.cc (cygwin_getsockopt): Allow NULL optval.
* path.cc (mount_info::read_cygdrive_info_from_registry): Don't write cygdrive
to registry if it doesn't exist.
Diffstat (limited to 'winsup/cygwin/net.cc')
| -rw-r--r-- | winsup/cygwin/net.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/winsup/cygwin/net.cc b/winsup/cygwin/net.cc index ca19fae04..512dd6f73 100644 --- a/winsup/cygwin/net.cc +++ b/winsup/cygwin/net.cc @@ -613,11 +613,11 @@ static int get_inet_addr (const struct sockaddr *in, int inlen, /* exported as sendto: standards? */ extern "C" int cygwin_sendto (int fd, - const void *buf, - int len, - unsigned int flags, - const struct sockaddr *to, - int tolen) + const void *buf, + int len, + unsigned int flags, + const struct sockaddr *to, + int tolen) { int res; wsock_event wsock_evt; @@ -684,7 +684,7 @@ cygwin_recvfrom (int fd, if (__check_null_invalid_struct_errno (buf, (unsigned) len) || check_null_invalid_struct_errno (fromlen) - || __check_null_invalid_struct_errno (from, (unsigned) *fromlen) + || (from && __check_null_invalid_struct_errno (from, (unsigned) *fromlen)) || !h) res = -1; else @@ -735,7 +735,7 @@ cygwin_setsockopt (int fd, int res = -1; const char *name = "error"; - if (!__check_invalid_read_ptr_errno (optval, optlen) && h) + if ((!optval || !__check_invalid_read_ptr_errno (optval, optlen)) && h) { /* For the following debug_printf */ switch (optname) @@ -799,7 +799,7 @@ cygwin_getsockopt (int fd, int res = -1; const char *name = "error"; if (!check_null_invalid_struct_errno (optlen) - && !__check_null_invalid_struct_errno (optval, (unsigned) optlen) + && (!optval || !__check_null_invalid_struct_errno (optval, (unsigned) optlen)) && h) { /* For the following debug_printf */ |