ruby-oci8 2.2.6.1 → 2.2.10

data/ext/oci8/connection_pool.c

@@ -144,13 +144,13 @@ static VALUE oci8_cpool_initialize(int argc, VALUE *argv, VALUE self)
     chker2(OCIConnectionPoolCreate(oci8_envhp, oci8_errhp, cpool->base.hp.poolhp,
                                    &pool_name, &pool_name_len,
                                    NIL_P(dbname) ? NULL : RSTRING_ORATEXT(dbname),
-                                   NIL_P(dbname) ? 0 : RSTRING_LEN(dbname),
+                                   NIL_P(dbname) ? 0 : RSTRING_LENINT(dbname),
                                    FIX2UINT(conn_min), FIX2UINT(conn_max),
                                    FIX2UINT(conn_incr),
                                    NIL_P(username) ? NULL : RSTRING_ORATEXT(username),
-                                   NIL_P(username) ? 0 : RSTRING_LEN(username),
+                                   NIL_P(username) ? 0 : RSTRING_LENINT(username),
                                    NIL_P(password) ? NULL : RSTRING_ORATEXT(password),
-                                   NIL_P(password) ? 0 : RSTRING_LEN(password),
+                                   NIL_P(password) ? 0 : RSTRING_LENINT(password),
                                    OCI_DEFAULT),
            &cpool->base);
     RB_OBJ_WRITE(cpool->base.self, &cpool->pool_name, rb_str_new(TO_CHARPTR(pool_name), pool_name_len));

data/ext/oci8/extconf.rb

@@ -139,6 +139,8 @@ when 'rbx'
   so_basename += 'rbx'
 when 'jruby'
   raise "Ruby-oci8 doesn't support jruby because its C extension support is in development in jruby 1.6 and deprecated in jruby 1.7."
+when 'truffleruby'
+  so_basename += 'truffleruby'
 else
   raise 'unsupported ruby engine: ' + RUBY_ENGINE
 end
@@ -153,8 +155,9 @@ when /darwin/
 else
   plthook_src = "plthook_elf.c"
 end
-if xsystem(cc_command("").gsub(CONFTEST_C, File.dirname(__FILE__) + "/" + plthook_src))
-  File.delete(plthook_src.gsub(/\.c$/, '.' + RbConfig::CONFIG["OBJEXT"]))
+FileUtils.copy(File.dirname(__FILE__) + "/" + plthook_src, CONFTEST_C)
+if xsystem(cc_command(""))
+  FileUtils.rm_f("#{CONFTEST}.#{$OBJEXT}")
   puts plthook_src
   $objs << plthook_src.gsub(/\.c$/, '.o')
   $objs << "hook_funcs.o"

data/ext/oci8/hook_funcs.c

@@ -298,13 +298,28 @@ static void *ocifunc_addr(void *dlsym_handle, const char **file)
     if (dladdr(addr, &dli) == 0) {
         return NULL;
     }
-    if (strstr(dli.dli_fname, "/libclntsh." SO_EXT) == 0) {
+    if (strstr(dli.dli_fname, "/libclntsh." SO_EXT) == NULL) {
         return NULL;
     }
     *file = dli.dli_fname;
     return addr;
 }
 
+#ifdef __linux__
+#include <link.h>
+static void *ocifunc_addr_linux(const char **file)
+{
+    struct link_map *lm;
+    for (lm = _r_debug.r_map; lm != NULL; lm = lm->l_next) {
+        if (strstr(lm->l_name, "/libclntsh." SO_EXT) != NULL) {
+            *file = lm->l_name;
+            return (void*)lm->l_addr;
+        }
+    }
+    return NULL;
+}
+#endif
+
 void oci8_install_hook_functions(void)
 {
     static int hook_functions_installed = 0;
@@ -319,6 +334,11 @@ void oci8_install_hook_functions(void)
         /* OCI symbols may be hooked by LD_PRELOAD. */
         addr = ocifunc_addr(RTLD_NEXT, &file);
     }
+#ifdef __linux__
+    if (addr == NULL) {
+        addr = ocifunc_addr_linux(&file);
+    }
+#endif
     if (addr == NULL) {
         rb_raise(rb_eRuntimeError, "No shared library is found to hook.");
     }

data/ext/oci8/lob.c

@@ -639,10 +639,9 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
 {
     oci8_lob_t *lob = TO_LOB(self);
     oci8_svcctx_t *svcctx = check_svcctx(lob);
-    ub8 lob_length;
-    ub8 read_len;
     ub8 pos = lob->pos;
-    long strbufsiz;
+    long strbufsiz = 512;
+    ub8 sz;
     ub8 byte_amt;
     ub8 char_amt;
     sword rv;
@@ -652,36 +651,21 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
     ub1 piece = OCI_FIRST_PIECE;
 
     rb_scan_args(argc, argv, "01", &size);
-    lob_length = oci8_lob_get_length(lob);
-    if (lob_length == 0 && NIL_P(size)) {
-        return rb_usascii_str_new("", 0);
-    }
-    if (lob_length <= pos) /* EOF */
-        return Qnil;
     if (NIL_P(size)) {
-        read_len = lob_length - pos;
+        sz = UB4MAXVAL;
     } else {
-        ub8 sz = NUM2ULL(size);
-        read_len = MIN(sz, lob_length - pos);
+        sz = NUM2ULL(size);
+    }
+    if (lob->state == S_BFILE_CLOSE) {
+        open_bfile(svcctx, lob, errhp);
     }
+read_more_data:
     if (lob->lobtype == OCI_TEMP_CLOB) {
         byte_amt = 0;
-        char_amt = read_len;
-        if (oci8_nls_ratio == 1) {
-            strbufsiz = MIN(read_len, ULONG_MAX);
-        } else {
-            strbufsiz = MIN(read_len + read_len / 8, ULONG_MAX);
-        }
-        if (strbufsiz <= 10) {
-            strbufsiz = 10;
-        }
+        char_amt = sz;
     } else {
-        byte_amt = read_len;
+        byte_amt = sz;
         char_amt = 0;
-        strbufsiz = MIN(read_len, ULONG_MAX);
-    }
-    if (lob->state == S_BFILE_CLOSE) {
-        open_bfile(svcctx, lob, errhp);
     }
     do {
         VALUE strbuf = rb_str_buf_new(strbufsiz);
@@ -711,22 +695,30 @@ static VALUE oci8_lob_read(int argc, VALUE *argv, VALUE self)
         }
         rb_str_set_len(strbuf, byte_amt);
         rb_ary_push(v, strbuf);
+        if (strbufsiz < 128 * 1024 * 1024) {
+            strbufsiz *= 2;
+        }
     } while (rv == OCI_NEED_DATA);
 
-    if (pos >= lob_length) {
-        bfile_close(lob);
+    if (NIL_P(size) && pos - lob->pos == sz) {
+        lob->pos = pos;
+        piece = OCI_FIRST_PIECE;
+        goto read_more_data;
     }
     lob->pos = pos;
     switch (RARRAY_LEN(v)) {
     case 0:
-        return Qnil;
+        if (NIL_P(size) && pos == 0) {
+            return rb_usascii_str_new("", 0);
+        } else {
+            return Qnil;
+        }
     case 1:
         v = RARRAY_AREF(v, 0);
         break;
     default:
         v = rb_ary_join(v, Qnil);
     }
-    OBJ_TAINT(v);
     if (lob->lobtype == OCI_TEMP_CLOB) {
         /* set encoding */
         rb_enc_associate(v, oci8_encoding);
@@ -773,10 +765,10 @@ static VALUE oci8_lob_write(VALUE self, VALUE data)
     RB_GC_GUARD(str);
     if (lob->lobtype == OCI_TEMP_CLOB) {
         lob->pos += char_amt;
-        return UINT2NUM(char_amt);
+        return ULL2NUM(char_amt);
     } else {
         lob->pos += byte_amt;
-        return UINT2NUM(byte_amt);
+        return ULL2NUM(byte_amt);
     }
 }
 

data/ext/oci8/metadata.c

@@ -195,7 +195,7 @@ VALUE oci8_do_describe(VALUE self, void *objptr, ub4 objlen, ub1 objtype, VALUE
 static VALUE oci8_describe(VALUE self, VALUE name, VALUE klass, VALUE check_public)
 {
     char *str;
-    size_t idx, len;
+    int idx, len;
     VALUE metadata;
     VALUE obj_link = Qnil;
 
@@ -204,7 +204,7 @@ static VALUE oci8_describe(VALUE self, VALUE name, VALUE klass, VALUE check_publ
         rb_raise(rb_eArgError, "empty string is set.");
     }
     str = RSTRING_PTR(name);
-    len = RSTRING_LEN(name);
+    len = RSTRING_LENINT(name);
     for (idx = 0; idx < len; idx++) {
         if (str[idx] == '@') {
             obj_link = rb_enc_str_new(str + idx + 1, len - idx - 1, oci8_encoding);

data/ext/oci8/object.c

@@ -485,7 +485,7 @@ static VALUE set_coll_element_func(set_coll_element_cb_data_t *cb_data)
 
     chkerr(OCICollSize(oci8_envhp, oci8_errhp, coll, &size));
     if (RARRAY_LEN(val) < size) {
-        chkerr(OCICollTrim(oci8_envhp, oci8_errhp, size - RARRAY_LEN(val), coll));
+        chkerr(OCICollTrim(oci8_envhp, oci8_errhp, (sb4)(size - RARRAY_LEN(val)), coll));
     }
     for (idx = 0; idx < RARRAY_LEN(val); idx++) {
         switch (FIX2INT(datatype)) {
@@ -559,13 +559,13 @@ static void set_attribute(VALUE self, VALUE datatype, VALUE typeinfo, void *data
     case ATTR_STRING:
         OCI8StringValue(val);
         chkerr(OCIStringAssignText(oci8_envhp, oci8_errhp,
-                                   RSTRING_ORATEXT(val), RSTRING_LEN(val),
+                                   RSTRING_ORATEXT(val), RSTRING_LENINT(val),
                                    (OCIString **)data));
         break;
     case ATTR_RAW:
         StringValue(val);
         chkerr(OCIRawAssignBytes(oci8_envhp, oci8_errhp,
-                                 RSTRING_ORATEXT(val), RSTRING_LEN(val),
+                                 RSTRING_ORATEXT(val), RSTRING_LENINT(val),
                                  (OCIRaw **)data));
         break;
     case ATTR_OCINUMBER:
@@ -680,45 +680,57 @@ static VALUE oci8_named_collection_alloc(VALUE klass)
     return oci8_allocate_typeddata(klass, &oci8_named_collection_data_type);
 }
 
+typedef struct {
+    oci8_bind_t bind;
+    VALUE *obj;
+} bind_named_type_t;
+
 static void bind_named_type_mark(oci8_base_t *base)
 {
-    oci8_bind_t *obind = (oci8_bind_t *)base;
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)base;
 
-    if (oho != NULL) {
+    if (bnt->obj != NULL) {
         ub4 idx = 0;
 
         do {
-            rb_gc_mark(oho[idx].obj);
-        } while (++idx < obind->maxar_sz);
+            rb_gc_mark(bnt->obj[idx]);
+        } while (++idx < bnt->bind.maxar_sz);
     }
-    rb_gc_mark(obind->tdo);
+    rb_gc_mark(bnt->bind.tdo);
 }
 
 static void bind_named_type_free(oci8_base_t *base)
 {
-    oci8_bind_t *obind = (oci8_bind_t *)base;
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)base;
+    void **hp = (void **)bnt->bind.valuep;
 
-    if (oho != NULL) {
+    if (hp != NULL) {
         ub4 idx = 0;
 
         do {
-            if (oho[idx].hp != NULL) {
-                OCIObjectFree(oci8_envhp, oci8_errhp, oho[idx].hp, OCI_DEFAULT);
-                oho[idx].hp = NULL;
+            if (hp[idx] != NULL) {
+                OCIObjectFree(oci8_envhp, oci8_errhp, hp[idx], OCI_DEFAULT);
+                hp[idx] = NULL;
             }
-        } while (++idx < obind->maxar_sz);
+        } while (++idx < bnt->bind.maxar_sz);
+    }
+    if (bnt->obj != NULL) {
+        xfree(bnt->obj);
+        bnt->obj = NULL;
     }
     oci8_bind_free(base);
 }
 
 static VALUE bind_named_type_get(oci8_bind_t *obind, void *data, void *null_struct)
 {
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)data;
-    return oho->obj;
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
+    ub4 idx = obind->curar_idx;
+
+    return bnt->obj[idx];
 }
 
+NORETURN(static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val));
+
 static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_structp, VALUE val)
 {
     rb_raise(rb_eRuntimeError, "not supported");
@@ -726,10 +738,12 @@ static void bind_named_type_set(oci8_bind_t *obind, void *data, void **null_stru
 
 static void bind_named_type_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE length)
 {
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
     VALUE tdo_obj = length;
 
     obind->value_sz = sizeof(void*);
-    obind->alloc_sz = sizeof(oci8_hp_obj_t);
+    obind->alloc_sz = sizeof(void*);
+    bnt->obj = xcalloc(sizeof(VALUE), obind->maxar_sz ? obind->maxar_sz : 1);
 
     CHECK_TDO(tdo_obj);
     RB_OBJ_WRITE(obind->base.self, &obind->tdo, tdo_obj);
@@ -737,7 +751,8 @@ static void bind_named_type_init(oci8_bind_t *obind, VALUE svc, VALUE val, VALUE
 
 static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
 {
-    oci8_hp_obj_t *oho = (oci8_hp_obj_t *)obind->valuep;
+    bind_named_type_t *bnt = (bind_named_type_t *)obind;
+    void **hp = (void **)obind->valuep;
     oci8_base_t *tdo = DATA_PTR(obind->tdo);
     OCITypeCode tc = OCITypeTypeCode(oci8_envhp, oci8_errhp, tdo->hp.tdo);
     VALUE klass = Qnil;
@@ -755,14 +770,14 @@ static void bind_named_type_init_elem(oci8_bind_t *obind, VALUE svc)
     }
     svcctx = oci8_get_svcctx(svc);
     do {
-        oho[idx].obj = rb_class_new_instance(0, NULL, klass);
-        RB_OBJ_WRITTEN(obind->base.self, Qundef, oho[idx].obj);
-        obj = DATA_PTR(oho[idx].obj);
-        RB_OBJ_WRITE(oho[idx].obj, &obj->tdo, obind->tdo);
-        obj->instancep = (char**)&oho[idx].hp;
+        bnt->obj[idx] = rb_class_new_instance(0, NULL, klass);
+        RB_OBJ_WRITTEN(obind->base.self, Qundef, bnt->obj[idx]);
+        obj = DATA_PTR(bnt->obj[idx]);
+        RB_OBJ_WRITE(bnt->obj[idx], &obj->tdo, obind->tdo);
+        obj->instancep = (char**)&hp[idx];
         obj->null_structp = (char**)&obind->u.null_structs[idx];
         oci8_link_to_parent(&obj->base, &obind->base);
-        RB_OBJ_WRITTEN(oho[idx].obj, Qundef, obind->base.self);
+        RB_OBJ_WRITTEN(bnt->obj[idx], Qundef, obind->base.self);
 
         chker2(OCIObjectNew(oci8_envhp, oci8_errhp, svcctx->base.hp.svc, tc, tdo->hp.tdo, NULL, OCI_DURATION_SESSION, TRUE, (dvoid**)obj->instancep),
                &svcctx->base);
@@ -804,7 +819,7 @@ static const oci8_bind_data_type_t bind_named_type_data_type = {
 #endif
         },
         bind_named_type_free,
-        sizeof(oci8_bind_t)
+        sizeof(bind_named_type_t)
     },
     bind_named_type_get,
     bind_named_type_set,

data/ext/oci8/oci8.c

@@ -2,7 +2,7 @@
 /*
  * oci8.c - part of ruby-oci8
  *
- * Copyright (C) 2002-2015 Kubo Takehiro <kubo@jiubao.org>
+ * Copyright (C) 2002-2019 Kubo Takehiro <kubo@jiubao.org>
  *
  */
 #include "oci8.h"
@@ -556,7 +556,7 @@ static VALUE oci8_server_attach(VALUE self, VALUE dbname, VALUE attach_mode)
     /* attach to the server */
     chker2(OCIServerAttach_nb(svcctx, svcctx->srvhp, oci8_errhp,
                               NIL_P(dbname) ? NULL : RSTRING_ORATEXT(dbname),
-                              NIL_P(dbname) ? 0 : RSTRING_LEN(dbname),
+                              NIL_P(dbname) ? 0 : RSTRING_LENINT(dbname),
                               mode),
            &svcctx->base);
     chker2(OCIAttrSet(svcctx->base.hp.ptr, OCI_HTYPE_SVCCTX,
@@ -734,14 +734,9 @@ static VALUE oci8_set_autocommit(VALUE self, VALUE val)
 /*
  * @overload long_read_len
  *
- *  Gets the maximum length in bytes to fetch a LONG or LONG RAW
- *  column. The default value is 65535.
- *
- *  If the actual data length is longer than long_read_len,
- *  the fetched valud is truncated and the value of {OCI8#last_error}
- *  become {OCISuccessWithInfo} whose message is "ORA-01406: fetched column value was truncated".
- *
- *  Note: long_read_len is also used for maximum length of XMLTYPE data type.
+ *  @deprecated This has no effect since ruby-oci8 2.2.7.
+ *    LONG, LONG RAW and XMLTYPE columns are fetched up to 4 gigabytes
+ *    without this parameter.
  *
  *  @return [Integer]
  *  @see #long_read_len=
@@ -749,14 +744,16 @@ static VALUE oci8_set_autocommit(VALUE self, VALUE val)
 static VALUE oci8_long_read_len(VALUE self)
 {
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
+    rb_warning("OCI8.long_read_len has no effect since ruby-oci8 2.2.7");
     return svcctx->long_read_len;
 }
 
 /*
  * @overload long_read_len=(length)
  *
- *  Sets the maximum length in bytes to fetch a LONG or LONG RAW
- *  column.
+ *  @deprecated This has no effect since ruby-oci8 2.2.7.
+ *    LONG, LONG RAW and XMLTYPE columns are fetched up to 4 gigabytes
+ *    without this parameter.
  *
  *  @param [Integer] length
  *  @see #long_read_len
@@ -766,6 +763,7 @@ static VALUE oci8_set_long_read_len(VALUE self, VALUE val)
     oci8_svcctx_t *svcctx = oci8_get_svcctx(self);
     Check_Type(val, T_FIXNUM);
     RB_OBJ_WRITE(self, &svcctx->long_read_len, val);
+    rb_warning("OCI8.long_read_len= has no effect since ruby-oci8 2.2.7");
     return val;
 }
 
@@ -866,7 +864,7 @@ static VALUE oci8_set_client_identifier(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -901,7 +899,7 @@ static VALUE oci8_set_module(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -935,7 +933,7 @@ static VALUE oci8_set_action(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;
@@ -966,7 +964,7 @@ static VALUE oci8_set_client_info(VALUE self, VALUE val)
     if (!NIL_P(val)) {
         OCI8SafeStringValue(val);
         ptr = RSTRING_PTR(val);
-        size = RSTRING_LEN(val);
+        size = RSTRING_LENINT(val);
     } else {
         ptr = "";
         size = 0;

data/ext/oci8/oci8.h

@@ -424,6 +424,7 @@ void *oci8_check_typeddata(VALUE obj, const oci8_handle_data_type_t *data_type,
 extern VALUE eOCIException;
 extern VALUE eOCIBreak;
 void Init_oci8_error(void);
+NORETURN(void oci8_do_raise(OCIError *errhp, sword status, OCIStmt *stmthp, const char *file, int line));
 NORETURN(void oci8_do_env_raise(OCIEnv *envhp, sword status, int free_envhp, const char *file, int line));
 NORETURN(void oci8_do_raise_init_error(const char *file, int line));
 sb4 oci8_get_error_code(OCIError *errhp);

data/ext/oci8/oci8lib.c

@@ -71,7 +71,7 @@ static VALUE bind_base_alloc(VALUE klass)
     rb_raise(rb_eNameError, "private method `new' called for %s:Class", rb_class2name(klass));
 }
 
-#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__)
+#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__) && !defined(TRUFFLERUBY)
 static const char *find_libclntsh(void *handle)
 {
     void *symaddr = dlsym(handle, "OCIEnvCreate");
@@ -226,7 +226,7 @@ Init_oci8lib()
         oracle_client_version = ORAVERNUM(major, minor, update, patch, port_update);
     }
 #endif
-#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__)
+#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__) && !defined(TRUFFLERUBY)
     rebind_internal_symbols();
 #endif
 
@@ -461,6 +461,7 @@ sword oci8_call_without_gvl(oci8_svcctx_t *svcctx, void *(*func)(void *), void *
         parg.func = func;
         parg.data = data;
         rv = (sword)rb_protect(protected_call, (VALUE)&parg, &state);
+        RB_OBJ_WRITE(svcctx->base.self, &svcctx->executing_thread, Qnil);
         if (state) {
             rb_jump_tag(state);
         }
@@ -481,8 +482,8 @@ typedef struct {
     OCIStmt *stmtp;
 } cb_arg_t;
 
-static VALUE exec_sql(cb_arg_t *arg);
-static VALUE ensure_func(cb_arg_t *arg);
+static VALUE exec_sql(VALUE varg);
+static VALUE ensure_func(VALUE varg);
 
 /*
  * utility function to execute a single SQL statement
@@ -503,13 +504,14 @@ sword oci8_exec_sql(oci8_svcctx_t *svcctx, const char *sql_text, ub4 num_define_
     return (sword)rb_ensure(exec_sql, (VALUE)&arg, ensure_func, (VALUE)&arg);
 }
 
-static VALUE exec_sql(cb_arg_t *arg)
+static VALUE exec_sql(VALUE varg)
 {
+    cb_arg_t *arg = (cb_arg_t *)varg;
     ub4 pos;
     sword rv;
 
     chker2(OCIStmtPrepare2(arg->svcctx->base.hp.svc, &arg->stmtp, oci8_errhp, 
-                           (text*)arg->sql_text, strlen(arg->sql_text), NULL, 0,
+                           (text*)arg->sql_text, (ub4)strlen(arg->sql_text), NULL, 0,
                            OCI_NTV_SYNTAX, OCI_DEFAULT),
            &arg->svcctx->base);
     for (pos = 0; pos < arg->num_define_vars; pos++) {
@@ -546,8 +548,9 @@ static VALUE exec_sql(cb_arg_t *arg)
     return (VALUE)rv;
 }
 
-static VALUE ensure_func(cb_arg_t *arg)
+static VALUE ensure_func(VALUE varg)
 {
+    cb_arg_t *arg = (cb_arg_t *)varg;
     if (arg->stmtp != NULL) {
         OCIStmtRelease(arg->stmtp, oci8_errhp, NULL, 0, OCI_DEFAULT);
     }

data/ext/oci8/ocihandle.c

@@ -752,7 +752,7 @@ static VALUE attr_set_string(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     OCI8SafeStringValue(val);
     /* set attribute */
-    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp), base);
+    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LENINT(val), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 
@@ -776,7 +776,7 @@ static VALUE attr_set_binary(VALUE self, VALUE attr_type, VALUE val)
     Check_Type(attr_type, T_FIXNUM);
     SafeStringValue(val);
     /* set attribute */
-    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LEN(val), FIX2INT(attr_type), oci8_errhp), base);
+    chker2(OCIAttrSet(base->hp.ptr, base->type, RSTRING_PTR(val), RSTRING_LENINT(val), FIX2INT(attr_type), oci8_errhp), base);
     return self;
 }
 

data/ext/oci8/ocinumber.c

@@ -154,7 +154,7 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
     StringValue(str);
     /* set from string. */
     if (NIL_P(fmt)) {
-        int rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        int rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LENINT(str));
         if (rv == ORANUMBER_SUCCESS) {
             return; /* success */
         } else {
@@ -172,17 +172,17 @@ static void set_oci_number_from_str(OCINumber *result, VALUE str, VALUE fmt, VAL
     }
     StringValue(fmt);
     fmt_ptr = RSTRING_ORATEXT(fmt);
-    fmt_len = RSTRING_LEN(fmt);
+    fmt_len = RSTRING_LENINT(fmt);
     if (NIL_P(nls_params)) {
         nls_params_ptr = NULL;
         nls_params_len = 0;
     } else {
         StringValue(nls_params);
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
-        nls_params_len = RSTRING_LEN(nls_params);
+        nls_params_len = RSTRING_LENINT(nls_params);
     }
     chkerr(OCINumberFromText(errhp,
-                             RSTRING_ORATEXT(str), RSTRING_LEN(str),
+                             RSTRING_ORATEXT(str), RSTRING_LENINT(str),
                              fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
                              result));
 }
@@ -216,6 +216,8 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
         num = rb_big2str(num, 10);
         set_oci_number_from_str(result, num, Qnil, Qnil, errhp);
         return 1;
+    default:
+        break;
     }
     if (RTEST(rb_obj_is_instance_of(num, cOCINumber))) {
         /* OCI::Number */
@@ -247,7 +249,7 @@ static int set_oci_number_from_num(OCINumber *result, VALUE num, int force, OCIE
             if (TYPE(ary[1]) != T_STRING) {
                 goto is_not_big_decimal;
             }
-            digits_len = RSTRING_LEN(ary[1]);
+            digits_len = RSTRING_LENINT(ary[1]);
             set_oci_number_from_str(&digits, ary[1], Qnil, Qnil, errhp);
             /* check base */
             if (TYPE(ary[2]) != T_FIXNUM || FIX2LONG(ary[2]) != 10) {
@@ -363,7 +365,7 @@ OCINumber *oci8_dbl_to_onum(OCINumber *result, double dbl, OCIError *errhp)
         sword rv;
 
         str = rb_obj_as_string(rb_float_new(dbl));
-        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LEN(str));
+        rv = oranumber_from_str(result, RSTRING_PTR(str), RSTRING_LENINT(str));
         if (rv != 0) {
             oci8_raise_by_msgno(rv, NULL);
         }
@@ -1307,14 +1309,14 @@ static VALUE onum_to_char(int argc, VALUE *argv, VALUE self)
     }
     StringValue(fmt);
     fmt_ptr = RSTRING_ORATEXT(fmt);
-    fmt_len = RSTRING_LEN(fmt);
+    fmt_len = RSTRING_LENINT(fmt);
     if (NIL_P(nls_params)) {
         nls_params_ptr = NULL;
         nls_params_len = 0;
     } else {
         StringValue(nls_params);
         nls_params_ptr = RSTRING_ORATEXT(nls_params);
-        nls_params_len = RSTRING_LEN(nls_params);
+        nls_params_len = RSTRING_LENINT(nls_params);
     }
     rv = OCINumberToText(errhp, _NUMBER(self),
                          fmt_ptr, fmt_len, nls_params_ptr, nls_params_len,
@@ -1435,7 +1437,7 @@ static VALUE onum_to_d_real(OCINumber *num, OCIError *errhp)
         rb_require("bigdecimal");
         cBigDecimal = rb_const_get(rb_cObject, id_BigDecimal);
     }
-    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, strlen(fmt),
+    chkerr(OCINumberToText(errhp, num, (const oratext *)fmt, (ub4)strlen(fmt),
                            NULL, 0, &buf_size, TO_ORATEXT(buf)));
     return rb_funcall(rb_cObject, id_BigDecimal, 1, rb_usascii_str_new(buf, buf_size));
 }