Skip to content

Commit

Permalink
[Ruby] Fixed SEGV when users pass nil messages.
Browse files Browse the repository at this point in the history
  • Loading branch information
haberman committed Mar 2, 2021
1 parent d7e943b commit dfa5457
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 16 deletions.
4 changes: 3 additions & 1 deletion ruby/ext/google/protobuf_c/message.c
Original file line number Diff line number Diff line change
Expand Up @@ -1248,7 +1248,9 @@ upb_msg* Message_deep_copy(const upb_msg* msg, const upb_msgdef* m,

const upb_msg* Message_GetUpbMessage(VALUE value, const upb_msgdef* m,
const char* name, upb_arena* arena) {
if (value == Qnil) return NULL;
if (value == Qnil) {
rb_raise(cTypeError, "nil message not allowed here.");
}

VALUE klass = CLASS_OF(value);
VALUE desc_rb = rb_ivar_get(klass, descriptor_instancevar_interned);
Expand Down
11 changes: 8 additions & 3 deletions ruby/tests/basic.rb
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,15 @@ def test_issue_8311_crash

outer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("Outer").msgclass

outer_proto = outer.new(
outer.new(
inners: []
)
outer_proto['inners'].to_s
)['inners'].to_s

assert_raise Google::Protobuf::TypeError do
outer.new(
inners: [nil]
).to_s
end
end

def test_has_field
Expand Down
12 changes: 0 additions & 12 deletions ruby/tests/repeated_field_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -339,18 +339,6 @@ def test_collect!
end
end

def test_compact!
m = TestMessage.new
m.repeated_msg << TestMessage2.new(:foo => 1)
m.repeated_msg << nil
m.repeated_msg << TestMessage2.new(:foo => 2)
reference_arr = m.repeated_string.to_a

check_self_modifying_method(m.repeated_string, reference_arr) do |arr|
arr.compact!
end
end

def test_delete
m = TestMessage.new
reference_arr = %w(foo bar baz)
Expand Down

0 comments on commit dfa5457

Please sign in to comment.