diff options
| author | Dick Porter <dick@acm.org> | 2007-01-24 18:26:19 +0300 |
|---|---|---|
| committer | Dick Porter <dick@acm.org> | 2007-01-24 18:26:19 +0300 |
| commit | 8bb4414a5bb0099b8d3444bd40fcc7da0e2a9411 (patch) | |
| tree | aae5e42dfc97f5738cf72e546ccc48e75c779dea | |
| parent | a8da36eaa4ed165565d04a7124bac41d32da32e2 (diff) | |
2007-01-24 Dick Porter <dick@ximian.com>
* socket-io.c
(ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal):
Create the returned object if we need to ignore an unsupported
socket option. Fixes a segfault reported by Atsushi.
svn path=/trunk/mono/; revision=71597
| -rw-r--r-- | mono/metadata/ChangeLog | 6 | ||||
| -rw-r--r-- | mono/metadata/socket-io.c | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog index e1156a9d2cf..84665974504 100644 --- a/mono/metadata/ChangeLog +++ b/mono/metadata/ChangeLog @@ -1,3 +1,9 @@ +2007-01-24 Dick Porter <dick@ximian.com> + + * socket-io.c + (ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal): + Create the returned object if we need to ignore an unsupported + socket option. Fixes a segfault reported by Atsushi. Tue Jan 23 18:09:21 CET 2007 Paolo Molaro <lupus@ximian.com> diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c index 03bd1947db9..823e1a5e3b9 100644 --- a/mono/metadata/socket-io.c +++ b/mono/metadata/socket-io.c @@ -1674,8 +1674,10 @@ void ves_icall_System_Net_Sockets_Socket_GetSocketOption_obj_internal(SOCKET soc *error = WSAENOPROTOOPT; return; } - if (ret == -2) + if (ret == -2) { + *obj_val = int_to_object (domain, 0); return; + } /* No need to deal with MulticastOption names here, because * you cant getsockopt AddMembership or DropMembership (the |