kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 19:28:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix module load errors for test_ari_model.so.

Browse Source 
You cannot use a function pointer variable with an external function from
another dynamically loaded module because data variables are always
resolved even with RTLD_LAZY.

* Added wrapper functions for ast_ari_validate_int() and
ast_ari_validate_string() to use instead for the function pointer
variable.

(closes issue ASTERISK-22457)
Reported by: David M. Lee
........

Merged revisions 399207 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@399208 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-09-16 18:36:22 +00:00
parent 10d4ed93ff
commit e77fba4b25
1 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
tests/test_ari_model.c
View File

@@ -38,6 +38,32 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/test.h" #include "asterisk/test.h"
#include "../res/ari/ari_model_validators.h" #include "../res/ari/ari_model_validators.h"
#if defined(TEST_FRAMEWORK)
/*!
* Wrapper of ast_test_validate_int() so an external function pointer is not used.
*
* \note Must do this because using an external function pointer
* does not play nicely when loading with RTLD_LAZY.
*/
static int wrap_ast_ari_validate_int(struct ast_json *json)
{
return ast_ari_validate_int(json);
}
#endif /* defined(TEST_FRAMEWORK) */
#if defined(TEST_FRAMEWORK)
/*!
* Wrapper of ast_ari_validate_string() so an external function pointer is not used.
*
* \note Must do this because using an external function pointer
* does not play nicely when loading with RTLD_LAZY.
*/
static int wrap_ast_ari_validate_string(struct ast_json *json)
{
return ast_ari_validate_string(json);
}
#endif /* defined(TEST_FRAMEWORK) */
AST_TEST_DEFINE(validate_byte) AST_TEST_DEFINE(validate_byte)
{ {
RAII_VAR(struct ast_json *, uut, NULL, ast_json_unref); RAII_VAR(struct ast_json *, uut, NULL, ast_json_unref);
@@ -385,21 +411,21 @@ AST_TEST_DEFINE(validate_list)
uut = ast_json_array_create(); uut = ast_json_array_create();
ast_test_validate(test, NULL != uut); ast_test_validate(test, NULL != uut);
ast_test_validate(test, ast_ari_validate_list(uut, ast_ari_validate_string)); ast_test_validate(test, ast_ari_validate_list(uut, wrap_ast_ari_validate_string));
ast_test_validate(test, ast_ari_validate_list(uut, ast_ari_validate_int)); ast_test_validate(test, ast_ari_validate_list(uut, wrap_ast_ari_validate_int));
res = ast_json_array_append(uut, ast_json_string_create("")); res = ast_json_array_append(uut, ast_json_string_create(""));
ast_test_validate(test, 0 == res); ast_test_validate(test, 0 == res);
ast_test_validate(test, ast_ari_validate_list(uut, ast_ari_validate_string)); ast_test_validate(test, ast_ari_validate_list(uut, wrap_ast_ari_validate_string));
ast_test_validate(test, !ast_ari_validate_list(uut, ast_ari_validate_int)); ast_test_validate(test, !ast_ari_validate_list(uut, wrap_ast_ari_validate_int));
res = ast_json_array_append(uut, ast_json_integer_create(0)); res = ast_json_array_append(uut, ast_json_integer_create(0));
ast_test_validate(test, 0 == res); ast_test_validate(test, 0 == res);
ast_test_validate(test, !ast_ari_validate_list(uut, ast_ari_validate_string)); ast_test_validate(test, !ast_ari_validate_list(uut, wrap_ast_ari_validate_string));
ast_test_validate(test, !ast_ari_validate_list(uut, ast_ari_validate_int)); ast_test_validate(test, !ast_ari_validate_list(uut, wrap_ast_ari_validate_int));
ast_test_validate(test, ast_test_validate(test,
!ast_ari_validate_list(ast_json_null(), ast_ari_validate_string)); !ast_ari_validate_list(ast_json_null(), wrap_ast_ari_validate_string));
return AST_TEST_PASS; return AST_TEST_PASS;
} }