From 20b0af446abf465cb3b75c7c2852c7a2ffbc4f34 Mon Sep 17 00:00:00 2001
From: Hanzei <16541325+hanzei@users.noreply.github.com>
Date: Fri, 9 Aug 2019 07:28:28 +0200
Subject: [PATCH] Fix NPE when installing a plugin via URL (#11809)

---
 api4/plugin.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/api4/plugin.go b/api4/plugin.go
index 9feb48700e..4ce44f9746 100644
--- a/api4/plugin.go
+++ b/api4/plugin.go
@@ -127,16 +127,15 @@ func installPluginFromUrl(c *Context, w http.ResponseWriter, r *http.Request) {
 		force = true
 	}
 
-	fileBytes, readErr := ioutil.ReadAll(resp.Body)
-	if readErr != nil {
+	fileBytes, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
 		c.Err = model.NewAppError("installPluginFromUrl", "api.plugin.install.reading_stream_failed.app_error", nil, err.Error(), http.StatusBadRequest)
 		return
 	}
 
-	manifest, unpackErr := c.App.InstallPlugin(bytes.NewReader(fileBytes), force)
-
-	if unpackErr != nil {
-		c.Err = unpackErr
+	manifest, appErr := c.App.InstallPlugin(bytes.NewReader(fileBytes), force)
+	if appErr != nil {
+		c.Err = appErr
 		return
 	}
 	w.WriteHeader(http.StatusCreated)