From c1baee398493434f7684f2db5ad48cc4b1b59279 Mon Sep 17 00:00:00 2001
From: Florian Orben <florian.orben@gmail.com>
Date: Fri, 6 Nov 2015 00:42:12 +0100
Subject: don't panic if incoming webhook contains invalid json

---
 web/web.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/web/web.go b/web/web.go
index 51f6664b6..96f826359 100644
--- a/web/web.go
+++ b/web/web.go
@@ -983,6 +983,11 @@ func incomingWebhook(c *api.Context, w http.ResponseWriter, r *http.Request) {
 		parsedRequest = model.IncomingWebhookRequestFromJson(strings.NewReader(r.FormValue("payload")))
 	}
 
+	if parsedRequest == nil {
+		c.Err = model.NewAppError("incomingWebhook", "Unable to parse incoming data", "")
+		return
+	}
+
 	text := parsedRequest.Text
 	if len(text) == 0 {
 		c.Err = model.NewAppError("incomingWebhook", "No text specified", "")
-- 
cgit v1.2.3-1-g7c22