ilios 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 119d5f16f005dbc317d42110162895ac90b7acc12fad39b4c2b33d04587ceeb9
-  data.tar.gz: d2b9caed7e97e5592737654171e6a06dea5cdecf872f5827b2547c6c4a704dc4
+  metadata.gz: ae1db76d702cb217eb8145f498dd86044183e441cbd896ac6acfd0d118823d13
+  data.tar.gz: 5e5e141d2578bdfd5c2b39b8b7e5b72e5a65de824a4e5868c3388e3308973d8c
 SHA512:
-  metadata.gz: 291ee870b21e87e4d33056f4f5a08c513904cb967786115a3d618bfd61943f561d31744b3554b87f069dcc59d308c52366788561d15d8ae7266f83cb1b865d65
-  data.tar.gz: a3517d6c2d4f746dd66234e02a96b084069128442ddab5ad2044995fcb5418bbebbdc7f6d2d0b5dc9eeefe654646c7a42af36ffd607aa40dd8208726d3c8cb36
+  metadata.gz: 2c78135d42da8f1c532c80531d0a493fed7f4bcf96ddf2d8aabdafac649740cb819a6f038640031993fe33fdc82c245e9725868f71149751aaaadf9ca3710d0b
+  data.tar.gz: 26771b46cf175596fdd14a19873783c151f3a1b02798ca43fa39b7828b8519a3316bbcafbc93a291d9c44cadb95d562c1e7fc6d30b19e48e2efb28592c72c674

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.0.6
+
+- Fix uninitialized memory being returned for an undecodable column value (#27)
+- Fix segmentation fault when a Result is used after Result#next_page fails (#26)
+- Fix uninitialized memory being bound for a malformed UUID string (#25)
+
 ## 1.0.5
 
 - Fix use-after-free when re-binding a statement with in-flight async executions (#24)

data/ext/ilios/result.c

@@ -45,6 +45,7 @@ static VALUE result_next_page(VALUE self)
     CassandraStatement *cassandra_statement;
     CassandraSession *cassandra_session;
     CassFuture *result_future;
+    CassError error_code;
 
     GET_RESULT(self, cassandra_result);
 
@@ -61,18 +62,31 @@ static VALUE result_next_page(VALUE self)
     cass_statement_set_paging_state(cassandra_result->executed_statement, cassandra_result->result);
 
     result_future = nogvl_session_execute(cassandra_session->session, cassandra_result->executed_statement);
+    nogvl_future_wait(result_future);
+
+    error_code = cass_future_error_code(result_future);
+    if (error_code != CASS_OK) {
+        cass_future_free(result_future);
+        rb_raise(eExecutionError, "Unable to wait executing: %s", cass_error_desc(error_code));
+    }
 
     cass_result_free(cassandra_result->result);
     if (cassandra_result->future) {
         cass_future_free(cassandra_result->future);
     }
-    cassandra_result->result = NULL;
+    cassandra_result->result = cass_future_get_result(result_future);
     cassandra_result->future = result_future;
 
-    result_await(cassandra_result);
     return self;
 }
 
+static void result_check_value(CassError error_code, VALUE key)
+{
+    if (error_code != CASS_OK) {
+        rb_raise(eExecutionError, "Unable to get value of %"PRIsVALUE" column: %s", key, cass_error_desc(error_code));
+    }
+}
+
 static VALUE result_convert_row(const CassResult *result, const CassRow *row, size_t column_count)
 {
     VALUE key;
@@ -95,56 +109,56 @@ static VALUE result_convert_row(const CassResult *result, const CassRow *row, si
         switch (type) {
         case CASS_VALUE_TYPE_TINY_INT:
             {
-                cass_int8_t output;
-                cass_value_get_int8(value, &output);
+                cass_int8_t output = 0;
+                result_check_value(cass_value_get_int8(value, &output), key);
                 rb_hash_aset(hash, key, INT2NUM(output));
             }
             break;
 
         case CASS_VALUE_TYPE_SMALL_INT:
             {
-                cass_int16_t output;
-                cass_value_get_int16(value, &output);
+                cass_int16_t output = 0;
+                result_check_value(cass_value_get_int16(value, &output), key);
                 rb_hash_aset(hash, key, INT2NUM(output));
             }
             break;
 
         case CASS_VALUE_TYPE_INT:
             {
-                cass_int32_t output;
-                cass_value_get_int32(value, &output);
+                cass_int32_t output = 0;
+                result_check_value(cass_value_get_int32(value, &output), key);
                 rb_hash_aset(hash, key, INT2NUM(output));
             }
             break;
 
         case CASS_VALUE_TYPE_BIGINT:
             {
-                cass_int64_t output;
-                cass_value_get_int64(value, &output);
+                cass_int64_t output = 0;
+                result_check_value(cass_value_get_int64(value, &output), key);
                 rb_hash_aset(hash, key, LL2NUM(output));
             }
             break;
 
         case CASS_VALUE_TYPE_FLOAT:
             {
-                cass_float_t output;
-                cass_value_get_float(value, &output);
+                cass_float_t output = 0;
+                result_check_value(cass_value_get_float(value, &output), key);
                 rb_hash_aset(hash, key, DBL2NUM(output));
             }
             break;
 
         case CASS_VALUE_TYPE_DOUBLE:
             {
-                cass_double_t output;
-                cass_value_get_double(value, &output);
+                cass_double_t output = 0;
+                result_check_value(cass_value_get_double(value, &output), key);
                 rb_hash_aset(hash, key, DBL2NUM(output));
             }
             break;
 
         case CASS_VALUE_TYPE_BOOLEAN:
             {
-                cass_bool_t output;
-                cass_value_get_bool(value, &output);
+                cass_bool_t output = cass_false;
+                result_check_value(cass_value_get_bool(value, &output), key);
                 rb_hash_aset(hash, key, output == cass_true ? Qtrue : Qfalse);
             }
             break;
@@ -153,26 +167,26 @@ static VALUE result_convert_row(const CassResult *result, const CassRow *row, si
         case CASS_VALUE_TYPE_ASCII:
         case CASS_VALUE_TYPE_VARCHAR:
             {
-                const char* s;
-                size_t s_length;
-                cass_value_get_string(value, &s, &s_length);
+                const char* s = NULL;
+                size_t s_length = 0;
+                result_check_value(cass_value_get_string(value, &s, &s_length), key);
                 rb_hash_aset(hash, key, rb_str_new(s, s_length));
             }
             break;
 
         case CASS_VALUE_TYPE_TIMESTAMP:
             {
-                cass_int64_t output;
-                cass_value_get_int64(value, &output);
+                cass_int64_t output = 0;
+                result_check_value(cass_value_get_int64(value, &output), key);
                 rb_hash_aset(hash, key, rb_time_new(output / 1000, output % 1000 * 1000));
             }
             break;
 
         case CASS_VALUE_TYPE_UUID:
             {
-                CassUuid output;
+                CassUuid output = { 0, 0 };
                 char uuid[40];
-                cass_value_get_uuid(value, &output);
+                result_check_value(cass_value_get_uuid(value, &output), key);
                 cass_uuid_string(output, uuid);
                 rb_hash_aset(hash, key, rb_str_new2(uuid));
             }

data/ext/ilios/statement.c

@@ -138,10 +138,14 @@ static int hash_cb(VALUE key, VALUE value, VALUE arg)
 
     case CASS_VALUE_TYPE_UUID:
         {
-            CassUuid uuid;
+            CassUuid uuid = { 0, 0 };
             const char *uuid_string = StringValueCStr(value);
 
-            cass_uuid_from_string(uuid_string, &uuid);
+            result = cass_uuid_from_string(uuid_string, &uuid);
+            if (result != CASS_OK) {
+                rb_raise(eStatementError, "Invalid UUID was given: %s=%"PRIsVALUE"", name, value);
+            }
+
             result = cass_statement_bind_uuid_by_name(ctx->statement, name, uuid);
         }
         break;

data/lib/ilios/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Ilios
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
   public_constant :VERSION
 
   CASSANDRA_CPP_DRIVER_VERSION = '2.17.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ilios
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Watson
@@ -58,7 +58,7 @@ metadata:
   homepage_uri: https://github.com/Watson1978/ilios
   source_code_uri: https://github.com/Watson1978/ilios
   bug_tracker_uri: https://github.com/Watson1978/ilios/issues
-  documentation_uri: https://www.rubydoc.info/gems/ilios/1.0.5
+  documentation_uri: https://www.rubydoc.info/gems/ilios/1.0.6
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - cmake
-rubygems_version: 4.0.15
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Cassandra driver written by C language
 test_files: []