diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/socket/socket.c | 3 | ||||
| -rw-r--r-- | lib/getopts.rb | 2 | ||||
| -rw-r--r-- | string.c | 1 |
4 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Fri Nov 5 08:34:43 2004 Yukihiro Matsumoto <[email protected]> + + * 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] + Thu Nov 4 23:54:21 2004 Kazuo Saito <[email protected]> * regexec.c, regparse.c, regint.h: fixed conflicts between 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; diff --git a/lib/getopts.rb b/lib/getopts.rb index 924ba5b249..f63bbfef6f 100644 --- a/lib/getopts.rb +++ b/lib/getopts.rb @@ -15,7 +15,7 @@ # rewritten by Akinori MUSHA <[email protected]> # -warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: getopts is deprecated after Ruby 1.8.1; use optparse instead" +warn "Warning:#{caller[0].sub(/:in `.*'\z/, '')}: getopts is deprecated after Ruby 1.8.1; use optparse instead" if caller[0] $RCS_ID=%q$Header$ @@ -2134,7 +2134,6 @@ str_gsub(argc, argv, str, bang) } rb_backref_set(match); *bp = '\0'; - rb_str_unlocktmp(str); rb_str_unlocktmp(dest); if (bang) { if (str_independent(str)) { |