ruby-oci8 2.2.12 → 2.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c98e1080c073f6f2f2a67676f754259e8c20d2ef95d6abbb1015fd62df569d84
-  data.tar.gz: 4a14e505c268c3a2b408c9f4881026dd32bbe6e4276df83c77483e0402bb32b1
+  metadata.gz: 1e144a61c64f6856db08e6e473ac4531dd008c967bad30f48bf6a6852c7fc623
+  data.tar.gz: e35589ae71e41de3d0b77ca04dfa4bc0aa761272915c5e4d2cabcb955b4923d8
 SHA512:
-  metadata.gz: 1e73a635ede56087026f6b573c2f1f6624d7a265423a91ab1d7592534f6c132a1e4f1ca812e4a2651f690588f39c8c82040d20fcc9719fa0028a67c230e76e1d
-  data.tar.gz: 57497720f51ed3d2062ed8dc5eb07b248d3b19326e7c83a2cd508aaec0e7f3d33b658eb0605134776913cffc631e57b9e6b97d8b6367e5cf59dd83d24e0c749d
+  metadata.gz: 474b19d0d1a92f1cd52e0b12babeff15c4ccdeb076a3b523b61ad8d7fdc9b0bab99715af698b83cf841b114880f111e727f0dbd8e583ca4263b30fb28a2621f7
+  data.tar.gz: '079389be6f6662ae81795da0c0e4c7ba81bee27a1724032cf2c7de652f5282d0201d4f3ffec9eaa6e74d2e068abb96097912d3417d5c65cb084ed02c51e6d89b'

data/NEWS

@@ -1,5 +1,31 @@
 # @markup markdown
 
+2.2.14 (2024-08-06)
+===================
+
+Fixed issues
+------------
+
+- Fix SIGSEGV when nokogiri is loaded before oci8 (GH-263 - Linux only)
+
+2.2.13 (2024-07-27)
+===================
+
+- Binary gems for Windows x64 and x86 supports ruby 2.7 - 3.3 inclusive.
+
+Fixed issues
+------------
+
+- Fix various issues about `OCI8.properties[:tcp_keepalive_time]` on macOS arm64. The feature was removed on the platform
+  and it raises `NotImplementedError` instead now.
+- Fix SIGSEGV when using truffleruby. It seems to be caused by `xfree()` outside of ruby threads.
+
+Changes
+-------
+
+- Change the format of fifth numeral of Oracle version number as two digit zero-padding number
+  when the Oracle version is 23 or upper. For example "23.4.0.24.05".
+
 2.2.12 (2022-12-30)
 ===================
 

data/docs/hanging-after-inactivity.md

@@ -39,7 +39,7 @@ by the `tcp_keepalive_time` property.
 It is supported on the following platforms since ruby-oci8 2.2.4.
 
 * Linux i386 and x86_64
-* macOS
+* macOS x86_64
 * Windows x86 and x64
 * Solaris x86_64
 

data/ext/oci8/extconf.rb

@@ -155,6 +155,7 @@ when /darwin/
 else
   plthook_src = "plthook_elf.c"
 end
+
 FileUtils.copy(File.dirname(__FILE__) + "/" + plthook_src, CONFTEST_C)
 if xsystem(cc_command(""))
   FileUtils.rm_f("#{CONFTEST}.#{$OBJEXT}")

data/ext/oci8/oci8.c

@@ -437,7 +437,7 @@ typedef struct {
 
 static void *complex_logoff_prepare(oci8_svcctx_t *svcctx)
 {
-    complex_logoff_arg_t *cla = xmalloc(sizeof(complex_logoff_arg_t));
+    complex_logoff_arg_t *cla = malloc(sizeof(complex_logoff_arg_t));
     cla->svchp = svcctx->base.hp.svc;
     cla->usrhp = svcctx->usrhp;
     cla->srvhp = svcctx->srvhp;
@@ -479,7 +479,7 @@ static void *complex_logoff_execute(void *arg)
     if (cla->svchp != NULL) {
         OCIHandleFree(cla->svchp, OCI_HTYPE_SVCCTX);
     }
-    xfree(cla);
+    free(cla);
     return (void*)(VALUE)rv;
 }
 

data/ext/oci8/oci8.h

@@ -29,11 +29,12 @@ extern "C"
  * hexadecimal ->  dotted version number    hexadecimal ->  dotted version number
  *  0c102304   ->  12.1.2.3.4                12012034   ->  18.1.2.3.4
  *                 ^  ^ ^ ^ ^                               ^  ^ ^ ^ ^
- *  0c ------------'  | | | |  2 bytes       12 ------------'  | | | |  2 bytes
- *    1 --------------' | | |  1 byte          01 -------------' | | |  2 bytes
- *     02 --------------' | |  2 bytes           2 --------------' | |  1 byte
- *       3 ---------------' |  1 byte             03 --------------' |  2 bytes
- *        04 ---------------'  2 bytes              4 ---------------'  1 byte
+ *  0c ------------'  | | | |  8 bits        12 ------------'  | | | |  8 bits
+ *    1 --------------' | | |  4 bits          01 -------------' | | |  8 bits
+ *     02 --------------' | |  8 bits            2 --------------' | |  4 bits
+ *       3 ---------------' |  4 bits             03 --------------' |  8 bits
+ *        04 ---------------'  8 bits               4 ---------------'  4 bits
+ *                      total 32 bits                            total 32 bits
  */
 #define ORAVERNUM(major, minor, update, patch, port_update) \
     (((major) >= 18) ? (((major) << 24) | ((minor) << 16) | ((update) << 12) | ((patch) << 4) | (port_update)) \

data/ext/oci8/oci8lib.c

@@ -9,6 +9,7 @@
 #endif
 #if defined(HAVE_PLTHOOK) && !defined(WIN32)
 #include <dlfcn.h>
+#include <sys/mman.h>
 #include "plthook.h"
 #endif
 
@@ -135,6 +136,8 @@ static void rebind_internal_symbols(void)
     void **addr;
     const char *prefix;
     size_t prefix_len;
+    int prot;
+    size_t page_size = sysconf(_SC_PAGESIZE);
 
 #ifdef RTLD_FIRST
     flags |= RTLD_FIRST; /* for macOS */
@@ -161,7 +164,7 @@ static void rebind_internal_symbols(void)
         plthook_close(ph);
         return;
     }
-    while (plthook_enum(ph, &pos, &name, &addr) == 0) {
+    while (plthook_enum_with_prot(ph, &pos, &name, &addr, &prot) == 0) {
         void *funcaddr;
         if (prefix_len != 0) {
             if (strncmp(name, prefix, prefix_len) != 0) {
@@ -179,7 +182,17 @@ static void rebind_internal_symbols(void)
              * PLT entries are forcedly modified to point to itself not
              * to use functions in other libraries.
              */
+#define ALIGN_ADDR(addr) ((void*)((size_t)(addr) & ~(page_size - 1)))
+            if ((prot & PROT_WRITE) == 0) {
+                /* when the region containing addr isn't writable, make it writable temporarily */
+                if (mprotect(ALIGN_ADDR(addr), page_size, PROT_READ | PROT_WRITE) != 0) {
+                    continue;
+                }
+            }
             *addr = funcaddr;
+            if ((prot & PROT_WRITE) == 0) {
+                mprotect(ALIGN_ADDR(addr), page_size, prot);
+            }
         }
     }
     plthook_close(ph);
@@ -675,28 +688,7 @@ void *oci8_find_symbol(const char *symbol_name)
 
 void *oci8_check_typeddata(VALUE obj, const oci8_handle_data_type_t *data_type, int error_if_closed)
 {
-#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
     oci8_base_t *hp = Check_TypedStruct(obj, &data_type->rb_data_type);
-#else
-    oci8_base_t *hp;
-    const char *expected_type_name = data_type->rb_data_type.wrap_struct_name;
-    const rb_data_type_t *rb_data_type;
-    const rb_data_type_t *expected_rb_data_type = &data_type->rb_data_type;
-
-    if (TYPE(obj) != T_DATA || !rb_obj_is_kind_of(obj, oci8_cOCIHandle)) {
-        rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-                 rb_obj_classname(obj), expected_type_name);
-    }
-    hp = DATA_PTR(obj);
-    rb_data_type = &hp->data_type->rb_data_type;
-    while (rb_data_type != expected_rb_data_type) {
-        if (rb_data_type == NULL) {
-            rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-                     rb_obj_classname(obj), expected_type_name);
-        }
-        rb_data_type = rb_data_type->parent;
-    }
-#endif
     if (error_if_closed && hp->closed) {
         rb_raise(eOCIException, "%s was already closed.",
                  rb_obj_classname(obj));

data/ext/oci8/oraconf.rb

@@ -130,6 +130,8 @@ class MiniSOReader
       @cpu = :ia64
     when 62
       @cpu = :x86_64
+    when 183
+      @cpu = :aarch64
     else
       raise "Invalid ELF archtype: #{archtype}"
     end
@@ -379,6 +381,8 @@ EOS
       @@ld_envs = %w[PATH]
       so_ext = 'dll'
       check_proc = make_proc_to_check_cpu(is_32bit ? :i386 : :x86_64)
+    when /aarch64-linux/
+      check_proc = make_proc_to_check_cpu(:aarch64)
     when /i.86-linux/
       check_proc = make_proc_to_check_cpu(:i386)
     when /ia64-linux/

data/ext/oci8/oradate.c

@@ -61,18 +61,7 @@ typedef struct ora_date ora_date_t;
     if (sec < 0 || 59 < sec) \
         rb_raise(rb_eRangeError, "Out of range for second %d (expect 0 .. 59)", sec)
 
-#ifdef HAVE_RB_DATA_TYPE_T_FUNCTION
 #define check_oradate(obj) ((ora_date_t*)Check_TypedStruct((obj), &odate_data_type))
-#else
-static ora_date_t *check_oradate(VALUE obj)
-{
-    if (!rb_obj_is_kind_of(obj, cOraDate)) {
-        rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)",
-                 rb_obj_classname(obj), rb_class2name(cOraDate));
-    }
-    return DATA_PTR(obj);
-}
-#endif
 
 static size_t odate_memsize(const void *ptr)
 {

data/ext/oci8/plthook.h

@@ -59,8 +59,14 @@ int plthook_replace(plthook_t *plthook, const char *funcname, void *funcaddr, vo
 void plthook_close(plthook_t *plthook);
 const char *plthook_error(void);
 
+/* enumerate entries with memory protection information (bitwise-OR of PROT_READ, PROT_WRITE and PROT_EXEC)
+ *
+ * source: plthook_elf.c and plthook_osx.c
+ */
+int plthook_enum_with_prot(plthook_t *plthook, unsigned int *pos, const char **name_out, void ***addr_out, int *prot);
+
 #ifdef __cplusplus
-}; /* extern "C" */
+} /* extern "C" */
 #endif
 
 #endif