Merge pull request #15873 from grafana/13344_fix

add nil/length check when delete old login attempts

Merge pull request #15873 from grafana/13344_fix
add nil/length check when delete old login attempts
c9e90f89 · Marcus Efraimsson · GitHub · 2bc573c8 · e3b30621 · c9e90f89
Commit c9e90f89 authored Mar 08, 2019 by Marcus Efraimsson Committed by GitHub Mar 08, 2019
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

pkg/services/sqlstore/login_attempt.go
+4 -0

No files found.
--- a/pkg/services/sqlstore/login_attempt.go
+++ b/pkg/services/sqlstore/login_attempt.go
@@ -44,6 +44,10 @@ func DeleteOldLoginAttempts(cmd *m.DeleteOldLoginAttemptsCommand) error {
 			return err
 		}

+		if result == nil || len(result) == 0 || result[0] == nil {
+			return nil
+		}
+
 		maxId = toInt64(result[0]["id"])

 		if maxId == 0 {