From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Fri, 27 Oct 2017 07:36:39 +0000 (+0200)
Subject: doveadm-server: http: Changed request parse error into an assertion.
X-Git-Tag: 2.3.0.rc1~736
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ccd63d6fc82558dd10c3bdc100653a16430f431;p=thirdparty%2Fdovecot%2Fcore.git

doveadm-server: http: Changed request parse error into an assertion.

The condition can never occur when json-parser and the request parsing state machine are behaving correctly.
At that point only an object key can be returned; the client cannot cause it to return anything else.
---

diff --git a/src/doveadm/client-connection-http.c b/src/doveadm/client-connection-http.c
index 5dff28053f..24db59cf8a 100644
--- a/src/doveadm/client-connection-http.c
+++ b/src/doveadm/client-connection-http.c
@@ -441,9 +441,7 @@ doveadm_http_handle_json_v1(struct client_request_http *req,
 			req->parse_state = CLIENT_REQUEST_PARSE_CMD_ID;
 			return TRUE;
 		}
-		// can happen...
-		if (type != JSON_TYPE_OBJECT_KEY && type != JSON_TYPE_STRING)
-			return FALSE;
+		i_assert(type == JSON_TYPE_OBJECT_KEY);
 		/* go hunting */
 		found = FALSE;
 		array_foreach_modifiable(&req->pargv, par) {