From: Joshua Colp <jcolp@digium.com>
Date: Thu, 3 May 2018 11:34:32 +0000 (+0000)
Subject: res_ari: Remove requirement that body exists when debug is on.
X-Git-Tag: 13.22.0-rc1~69^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a36d6e3674b11934df177f86c8f1d464bb8f662b;p=thirdparty%2Fasterisk.git

res_ari: Remove requirement that body exists when debug is on.

The "ari set debug" code for incoming requests incorrectly assumed
that all requests would contain a body. If one did not exist the
request would be incorrectly rejected. The response that was sent
was also incomplete as an incorrect function was used to construct
the response.

The code has now been changed to no longer require a request to have
a body and the response updated to use the correct function.

ASTERISK-27801

Change-Id: I4eef036ad54550a4368118cc348765ecac25e0f8
---

diff --git a/res/res_ari.c b/res/res_ari.c
index 006e25db18..75af26b276 100644
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -984,9 +984,9 @@ static int ast_ari_callback(struct ast_tcptls_session_instance *ser,
 		struct ast_str *buf = ast_str_create(512);
 		char *str = ast_json_dump_string_format(body, ast_ari_json_format());
 
-		if (!buf || !str) {
+		if (!buf || (body && !str)) {
 			ast_http_request_close_on_completion(ser);
-			ast_http_error(ser, 500, "Server Error", "Out of memory");
+			ast_ari_response_error(&response, 500, "Server Error", "Out of memory");
 			ast_json_free(str);
 			ast_free(buf);
 			goto request_failed;
@@ -1000,7 +1000,7 @@ static int ast_ari_callback(struct ast_tcptls_session_instance *ser,
 		for (var = get_params; var; var = var->next) {
 			ast_str_append(&buf, 0, "%s: %s\n", var->name, var->value);
 		}
-		ast_verbose("%sbody:\n%s\n\n", ast_str_buffer(buf), str);
+		ast_verbose("%sbody:\n%s\n\n", ast_str_buffer(buf), S_OR(str, ""));
 		ast_json_free(str);
 		ast_free(buf);
 	}