diff options
| author | Michael Biebl <biebl@debian.org> | 2018-05-11 22:08:45 +0200 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2018-05-11 22:08:45 +0200 |
| commit | ee9c73a923909e23a649407be77e25235d769e25 (patch) | |
| tree | e21c923621fa278e737da693df9eb60ea31a6067 /libnm-core/nm-json.c | |
| parent | f60117b41d5433be1b4a96d82cd11d0c3dce9b63 (diff) | |
New upstream version 1.10.8 upstream/1.10.8
Diffstat (limited to 'libnm-core/nm-json.c')
| -rw-r--r-- | libnm-core/nm-json.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/libnm-core/nm-json.c b/libnm-core/nm-json.c index aa181a4a..f9042b1f 100644 --- a/libnm-core/nm-json.c +++ b/libnm-core/nm-json.c @@ -44,6 +44,7 @@ void *_nm_jansson_json_true; void *_nm_jansson_json_object_size; void *_nm_jansson_json_object_set_new; void *_nm_jansson_json_object_iter; +void *_nm_jansson_json_object_iter_at; void *_nm_jansson_json_integer_value; void *_nm_jansson_json_string_value; @@ -79,6 +80,7 @@ bind_symbols (void *handle) TRY_BIND_SYMBOL (json_object_size); TRY_BIND_SYMBOL (json_object_set_new); TRY_BIND_SYMBOL (json_object_iter); + TRY_BIND_SYMBOL (json_object_iter_at); TRY_BIND_SYMBOL (json_integer_value); TRY_BIND_SYMBOL (json_string_value); @@ -94,7 +96,6 @@ nm_jansson_load (void) MISSING, } state = UNKNOWN; void *handle; - int mode; if (G_LIKELY (state != UNKNOWN)) goto out; @@ -103,13 +104,7 @@ nm_jansson_load (void) if (!bind_symbols (RTLD_DEFAULT)) goto out; - mode = RTLD_LAZY | RTLD_LOCAL | RTLD_NODELETE | RTLD_DEEPBIND; -#if defined (ASAN_BUILD) - /* Address sanitizer is incompatible with RTLD_DEEPBIND. */ - mode &= ~RTLD_DEEPBIND; -#endif - handle = dlopen (JANSSON_SONAME, mode); - + handle = dlopen (JANSSON_SONAME, RTLD_LAZY | RTLD_LOCAL | RTLD_NODELETE | RTLD_DEEPBIND); if (!handle) goto out; |