ruby-oci8 2.2.0.2 → 2.2.12

data/ext/oci8/oci8lib.c

@@ -7,6 +7,10 @@
 #ifdef HAVE_RUBY_THREAD_H
 #include <ruby/thread.h>
 #endif
+#if defined(HAVE_PLTHOOK) && !defined(WIN32)
+#include <dlfcn.h>
+#include "plthook.h"
+#endif
 
 ID oci8_id_at_last_error;
 ID oci8_id_get;
@@ -54,7 +58,6 @@ void oci8_base_free(oci8_base_t *base)
     base->hp.ptr = NULL;
 }
 
-#ifdef HAVE_RB_SET_END_PROC
 static void at_exit_func(VALUE val)
 {
     oci8_in_finalizer = 1;
@@ -62,21 +65,136 @@ static void at_exit_func(VALUE val)
     oci8_shutdown_sockets();
 #endif
 }
-#endif
 
 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__) && !defined(TRUFFLERUBY)
+static const char *find_libclntsh(void *handle)
+{
+    void *symaddr = dlsym(handle, "OCIEnvCreate");
+    Dl_info info;
+#ifdef __APPLE__
+    const char *basename = "libclntsh.dylib";
+#else
+    const char *basename = "libclntsh.so";
+#endif
+    const char *p;
+
+    if (symaddr == NULL) {
+        return NULL;
+    }
+    if (dladdr(symaddr, &info) == 0) {
+        return NULL;
+    }
+    if ((p = strrchr(info.dli_fname, '/')) == NULL) {
+        return NULL;
+    }
+    if (strncmp(p + 1, basename, strlen(basename)) != 0) {
+        return NULL;
+    }
+    return info.dli_fname;
+}
+
+/*
+ * Symbol prefix depends on the platform.
+ *  Linux x86_64 - no prefix
+ *  Linux x86_32 - "_"
+ *  macOS        - "@_"
+ */
+static const char *find_symbol_prefix(plthook_t *ph, size_t *len)
+{
+    unsigned int pos = 0;
+    const char *name;
+    void **addr;
+
+    while (plthook_enum(ph, &pos, &name, &addr) == 0) {
+        const char *p = strstr(name, "OCIEnvCreate");
+        if (p != NULL) {
+            *len = p - name;
+            return name;
+        }
+    }
+    return NULL;
+}
+
+/*
+ * Fix PLT entries against function interposition.
+ * See: http://www.rubydoc.info/github/kubo/ruby-oci8/file/docs/ldap-auth-and-function-interposition.md
+ */
+static void rebind_internal_symbols(void)
+{
+    const char *libfile;
+    void *handle;
+    int flags = RTLD_LAZY | RTLD_NOLOAD;
+    plthook_t *ph;
+    unsigned int pos = 0;
+    const char *name;
+    void **addr;
+    const char *prefix;
+    size_t prefix_len;
+
+#ifdef RTLD_FIRST
+    flags |= RTLD_FIRST; /* for macOS */
+#endif
+
+    libfile = find_libclntsh(RTLD_DEFAULT); /* normal case */
+    if (libfile == NULL) {
+        libfile = find_libclntsh(RTLD_NEXT); /* special case when OCIEnvCreate is hooked by LD_PRELOAD */
+    }
+    if (libfile == NULL) {
+        return;
+    }
+    handle = dlopen(libfile, flags);
+    if (handle == NULL) {
+        return;
+    }
+    if (plthook_open(&ph, libfile) != 0) {
+        dlclose(handle);
+        return;
+    }
+    prefix = find_symbol_prefix(ph, &prefix_len);
+    if (prefix == NULL) {
+        dlclose(handle);
+        plthook_close(ph);
+        return;
+    }
+    while (plthook_enum(ph, &pos, &name, &addr) == 0) {
+        void *funcaddr;
+        if (prefix_len != 0) {
+            if (strncmp(name, prefix, prefix_len) != 0) {
+                continue;
+            }
+            name += prefix_len;
+        }
+        if (strncmp(name, "OCI", 3) == 0) {
+            /* exclude functions starting with OCI not to prevent LD_PRELOAD hooking */
+            continue;
+        }
+        funcaddr = dlsym(handle, name);
+        if (funcaddr != NULL && *addr != funcaddr) {
+            /* If libclntsh.so exports and imports same functions, their
+             * PLT entries are forcedly modified to point to itself not
+             * to use functions in other libraries.
+             */
+            *addr = funcaddr;
+        }
+    }
+    plthook_close(ph);
+    dlclose(handle);
+}
+#endif
+
 #ifdef _WIN32
 __declspec(dllexport)
 #endif
 void
-Init_oci8lib()
+Init_oci8lib(void)
 {
     VALUE cOCI8;
-    OCIEnv *envhp;
+    OCIEnv *envhp = NULL;
     OCIError *errhp;
     sword rv;
 
@@ -108,6 +226,9 @@ Init_oci8lib()
         oracle_client_version = ORAVERNUM(major, minor, update, patch, port_update);
     }
 #endif
+#if defined(HAVE_PLTHOOK) && !defined(WIN32) && !defined(__CYGWIN__) && !defined(TRUFFLERUBY)
+    rebind_internal_symbols();
+#endif
 
     oci8_id_at_last_error = rb_intern("@last_error");
     oci8_id_get = rb_intern("get");
@@ -118,9 +239,7 @@ Init_oci8lib()
     oci8_id_mul_op = rb_intern("*");
     oci8_id_div_op = rb_intern("/");
 #endif
-#ifdef HAVE_RB_SET_END_PROC
     rb_set_end_proc(at_exit_func, Qnil);
-#endif
 
     Init_oci8_thread_util();
     Init_oci8_error();
@@ -157,7 +276,11 @@ Init_oci8lib()
     /* allocate a temporary errhp to pass Init_oci_number() */
     rv = OCIEnvCreate(&envhp, oci8_env_mode, NULL, NULL, NULL, NULL, 0, NULL);
     if (rv != OCI_SUCCESS) {
-        oci8_raise_init_error();
+        if (envhp != NULL) {
+            oci8_env_free_and_raise(envhp, rv);
+        } else {
+            oci8_raise_init_error();
+        }
     }
     rv = OCIHandleAlloc(envhp, (dvoid *)&errhp, OCI_HTYPE_ERROR, 0, NULL);
     if (rv != OCI_SUCCESS)
@@ -338,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);
         }
@@ -358,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
@@ -380,17 +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;
 
-    rv = OCIHandleAlloc(oci8_envhp, (dvoid*)&arg->stmtp, OCI_HTYPE_STMT, 0, NULL);
-    if (rv != OCI_SUCCESS) {
-        oci8_env_raise(oci8_envhp, 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++) {
@@ -427,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);
     }
@@ -439,6 +561,24 @@ static VALUE ensure_func(cb_arg_t *arg)
 
 #ifndef _WIN32
 #include <dlfcn.h>
+static void *load_file(const char *filename, int flags, VALUE errors)
+{
+    void *handle = dlopen(filename, flags);
+
+    if (handle == NULL) {
+        char *err = dlerror();
+        VALUE msg;
+
+        if (strstr(err, filename) == NULL) {
+            msg = rb_sprintf("%s: %s", filename, err);
+            msg = rb_enc_associate_index(msg, rb_locale_encindex());
+        } else {
+            msg = rb_locale_str_new_cstr(err);
+        }
+        rb_ary_push(errors, msg);
+    }
+    return handle;
+}
 #endif
 
 void *oci8_find_symbol(const char *symbol_name)
@@ -481,58 +621,50 @@ void *oci8_find_symbol(const char *symbol_name)
             "libclntsh.sl.12.1",
             "libclntsh.sl.11.1",
             "libclntsh.sl.10.1",
-            "libclntsh.sl.9.0",
-            "libclntsh.sl.8.0",
 #elif defined(__APPLE__)
             /* Mac OS X */
+            "libclntsh.dylib",
             "libclntsh.dylib.12.1",
             "libclntsh.dylib.11.1",
             "libclntsh.dylib.10.1",
 #else
             /* Linux, Solaris and HP-UX(IA64) */
+            "libclntsh.so",
             "libclntsh.so.12.1",
             "libclntsh.so.11.1",
             "libclntsh.so.10.1",
-            "libclntsh.so.9.0",
-            "libclntsh.so.8.0",
 #endif
         };
 #define NUM_SONAMES (sizeof(sonames)/sizeof(sonames[0]))
+#if defined(_AIX) /* AIX */
+#define BASE_SONAME "libclntsh.a(shr.o)"
+#elif defined(__hppa) /* HP-UX(PA-RISC) */
+#define BASE_SONAME "libclntsh.sl"
+#elif !defined(__CYGWIN__) && !defined(__APPLE__)
+#define BASE_SONAME "libclntsh.so"
+#endif
         size_t idx;
-        volatile VALUE err = rb_ary_new();
+        VALUE err = rb_ary_new();
 
 #ifdef _AIX
 #define DLOPEN_FLAG (RTLD_LAZY|RTLD_GLOBAL|RTLD_MEMBER)
 #else
 #define DLOPEN_FLAG (RTLD_LAZY|RTLD_GLOBAL)
 #endif
-        for (idx = 0; idx < NUM_SONAMES; idx++) {
-            handle = dlopen(sonames[idx], DLOPEN_FLAG);
-            if (handle != NULL) {
-                break;
-            }
-            rb_ary_push(err, rb_locale_str_new_cstr(dlerror()));
+#ifdef BASE_SONAME
+        char *oracle_home = getenv("ORACLE_HOME");
+
+        if (oracle_home != NULL) {
+            VALUE fname = rb_str_buf_cat2(rb_str_buf_new_cstr(oracle_home),  "/lib/" BASE_SONAME);
+            handle = load_file(StringValueCStr(fname), DLOPEN_FLAG, err);
+            RB_GC_GUARD(fname);
+        }
+#endif
+        for (idx = 0; handle == NULL && idx < NUM_SONAMES; idx++) {
+            handle = load_file(sonames[idx], DLOPEN_FLAG, err);
         }
         if (handle == NULL) {
-            VALUE msg;
-            const VALUE *arr = RARRAY_CONST_PTR(err);
-
-            msg = rb_str_buf_new(NUM_SONAMES * 50);
-            for (idx = 0; idx < NUM_SONAMES; idx++) {
-                const char *errmsg = RSTRING_PTR(arr[idx]);
-                if (idx != 0) {
-                    rb_str_buf_cat2(msg, " ");
-                }
-                if (strstr(errmsg, sonames[idx]) == NULL) {
-                    /* prepend "soname: " if soname is not found in
-                     * the error message.
-                     */
-                    rb_str_buf_cat2(msg, sonames[idx]);
-                    rb_str_buf_cat2(msg, ": ");
-                }
-                rb_str_buf_append(msg, arr[idx]);
-                rb_str_buf_cat2(msg, ";");
-            }
+            VALUE msg = rb_ary_join(err, rb_usascii_str_new_cstr("; "));
             rb_exc_raise(rb_exc_new3(rb_eLoadError, msg));
         }
     }

data/ext/oci8/ocihandle.c

@@ -217,7 +217,7 @@ static VALUE attr_get_common(int argc, VALUE *argv, VALUE self, enum datatype da
         }
         return rb_external_str_new_with_enc(v.charptr, size, oci8_encoding);
     case DATATYPE_BINARY:
-        return rb_tainted_str_new(v.charptr, size);
+        return rb_str_new(v.charptr, size);
     case DATATYPE_INTEGER:
         if (size > sizeof(onum.OCINumberPart) - 1) {
             rb_raise(rb_eRuntimeError, "Too long size %u", size);
@@ -245,9 +245,9 @@ static VALUE attr_get_common(int argc, VALUE *argv, VALUE self, enum datatype da
  *
  *  Gets the value of an attribute as `ub1' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -262,9 +262,9 @@ static VALUE attr_get_ub1(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub2' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -279,7 +279,7 @@ static VALUE attr_get_ub2(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub4' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -296,7 +296,7 @@ static VALUE attr_get_ub4(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `ub8' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -313,9 +313,9 @@ static VALUE attr_get_ub8(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb1' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -330,9 +330,9 @@ static VALUE attr_get_sb1(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb2' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -347,7 +347,7 @@ static VALUE attr_get_sb2(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb4' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -364,7 +364,7 @@ static VALUE attr_get_sb4(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `sb8' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [Integer]
  *
@@ -381,7 +381,7 @@ static VALUE attr_get_sb8(int argc, VALUE *argv, VALUE self)
  *
  *  Gets the value of an attribute as `boolean' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [true of false]
  *
@@ -403,7 +403,7 @@ static VALUE attr_get_boolean(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [String]
  *
@@ -424,7 +424,7 @@ static VALUE attr_get_string(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [String]
  *
@@ -445,9 +445,9 @@ static VALUE attr_get_binary(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
- *  @return [Fixnum]
+ *  @return [Integer]
  *
  *  @since 2.0.4
  *  @private
@@ -466,7 +466,7 @@ static VALUE attr_get_integer(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is not a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Boolean] strict If false, "ORA-24328: illegal attribute value" is ignored.
  *  @return [OraDate]
  *
@@ -486,8 +486,8 @@ static VALUE attr_get_oradate(int argc, VALUE *argv, VALUE self)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -514,8 +514,8 @@ static VALUE attr_set_ub1(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -542,7 +542,7 @@ static VALUE attr_set_ub2(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -570,7 +570,7 @@ static VALUE attr_set_ub4(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -598,8 +598,8 @@ static VALUE attr_set_ub8(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -626,8 +626,8 @@ static VALUE attr_set_sb1(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *   pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
- *  @param [Fixnum] attr_value
+ *  @param [Integer] attr_type
+ *  @param [Integer] attr_value
  *  @return [self]
  *
  *  @since 2.0.4
@@ -654,7 +654,7 @@ static VALUE attr_set_sb2(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -682,7 +682,7 @@ static VALUE attr_set_sb4(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Integer] attr_value
  *  @return [self]
  *
@@ -710,7 +710,7 @@ static VALUE attr_set_sb8(VALUE self, VALUE attr_type, VALUE val)
  *  @note If the specified attr_type's datatype is a
  *    pointer type, it causes a segmentation fault.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [true or false] attr_value
  *  @return [self]
  *
@@ -737,7 +737,7 @@ static VALUE attr_set_boolean(VALUE self, VALUE attr_type, VALUE val)
  *  +attr_value+ is converted to {OCI8.encoding} before it is set
  *  when the ruby version is 1.9.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [String] attr_value
  *  @return [self]
  *
@@ -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;
 }
 
@@ -761,7 +761,7 @@ static VALUE attr_set_string(VALUE self, VALUE attr_type, VALUE val)
  *
  *  Sets the value of an attribute as `ub1 *' datatype.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [String] attr_value
  *  @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;
 }
 
@@ -787,7 +787,7 @@ static VALUE attr_set_binary(VALUE self, VALUE attr_type, VALUE val)
  *  +number+ is converted to internal Oracle NUMBER format before
  *  it is set.
  *
- *  @param [Fixnum] attr_type
+ *  @param [Integer] attr_type
  *  @param [Numeric] number
  *  @return [self]
  *