From 22afb3571c4bb6268664ecc5da4416ec58d3e060 Mon Sep 17 00:00:00 2001
From: Ian Davis <nospam@iandavis.com>
Date: Mon, 3 Sep 2018 11:20:23 +0100
Subject: encoding/json: recover saved error context when unmarshalling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes: #27464

Change-Id: I270c56fd0d5ae8787a1293029aff3072f4f52f33
Reviewed-on: https://go-review.googlesource.com/132955
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
---
 src/encoding/json/decode.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/encoding/json/decode.go')

diff --git a/src/encoding/json/decode.go b/src/encoding/json/decode.go
index fd2bf92dc2..82dc78083a 100644
--- a/src/encoding/json/decode.go
+++ b/src/encoding/json/decode.go
@@ -179,7 +179,7 @@ func (d *decodeState) unmarshal(v interface{}) error {
 	// test must be applied at the top level of the value.
 	err := d.value(rv)
 	if err != nil {
-		return err
+		return d.addErrorContext(err)
 	}
 	return d.savedError
 }
-- 
cgit v1.3