mirror of https://github.com/asterisk/asterisk
Jenkins2
7 years ago
committed by
Gerrit Code Review
commit
b876d624d7
@ -0,0 +1,4 @@
|
||||
source/
|
||||
dest/
|
||||
**.bz2
|
||||
.rebuild_needed
|
||||
@ -0,0 +1,99 @@
|
||||
.PHONY: _all all _install install clean distclean configure
|
||||
|
||||
.NOTPARALLEL:
|
||||
|
||||
include ../versions.mak
|
||||
export JANSSON_DIR := $(shell pwd -P)
|
||||
|
||||
SPECIAL_TARGETS :=
|
||||
|
||||
ifneq ($(findstring configure,$(MAKECMDGOALS)),)
|
||||
# Run from $(ASTTOPDIR)/configure
|
||||
SPECIAL_TARGETS += configure
|
||||
endif
|
||||
|
||||
ifeq ($(findstring clean,$(MAKECMDGOALS)),clean)
|
||||
# clean or distclean
|
||||
SPECIAL_TARGETS += clean
|
||||
endif
|
||||
|
||||
ifeq ($(findstring uninstall,$(MAKECMDGOALS)),uninstall)
|
||||
SPECIAL_TARGETS += uninstall
|
||||
endif
|
||||
|
||||
|
||||
ifneq ($(wildcard ../../makeopts),)
|
||||
include ../../makeopts
|
||||
endif
|
||||
|
||||
ifeq ($(SPECIAL_TARGETS),)
|
||||
# Run locally or from $(ASTTOPDIR)/Makefile. All include files should be present
|
||||
ifeq ($(wildcard ../../makeopts),)
|
||||
$(error ASTTOPDIR/configure hasn't been run)
|
||||
endif
|
||||
|
||||
ifeq ($(JANSSON_BUNDLED),yes)
|
||||
ifneq ($(wildcard ../../menuselect.makeopts),)
|
||||
include ../../menuselect.makeopts
|
||||
else
|
||||
$(warning ASTTOPDIR/menuselect hasn't been run yet. Can't find debug options.)
|
||||
endif
|
||||
|
||||
all: _all
|
||||
install: _install
|
||||
else
|
||||
all install:
|
||||
endif
|
||||
endif
|
||||
|
||||
include ../../Makefile.rules
|
||||
include ../Makefile.rules
|
||||
include Makefile.rules
|
||||
|
||||
ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] '
|
||||
SHELL_ECHO_PREFIX := echo '[jansson] '
|
||||
|
||||
_all: source/config.status
|
||||
$(ECHO_PREFIX) Building bundled jansson.
|
||||
$(CMD_PREFIX) (cd source; make)
|
||||
$(CMD_PREFIX) (cd source; make install)
|
||||
|
||||
.DELETE_ON_ERROR:
|
||||
|
||||
$(DOWNLOAD_DIR)/$(TARBALL_FILE): ../versions.mak
|
||||
$(CMD_PREFIX) ($(TARBALL_EXISTS) && $(TARBALL_VERIFY) && touch $@) || (rm -rf $@ ;\
|
||||
$(TARBALL_DOWNLOAD)) || (rm -rf $@ ;\
|
||||
$(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD))
|
||||
|
||||
source/.unpacked: $(DOWNLOAD_DIR)/$(TARBALL_FILE)
|
||||
$(CMD_PREFIX) $(TARBALL_VERIFY) || (rm -rf $@ ;\
|
||||
$(SHELL_ECHO_PREFIX) Retrying download ; $(TARBALL_DOWNLOAD))
|
||||
$(ECHO_PREFIX) Unpacking $<
|
||||
-@rm -rf source jansson-*/ >/dev/null 2>&1
|
||||
$(CMD_PREFIX) $(TAR) -xjf $<
|
||||
@mv jansson-$(JANSSON_VERSION) source
|
||||
$(ECHO_PREFIX) Applying patches "$(realpath patches)" "$(realpath .)/source"
|
||||
$(CMD_PREFIX) ../apply_patches $(QUIET_CONFIGURE) "$(realpath patches)" "$(realpath .)/source"
|
||||
-@touch source/.unpacked
|
||||
|
||||
.rebuild_needed: $(wildcard ../../.lastclean)
|
||||
$(ECHO_PREFIX) Rebuilding
|
||||
$(CMD_PREFIX) $(MAKE) clean $(REALLY_QUIET)
|
||||
|
||||
source/config.status: source/.unpacked Makefile.rules .rebuild_needed
|
||||
$(ECHO_PREFIX) Configuring
|
||||
$(CMD_PREFIX) (cd source ; ./configure $(QUIET_CONFIGURE) $(JANSSON_CONFIG_OPTS) --disable-shared --enable-static --prefix=$(JANSSON_DIR)/dest)
|
||||
|
||||
configure: source/config.status
|
||||
|
||||
_install: _all
|
||||
|
||||
uninstall:
|
||||
|
||||
clean:
|
||||
$(ECHO_PREFIX) Cleaning
|
||||
+-$(CMD_PREFIX) test -d source dest && $(SUBMAKE) -C source clean || :
|
||||
|
||||
distclean:
|
||||
$(ECHO_PREFIX) Distcleaning
|
||||
-$(CMD_PREFIX) rm -rf source jansson-*.tar.bz2 .rebuild_needed
|
||||
@ -0,0 +1,16 @@
|
||||
# We switched download locations so Asterisk users don't bombard the Digip
|
||||
# site with download requests.
|
||||
#
|
||||
# For future reference when upgrading bundled JANSSON the next time
|
||||
# JANSSON is released.
|
||||
# Digip's download URL.
|
||||
# PACKAGE_URL ?= http://www.digip.org/jansson/releases/
|
||||
|
||||
PACKAGE_URL ?= https://raw.githubusercontent.com/asterisk/third-party/master/jansson/$(JANSSON_VERSION)
|
||||
TARBALL_FILE = jansson-$(JANSSON_VERSION).tar.bz2
|
||||
|
||||
# JANSSON_CONFIGURE_OPTS could come from the command line or could be
|
||||
# set/modified by configure.m4 if the build or host tuples aren't the same
|
||||
# as the current build environment (cross-compile).
|
||||
|
||||
JANSSON_CONFIG_OPTS = $(JANSSON_CONFIGURE_OPTS)
|
||||
@ -0,0 +1,89 @@
|
||||
#
|
||||
# If this file is changed, be sure to run ASTTOPDIR/bootstrap.sh
|
||||
# before committing.
|
||||
#
|
||||
|
||||
AC_DEFUN([_JANSSON_CONFIGURE],
|
||||
[
|
||||
if test "${ac_mandatory_list#*JANSSON*}" != "$ac_mandatory_list" ; then
|
||||
AC_MSG_ERROR(--with-jansson and --with-jansson-bundled can't both be specified)
|
||||
fi
|
||||
|
||||
ac_mandatory_list="$ac_mandatory_list JANSSON"
|
||||
JANSSON_DIR="${ac_pwd}/third-party/jansson"
|
||||
|
||||
AC_MSG_CHECKING(for embedded jansson (may have to download))
|
||||
AC_MSG_RESULT(configuring)
|
||||
|
||||
if test "x${DOWNLOAD_TO_STDOUT}" = "x" ; then
|
||||
AC_MSG_ERROR(A download utility (wget, curl, or fetch) is required to download bundled jansson)
|
||||
fi
|
||||
if test "${BZIP2}" = ":" ; then
|
||||
AC_MSG_ERROR(bzip2 is required to extract the jansson tar file)
|
||||
fi
|
||||
if test "${TAR}" = ":" ; then
|
||||
AC_MSG_ERROR(tar is required to extract the jansson tar file)
|
||||
fi
|
||||
if test "${PATCH}" = ":" ; then
|
||||
AC_MSG_ERROR(patch is required to configure bundled jansson)
|
||||
fi
|
||||
if test "${SED}" = ":" ; then
|
||||
AC_MSG_ERROR(sed is required to configure bundled jansson)
|
||||
fi
|
||||
if test "${NM}" = ":" ; then
|
||||
AC_MSG_ERROR(nm is required to build bundled jansson)
|
||||
fi
|
||||
if test "${MD5}" = ":" ; then
|
||||
AC_MSG_ERROR(md5sum is required to build bundled jansson)
|
||||
fi
|
||||
if test "${CAT}" = ":" ; then
|
||||
AC_MSG_ERROR(cat is required to build bundled jansson)
|
||||
fi
|
||||
if test "${CUT}" = ":" ; then
|
||||
AC_MSG_ERROR(cut is required to build bundled jansson)
|
||||
fi
|
||||
if test "${GREP}" = ":" ; then
|
||||
AC_MSG_ERROR(grep is required to build bundled jansson)
|
||||
fi
|
||||
|
||||
AC_ARG_VAR([JANSSON_CONFIGURE_OPTS],[Additional configure options to pass to bundled jansson])
|
||||
this_host=$(./config.sub $(./config.guess))
|
||||
if test "$build" != "$this_host" ; then
|
||||
JANSSON_CONFIGURE_OPTS+=" --build=$build"
|
||||
fi
|
||||
if test "$host" != "$this_host" ; then
|
||||
JANSSON_CONFIGURE_OPTS+=" --host=$host"
|
||||
fi
|
||||
|
||||
export TAR PATCH SED NM EXTERNALS_CACHE_DIR AST_DOWNLOAD_CACHE DOWNLOAD_TO_STDOUT DOWNLOAD_TIMEOUT DOWNLOAD MD5 CAT CUT GREP
|
||||
export NOISY_BUILD
|
||||
${GNU_MAKE} --quiet --no-print-directory -C ${JANSSON_DIR} \
|
||||
JANSSON_CONFIGURE_OPTS="$JANSSON_CONFIGURE_OPTS" \
|
||||
EXTERNALS_CACHE_DIR="${EXTERNALS_CACHE_DIR:-${AST_DOWNLOAD_CACHE}}" \
|
||||
configure
|
||||
if test $? -ne 0 ; then
|
||||
AC_MSG_RESULT(failed)
|
||||
AC_MSG_NOTICE(Unable to configure ${JANSSON_DIR})
|
||||
AC_MSG_ERROR(Re-run the ./configure command with 'NOISY_BUILD=yes' appended to see error details.)
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(for bundled jansson)
|
||||
|
||||
JANSSON_INCLUDE=-I${JANSSON_DIR}/dest/include
|
||||
JANSSON_CFLAGS="$JANSSON_INCLUDE"
|
||||
JANSSON_LIB="-L${JANSSON_DIR}/dest/lib -ljansson"
|
||||
PBX_JANSSON=1
|
||||
|
||||
AC_SUBST([JANSSON_BUNDLED])
|
||||
AC_SUBST([PBX_JANSSON])
|
||||
AC_SUBST([JANSSON_LIB])
|
||||
AC_SUBST([JANSSON_INCLUDE])
|
||||
AC_MSG_RESULT(yes)
|
||||
])
|
||||
|
||||
AC_DEFUN([JANSSON_CONFIGURE],
|
||||
[
|
||||
if test "$JANSSON_BUNDLED" = "yes" ; then
|
||||
_JANSSON_CONFIGURE()
|
||||
fi
|
||||
])
|
||||
@ -0,0 +1 @@
|
||||
289ca8cbd2df31de9bda7e5220754d25 jansson-2.11.tar.bz2
|
||||
@ -0,0 +1,128 @@
|
||||
From 73c22de51672cb40fdc29c95331923d4dcebb6fa Mon Sep 17 00:00:00 2001
|
||||
From: Corey Farrell <git@cfware.com>
|
||||
Date: Tue, 13 Feb 2018 04:35:37 -0500
|
||||
Subject: [PATCH 01/22] Improve test coverage.
|
||||
|
||||
Changes to test/ removed for bundled use in Asterisk.
|
||||
|
||||
* Test equality of different length strings.
|
||||
* Add tab to json_pack whitespace test.
|
||||
* Test json_sprintf with empty result and invalid UTF.
|
||||
* Test json_get_alloc_funcs with NULL arguments.
|
||||
* Test invalid arguments.
|
||||
* Add test_chaos to test allocation failure code paths.
|
||||
* Remove redundant json_is_string checks from json_string_equal and
|
||||
json_string_copy. Both functions are static and can only be called
|
||||
with a json string.
|
||||
|
||||
Fixes to issues found by test_chaos:
|
||||
* Fix crash on OOM in pack_unpack.c:read_string().
|
||||
* Unconditionally free string in string_create upon allocation failure.
|
||||
Update load.c:parse_value() to reflect this. This resolves a leak on
|
||||
allocation failure for pack_unpack.c:pack_string() and
|
||||
value.c:json_sprintf().
|
||||
|
||||
Although not visible from CodeCoverage these changes significantly
|
||||
increase branch coverage. Especially in src/value.c where we previously
|
||||
covered 67.4% of branches and now cover 96.3% of branches.
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
src/load.c | 6 +-
|
||||
src/pack_unpack.c | 5 +-
|
||||
src/value.c | 9 +-
|
||||
test/.gitignore | 1 +
|
||||
test/suites/api/Makefile.am | 2 +
|
||||
test/suites/api/test_array.c | 73 +++++++++++++++++
|
||||
test/suites/api/test_chaos.c | 115 ++++++++++++++++++++++++++
|
||||
test/suites/api/test_equal.c | 7 ++
|
||||
test/suites/api/test_memory_funcs.c | 7 ++
|
||||
test/suites/api/test_number.c | 36 ++++++++
|
||||
test/suites/api/test_object.c | 122 ++++++++++++++++++++++++++++
|
||||
test/suites/api/test_pack.c | 10 ++-
|
||||
test/suites/api/test_simple.c | 52 ++++++++++++
|
||||
test/suites/api/test_sprintf.c | 12 +++
|
||||
15 files changed, 444 insertions(+), 14 deletions(-)
|
||||
create mode 100644 test/suites/api/test_chaos.c
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 16cf552..2f6cfec 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -487,6 +487,7 @@ if (NOT JANSSON_WITHOUT_TESTS)
|
||||
set(api_tests
|
||||
test_array
|
||||
test_copy
|
||||
+ test_chaos
|
||||
test_dump
|
||||
test_dump_callback
|
||||
test_equal
|
||||
diff --git a/src/load.c b/src/load.c
|
||||
index deb36f3..25efe2e 100644
|
||||
--- a/src/load.c
|
||||
+++ b/src/load.c
|
||||
@@ -829,10 +829,8 @@ static json_t *parse_value(lex_t *lex, size_t flags, json_error_t *error)
|
||||
}
|
||||
|
||||
json = jsonp_stringn_nocheck_own(value, len);
|
||||
- if(json) {
|
||||
- lex->value.string.val = NULL;
|
||||
- lex->value.string.len = 0;
|
||||
- }
|
||||
+ lex->value.string.val = NULL;
|
||||
+ lex->value.string.len = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
diff --git a/src/pack_unpack.c b/src/pack_unpack.c
|
||||
index 153f64d..19dbf93 100644
|
||||
--- a/src/pack_unpack.c
|
||||
+++ b/src/pack_unpack.c
|
||||
@@ -159,7 +159,10 @@ static char *read_string(scanner_t *s, va_list *ap,
|
||||
return (char *)str;
|
||||
}
|
||||
|
||||
- strbuffer_init(&strbuff);
|
||||
+ if(strbuffer_init(&strbuff)) {
|
||||
+ set_error(s, "<internal>", json_error_out_of_memory, "Out of memory");
|
||||
+ s->has_error = 1;
|
||||
+ }
|
||||
|
||||
while(1) {
|
||||
str = va_arg(*ap, const char *);
|
||||
diff --git a/src/value.c b/src/value.c
|
||||
index b3b3141..29a978c 100644
|
||||
--- a/src/value.c
|
||||
+++ b/src/value.c
|
||||
@@ -652,8 +652,7 @@ static json_t *string_create(const char *value, size_t len, int own)
|
||||
|
||||
string = jsonp_malloc(sizeof(json_string_t));
|
||||
if(!string) {
|
||||
- if(!own)
|
||||
- jsonp_free(v);
|
||||
+ jsonp_free(v);
|
||||
return NULL;
|
||||
}
|
||||
json_init(&string->json, JSON_STRING);
|
||||
@@ -768,9 +767,6 @@ static int json_string_equal(const json_t *string1, const json_t *string2)
|
||||
{
|
||||
json_string_t *s1, *s2;
|
||||
|
||||
- if(!json_is_string(string1) || !json_is_string(string2))
|
||||
- return 0;
|
||||
-
|
||||
s1 = json_to_string(string1);
|
||||
s2 = json_to_string(string2);
|
||||
return s1->length == s2->length && !memcmp(s1->value, s2->value, s1->length);
|
||||
@@ -780,9 +776,6 @@ static json_t *json_string_copy(const json_t *string)
|
||||
{
|
||||
json_string_t *s;
|
||||
|
||||
- if(!json_is_string(string))
|
||||
- return NULL;
|
||||
-
|
||||
s = json_to_string(string);
|
||||
return json_stringn_nocheck(s->value, s->length);
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -0,0 +1,103 @@
|
||||
From 15105b66b4df387037b670ac713584194ea10c2f Mon Sep 17 00:00:00 2001
|
||||
From: Maxim Zhukov <mussitantesmortem@gmail.com>
|
||||
Date: Mon, 12 Mar 2018 17:39:04 +0300
|
||||
Subject: [PATCH 17/22] Fix error handling in json_pack
|
||||
|
||||
Changes to test/ removed.
|
||||
|
||||
Fixed a bug where the error message was not filled if an empty object
|
||||
was passed to the json_pack.
|
||||
|
||||
Fixes #271
|
||||
---
|
||||
src/pack_unpack.c | 64 ++++++++++++++++++-------------------
|
||||
test/suites/api/test_pack.c | 8 +++++
|
||||
2 files changed, 40 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/src/pack_unpack.c b/src/pack_unpack.c
|
||||
index 4026fd9..6461c06 100644
|
||||
--- a/src/pack_unpack.c
|
||||
+++ b/src/pack_unpack.c
|
||||
@@ -348,6 +348,36 @@ static json_t *pack_string(scanner_t *s, va_list *ap)
|
||||
}
|
||||
}
|
||||
|
||||
+static json_t *pack_object_inter(scanner_t *s, va_list *ap, int need_incref)
|
||||
+{
|
||||
+ json_t *json;
|
||||
+ char ntoken;
|
||||
+
|
||||
+ next_token(s);
|
||||
+ ntoken = token(s);
|
||||
+
|
||||
+ if (ntoken != '?')
|
||||
+ prev_token(s);
|
||||
+
|
||||
+ json = va_arg(*ap, json_t *);
|
||||
+
|
||||
+ if (json)
|
||||
+ return need_incref ? json_incref(json) : json;
|
||||
+
|
||||
+ switch (ntoken) {
|
||||
+ case '?':
|
||||
+ return json_null();
|
||||
+ case '*':
|
||||
+ return NULL;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ set_error(s, "<args>", json_error_null_value, "NULL object key");
|
||||
+ s->has_error = 1;
|
||||
+ return NULL;
|
||||
+}
|
||||
+
|
||||
static json_t *pack(scanner_t *s, va_list *ap)
|
||||
{
|
||||
switch(token(s)) {
|
||||
@@ -376,40 +406,10 @@ static json_t *pack(scanner_t *s, va_list *ap)
|
||||
return json_real(va_arg(*ap, double));
|
||||
|
||||
case 'O': /* a json_t object; increments refcount */
|
||||
- {
|
||||
- int nullable;
|
||||
- json_t *json;
|
||||
-
|
||||
- next_token(s);
|
||||
- nullable = token(s) == '?';
|
||||
- if (!nullable)
|
||||
- prev_token(s);
|
||||
-
|
||||
- json = va_arg(*ap, json_t *);
|
||||
- if (!json && nullable) {
|
||||
- return json_null();
|
||||
- } else {
|
||||
- return json_incref(json);
|
||||
- }
|
||||
- }
|
||||
+ return pack_object_inter(s, ap, 1);
|
||||
|
||||
case 'o': /* a json_t object; doesn't increment refcount */
|
||||
- {
|
||||
- int nullable;
|
||||
- json_t *json;
|
||||
-
|
||||
- next_token(s);
|
||||
- nullable = token(s) == '?';
|
||||
- if (!nullable)
|
||||
- prev_token(s);
|
||||
-
|
||||
- json = va_arg(*ap, json_t *);
|
||||
- if (!json && nullable) {
|
||||
- return json_null();
|
||||
- } else {
|
||||
- return json;
|
||||
- }
|
||||
- }
|
||||
+ return pack_object_inter(s, ap, 0);
|
||||
|
||||
default:
|
||||
set_error(s, "<format>", json_error_invalid_format, "Unexpected format character '%c'",
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -0,0 +1,2 @@
|
||||
8119f0d91a00b6f553099e6ee5358ade *pjproject-2.7.2.zip
|
||||
fa3f0bc098c4bff48ddd92db1c016a7a pjproject-2.7.2.tar.bz2
|
||||
@ -1,2 +1,2 @@
|
||||
|
||||
JANSSON_VERSION = 2.11
|
||||
PJPROJECT_VERSION = 2.7.2
|
||||
|
||||
Loading…
Reference in new issue