From fd089e27d7260cee1c7ca449c41cdd0341ebc6cb Mon Sep 17 00:00:00 2001 From: Ondřej Surý Date: Wed, 4 May 2011 15:46:02 +0200 Subject: Imported Upstream version 2011.04.27 --- src/pkg/xml/read.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'src/pkg/xml/read.go') diff --git a/src/pkg/xml/read.go b/src/pkg/xml/read.go index e2b349c3f..554b2a61b 100644 --- a/src/pkg/xml/read.go +++ b/src/pkg/xml/read.go @@ -220,10 +220,13 @@ func (p *Parser) unmarshal(val reflect.Value, start *StartElement) os.Error { } if pv := val; pv.Kind() == reflect.Ptr { - if pv.IsNil() { - pv.Set(reflect.New(pv.Type().Elem())) + if pv.Pointer() == 0 { + zv := reflect.Zero(pv.Type().Elem()) + pv.Set(zv.Addr()) + val = zv + } else { + val = pv.Elem() } - val = pv.Elem() } var ( -- cgit v1.2.3