summaryrefslogtreecommitdiffstats
path: root/ext
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-21 15:32:52 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-21 15:32:52 +0000
commite3e9696856eeb74158797fce4f42e61f945f0431 (patch)
treeb626b385b9dd18033597c4f29077d466f2116c5f /ext
parent1c45c64470afd05d5b8aa816b95d4b49311802eb (diff)
downloadruby-e3e9696856eeb74158797fce4f42e61f945f0431.tar.gz
ruby-e3e9696856eeb74158797fce4f42e61f945f0431.tar.xz
ruby-e3e9696856eeb74158797fce4f42e61f945f0431.zip
* ext/socket/ancdata.c (bsock_recvmsg_internal): check recvmsg error
earlier. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22480 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/socket/ancdata.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index a949fba53..e88829db9 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -1290,6 +1290,9 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
goto retry;
}
+ if (ss == -1)
+ rb_sys_fail("recvmsg(2)");
+
if (grow_buffer) {
int grown = 0;
#if defined(HAVE_ST_MSG_CONTROL)
@@ -1321,9 +1324,6 @@ bsock_recvmsg_internal(int argc, VALUE *argv, VALUE sock, int nonblock)
}
}
- if (ss == -1)
- rb_sys_fail("recvmsg(2)");
-
if (NIL_P(dat_str))
dat_str = rb_tainted_str_new(datbuf, ss);
else {