ruby-oci8 2.0.5 → 2.0.6

data/ChangeLog

@@ -1,3 +1,12 @@
+2011-06-14  KUBO Takehiro  <kubo@jiubao.org>
+	* NEWS: add changes between 2.0.5 and 2.0.6.
+	* VERSION: change the version to 2.0.6.
+	* ext/oci8/apiwrap.yml, ext/oci8/lob.c: fix SEGV when freeing a temporary
+	    LOB during GC on rubinius 1.2.3.
+	* ext/oci8/oci8lib.c: revert the exception type from RuntimeError to
+	    OCIException when a closed OCI handle's method is called.
+	    It was chaned in 2.0.5 by mistake.
+
 2011-06-12  KUBO Takehiro  <kubo@jiubao.org>
 	* NEWS: add changes between 2.0.4 and 2.0.5.
 	* VERSION: change the version to 2.0.5.

data/NEWS

@@ -1,3 +1,13 @@
+2.0.6:
+
+* Fixed issues
+
+  - fix SEGV when freeing a temporary LOB during GC on rubinius 1.2.3.
+
+  - revert the exception type from RuntimeError to OCIException when
+    a closed OCI handle's method is called. It was chaned in 2.0.5
+    by mistake.
+
 2.0.5:
 
 * New Features

data/VERSION

@@ -1 +1 @@
-2.0.5
+2.0.6

data/ext/oci8/apiwrap.yml

@@ -1019,7 +1019,7 @@ OCILobCreateTemporary_nb:
             - OCIDuration duration
 
 # round trip: 1
-OCILobFreeTemporary_nb:
+OCILobFreeTemporary:
   :version: 810
   :args:
             - OCISvcCtx *svchp

data/ext/oci8/attr.c

@@ -3,7 +3,7 @@
  * attr.c
  *
  * $Author: kubo $
- * $Date: 2009-05-17 19:08:39 +0900 (日, 17  5月 2009) $
+ * $Date: 2009-05-17 19:08:39 +0900 (Sun, 17 May 2009) $
  *
  * Copyright (C) 2002-2007 KUBO Takehiro <kubo@jiubao.org>
  */

data/ext/oci8/bind.c

@@ -3,7 +3,7 @@
  * bind.c
  *
  * $Author: kubo $
- * $Date: 2010-12-14 20:30:44 +0900 (火, 14 12月 2010) $
+ * $Date: 2010-12-14 20:30:44 +0900 (Tue, 14 Dec 2010) $
  *
  * Copyright (C) 2002-2008 KUBO Takehiro <kubo@jiubao.org>
  */

data/ext/oci8/lob.c

@@ -23,6 +23,7 @@ enum state {
 typedef struct {
     oci8_base_t base;
     VALUE svc;
+    OCISvcCtx *svchp;
     ub4 pos;
     int char_width;
     ub1 csfrm;
@@ -96,28 +97,20 @@ static void oci8_lob_mark(oci8_base_t *base)
     rb_gc_mark(lob->svc);
 }
 
-static VALUE free_temp_lob(oci8_lob_t *lob)
-{
-    oci8_svcctx_t *svcctx = oci8_get_svcctx(lob->svc);
-
-    OCILobFreeTemporary_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob);
-    return Qnil;
-}
-
 static void oci8_lob_free(oci8_base_t *base)
 {
     oci8_lob_t *lob = (oci8_lob_t *)base;
     boolean is_temporary;
 
-    if (have_OCILobIsTemporary
+    if (have_OCILobIsTemporary && lob->svchp != NULL
         && OCILobIsTemporary(oci8_envhp, oci8_errhp, lob->base.hp.lob, &is_temporary) == OCI_SUCCESS
         && is_temporary) {
-        /* Exceptions in free_temp_lob() are ignored.
-         * oci8_lob_free() is called in GC. It must not raise an exception.
-         */
-        rb_rescue(free_temp_lob, (VALUE)base, NULL, 0);
+
+        /* FIXME: This may stall the GC. */
+        OCILobFreeTemporary(lob->svchp, oci8_errhp, lob->base.hp.lob);
     }
     lob->svc = Qnil;
+    lob->svchp = NULL;
 }
 
 static oci8_base_class_t oci8_lob_class = {
@@ -191,6 +184,7 @@ static VALUE oci8_lob_do_initialize(int argc, VALUE *argv, VALUE self, ub1 csfrm
         oci8_env_raise(oci8_envhp, rv);
     lob->base.type = OCI_DTYPE_LOB;
     lob->svc = svc;
+    lob->svchp = NULL;
     lob->pos = 0;
     lob->char_width = 1;
     lob->csfrm = csfrm;
@@ -202,6 +196,7 @@ static VALUE oci8_lob_do_initialize(int argc, VALUE *argv, VALUE self, ub1 csfrm
             oci8_svcctx_t *svcctx = oci8_get_svcctx(svc);
             OCI8StringValue(val);
             oci_lc(OCILobCreateTemporary_nb(svcctx, svcctx->base.hp.svc, oci8_errhp, lob->base.hp.lob, 0, csfrm, lobtype, TRUE, OCI_DURATION_SESSION));
+            lob->svchp = oci8_get_oci_svcctx(svc);
             oci8_lob_write(self, val);
         } else {
             rb_raise(rb_eRuntimeError, "creating a temporary lob is not supported on this Oracle version");

data/ext/oci8/oci8lib.c

@@ -498,7 +498,7 @@ oci8_base_t *oci8_get_handle(VALUE obj, VALUE klass)
     }
     Data_Get_Struct(obj, oci8_base_t, hp);
     if (hp->type == 0) {
-        rb_raise(rb_eRuntimeError, "%s was already closed.",
+        rb_raise(eOCIException, "%s was already closed.",
                  rb_obj_classname(obj));
     }
     return hp;

data/ext/oci8/ocidatetime.c

@@ -3,7 +3,7 @@
  *  ocidatetime.c
  *
  * $Author: kubo $
- * $Date: 2011-06-12 22:14:51 +0900 (日, 12  6月 2011) $
+ * $Date: 2011-06-14 20:45:16 +0900 (Tue, 14 Jun 2011) $
  *
  * Copyright (C) 2005-2008 KUBO Takehiro <kubo@jiubao.org>
  *

data/ext/oci8/oradate.c

@@ -3,7 +3,7 @@
  *  oradate.c
  *
  * $Author: kubo $
- * $Date: 2010-09-05 22:07:21 +0900 (日, 05  9月 2010) $
+ * $Date: 2010-09-05 22:07:21 +0900 (Sun, 05 Sep 2010) $
  *
  * Copyright (C) 2002-2008 KUBO Takehiro <kubo@jiubao.org>
  *

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-oci8
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 5
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors: 
 - KUBO Takehiro
@@ -14,13 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-12 00:00:00 +09:00
+date: 2011-06-14 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
-description: |
-  ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle8, Oracle8i, Oracle9i, Oracle10g and Oracle Instant Client.
-
+description: ruby-oci8 is a ruby interface for Oracle using OCI8 API. It is available with Oracle8, Oracle8i, Oracle9i, Oracle10g and Oracle Instant Client.
 email: kubo@jiubao.org
 executables: []
 
@@ -109,8 +102,6 @@ files:
 - test/test_rowid.rb
 has_rdoc: true
 homepage: http://ruby-oci8.rubyforge.org
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --main
@@ -118,29 +109,23 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 8
-      - 0
       version: 1.8.0
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: ruby-oci8
-rubygems_version: 1.3.7
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Ruby interface for Oracle using OCI8 API
 test_files: 
 - test/test_all.rb