tree f07ce9dd321283ff56fefa3e4d1596bc74b23bb5
parent 0e358a402f994eaf96a258b7c5c5b3317d4575aa
author Damien Neil <dneil@google.com> 1621532118 -0700
committer Damien Neil <dneil@google.com> 1621535000 +0000

internal/impl: support typed nil source for Merge of aberrant messages

When merging aberrant messages with legacy Marshal and Unmarshal
methods, check for a typed nil source before calling Marshal.

Add an aberrant message with Marshal/Unmarshal methods to
internal/testprotos/nullable and use it to test the internal/impl
support for these methods.

Fixes golang/protobuf#1324

Change-Id: Ib6ce85b30b46e3392a226ca6abe411932a371f02
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/321529
Trust: Damien Neil <dneil@google.com>
Run-TryBot: Damien Neil <dneil@google.com>
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>