| commit | 814b936cd012ffe7a0307a3ecceae947c8439df1 | [log] [tgz] |
|---|---|---|
| author | David Symonds <dsymonds@golang.org> | Tue Dec 13 09:10:47 2011 +1100 |
| committer | David Symonds <dsymonds@golang.org> | Tue Dec 13 09:10:47 2011 +1100 |
| tree | e6ee11d3dbd32990572806e00eb1e317e1efcf73 | |
| parent | 2c737f3c3b7e212cc5fe5d4190ff3d85d8ff6f92 [diff] [blame] |
goprotobuf: Fix panic in SetDefaults for nil sub-messages. Fixes #23. R=r CC=golang-dev http://codereview.appspot.com/5477071
diff --git a/proto/lib.go b/proto/lib.go index 33795e9..498cb75 100644 --- a/proto/lib.go +++ b/proto/lib.go
@@ -657,7 +657,11 @@ } for _, ni := range dm.nested { - setDefaults(v.Field(ni), recur, zeros) + f := v.Field(ni) + if f.IsNil() { + continue + } + setDefaults(f, recur, zeros) } }