mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-01-06 10:01:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

reflect/protodesc: don't panic on nil Resolver

Browse Source 
The change to make protodesc.NewFile take an interface rather than a
concrete type means that NewFile(f, nil) now causes a panic. (A nil
*protoregistry.Files is valid.)

Fix this panic by using a default, empty registry when NewFile's second
parameter is nil.

Change-Id: I70a1f0759e7ea5b57fba5b6123ee85188f4d560c
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/182979
Reviewed-by: Joe Tsai <thebrokentoaster@gmail.com>
This commit is contained in:
Damien Neil 2019-06-19 10:21:17 -07:00
parent 5857a5ab4f
commit 3631e225f8
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
reflect/protodesc/protodesc.go
View File

@ -13,6 +13,7 @@ import (
"google.golang.org/protobuf/internal/errors" "google.golang.org/protobuf/internal/errors"
"google.golang.org/protobuf/internal/prototype" "google.golang.org/protobuf/internal/prototype"
"google.golang.org/protobuf/reflect/protoreflect" "google.golang.org/protobuf/reflect/protoreflect"
"google.golang.org/protobuf/reflect/protoregistry"
"google.golang.org/protobuf/types/descriptorpb" "google.golang.org/protobuf/types/descriptorpb"
) )
@ -53,6 +54,9 @@ type Resolver interface {
// The caller must relinquish full ownership of the input fd and must not // The caller must relinquish full ownership of the input fd and must not
// access or mutate any fields. // access or mutate any fields.
func NewFile(fd *descriptorpb.FileDescriptorProto, r Resolver) (protoreflect.FileDescriptor, error) { func NewFile(fd *descriptorpb.FileDescriptorProto, r Resolver) (protoreflect.FileDescriptor, error) {
if r == nil {
r = (*protoregistry.Files)(nil) // empty resolver
}
var f prototype.File var f prototype.File
switch fd.GetSyntax() { switch fd.GetSyntax() {
case "proto2", "": case "proto2", "":