From ce8531fed4c7295aee94d24124914441db578136 Mon Sep 17 00:00:00 2001
From: Peter Zhu <peter@peterzhu.ca>
Date: Fri, 23 Feb 2024 11:05:51 -0500
Subject: [PATCH] Stop using rb_str_locktmp_ensure publicly

rb_str_locktmp_ensure is a private API.
---
 ext/socket/init.c | 3 ++-
 string.c          | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ext/socket/init.c b/ext/socket/init.c
index dd1158e19d..0e312b540e 100644
--- a/ext/socket/init.c
+++ b/ext/socket/init.c
@@ -204,7 +204,8 @@ rsock_s_recvfrom(VALUE socket, int argc, VALUE *argv, enum sock_recv_type from)
         rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil);
 #endif
 
-        slen = (long)rb_str_locktmp_ensure(str, recvfrom_locktmp, (VALUE)&arg);
+        rb_str_locktmp(str);
+        slen = (long)rb_ensure(recvfrom_locktmp, (VALUE)&arg, rb_str_unlocktmp, str);
 
         if (slen == 0 && !rsock_is_dgram(fptr)) {
             return Qnil;
diff --git a/string.c b/string.c
index d8b145db06..d9182530ed 100644
--- a/string.c
+++ b/string.c
@@ -3097,7 +3097,7 @@ rb_str_unlocktmp(VALUE str)
     return str;
 }
 
-RUBY_FUNC_EXPORTED VALUE
+VALUE
 rb_str_locktmp_ensure(VALUE str, VALUE (*func)(VALUE), VALUE arg)
 {
     rb_str_locktmp(str);