From: Chris-Savinovich <csavinovich@digium.com>
Date: Mon, 1 Jul 2019 21:57:25 +0000 (-0500)
Subject: chan_dahdi.c: crash in chan_dahdi
X-Git-Tag: 17.0.0-rc1~43^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e669712e2b5e1cc34ec973a29aac5a9d5487437;p=thirdparty%2Fasterisk.git

chan_dahdi.c: crash in chan_dahdi

Fixes a crash in chan_dahdi occurring on 32-bit systems. A previous
patch introduced a variable of type unassigned long long which is 64-bits.
Casting it as 'ast_json_int_t' along with JSON type 'I' makes it work
with 32-bit systems.

ASTERISK-28457

Change-Id: I9cef6b5f2d826fc5c93f2f6a1c997c4e3e6c93fe
---

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index f428530821..434bd16a82 100644
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -1766,8 +1766,8 @@ static void publish_dahdichannel(struct ast_channel *chan, ast_group_t group, in
 
 	ast_assert(dahdi_channel != NULL);
 
-	blob = ast_json_pack("{s: i, s: i, s: s}",
-		"group", group,
+	blob = ast_json_pack("{s: I, s: i, s: s}",
+		"group", (ast_json_int_t)group,
 		"span", span,
 		"channel", dahdi_channel);
 	if (!blob) {