tree 126cabec1b9719b1d6be305e8f2f3e4ff678dbd9
parent c908144c88526c647a4f0711b5890f9e8bb1ea30
author Joe Tsai <joetsai@digital-static.net> 1569127850 -0700
committer Joe Tsai <joetsai@digital-static.net> 1569255279 +0000

proto: fix self-merging

While odd, it is possible to merge a message into itself.
In such a situation, the material impact is that repeated
and unknown fields are duplicated. The previous logic would
inifinite loop since the list iteration logic uses the current
length, but since the current length is ever growing, this loop
will never terminate. Instead, record the list length once
and iterate exactly that many times.

Change-Id: Ief98afa1b20bd950a9c2422d4462b170dbe6fa11
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/196857
Reviewed-by: Damien Neil <dneil@google.com>