From fd6445b7e8bab9d340be6f76688a8b96f1b52029 Mon Sep 17 00:00:00 2001
From: Koichi Sasada <ko1@atdot.net>
Date: Tue, 12 Nov 2019 10:02:47 +0900
Subject: Monitor#exit: check monitor ownership.

Monitor#exit should be called by only onwer Thread. However, there
is not check for it.
---
 ext/monitor/monitor.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'ext/monitor/monitor.c')

diff --git a/ext/monitor/monitor.c b/ext/monitor/monitor.c
index 2d399768b2..256fc4d7db 100644
--- a/ext/monitor/monitor.c
+++ b/ext/monitor/monitor.c
@@ -85,11 +85,26 @@ monitor_enter(VALUE monitor)
     return Qnil;
 }
 
+static VALUE
+monitor_check_owner(VALUE monitor)
+{
+    struct rb_monitor *mc = monitor_ptr(monitor);
+    if (!mc_owner_p(mc)) {
+        rb_raise(rb_eThreadError, "current thread not owner");
+    }
+    return Qnil;
+}
+
 static VALUE
 monitor_exit(VALUE monitor)
 {
+    monitor_check_owner(monitor);
+
     struct rb_monitor *mc = monitor_ptr(monitor);
+
+    if (mc->count <= 0) rb_bug("monitor_exit: count:%d\n", (int)mc->count);
     mc->count--;
+
     if (mc->count == 0) {
         RB_OBJ_WRITE(monitor, &mc->owner, Qnil);
         rb_mutex_unlock(mc->mutex);
@@ -111,16 +126,6 @@ monitor_owned_p(VALUE monitor)
     return (rb_mutex_locked_p(mc->mutex) && mc_owner_p(mc)) ? Qtrue : Qfalse;
 }
 
-static VALUE
-monitor_check_owner(VALUE monitor)
-{
-    struct rb_monitor *mc = monitor_ptr(monitor);
-    if (!mc_owner_p(mc)) {
-        rb_raise(rb_eThreadError, "current thread not owner");
-    }
-    return Qnil;
-}
-
 static VALUE
 monitor_exit_for_cond(VALUE monitor)
 {
-- 
cgit v1.2.3