kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject

Browse source 
non-AF_INET/AF_INET6 sockaddr.
  (sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
  [ruby-dev:28691]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10218 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2006-06-05 09:16:14 +00:00
parent 219a6edf8f
commit 8b074b2442
4 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Jun 5 18:12:12 2006 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c (sock_s_unpack_sockaddr_in): reject
non-AF_INET/AF_INET6 sockaddr.
(sock_s_unpack_sockaddr_un): reject non-AF_UNIX sockaddr.
[ruby-dev:28691]
Sun Jun 4 20:40:19 2006 Tanaka Akira <akr@m17n.org> Sun Jun 4 20:40:19 2006 Tanaka Akira <akr@m17n.org>
* ext/socket/socket.c: fix sockaddr_un handling. * ext/socket/socket.c: fix sockaddr_un handling.

14
ext/socket/socket.c
View file

@ -3512,6 +3512,17 @@ sock_s_unpack_sockaddr_in(self, addr)
VALUE host; VALUE host;
sockaddr = (struct sockaddr_in*)StringValuePtr(addr); sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
if (((struct sockaddr *)sockaddr)->sa_family != AF_INET
#ifdef INET6
&& ((struct sockaddr *)sockaddr)->sa_family != AF_INET6
#endif
) {
#ifdef INET6
rb_raise(rb_eArgError, "not an AF_INET/AF_INET6 sockaddr");
#else
rb_raise(rb_eArgError, "not an AF_INET sockaddr");
#endif
}
host = make_ipaddr((struct sockaddr*)sockaddr); host = make_ipaddr((struct sockaddr*)sockaddr);
OBJ_INFECT(host, addr); OBJ_INFECT(host, addr);
return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host); return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
@ -3549,6 +3560,9 @@ sock_s_unpack_sockaddr_un(self, addr)
VALUE path; VALUE path;
sockaddr = (struct sockaddr_un*)StringValuePtr(addr); sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
if (((struct sockaddr *)sockaddr)->sa_family != AF_UNIX) {
rb_raise(rb_eArgError, "not an AF_UNIX sockaddr");
}
if (sizeof(struct sockaddr_un) < RSTRING(addr)->len) { if (sizeof(struct sockaddr_un) < RSTRING(addr)->len) {
rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d", rb_raise(rb_eTypeError, "too long sockaddr_un - %ld longer than %d",
RSTRING(addr)->len, sizeof(struct sockaddr_un)); RSTRING(addr)->len, sizeof(struct sockaddr_un));

9
test/socket/test_socket.rb
View file

@ -72,3 +72,12 @@ class TestBasicSocket < Test::Unit::TestCase
end end
end end
end if defined?(Socket) end if defined?(Socket)
class TestSocket < Test::Unit::TestCase
def test_unpack_sockaddr
sockaddr_in = Socket.sockaddr_in(80, "")
assert_raise(ArgumentError) { Socket.unpack_sockaddr_un(sockaddr_in) }
sockaddr_un = Socket.sockaddr_un("/tmp/s")
assert_raise(ArgumentError) { Socket.unpack_sockaddr_in(sockaddr_un) }
end
end

6
version.h
View file

@ -1,14 +1,14 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2006-06-04" #define RUBY_RELEASE_DATE "2006-06-05"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20060604 #define RUBY_RELEASE_CODE 20060605
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_MINOR 9
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2006 #define RUBY_RELEASE_YEAR 2006
#define RUBY_RELEASE_MONTH 6 #define RUBY_RELEASE_MONTH 6
#define RUBY_RELEASE_DAY 4 #define RUBY_RELEASE_DAY 5
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_release_date[];