Merge pull request #1329 from florianorben/no_panic_on_webhook_err

don't panic if incoming webhook contains invalid json

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", "")