diff options
| author | Joshua Haberman <jhaberman@gmail.com> | 2016-08-29 17:05:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-29 17:05:43 -0700 |
| commit | e721ce66cfeaa5d8790ecba09c73d1ef399887d2 (patch) | |
| tree | bf75df4980037f4c4dc4b150a12611a0546c847f /ruby/ext/google/protobuf_c/upb.c | |
| parent | 7e627738b3b5c4ffba54343b6872a09153575851 (diff) | |
| parent | 3a674ffe05164b858d88aae4e241e2c44b7ff1a7 (diff) | |
| download | protobuf-e721ce66cfeaa5d8790ecba09c73d1ef399887d2.tar.gz protobuf-e721ce66cfeaa5d8790ecba09c73d1ef399887d2.tar.bz2 protobuf-e721ce66cfeaa5d8790ecba09c73d1ef399887d2.zip | |
Merge pull request #2012 from haberman/rubymapgcfix
Ruby: make sure map parsing frames are GC-rooted.
Diffstat (limited to 'ruby/ext/google/protobuf_c/upb.c')
| -rw-r--r-- | ruby/ext/google/protobuf_c/upb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ruby/ext/google/protobuf_c/upb.c b/ruby/ext/google/protobuf_c/upb.c index 976a3934..544ebc04 100644 --- a/ruby/ext/google/protobuf_c/upb.c +++ b/ruby/ext/google/protobuf_c/upb.c @@ -11175,7 +11175,7 @@ static bool parse_mapentry_key(upb_json_parser *p) { sel = getsel_for_handlertype(p, UPB_HANDLER_STRING); upb_sink_putstring(&subsink, sel, buf, len, NULL); sel = getsel_for_handlertype(p, UPB_HANDLER_ENDSTR); - upb_sink_endstr(&subsink, sel); + upb_sink_endstr(&p->top->sink, sel); multipart_end(p); break; } |