From 3f95180c983602e27aa8d7bd3ff6d15d2827c460 Mon Sep 17 00:00:00 2001
From: jomenxiao <jomenxiao@gmail.com>
Date: Tue, 28 Nov 2017 22:20:22 +0800
Subject: [PATCH] fix render http[get] params error

---
 pkg/api/render.go |  6 +++++-
 pkg/util/url.go   | 11 ++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkg/api/render.go b/pkg/api/render.go
index 5284c7831bb..fdf53e6730d 100644
--- a/pkg/api/render.go
+++ b/pkg/api/render.go
@@ -10,7 +10,11 @@ import (
 )
 
 func RenderToPng(c *middleware.Context) {
-	queryReader := util.NewUrlQueryReader(c.Req.URL)
+	queryReader, err := util.NewUrlQueryReader(c.Req.URL)
+	if err != nil {
+		c.Handle(400, "Rander parameters error", err)
+		return
+	}
 	queryParams := fmt.Sprintf("?%s", c.Req.URL.RawQuery)
 
 	renderOpts := &renderer.RenderOpts{
diff --git a/pkg/util/url.go b/pkg/util/url.go
index ba452596a2b..c82dcef67c5 100644
--- a/pkg/util/url.go
+++ b/pkg/util/url.go
@@ -9,10 +9,15 @@ type UrlQueryReader struct {
 	values url.Values
 }
 
-func NewUrlQueryReader(url *url.URL) *UrlQueryReader {
-	return &UrlQueryReader{
-		values: url.Query(),
+func NewUrlQueryReader(urlInfo *url.URL) (*UrlQueryReader, error) {
+	u, err := url.ParseQuery(urlInfo.String())
+	if err != nil {
+		return nil, err
 	}
+
+	return &UrlQueryReader{
+		values: u,
+	}, nil
 }
 
 func (r *UrlQueryReader) Get(name string, def string) string {