trilogy 2.13.2 → 2.13.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea4b038d25e87b1d26c6dc0af6aa37b3cfa2b7244ea4788155bb392f7a5e93e
-  data.tar.gz: c4201dd5f2c3974244cea9ae97af6052d3d1991509e64c2dde8319882b00a53e
+  metadata.gz: 18d367219cde913a99e5fcda45192907cce6577f5308d682b42b48f1d046bbb2
+  data.tar.gz: 2ddfd049d0061f446f18d378e0f297b757bf63f01015eb302541d6482ed388c4
 SHA512:
-  metadata.gz: 2e58cdf8bf20b4d31e43b811ceb7972a772c2ccb44133f715a4d9c0723c1c1ed4b3139c5e7be68575b119932348f5d8d393d088b88fd73ba058eeef9d8203796
-  data.tar.gz: ef9527a11371f0b6dbab901eb6c682e5a6e7cbf48d81e483b647682355b825a08ca342491a523859f543bfcaaf598588a713c5859baf8a883fe5adcda14f59ea
+  metadata.gz: ce0b26f62e79f480b89d902002b0cff30d85b2f7fcaddf1313c9d0127da87e200e719aeb9716641b343fe0fc6af2ee901f704d40e90f335352de147a63eb0920
+  data.tar.gz: 8c0b3ca40a1cc51ae4233086b2ed995a439a119114a01043877993a8a6268a4415d0e64338136f9c5f9ed42aa22b6dc497faf22a11ce894d50314500a3d2ced4

data/ext/trilogy-ruby/cext.c

@@ -233,18 +233,22 @@ static struct trilogy_ctx *get_open_ctx(VALUE obj)
     return ctx;
 }
 
-NORETURN(static void trilogy_syserr_fail_str(int, VALUE));
-static void trilogy_syserr_fail_str(int e, VALUE msg)
+static VALUE trilogy_new_syserr_fail(int e, VALUE msg)
 {
     if (e == EPIPE) {
         // Backwards compatibility: This error message is a bit odd, but includes "TRILOGY_CLOSED_CONNECTION" to match legacy string matching
-        rb_raise(Trilogy_EOFError, "%" PRIsVALUE ": TRILOGY_CLOSED_CONNECTION: EPIPE", msg);
+        return rb_exc_new_str(Trilogy_EOFError, rb_sprintf("%" PRIsVALUE ": TRILOGY_CLOSED_CONNECTION: EPIPE", msg));
     } else {
-        VALUE exc = rb_funcall(Trilogy_SyscallError, id_from_errno, 2, INT2NUM(e), msg);
-        rb_exc_raise(exc);
+        return rb_funcall(Trilogy_SyscallError, id_from_errno, 2, INT2NUM(e), msg);
     }
 }
 
+NORETURN(static void trilogy_syserr_fail_str(int, VALUE));
+static void trilogy_syserr_fail_str(int e, VALUE msg)
+{
+    rb_exc_raise(trilogy_new_syserr_fail(e, msg));
+}
+
 static int trilogy_error_recoverable_p(int rc)
 {
     // TRILOGY_OPENSSL_ERR and TRILOGY_SYSERR (which can result from an SSL error) must shut down the socket, as further
@@ -263,8 +267,7 @@ static void handle_trilogy_error(struct trilogy_ctx *ctx, int rc, const char *ms
     va_start(args, msg);
     VALUE rbmsg = rb_vsprintf(msg, args);
     va_end(args);
-
-    rb_trilogy_release_buffer(ctx);
+    VALUE exc;
 
     if (!trilogy_error_recoverable_p(rc)) {
         if (ctx->conn.socket != NULL) {
@@ -275,18 +278,23 @@ static void handle_trilogy_error(struct trilogy_ctx *ctx, int rc, const char *ms
         }
     }
 
+
     switch (rc) {
-    case TRILOGY_SYSERR:
-        trilogy_syserr_fail_str(errno, rbmsg);
+    case TRILOGY_SYSERR: {
+        exc = trilogy_new_syserr_fail(errno, rbmsg);
+        break;
+    }
 
-    case TRILOGY_TIMEOUT:
-        rb_raise(Trilogy_TimeoutError, "%" PRIsVALUE, rbmsg);
+    case TRILOGY_TIMEOUT: {
+        exc = rb_exc_new_str(Trilogy_TimeoutError, rbmsg);
+        break;
+    }
 
     case TRILOGY_ERR: {
         VALUE conn_message = rb_str_new(ctx->conn.error_message, ctx->conn.error_message_len);
         VALUE message = rb_sprintf("%" PRIsVALUE " (%" PRIsVALUE ")", conn_message, rbmsg);
-        VALUE exc = rb_funcall(Trilogy_ProtocolError, id_from_code, 2, message, INT2NUM(ctx->conn.error_code));
-        rb_exc_raise(exc);
+        exc = rb_funcall(Trilogy_ProtocolError, id_from_code, 2, message, INT2NUM(ctx->conn.error_code));
+        break;
     }
 
     case TRILOGY_OPENSSL_ERR: {
@@ -294,30 +302,48 @@ static void handle_trilogy_error(struct trilogy_ctx *ctx, int rc, const char *ms
         ERR_clear_error();
         if (ERR_GET_LIB(ossl_error) == ERR_LIB_SYS) {
             int err_reason = ERR_GET_REASON(ossl_error);
-            trilogy_syserr_fail_str(err_reason, rbmsg);
+            exc = trilogy_new_syserr_fail(err_reason, rbmsg);
         }
-        rb_raise(Trilogy_SSLError, "%" PRIsVALUE ": SSL Error: %s", rbmsg, ERR_reason_error_string(ossl_error));
+        else {
+            rbmsg = rb_sprintf("%" PRIsVALUE ": SSL Error: %s", rbmsg, ERR_reason_error_string(ossl_error));
+            exc = rb_exc_new_str(Trilogy_SSLError, rbmsg);
+        }
+        break;
     }
 
     case TRILOGY_DNS_ERR: {
-        rb_raise(Trilogy_BaseConnectionError, "%" PRIsVALUE ": TRILOGY_DNS_ERROR", rbmsg);
+        rbmsg = rb_sprintf("%" PRIsVALUE ": TRILOGY_DNS_ERROR", rbmsg);
+        exc = rb_exc_new_str(Trilogy_BaseConnectionError, rbmsg);
+        break;
     }
 
     case TRILOGY_CLOSED_CONNECTION: {
-        rb_raise(Trilogy_EOFError, "%" PRIsVALUE ": TRILOGY_CLOSED_CONNECTION", rbmsg);
+        rbmsg = rb_sprintf("%" PRIsVALUE ": TRILOGY_CLOSED_CONNECTION", rbmsg);
+        exc = rb_exc_new_str(Trilogy_EOFError, rbmsg);
+        break;
     }
 
     case TRILOGY_AUTH_PLUGIN_ERROR: {
-        rb_raise(Trilogy_AuthPluginError, "%" PRIsVALUE ": TRILOGY_AUTH_PLUGIN_ERROR", rbmsg);
+        rbmsg = rb_sprintf("%" PRIsVALUE ": TRILOGY_AUTH_PLUGIN_ERROR", rbmsg);
+        exc = rb_exc_new_str(Trilogy_AuthPluginError, rbmsg);
+        break;
     }
 
     case TRILOGY_UNSUPPORTED: {
-        rb_raise(Trilogy_BaseConnectionError, "%" PRIsVALUE ": TRILOGY_UNSUPPORTED", rbmsg);
+        rbmsg = rb_sprintf("%" PRIsVALUE ": TRILOGY_UNSUPPORTED", rbmsg);
+        exc = rb_exc_new_str(Trilogy_BaseConnectionError, rbmsg);
+        break;
     }
 
     default:
-        rb_raise(Trilogy_QueryError, "%" PRIsVALUE ": %s", rbmsg, trilogy_error(rc));
+        rbmsg = rb_sprintf("%" PRIsVALUE ": %s", rbmsg, trilogy_error(rc));
+        exc = rb_exc_new_str(Trilogy_QueryError, rbmsg);
+        break;
     }
+
+    // Some error messages depend on the buffer.
+    rb_trilogy_release_buffer(ctx);
+    rb_exc_raise(exc);
 }
 
 static VALUE allocate_trilogy(VALUE klass)

data/lib/trilogy/version.rb

@@ -1,3 +1,3 @@
 class Trilogy
-  VERSION = "2.13.2"
+  VERSION = "2.13.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trilogy
 version: !ruby/object:Gem::Version
-  version: 2.13.2
+  version: 2.13.3
 platform: ruby
 authors:
 - GitHub Engineering