diff options
| author | Ondřej Surý <ondrej@sury.org> | 2011-05-23 09:45:29 +0200 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2011-05-23 11:04:16 +0200 |
| commit | 4e5e42a1c1a9eb757743648c48df70cbd42635db (patch) | |
| tree | 64220a5cf0a1ad27206bbcdbc810ea56ba5ed67f /src/pkg/xml/read.go | |
| parent | fd089e27d7260cee1c7ca449c41cdd0341ebc6cb (diff) | |
| download | golang-4e5e42a1c1a9eb757743648c48df70cbd42635db.tar.gz | |
Imported Upstream version 2011.05.22
Diffstat (limited to 'src/pkg/xml/read.go')
| -rw-r--r-- | src/pkg/xml/read.go | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/pkg/xml/read.go b/src/pkg/xml/read.go index 554b2a61b..e2b349c3f 100644 --- a/src/pkg/xml/read.go +++ b/src/pkg/xml/read.go @@ -220,13 +220,10 @@ func (p *Parser) unmarshal(val reflect.Value, start *StartElement) os.Error { } if pv := val; pv.Kind() == reflect.Ptr { - if pv.Pointer() == 0 { - zv := reflect.Zero(pv.Type().Elem()) - pv.Set(zv.Addr()) - val = zv - } else { - val = pv.Elem() + if pv.IsNil() { + pv.Set(reflect.New(pv.Type().Elem())) } + val = pv.Elem() } var ( |