From 2ba6eec1fa50cacaff647525358fd93c7c862a27 Mon Sep 17 00:00:00 2001
From: akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 28 Feb 2009 09:29:26 +0000
Subject: [PATCH] * ext/socket/ancdata.c (ancillary_unix_rights): check message
 type.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22676 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                   | 4 ++++
 ext/socket/ancdata.c        | 8 ++++++++
 test/socket/test_ancdata.rb | 8 ++++++++
 3 files changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 5435baac62..7139acd823 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Feb 28 18:28:58 2009  Tanaka Akira  <akr@fsij.org>
+
+	* ext/socket/ancdata.c (ancillary_unix_rights): check message type.
+
 Sat Feb 28 16:18:39 2009  Tanaka Akira  <akr@fsij.org>
 
 	* lib/net/http.rb: suppress warnings of non-existing instance variable
diff --git a/ext/socket/ancdata.c b/ext/socket/ancdata.c
index 204f745314..9d1ab95c1f 100644
--- a/ext/socket/ancdata.c
+++ b/ext/socket/ancdata.c
@@ -254,6 +254,14 @@ static VALUE
 ancillary_unix_rights(VALUE self)
 {
 #ifdef SCM_RIGHTS
+    int level, type;
+
+    level = ancillary_level(self);
+    type = ancillary_type(self);
+
+    if (level != SOL_SOCKET || type != SCM_RIGHTS)
+        rb_raise(rb_eTypeError, "SCM_RIGHTS ancillary data expected");
+
     VALUE v = rb_attr_get(self, rb_intern("unix_rights"));
     return v;
 #else
diff --git a/test/socket/test_ancdata.rb b/test/socket/test_ancdata.rb
index 0c1029f1d6..112b0c9e58 100644
--- a/test/socket/test_ancdata.rb
+++ b/test/socket/test_ancdata.rb
@@ -55,4 +55,12 @@ class TestSocketAncData < Test::Unit::TestCase
       assert(!ancdata.cmsg_is?(:IP, :PKTINFO))
     end
   end
+
+  if defined?(Socket::SCM_RIGHTS) && defined?(Socket::SCM_TIMESTAMP)
+    def test_unix_rights
+      assert_raise(TypeError) {
+        Socket::AncillaryData.int(:UNIX, :SOL_SOCKET, :TIMESTAMP, 1).unix_rights
+      }
+    end
+  end
 end if defined? Socket::AncillaryData