From 3eaaf39efffc95327b4ff440fc4a412486f94311 Mon Sep 17 00:00:00 2001
From: murgatroid99 <mlumish@google.com>
Date: Mon, 14 Mar 2016 11:53:42 -0700
Subject: [PATCH] Properly mark proc used in call credentials for garbage
collection
---
src/ruby/ext/grpc/rb_call_credentials.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/ruby/ext/grpc/rb_call_credentials.c b/src/ruby/ext/grpc/rb_call_credentials.c
index 2426f106a9..402becf6aa 100644
--- a/src/ruby/ext/grpc/rb_call_credentials.c
+++ b/src/ruby/ext/grpc/rb_call_credentials.c
@@ -57,6 +57,10 @@ typedef struct grpc_rb_call_credentials {
/* Holder of ruby objects involved in contructing the credentials */
VALUE mark;
+ /* The proc called when getting the credentials. Same pointer as
+ wrapped->state */
+ VALUE proc;
+
/* The actual credentials */
grpc_call_credentials *wrapped;
} grpc_rb_call_credentials;
@@ -164,11 +168,11 @@ static void grpc_rb_call_credentials_mark(void *p) {
return;
}
wrapper = (grpc_rb_call_credentials *)p;
-
/* If it's not already cleaned up, mark the mark object */
if (wrapper->mark != Qnil) {
rb_gc_mark(wrapper->mark);
}
+ rb_gc_mark(wrapper->proc);
}
static rb_data_type_t grpc_rb_call_credentials_data_type = {
@@ -187,6 +191,7 @@ static rb_data_type_t grpc_rb_call_credentials_data_type = {
static VALUE grpc_rb_call_credentials_alloc(VALUE cls) {
grpc_rb_call_credentials *wrapper = ALLOC(grpc_rb_call_credentials);
wrapper->wrapped = NULL;
+ wrapper->proc = Qnil;
wrapper->mark = Qnil;
return TypedData_Wrap_Struct(cls, &grpc_rb_call_credentials_data_type, wrapper);
}
@@ -267,6 +272,7 @@ static VALUE grpc_rb_call_credentials_init(VALUE self, VALUE proc) {
return Qnil;
}
+ wrapper->proc = proc;
wrapper->wrapped = creds;
rb_ivar_set(self, id_callback, proc);
--
GitLab