auth: Ensure authdb_event returns event

We don't want nasty crashes due to lack of event.
dovecot · Mar 8, 2019 · e14ba50 · e14ba50
1 parent 2325b20
commit e14ba50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/src/auth/auth-request.c b/src/auth/auth-request.c
@@ -913,6 +913,7 @@ auth_request_lookup_end_common(struct auth_request *request,
 void auth_request_passdb_lookup_end(struct auth_request *request,
 				    enum passdb_result result)
 {
+	i_assert(array_count(&request->authdb_event) > 0);
 	struct event *event = authdb_event(request);
 	struct event_passthrough *e =
 		auth_request_lookup_end_common(request, event)->
@@ -956,6 +957,7 @@ void auth_request_userdb_lookup_begin(struct auth_request *request)
 void auth_request_userdb_lookup_end(struct auth_request *request,
 				    enum userdb_result result)
 {
+	i_assert(array_count(&request->authdb_event) > 0);
 	struct event *event = authdb_event(request);
 	struct event_passthrough *e =
 		auth_request_lookup_end_common(request, event)->

diff --git a/src/auth/auth-request.h b/src/auth/auth-request.h
@@ -315,6 +315,8 @@ void auth_request_userdb_lookup_end(struct auth_request *request,
    which will be returned here. */
 static inline struct event *authdb_event(struct auth_request *request)
 {
+	if (array_count(&request->authdb_event) == 0)
+		return request->event;
 	struct event **e = array_back_modifiable(&request->authdb_event);
 	return *e;
 }