From f748a4771dce6d6974393fdace000eba85fd24a3 Mon Sep 17 00:00:00 2001 From: Yuki Yugui Sonoda <yugui@yugui.jp> Date: Mon, 1 Jun 2015 20:13:09 +0900 Subject: [PATCH] Prevent infinite loop on package name collision Fixes #17. Based on suggestion by Seongjin Cho (@w4-sjcho). --- protoc-gen-grpc-gateway/gengateway/generator.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/protoc-gen-grpc-gateway/gengateway/generator.go b/protoc-gen-grpc-gateway/gengateway/generator.go index e04dd7e9b9f..6d752440b4a 100644 --- a/protoc-gen-grpc-gateway/gengateway/generator.go +++ b/protoc-gen-grpc-gateway/gengateway/generator.go @@ -45,7 +45,7 @@ func New(reg *descriptor.Registry) *generator { if err := reg.ReserveGoPackageAlias(pkg.Name, pkg.Path); err != nil { for i := 0; ; i++ { alias := fmt.Sprintf("%s_%d", pkg.Name, i) - if err := reg.ReserveGoPackageAlias(pkg.Name, pkg.Path); err != nil { + if err := reg.ReserveGoPackageAlias(alias, pkg.Path); err != nil { continue } pkg.Alias = alias