do_sqlite3 0.10.8-java → 0.10.9-java

data/ChangeLog.markdown

@@ -1,3 +1,7 @@
+## 0.10.9 2012-08-13
+
+* Fix segfault when loading custom extensions
+
 ## 0.10.8 2012-02-10
 
 * Ruby 1.9.3 compatibility on Windows

data/Rakefile

@@ -15,7 +15,7 @@ JRUBY    = RUBY_PLATFORM =~ /java/
 IRONRUBY = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'ironruby'
 WINDOWS  = Gem.win_platform? || (JRUBY && ENV_JAVA['os.name'] =~ /windows/i)
 SUDO     = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS'])
-BINARY_VERSION = '3070600'
+BINARY_VERSION = '3071300'
 
 CLEAN.include(%w[ {tmp,pkg}/ **/*.{o,so,bundle,jar,log,a,gem,dSYM,obj,pdb,exp,DS_Store,rbc,db} ext/do_sqlite3/Makefile ext-java/target ])
 

data/ext/do_sqlite3/do_common.c

@@ -185,6 +185,10 @@ VALUE data_objects_parse_date(const char *date) {
       return Qnil;
   }
 
+  if(!year && !month && !day) {
+    return Qnil;
+  }
+
   return rb_funcall(rb_cDate, ID_NEW, 3, INT2NUM(year), INT2NUM(month), INT2NUM(day));
 }
 
@@ -237,6 +241,10 @@ VALUE data_objects_parse_date_time(const char *date) {
   fmt_datetime = strchr(date, '.') ? _fmt_datetime_tz_subsec : _fmt_datetime_tz_normal;
   tokens_read  = sscanf(date, fmt_datetime, &year, &month, &day, &hour, &min, &sec, &hour_offset, &minute_offset);
 
+  if(!year && !month && !day && !hour && !min && !sec) {
+    return Qnil;
+  }
+
   switch (tokens_read) {
     case 8:
       minute_offset *= hour_offset < 0 ? -1 : 1;

data/ext/do_sqlite3/do_sqlite3.c

@@ -172,7 +172,8 @@ VALUE do_sqlite3_cConnection_dispose(VALUE self) {
     return Qfalse;
   }
 
-  sqlite3 *db = DATA_PTR(connection_container);
+  sqlite3 *db;
+  Data_Get_Struct(connection_container, sqlite3, db);
 
   if (!db) {
     return Qfalse;

data/ext/do_sqlite3/do_sqlite3_extension.c

@@ -16,12 +16,15 @@ VALUE do_sqlite3_cExtension_enable_load_extension(VALUE self, VALUE on) {
   if (connection == Qnil) { return Qfalse; }
 
   // Retrieve the actual connection from the
-  connection = rb_iv_get(self, "@connection");
+  VALUE sqlite3_connection = rb_iv_get(connection, "@connection");
 
-  if (connection == Qnil) { return Qfalse; }
+  if (sqlite3_connection == Qnil) { return Qfalse; }
 
   sqlite3 *db;
 
+  Data_Get_Struct(sqlite3_connection, sqlite3, db);
+
+
   if (!(db = DATA_PTR(connection))) {
     return Qfalse;
   }
@@ -40,26 +43,23 @@ VALUE do_sqlite3_cExtension_enable_load_extension(VALUE self, VALUE on) {
 
 VALUE do_sqlite3_cExtension_load_extension(VALUE self, VALUE path) {
 #ifdef HAVE_SQLITE3_ENABLE_LOAD_EXTENSION
-  VALUE id_connection = rb_intern("connection");
-  VALUE connection = rb_funcall(self, id_connection, 0);
+  VALUE connection = rb_iv_get(self, "@connection");
 
   if (connection == Qnil) { return Qfalse; }
 
-  // Retrieve the actual connection from the
-  connection = rb_iv_get(self, "@connection");
+  // Retrieve the actual connection from the object
+  VALUE sqlite3_connection = rb_iv_get(connection, "@connection");
 
-  if (connection == Qnil) { return Qfalse; }
+  if (sqlite3_connection == Qnil) { return Qfalse; }
 
   sqlite3 *db;
 
-  if (!(db = DATA_PTR(connection))) {
-    return Qfalse;
-  }
+  Data_Get_Struct(sqlite3_connection, sqlite3, db);
 
   const char *extension_path  = rb_str_ptr_readonly(path);
-  char *errmsg;
+  char *errmsg = sqlite3_malloc(1024);
 
-  if (!(errmsg = sqlite3_malloc(1024))) {
+  if (!errmsg) {
     return Qfalse;
   }
 
@@ -72,6 +72,7 @@ VALUE do_sqlite3_cExtension_load_extension(VALUE self, VALUE path) {
     rb_exc_raise(errexp);
   }
 
+  sqlite3_free(errmsg);
   return Qtrue;
 #else
   return Qfalse;

data/lib/do_sqlite3.rb

@@ -11,7 +11,7 @@ if RUBY_PLATFORM =~ /java/
 
   begin
     java.lang.Thread.currentThread.getContextClassLoader().loadClass(DataObjects::Sqlite3::JDBC_DRIVER, true)
-  rescue
+  rescue java.lang.ClassNotFoundException
     require 'jdbc/sqlite3' # the JDBC driver, packaged as a gem
   end
 

data/lib/do_sqlite3/version.rb

@@ -1,5 +1,5 @@
 module DataObjects
   module Sqlite3
-    VERSION = '0.10.8'
+    VERSION = '0.10.9'
   end
 end

data/tasks/compile.rake

@@ -55,7 +55,7 @@ begin
     ext.classpath = '../do_jdbc/lib/do_jdbc_internal.jar'
     ext.java_compiling do |gem|
       gem.add_dependency 'jdbc-sqlite3', '>=3.5.8'
-      gem.add_dependency 'do_jdbc',      '0.10.8'
+      gem.add_dependency 'do_jdbc',      '0.10.9'
     end
   end
 rescue LoadError

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: do_sqlite3
 version: !ruby/object:Gem::Version 
-  hash: 39
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
   - 10
-  - 8
-  version: 0.10.8
+  - 9
+  version: 0.10.9
 platform: java
 authors: 
 - Dirkjan Bussink
@@ -15,85 +14,76 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 Z
+date: 2011-03-29 00:00:00 +02:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: data_objects
   version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 0
         - 10
-        - 8
-        version: 0.10.8
-  name: data_objects
-  prerelease: false
-  type: :runtime
+        - 9
+        version: 0.10.9
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rspec
   version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 2
         - 5
         version: "2.5"
-  name: rspec
-  prerelease: false
-  type: :development
   requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  name: rake-compiler
   version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
         segments: 
         - 0
         - 7
         version: "0.7"
-  name: rake-compiler
-  prerelease: false
-  type: :development
   requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: jdbc-sqlite3
   version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 3
         - 5
         - 8
         version: 3.5.8
-  name: jdbc-sqlite3
-  prerelease: false
-  type: :runtime
   requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :runtime
+  name: do_jdbc
   version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 39
         segments: 
         - 0
         - 10
-        - 8
-        version: 0.10.8
-  name: do_jdbc
-  prerelease: false
-  type: :runtime
+        - 9
+        version: 0.10.9
   requirement: *id005
 description: Implements the DataObjects API for Sqlite3
 email: d.bussink@gmail.com
@@ -147,6 +137,7 @@ files:
 - tasks/retrieve.rake
 - tasks/spec.rake
 - lib/do_sqlite3/do_sqlite3.jar
+has_rdoc: true
 homepage: 
 licenses: []
 
@@ -156,27 +147,23 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: dorb
-rubygems_version: 1.8.14
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: DataObjects Sqlite3 Driver