From: Joshua Colp <jcolp@digium.com>
Date: Fri, 14 Oct 2016 19:15:51 +0000 (-0500)
Subject: Merge "Audit ast_json_pack() calls for needed UTF-8 checks." into 14
X-Git-Tag: 14.1.0-rc1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=839766f5e1d82b1e4692923ac698eb541cb6e265;p=thirdparty%2Fasterisk.git

Merge "Audit ast_json_pack() calls for needed UTF-8 checks." into 14
---

839766f5e1d82b1e4692923ac698eb541cb6e265
diff --cc main/aoc.c
index b98bfa7654,552c406a15..8d4332901f
--- a/main/aoc.c
+++ b/main/aoc.c
@@@ -1691,12 -1694,12 +1693,11 @@@ static struct ast_json *association_to_
  {
  	switch (decoded->charging_association.charging_type) {
  	case AST_AOC_CHARGING_ASSOCIATION_NUMBER:
- 		return ast_json_pack(
- 			"{s:s, s:i}",
- 			"Number", decoded->charging_association.charge.number.number,
+ 		return ast_json_pack("{s:s, s:i}",
+ 			"Number", AST_JSON_UTF8_VALIDATE(decoded->charging_association.charge.number.number),
  			"Plan", decoded->charging_association.charge.number.plan);
  	case AST_AOC_CHARGING_ASSOCIATION_ID:
 -		return ast_json_pack(
 -			"{s:i}", "ID", decoded->charging_association.charge.id);
 +		return ast_json_pack("{s:i}", "ID", decoded->charging_association.charge.id);
  	case AST_AOC_CHARGING_ASSOCIATION_NA:
  	default:
  		return ast_json_null();