diff options
| author | Jeremy Evans <code@jeremyevans.net> | 2019-09-24 20:59:12 -0700 |
|---|---|---|
| committer | Jeremy Evans <code@jeremyevans.net> | 2019-11-18 01:00:25 +0200 |
| commit | ffd0820ab317542f8780aac475da590a4bdbc7a8 (patch) | |
| tree | 6a5d774933c15fd2b9ea948bd3ae2fa587faaf82 /ext/socket/init.c | |
| parent | c5c05460ac20abcbc0ed686eb4acf06da7a39a79 (diff) | |
| download | ruby-ffd0820ab317542f8780aac475da590a4bdbc7a8.tar.gz | |
Deprecate taint/trust and related methods, and make the methods no-ops
This removes the related tests, and puts the related specs behind
version guards. This affects all code in lib, including some
libraries that may want to support older versions of Ruby.
Diffstat (limited to 'ext/socket/init.c')
| -rw-r--r-- | ext/socket/init.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/socket/init.c b/ext/socket/init.c index 44d1506973..0675194d74 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -143,7 +143,7 @@ rsock_strbuf(VALUE str, long buflen) { long len; - if (NIL_P(str)) return rb_tainted_str_new(0, buflen); + if (NIL_P(str)) return rb_str_new(0, buflen); StringValue(str); len = RSTRING_LEN(str); @@ -201,7 +201,6 @@ rsock_s_recvfrom(VALUE sock, int argc, VALUE *argv, enum sock_recv_type from) if (slen != RSTRING_LEN(str)) { rb_str_set_len(str, slen); } - rb_obj_taint(str); switch (from) { case RECV_RECV: return str; @@ -282,7 +281,6 @@ rsock_s_recvfrom_nonblock(VALUE sock, VALUE len, VALUE flg, VALUE str, if (slen != RSTRING_LEN(str)) { rb_str_set_len(str, slen); } - rb_obj_taint(str); switch (from) { case RECV_RECV: return str; @@ -329,7 +327,6 @@ rsock_read_nonblock(VALUE sock, VALUE length, VALUE buf, VALUE ex) VALUE str = rsock_strbuf(buf, len); char *ptr; - OBJ_TAINT(str); GetOpenFile(sock, fptr); if (len == 0) { |