<p>George Joseph <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10255">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Richard Mudgett: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">jansson: Backport fixes to bundled, use json_vsprintf if available.<br><br>Use json_vsprintf from versions which contain fix for va_copy leak.<br><br>Apply fixes from jansson master:<br>* va_copy leak fix.<br>* Avoid potential invalid memory read in json_pack.<br>* Rename variable that shadowed another.<br><br>Change-Id: I7522e462d2a52f53010ffa1e7d705c666ec35539<br>---<br>M configure<br>M include/asterisk/autoconfig.h.in<br>M main/json.c<br>M menuselect/configure<br>M third-party/jansson/configure.m4<br>A third-party/jansson/patches/0022-Avoid-invalid-memory-read-in-json_pack.patch<br>A third-party/jansson/patches/0025-Call-va_end-after-va_copy-in-json_vsprintf.patch<br>A third-party/jansson/patches/0027-Rename-a-varialble-that-shadows-another-one.patch<br>8 files changed, 182 insertions(+), 34 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/configure b/configure</span><br><span>index 6c5d973..ac419e2 100755</span><br><span>--- a/configure</span><br><span>+++ b/configure</span><br><span>@@ -1337,7 +1337,6 @@</span><br><span> docdir</span><br><span> oldincludedir</span><br><span> includedir</span><br><span style="color: hsl(0, 100%, 40%);">-runstatedir</span><br><span> localstatedir</span><br><span> sharedstatedir</span><br><span> sysconfdir</span><br><span>@@ -1525,7 +1524,6 @@</span><br><span> sysconfdir='${prefix}/etc'</span><br><span> sharedstatedir='${prefix}/com'</span><br><span> localstatedir='${prefix}/var'</span><br><span style="color: hsl(0, 100%, 40%);">-runstatedir='${localstatedir}/run'</span><br><span> includedir='${prefix}/include'</span><br><span> oldincludedir='/usr/include'</span><br><span> docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'</span><br><span>@@ -1778,15 +1776,6 @@</span><br><span> | -silent | --silent | --silen | --sile | --sil)</span><br><span> silent=yes ;;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- -runstatedir | --runstatedir | --runstatedi | --runstated \</span><br><span style="color: hsl(0, 100%, 40%);">- | --runstate | --runstat | --runsta | --runst | --runs \</span><br><span style="color: hsl(0, 100%, 40%);">- | --run | --ru | --r)</span><br><span style="color: hsl(0, 100%, 40%);">- ac_prev=runstatedir ;;</span><br><span style="color: hsl(0, 100%, 40%);">- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \</span><br><span style="color: hsl(0, 100%, 40%);">- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \</span><br><span style="color: hsl(0, 100%, 40%);">- | --run=* | --ru=* | --r=*)</span><br><span style="color: hsl(0, 100%, 40%);">- runstatedir=$ac_optarg ;;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)</span><br><span> ac_prev=sbindir ;;</span><br><span> -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \</span><br><span>@@ -1924,7 +1913,7 @@</span><br><span> for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \</span><br><span> datadir sysconfdir sharedstatedir localstatedir includedir \</span><br><span> oldincludedir docdir infodir htmldir dvidir pdfdir psdir \</span><br><span style="color: hsl(0, 100%, 40%);">- libdir localedir mandir runstatedir</span><br><span style="color: hsl(120, 100%, 40%);">+ libdir localedir mandir</span><br><span> do</span><br><span> eval ac_val=\$$ac_var</span><br><span> # Remove trailing slashes.</span><br><span>@@ -2077,7 +2066,6 @@</span><br><span> --sysconfdir=DIR read-only single-machine data [PREFIX/etc]</span><br><span> --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]</span><br><span> --localstatedir=DIR modifiable single-machine data [PREFIX/var]</span><br><span style="color: hsl(0, 100%, 40%);">- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]</span><br><span> --libdir=DIR object code libraries [EPREFIX/lib]</span><br><span> --includedir=DIR C header files [PREFIX/include]</span><br><span> --oldincludedir=DIR C header files for non-gcc [/usr/include]</span><br><span>@@ -9305,6 +9293,9 @@</span><br><span> { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5</span><br><span> $as_echo "yes" >&6; }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+$as_echo "#define HAVE_JANSSON_BUNDLED 1" >>confdefs.h</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> fi</span><br><span> </span><br><span> </span><br><span>@@ -14815,7 +14806,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -14861,7 +14852,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -14885,7 +14876,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -14930,7 +14921,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -14954,7 +14945,7 @@</span><br><span> We can't simply define LARGE_OFF_T to be 9223372036854775807,</span><br><span> since some C++ compilers masquerading as C compilers</span><br><span> incorrectly reject 9223372036854775807. */</span><br><span style="color: hsl(0, 100%, 40%);">-#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31))</span><br><span style="color: hsl(120, 100%, 40%);">+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))</span><br><span> int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721</span><br><span> && LARGE_OFF_T % 2147483647 == 1)</span><br><span> ? 1 : -1];</span><br><span>@@ -16254,8 +16245,6 @@</span><br><span> if (*(data + i) != *(data3 + i))</span><br><span> return 14;</span><br><span> close (fd);</span><br><span style="color: hsl(0, 100%, 40%);">- free (data);</span><br><span style="color: hsl(0, 100%, 40%);">- free (data3);</span><br><span> return 0;</span><br><span> }</span><br><span> _ACEOF</span><br><span>diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in</span><br><span>index 69ab585..66c0ce4 100644</span><br><span>--- a/include/asterisk/autoconfig.h.in</span><br><span>+++ b/include/asterisk/autoconfig.h.in</span><br><span>@@ -410,6 +410,9 @@</span><br><span> /* Define if your system has the JANSSON libraries. */</span><br><span> #undef HAVE_JANSSON</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Define if your system has JANSSON_BUNDLED */</span><br><span style="color: hsl(120, 100%, 40%);">+#undef HAVE_JANSSON_BUNDLED</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Define to 1 if you have the `kevent64' function. */</span><br><span> #undef HAVE_KEVENT64</span><br><span> </span><br><span>diff --git a/main/json.c b/main/json.c</span><br><span>index f8f4c0d..a9f6b42 100644</span><br><span>--- a/main/json.c</span><br><span>+++ b/main/json.c</span><br><span>@@ -292,16 +292,25 @@</span><br><span> </span><br><span> struct ast_json *ast_json_vstringf(const char *format, va_list args)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- char *str = NULL;</span><br><span> json_t *ret = NULL;</span><br><span> </span><br><span> if (format) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* json_pack was not introduced until jansson-2.0 so Asterisk could never</span><br><span style="color: hsl(120, 100%, 40%);">+ * be compiled against older versions. The version check can never match</span><br><span style="color: hsl(120, 100%, 40%);">+ * anything older than 2.12. */</span><br><span style="color: hsl(120, 100%, 40%);">+#if defined(HAVE_JANSSON_BUNDLED) || JANSSON_MAJOR_VERSION > 2 || JANSSON_MINOR_VERSION > 11</span><br><span style="color: hsl(120, 100%, 40%);">+ ret = json_vsprintf(format, args);</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ char *str = NULL;</span><br><span> int err = ast_vasprintf(&str, format, args);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> if (err >= 0) {</span><br><span> ret = json_string(str);</span><br><span> ast_free(str);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return (struct ast_json *)ret;</span><br><span> }</span><br><span> </span><br><span>diff --git a/menuselect/configure b/menuselect/configure</span><br><span>index fd7d24b..8efb637 100755</span><br><span>--- a/menuselect/configure</span><br><span>+++ b/menuselect/configure</span><br><span>@@ -692,7 +692,6 @@</span><br><span> docdir</span><br><span> oldincludedir</span><br><span> includedir</span><br><span style="color: hsl(0, 100%, 40%);">-runstatedir</span><br><span> localstatedir</span><br><span> sharedstatedir</span><br><span> sysconfdir</span><br><span>@@ -773,7 +772,6 @@</span><br><span> sysconfdir='${prefix}/etc'</span><br><span> sharedstatedir='${prefix}/com'</span><br><span> localstatedir='${prefix}/var'</span><br><span style="color: hsl(0, 100%, 40%);">-runstatedir='${localstatedir}/run'</span><br><span> includedir='${prefix}/include'</span><br><span> oldincludedir='/usr/include'</span><br><span> docdir='${datarootdir}/doc/${PACKAGE}'</span><br><span>@@ -1026,15 +1024,6 @@</span><br><span> | -silent | --silent | --silen | --sile | --sil)</span><br><span> silent=yes ;;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- -runstatedir | --runstatedir | --runstatedi | --runstated \</span><br><span style="color: hsl(0, 100%, 40%);">- | --runstate | --runstat | --runsta | --runst | --runs \</span><br><span style="color: hsl(0, 100%, 40%);">- | --run | --ru | --r)</span><br><span style="color: hsl(0, 100%, 40%);">- ac_prev=runstatedir ;;</span><br><span style="color: hsl(0, 100%, 40%);">- -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \</span><br><span style="color: hsl(0, 100%, 40%);">- | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \</span><br><span style="color: hsl(0, 100%, 40%);">- | --run=* | --ru=* | --r=*)</span><br><span style="color: hsl(0, 100%, 40%);">- runstatedir=$ac_optarg ;;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)</span><br><span> ac_prev=sbindir ;;</span><br><span> -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \</span><br><span>@@ -1172,7 +1161,7 @@</span><br><span> for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \</span><br><span> datadir sysconfdir sharedstatedir localstatedir includedir \</span><br><span> oldincludedir docdir infodir htmldir dvidir pdfdir psdir \</span><br><span style="color: hsl(0, 100%, 40%);">- libdir localedir mandir runstatedir</span><br><span style="color: hsl(120, 100%, 40%);">+ libdir localedir mandir</span><br><span> do</span><br><span> eval ac_val=\$$ac_var</span><br><span> # Remove trailing slashes.</span><br><span>@@ -1325,7 +1314,6 @@</span><br><span> --sysconfdir=DIR read-only single-machine data [PREFIX/etc]</span><br><span> --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]</span><br><span> --localstatedir=DIR modifiable single-machine data [PREFIX/var]</span><br><span style="color: hsl(0, 100%, 40%);">- --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]</span><br><span> --libdir=DIR object code libraries [EPREFIX/lib]</span><br><span> --includedir=DIR C header files [PREFIX/include]</span><br><span> --oldincludedir=DIR C header files for non-gcc [/usr/include]</span><br><span>diff --git a/third-party/jansson/configure.m4 b/third-party/jansson/configure.m4</span><br><span>index d59d861..aa112f0 100644</span><br><span>--- a/third-party/jansson/configure.m4</span><br><span>+++ b/third-party/jansson/configure.m4</span><br><span>@@ -79,6 +79,7 @@</span><br><span> AC_SUBST([JANSSON_LIB])</span><br><span> AC_SUBST([JANSSON_INCLUDE])</span><br><span> AC_MSG_RESULT(yes)</span><br><span style="color: hsl(120, 100%, 40%);">+ AC_DEFINE([HAVE_JANSSON_BUNDLED], 1, [Define if your system has JANSSON_BUNDLED])</span><br><span> ])</span><br><span> </span><br><span> AC_DEFUN([JANSSON_CONFIGURE],</span><br><span>diff --git a/third-party/jansson/patches/0022-Avoid-invalid-memory-read-in-json_pack.patch b/third-party/jansson/patches/0022-Avoid-invalid-memory-read-in-json_pack.patch</span><br><span>new file mode 100644</span><br><span>index 0000000..2e8f746</span><br><span>--- /dev/null</span><br><span>+++ b/third-party/jansson/patches/0022-Avoid-invalid-memory-read-in-json_pack.patch</span><br><span>@@ -0,0 +1,38 @@</span><br><span style="color: hsl(120, 100%, 40%);">+From aed855e6920923898b94a1b922fbace27a34ddf2 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From: Petri Lehtinen <petri@digip.org></span><br><span style="color: hsl(120, 100%, 40%);">+Date: Mon, 9 Jul 2018 22:26:35 +0300</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH 22/29] Avoid invalid memory read in json_pack()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Initial patch by @bharjoc-bitdefender</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Fixes #421</span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+ src/pack_unpack.c | 5 ++++-</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 file changed, 4 insertions(+), 1 deletion(-)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/src/pack_unpack.c b/src/pack_unpack.c</span><br><span style="color: hsl(120, 100%, 40%);">+index 6461c06..b842772 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/src/pack_unpack.c</span><br><span>++++ b/src/pack_unpack.c</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -75,6 +75,9 @@ static void next_token(scanner_t *s)</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">++ if (!token(s) && !*s->fmt)</span><br><span style="color: hsl(120, 100%, 40%);">++ return;</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">+ t = s->fmt;</span><br><span style="color: hsl(120, 100%, 40%);">+ s->column++;</span><br><span style="color: hsl(120, 100%, 40%);">+ s->pos++;</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -97,7 +100,7 @@ static void next_token(scanner_t *s)</span><br><span style="color: hsl(120, 100%, 40%);">+ s->token.column = s->column;</span><br><span style="color: hsl(120, 100%, 40%);">+ s->token.pos = s->pos;</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+- t++;</span><br><span style="color: hsl(120, 100%, 40%);">++ if (*t) t++;</span><br><span style="color: hsl(120, 100%, 40%);">+ s->fmt = t;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+-- </span><br><span style="color: hsl(120, 100%, 40%);">+2.17.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/third-party/jansson/patches/0025-Call-va_end-after-va_copy-in-json_vsprintf.patch b/third-party/jansson/patches/0025-Call-va_end-after-va_copy-in-json_vsprintf.patch</span><br><span>new file mode 100644</span><br><span>index 0000000..a56c03c</span><br><span>--- /dev/null</span><br><span>+++ b/third-party/jansson/patches/0025-Call-va_end-after-va_copy-in-json_vsprintf.patch</span><br><span>@@ -0,0 +1,64 @@</span><br><span style="color: hsl(120, 100%, 40%);">+From 66e4ee795d21a30118f8503c966e9f9ae87db315 Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From: Xin Long <lucien.xin@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+Date: Wed, 25 Jul 2018 17:39:33 +0800</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH 25/29] Call va_end after va_copy in json_vsprintf</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+As said in man doc:</span><br><span style="color: hsl(120, 100%, 40%);">+ "Each invocation of va_copy() must be matched by a corresponding</span><br><span style="color: hsl(120, 100%, 40%);">+ invocation of va_end() in the same function."</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+va_copy may alloc memory in some system, it's necessay to free it by</span><br><span style="color: hsl(120, 100%, 40%);">+va_end.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Fixes: efe6c7b3f2b3 ("Add json_sprintf and json_vsprintf")</span><br><span style="color: hsl(120, 100%, 40%);">+Signed-off-by: Xin Long <lucien.xin@gmail.com></span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+ src/value.c | 17 ++++++++++++-----</span><br><span style="color: hsl(120, 100%, 40%);">+ 1 file changed, 12 insertions(+), 5 deletions(-)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/src/value.c b/src/value.c</span><br><span style="color: hsl(120, 100%, 40%);">+index 29a978c..861dce8 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/src/value.c</span><br><span>++++ b/src/value.c</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -781,26 +781,33 @@ static json_t *json_string_copy(const json_t *string)</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ json_t *json_vsprintf(const char *fmt, va_list ap) {</span><br><span style="color: hsl(120, 100%, 40%);">++ json_t *json = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ int length;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ va_list aq;</span><br><span style="color: hsl(120, 100%, 40%);">+ va_copy(aq, ap);</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ length = vsnprintf(NULL, 0, fmt, ap);</span><br><span style="color: hsl(120, 100%, 40%);">+- if (length == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+- return json_string("");</span><br><span style="color: hsl(120, 100%, 40%);">++ if (length == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">++ json = json_string("");</span><br><span style="color: hsl(120, 100%, 40%);">++ goto out;</span><br><span style="color: hsl(120, 100%, 40%);">++ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ buf = jsonp_malloc(length + 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!buf)</span><br><span style="color: hsl(120, 100%, 40%);">+- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">++ goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ vsnprintf(buf, length + 1, fmt, aq);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!utf8_check_string(buf, length)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ jsonp_free(buf);</span><br><span style="color: hsl(120, 100%, 40%);">+- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">++ goto out;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+- return jsonp_stringn_nocheck_own(buf, length);</span><br><span style="color: hsl(120, 100%, 40%);">++ json = jsonp_stringn_nocheck_own(buf, length);</span><br><span style="color: hsl(120, 100%, 40%);">++</span><br><span style="color: hsl(120, 100%, 40%);">++out:</span><br><span style="color: hsl(120, 100%, 40%);">++ va_end(aq);</span><br><span style="color: hsl(120, 100%, 40%);">++ return json;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ json_t *json_sprintf(const char *fmt, ...) {</span><br><span style="color: hsl(120, 100%, 40%);">+-- </span><br><span style="color: hsl(120, 100%, 40%);">+2.17.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span>diff --git a/third-party/jansson/patches/0027-Rename-a-varialble-that-shadows-another-one.patch b/third-party/jansson/patches/0027-Rename-a-varialble-that-shadows-another-one.patch</span><br><span>new file mode 100644</span><br><span>index 0000000..fc4ce07</span><br><span>--- /dev/null</span><br><span>+++ b/third-party/jansson/patches/0027-Rename-a-varialble-that-shadows-another-one.patch</span><br><span>@@ -0,0 +1,56 @@</span><br><span style="color: hsl(120, 100%, 40%);">+From 020cc26b5cb147ae3569a3f7d314d3900b4bbc0b Mon Sep 17 00:00:00 2001</span><br><span style="color: hsl(120, 100%, 40%);">+From: Petri Lehtinen <petri@digip.org></span><br><span style="color: hsl(120, 100%, 40%);">+Date: Sun, 12 Aug 2018 18:25:51 +0300</span><br><span style="color: hsl(120, 100%, 40%);">+Subject: [PATCH 27/29] Rename a varialble that shadows another one</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+configure.ac changes are removed for bundled jansson.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Fixes #430</span><br><span style="color: hsl(120, 100%, 40%);">+---</span><br><span style="color: hsl(120, 100%, 40%);">+ configure.ac | 2 +-</span><br><span style="color: hsl(120, 100%, 40%);">+ src/dump.c | 8 ++++----</span><br><span style="color: hsl(120, 100%, 40%);">+ 2 files changed, 5 insertions(+), 5 deletions(-)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+diff --git a/src/dump.c b/src/dump.c</span><br><span style="color: hsl(120, 100%, 40%);">+index 8e725c9..4a64aa4 100644</span><br><span style="color: hsl(120, 100%, 40%);">+--- a/src/dump.c</span><br><span>++++ b/src/dump.c</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -306,7 +306,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *separator;</span><br><span style="color: hsl(120, 100%, 40%);">+ int separator_length;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Space for "0x", double the sizeof a pointer for the hex and a terminator. */</span><br><span style="color: hsl(120, 100%, 40%);">+- char key[2 + (sizeof(json) * 2) + 1];</span><br><span style="color: hsl(120, 100%, 40%);">++ char loop_key[2 + (sizeof(json) * 2) + 1];</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ if(flags & JSON_COMPACT) {</span><br><span style="color: hsl(120, 100%, 40%);">+ separator = ":";</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -318,7 +318,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ /* detect circular references */</span><br><span style="color: hsl(120, 100%, 40%);">+- if (loop_check(parents, json, key, sizeof(key)))</span><br><span style="color: hsl(120, 100%, 40%);">++ if (loop_check(parents, json, loop_key, sizeof(loop_key)))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+ iter = json_object_iter((json_t *)json);</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -326,7 +326,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,</span><br><span style="color: hsl(120, 100%, 40%);">+ if(!embed && dump("{", 1, data))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+ if(!iter) {</span><br><span style="color: hsl(120, 100%, 40%);">+- hashtable_del(parents, key);</span><br><span style="color: hsl(120, 100%, 40%);">++ hashtable_del(parents, loop_key);</span><br><span style="color: hsl(120, 100%, 40%);">+ return embed ? 0 : dump("}", 1, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ if(dump_indent(flags, depth + 1, 0, dump, data))</span><br><span style="color: hsl(120, 100%, 40%);">+@@ -422,7 +422,7 @@ static int do_dump(const json_t *json, size_t flags, int depth,</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+- hashtable_del(parents, key);</span><br><span style="color: hsl(120, 100%, 40%);">++ hashtable_del(parents, loop_key);</span><br><span style="color: hsl(120, 100%, 40%);">+ return embed ? 0 : dump("}", 1, data);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ </span><br><span style="color: hsl(120, 100%, 40%);">+-- </span><br><span style="color: hsl(120, 100%, 40%);">+2.17.1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10255">change 10255</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10255"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7522e462d2a52f53010ffa1e7d705c666ec35539 </div>
<div style="display:none"> Gerrit-Change-Number: 10255 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 (1000185) </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Richard Mudgett <rmudgett@digium.com> </div>