From a5ea0e8c3209343063ff5943b76e8243edaa7914 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 23 Oct 2008 02:18:00 +0000
Subject: * ext/socket/socket.c (sock_s_getservbyport): the port should be  
 converted before the proto so that the #to_int of the former cannot   alter
 the latter.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/socket/socket.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'ext/socket')

diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index 06d9f337c0..5788632f8a 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -3249,14 +3249,16 @@ sock_s_getservbyport(int argc, VALUE *argv)
 {
     VALUE port, proto;
     struct servent *sp;
+    long portnum;
+    const char *protoname = "tcp";
 
     rb_scan_args(argc, argv, "11", &port, &proto);
-    if (NIL_P(proto)) proto = rb_str_new2("tcp");
-    StringValue(proto);
+    portnum = NUM2LONG(port);
+    if (!NIL_P(proto)) protoname = StringValueCStr(proto);
 
-    sp = getservbyport(htons((uint16_t)NUM2INT(port)), StringValueCStr(proto));
+    sp = getservbyport((int)htons((uint16_t)portnum), protoname);
     if (!sp) {
-	rb_raise(rb_eSocket, "no such service for port %d/%s", NUM2INT(port), RSTRING_PTR(proto));
+	rb_raise(rb_eSocket, "no such service for port %d/%s", (int)portnum, protoname);
     }
     return rb_tainted_str_new2(sp->s_name);
 }
-- 
cgit v1.2.3