openbase 0.8.2 → 0.8.3

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.8.3
+
+* Fixed memory error that would occur when a returned column has no OpenBase type
+
+
 === 0.8.2
 
 * Added new class level administrative functions to the OpenBase class object

data/ext/openbase.c

@@ -449,7 +449,7 @@ static void result_free( OpenBaseResult *result )
 {
    int i;
    for (i = 0; i < result->col_count; i++) {
-	  free(result->buf[i]);
+	  if (result->buf[i] != NULL) free(result->buf[i]);
    }
 	free(result->types);
 	free(result->buf);
@@ -458,6 +458,8 @@ static void result_free( OpenBaseResult *result )
    free(result);
 }
 
+#define STR2_OR_QNIL(ptr) (ptr == NULL ? Qnil : rb_str_new2(ptr))
+
 static VALUE result_new( VALUE self, VALUE ob )
 {
 	OpenBasePtr openbase;
@@ -561,12 +563,13 @@ static VALUE result_new( VALUE self, VALUE ob )
 				result->buf[i] = ALLOC_N(char, OB_TIMESTAMP_LENGTH);
 				ob_bindString(openbase,(char *)result->buf[i]);
 				break;
-			default:
-        break;
+			default: 
+            result->buf[i] = ALLOC(int);
+            break;
 		}
-      rb_ary_push(col_names,rb_str_new2(ob_resultColumnName(openbase,i)));
-		info = columninfo_new(rb_cOpenBaseColumnInfo, rb_str_new2(ob_resultColumnName(openbase,i)), \
-		        rb_str_new2(type), rb_str_new2(ob_resultTableName(openbase,i)));
+      rb_ary_push(col_names,STR2_OR_QNIL(ob_resultColumnName(openbase,i)));
+		info = columninfo_new(rb_cOpenBaseColumnInfo, STR2_OR_QNIL(ob_resultColumnName(openbase,i)), \
+		        STR2_OR_QNIL(type), STR2_OR_QNIL(ob_resultTableName(openbase,i)));
 		rb_ary_push(infos, info);
 	}
 
@@ -879,9 +882,9 @@ static VALUE columninfo_new( VALUE self, VALUE name, VALUE type, VALUE table )
   OpenBaseColumnInfo *info;
   info = ALLOC(OpenBaseColumnInfo);
 
-  Check_Type(name, T_STRING);
-  Check_Type(type, T_STRING);
-  Check_Type(table, T_STRING);
+  if (name != Qnil) {Check_Type(name, T_STRING);}
+  if (type != Qnil) {Check_Type(type, T_STRING);}
+  if (table != Qnil) {Check_Type(table, T_STRING);}
   info->name = name;
   info->type = type;
   info->table = table;

data/lib/ruby-openbase/version.rb

@@ -2,7 +2,7 @@ module RubyOpenBase #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 8
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Ruby/OpenBase</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/ruby-openbase"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/ruby-openbase" class="numbers">0.8.2</a>
+      <a href="http://rubyforge.org/projects/ruby-openbase" class="numbers">0.8.3</a>
     </div>
     <h2>What</h2>
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: openbase
 version: !ruby/object:Gem::Version 
-  version: 0.8.2
-date: 2007-07-22 00:00:00 -04:00
+  version: 0.8.3
+date: 2007-09-09 00:00:00 -04:00
 summary: Provides access to OpenBase databases from Ruby.
 require_paths: 
 - lib