aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2023-09-26 15:31:55 -0700
committerJeremy Evans <code@jeremyevans.net>2023-09-27 19:57:50 +0100
commit62181e17da2db729eb6d95f6edff9e028ff557b6 (patch)
tree014fd0bd19c5063b6f8938100229549406e1ada3
parent84312e688f7e30839ab0756dcd88fac21e265bd4 (diff)
downloadruby-62181e17da2db729eb6d95f6edff9e028ff557b6.tar.gz
Make {Queue,SizedQueue}#freeze raise TypeError
Fixes [Bug #17146]
-rw-r--r--test/ruby/test_thread_queue.rb9
-rw-r--r--thread_sync.c17
2 files changed, 26 insertions, 0 deletions
diff --git a/test/ruby/test_thread_queue.rb b/test/ruby/test_thread_queue.rb
index fd77853f0e..545bf98888 100644
--- a/test/ruby/test_thread_queue.rb
+++ b/test/ruby/test_thread_queue.rb
@@ -19,6 +19,15 @@ class TestThreadQueue < Test::Unit::TestCase
}
end
+ def test_freeze
+ assert_raise(TypeError) {
+ Queue.new.freeze
+ }
+ assert_raise(TypeError) {
+ SizedQueue.new(5).freeze
+ }
+ end
+
def test_queue
grind(5, 1000, 15, Queue)
end
diff --git a/thread_sync.c b/thread_sync.c
index 85ebec4d8c..ca463c35f1 100644
--- a/thread_sync.c
+++ b/thread_sync.c
@@ -1138,6 +1138,21 @@ rb_queue_length(VALUE self)
return LONG2NUM(queue_length(self, queue_ptr(self)));
}
+NORETURN(static VALUE rb_queue_freeze(VALUE self));
+/*
+ * call-seq:
+ * freeze
+ *
+ * Raises an exception:
+ * Queue.new.freeze # Raises TypeError (cannot freeze #<Thread::Queue:0x...>)
+ */
+static VALUE
+rb_queue_freeze(VALUE self)
+{
+ rb_raise(rb_eTypeError, "cannot freeze " "%+"PRIsVALUE, self);
+ UNREACHABLE_RETURN(self);
+}
+
/*
* Document-method: Thread::Queue#num_waiting
*
@@ -1599,6 +1614,7 @@ Init_thread_sync(void)
rb_define_method(rb_cQueue, "clear", rb_queue_clear, 0);
rb_define_method(rb_cQueue, "length", rb_queue_length, 0);
rb_define_method(rb_cQueue, "num_waiting", rb_queue_num_waiting, 0);
+ rb_define_method(rb_cQueue, "freeze", rb_queue_freeze, 0);
rb_define_alias(rb_cQueue, "enq", "push");
rb_define_alias(rb_cQueue, "<<", "push");
@@ -1615,6 +1631,7 @@ Init_thread_sync(void)
rb_define_method(rb_cSizedQueue, "clear", rb_szqueue_clear, 0);
rb_define_method(rb_cSizedQueue, "length", rb_szqueue_length, 0);
rb_define_method(rb_cSizedQueue, "num_waiting", rb_szqueue_num_waiting, 0);
+ rb_define_method(rb_cSizedQueue, "freeze", rb_queue_freeze, 0);
rb_define_alias(rb_cSizedQueue, "size", "length");
/* CVar */