diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 23:43:40 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-11-04 23:43:40 +0000 |
commit | 28d67a0bfebaeeb61f436a6d1f38909f823061c7 (patch) | |
tree | 52d716a8fcc63780eaadf6aeb20d3c0cdb316315 /ext/socket | |
parent | 47548dd33e4cb2cd747f746262a4777bd214e485 (diff) | |
download | ruby-28d67a0bfebaeeb61f436a6d1f38909f823061c7.tar.gz |
* string.c (str_gsub): should have removed rb_str_unlocktmp(str).
[ruby-dev:24708]
* ext/socket/socket.c (s_recvfrom): buffer modification check.
[ruby-dev:24708]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7208 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
-rw-r--r-- | ext/socket/socket.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index cbd3dd86ce..0e7b539588 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -476,6 +476,9 @@ s_recvfrom(sock, argc, argv, from) retry: rb_str_locktmp(str); rb_thread_wait_fd(fd); + if (buflen != RSTRING(str)->len) { + rb_raise(rb_eRuntimeError, "buffer modified"); + } TRAP_BEG; slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen); TRAP_END; |