pycall 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381593af8570fc0a96f4df77aad616cf93cf86afa336b0be1618ac39c68fdd73
-  data.tar.gz: b1c8075e157dd32d4699ea6ae581d148c4ae537b77f60437a31a1940e31bf8fe
+  metadata.gz: c0793d5cd5f93c4eb9cd5938b7999799649db72f2abd35b4ae3247c450aec7ce
+  data.tar.gz: 404e3c06167a752f94cfc9051734a259725366f7c981c654e4f8744a3613c907
 SHA512:
-  metadata.gz: 5a4d26affe26f179752eba471971dfbee4a3336faf7337696dd0cc6cc8b4462e6e8dc27a7bb8d53495178fe2b09fa95c11a6f1da3366a645ac9106248ba5b376
-  data.tar.gz: c72271ccdb5a50f47ced48619468114666e7767ff697ff385968e61e721f7f8449c79d86f218607f1a0fb67ec31ec88f843aeb5cab491fbd481025e3917b9df6
+  metadata.gz: 2c8f666bb616b01f69bcd33130991cd22f9f2bfea3b67946e87550c846327032bd14d69d2522d8b83ee18db5551cea3bf0fa51f7043d7cfcfd8a8490c6bf04df
+  data.tar.gz: 041600f566b4d8158dc4772830ab1a8eb00479a82b118f0f135e20130d05d9047dba53b8ab32701c2bee20ec770a48cd540cd259d369163e64f4da775e7e26ae

data/.github/dependabot.yml

@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  - package-ecosystem: "bundler" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

data/.github/workflows/ci.yml

@@ -25,6 +25,7 @@ jobs:
         - ubuntu-20.04
         - macos-latest
         ruby:
+        - "3.3"
         - "3.2"
         - "3.1"
         - "3.0"
@@ -42,6 +43,7 @@ jobs:
         - { os: ubuntu-20.04   , ruby: 2.4   , python: "3.x"  , python_architecture: x64 , venv: "" }
 
         # Ruby 2.7 with Each Python 3.x
+        - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.12" , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.11" , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.10" , python_architecture: x64 , venv: "" }
         - { os: ubuntu-20.04   , ruby: 2.7   , python: "3.9"  , python_architecture: x64 , venv: "" }
@@ -52,12 +54,11 @@ jobs:
         # Ruby-debug with the latest Python 3
         - { os: ubuntu-20.04   , ruby: debug , python: "3.x"  , python_architecture: x64 , venv: "" }
 
-        # Ruby 3.1 with the latest Python 3 with venv
-        - { os: ubuntu-20.04   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
+        # The latest stable Ruby with the latest Python 3 with venv
+        - { os: ubuntu-20.04   , ruby: "3.3" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
 
         # macOS with venv
-        - { os: macos-latest   , ruby: "3.1" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
-        - { os: macos-latest   , ruby: "3.1" , python: "3.8"  , python_architecture: x64 , venv: "venv:"  }
+        - { os: macos-latest   , ruby: "3.3" , python: "3.x"  , python_architecture: x64 , venv: "venv:"  }
 
         #- { os: macos-latest   , ruby: debug , python: "3.x" , python_architecture: x64 , venv: "" }
 

data/CHANGES.md

@@ -1,5 +1,17 @@
 # The change history of PyCall
 
+## 1.5.2
+
+* Fix memory leak with str(list) (#169).
+
+  *mknkmyza*
+
+* Fix SEGV occured on Ruby process finalization.
+
+* Fix for supporting Ruby >= 3.3.
+
+* Fix for supporting Python >= 3.2.
+
 ## 1.5.1
 
 * Fix memory leak in rich compare methods (#167, #168).

data/ext/pycall/extconf.rb

@@ -1,3 +1,5 @@
 require 'mkmf'
 
+have_func("RTYPEDDATA_GET_DATA")
+
 create_makefile('pycall')

data/ext/pycall/gc.c

@@ -1,5 +1,7 @@
 #include "pycall_internal.h"
 
+static ID id_gcguard_table;
+
 struct gcguard {
   st_table *guarded_objects;
 };
@@ -24,6 +26,7 @@ gcguard_free(void* ptr)
 {
   struct gcguard *gg = (struct gcguard *)ptr;
   st_free_table(gg->guarded_objects);
+  rb_ivar_set(mPyCall, id_gcguard_table, Qnil);
 }
 
 static size_t
@@ -69,7 +72,6 @@ gcguard_delete(VALUE gcguard, PyObject *pyptr)
   }
 }
 
-static ID id_gcguard_table;
 static PyObject *weakref_callback_pyobj;
 static PyObject *gcguard_weakref_destroyed(PyObject *self, PyObject *weakref);
 
@@ -98,7 +100,9 @@ void
 pycall_gcguard_delete(PyObject *pyobj)
 {
   VALUE gcguard = rb_ivar_get(mPyCall, id_gcguard_table);
-  gcguard_delete(gcguard, pyobj);
+  if (!NIL_P(gcguard)) {
+    gcguard_delete(gcguard, pyobj);
+  }
 }
 
 void

data/ext/pycall/libpython.c

@@ -217,6 +217,10 @@ pycall_init_libpython_api_table(VALUE libpython_handle)
     INIT_API_TABLE_ENTRY2(PyUnicode_DecodeUTF8, PyUnicodeUCS2_DecodeUTF8, required);
     INIT_API_TABLE_ENTRY2(PyUnicode_FromFormatV, PyUnicodeUCS2_FromFormatV, required);
   }
+
+  INIT_API_TABLE_ENTRY(PyGILState_Check, required);
+  INIT_API_TABLE_ENTRY(PyGILState_Ensure, required);
+  INIT_API_TABLE_ENTRY(PyGILState_Release, required);
 }
 
 void

data/ext/pycall/pycall.c

@@ -139,7 +139,15 @@ pycall_pyptr_free(void *ptr)
     fprintf(stderr, "zero refcnt object %p of type %s\n", pyobj, Py_TYPE(pyobj)->tp_name);
   }
 #endif /* PYCALL_DEBUG_DUMP_REFCNT */
-  pycall_Py_DecRef(pyobj);
+
+  if (Py_API(PyGILState_Check())) {
+    pycall_Py_DecRef(pyobj);
+  }
+  else {
+    PyGILState_STATE gstate = Py_API(PyGILState_Ensure)();
+    pycall_Py_DecRef(pyobj);
+    Py_API(PyGILState_Release)(gstate);
+  }
 }
 
 static size_t _PySys_GetSizeOf(PyObject *);
@@ -1270,7 +1278,9 @@ pycall_libpython_helpers_m_str(VALUE mod, VALUE pyptr)
     pycall_pyerror_fetch_and_raise("PyObject_Str");
   }
 
-  return pycall_pyobject_to_ruby(pyobj_str);
+  VALUE v = pycall_pyobject_to_ruby(pyobj_str);
+  pycall_Py_DecRef(pyobj_str);
+  return v;
 }
 
 static VALUE
@@ -1690,19 +1700,21 @@ pycall_pyunicode_to_ruby(PyObject *pyobj)
     return Qnil;
   }
 
-  pyobj = Py_API(PyUnicode_AsUTF8String)(pyobj);
-  if (!pyobj) {
+  PyObject *pyobj_uni = Py_API(PyUnicode_AsUTF8String)(pyobj);
+  if (!pyobj_uni) {
     Py_API(PyErr_Clear)();
     return Qnil;
   }
 
-  res = Py_API(PyString_AsStringAndSize)(pyobj, &str, &len);
+  res = Py_API(PyString_AsStringAndSize)(pyobj_uni, &str, &len);
   if (res < 0) {
-    pycall_Py_DecRef(pyobj);
+    pycall_Py_DecRef(pyobj_uni);
     return Qnil;
   }
 
-  return rb_enc_str_new(str, len, rb_enc_from_index(rb_utf8_encindex()));
+  VALUE v = rb_enc_str_new(str, len, rb_enc_from_index(rb_utf8_encindex()));
+  pycall_Py_DecRef(pyobj_uni);
+  return v;
 }
 
 static VALUE

data/ext/pycall/pycall_internal.h

@@ -519,6 +519,11 @@ PyObject * PyRuby_New(VALUE ruby_object);
 
 /* ==== thread support ==== */
 
+typedef enum {
+  PyGILState_LOCKED,
+  PyGILState_UNLOCKED
+} PyGILState_STATE;
+
 #if   defined(PYCALL_THREAD_WIN32)
 typedef DWORD pycall_tls_key;
 #elif defined(PYCALL_THREAD_PTHREAD)
@@ -669,6 +674,10 @@ typedef struct {
   PyObject * (* PyUnicode_AsUTF8String)(PyObject *);
   PyObject * (* PyUnicode_DecodeUTF8)(char const*, Py_ssize_t, char const *);
   PyObject * (* PyUnicode_FromFormatV)(char const*, ...);
+
+  int (* PyGILState_Check)(void);
+  PyGILState_STATE (* PyGILState_Ensure)(void);
+  void (* PyGILState_Release)(PyGILState_STATE);
 } pycall_libpython_api_table_t;
 
 pycall_libpython_api_table_t *pycall_libpython_api_table(void);

data/ext/pycall/range.c

@@ -6,6 +6,12 @@ struct enumerator_head {
     VALUE args;
 };
 
+#ifdef HAVE_RTYPEDDATA_GET_DATA
+# define GET_ENUMERATOR_DATA(obj) ((struct enumerator_head *)RTYPEDDATA_GET_DATA(obj))
+#else
+# define GET_ENUMERATOR_DATA(obj) ((struct enumerator_head *)DATA_PTR(obj))
+#endif
+
 int
 pycall_obj_is_step_range(VALUE obj)
 {
@@ -19,7 +25,7 @@ pycall_obj_is_step_range(VALUE obj)
     return 0;
   }
 
-  eh = (struct enumerator_head *)DATA_PTR(obj);
+  eh = GET_ENUMERATOR_DATA(obj);
 
   if (!rb_obj_is_kind_of(eh->obj, rb_cRange)) {
     return 0;
@@ -50,7 +56,7 @@ pycall_extract_range(VALUE obj, VALUE *pbegin, VALUE *pend, int *pexclude_end, V
     exclude_end = rb_funcallv(obj, id_exclude_end, 0, 0);
   }
   else if (pycall_obj_is_step_range(obj)) {
-    struct enumerator_head *eh = (struct enumerator_head *)DATA_PTR(obj);
+    struct enumerator_head *eh = GET_ENUMERATOR_DATA(obj);
     begin = rb_funcallv(eh->obj, id_begin, 0, 0);
     end   = rb_funcallv(eh->obj, id_end,   0, 0);
     exclude_end = rb_funcallv(eh->obj, id_exclude_end, 0, 0);

data/ext/pycall/ruby_wrapper.c

@@ -59,10 +59,11 @@ PyObject *
 PyRuby_New(VALUE ruby_object)
 {
   if (!ruby_thread_has_gvl_p()) {
-    CALL_WITH_GVL(PyRuby_New_impl, ruby_object);
+    return CALL_WITH_GVL(PyRuby_New_impl, ruby_object);
+  }
+  else {
+    return PyRuby_New_impl(ruby_object);
   }
-
-  return PyRuby_New_impl(ruby_object);
 }
 
 static void *
@@ -90,7 +91,9 @@ PyRuby_dealloc_with_gvl(PyRubyObject *pyro)
   if (!ruby_thread_has_gvl_p()) {
     CALL_WITH_GVL(PyRuby_dealloc, pyro);
   }
-  PyRuby_dealloc(pyro);
+  else {
+    PyRuby_dealloc(pyro);
+  }
 }
 
 static PyObject *
@@ -114,7 +117,9 @@ PyRuby_repr_with_gvl(PyRubyObject *pyro)
   if (!ruby_thread_has_gvl_p()) {
     return CALL_WITH_GVL(PyRuby_repr, pyro);
   }
-  return PyRuby_repr(pyro);
+  else {
+    return PyRuby_repr(pyro);
+  }
 }
 
 #if SIZEOF_SSIZE_T < 8
@@ -154,7 +159,9 @@ PyRuby_hash_long_with_gvl(PyRubyObject *pyro)
   if (!ruby_thread_has_gvl_p()) {
     return (long)(intptr_t)CALL_WITH_GVL(PyRuby_hash_long, pyro);
   }
-  return (long)(intptr_t)PyRuby_hash_long(pyro);
+  else {
+    return (long)(intptr_t)PyRuby_hash_long(pyro);
+  }
 }
 
 static void *
@@ -185,7 +192,9 @@ PyRuby_hash_hash_t_with_gvl(PyRubyObject *pyro)
   if (!ruby_thread_has_gvl_p()) {
     return (Py_hash_t)CALL_WITH_GVL(PyRuby_hash_hash_t, pyro);
   }
-  return (Py_hash_t)PyRuby_hash_hash_t(pyro);
+  else {
+    return (Py_hash_t)PyRuby_hash_hash_t(pyro);
+  }
 }
 
 struct call_rb_funcallv_params {
@@ -269,8 +278,9 @@ PyRuby_call_with_gvl(PyRubyObject *pyro, PyObject *pyobj_args, PyObject *pyobj_k
   if (!ruby_thread_has_gvl_p()) {
     return CALL_WITH_GVL(PyRuby_call, &params);
   }
-
-  return PyRuby_call(&params);
+  else {
+    return PyRuby_call(&params);
+  }
 }
 
 struct PyRuby_getattro_params {
@@ -348,8 +358,9 @@ PyRuby_getattro_with_gvl(PyRubyObject *pyro, PyObject *pyobj_name)
   if (!ruby_thread_has_gvl_p()) {
     return CALL_WITH_GVL(PyRuby_getattro, &params);
   }
-
-  return PyRuby_getattro(&params);
+  else {
+    return PyRuby_getattro(&params);
+  }
 }
 
 /* ==== PyCall::PyRubyPtr ==== */

data/lib/pycall/version.rb

@@ -1,5 +1,5 @@
 module PyCall
-  VERSION = "1.5.1"
+  VERSION = "1.5.2"
 
   module Version
     numbers, TAG = VERSION.split("-")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pycall
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.2
 platform: ruby
 authors:
 - Kenta Murata
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-08-28 00:00:00.000000000 Z
+date: 2024-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -144,6 +144,7 @@ extensions:
 - ext/pycall/extconf.rb
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".github/workflows/windows.yml"
 - ".gitignore"
@@ -236,7 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.5.10
 signing_key:
 specification_version: 4
 summary: pycall