From d95a144563189961e3759a1c2107511e820f566a Mon Sep 17 00:00:00 2001
From: Adam Reese <adam@reese.io>
Date: Thu, 9 Jun 2016 11:09:00 -0700
Subject: [PATCH] fix(chartutil): fix nil error on values

Fixes: https://github.com/kubernetes/helm/issues/803
---
 pkg/chartutil/values.go   | 10 ++++++----
 pkg/engine/engine_test.go |  4 ++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go
index 904b9f2de..d1c9aceec 100644
--- a/pkg/chartutil/values.go
+++ b/pkg/chartutil/values.go
@@ -65,10 +65,12 @@ func tableLookup(v Values, simple string) (Values, error) {
 }
 
 // ReadValues will parse YAML byte data into a Values.
-func ReadValues(data []byte) (Values, error) {
-	out := map[string]interface{}{}
-	err := yaml.Unmarshal(data, &out)
-	return out, err
+func ReadValues(data []byte) (vals Values, err error) {
+	vals = make(map[string]interface{})
+	if len(data) > 0 {
+		err = yaml.Unmarshal(data, &vals)
+	}
+	return
 }
 
 // ReadValuesFile will parse a YAML file into a Values.
diff --git a/pkg/engine/engine_test.go b/pkg/engine/engine_test.go
index 2d0b7de6f..095fb4b26 100644
--- a/pkg/engine/engine_test.go
+++ b/pkg/engine/engine_test.go
@@ -53,6 +53,10 @@ func TestRender(t *testing.T) {
 	if out["test1"] != expect {
 		t.Errorf("Expected %q, got %q", expect, out["test1"])
 	}
+
+	if _, err := e.Render(c, &chart.Config{}, overrides); err != nil {
+		t.Errorf("Unexpected error: %s", err)
+	}
 }
 
 func TestRenderInternals(t *testing.T) {