From 85ce27fc932b298ce7fae24cc79f1958cf97cd35 Mon Sep 17 00:00:00 2001 From: Miguel de la Cruz Date: Fri, 13 Sep 2019 19:58:27 +0200 Subject: [PATCH] [MM-18544] Initialise UserSearch struct before trying to decode JSON (#12198) --- model/user_search.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/model/user_search.go b/model/user_search.go index 9ea69c46e1..2a814d0fcb 100644 --- a/model/user_search.go +++ b/model/user_search.go @@ -33,14 +33,14 @@ func (u *UserSearch) ToJson() []byte { // UserSearchFromJson will decode the input and return a User func UserSearchFromJson(data io.Reader) *UserSearch { - var us *UserSearch + us := UserSearch{} json.NewDecoder(data).Decode(&us) if us.Limit == 0 { us.Limit = USER_SEARCH_DEFAULT_LIMIT } - return us + return &us } // UserSearchOptions captures internal parameters derived from the user's permissions and a