diff options
| author | David M. Lee <dlee@digium.com> | 2013-08-02 14:27:35 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-08-02 14:27:35 +0000 |
| commit | 10c91bc96eafbf5f897869ede83127c9c267981c (patch) | |
| tree | c9aaaf3cc4c9794057e258166854d5f88a6a0c18 /main/cel.c | |
| parent | 328e99f41d48d8f15832bf4f6c97beb0ef71fc0c (diff) | |
Address JSON thread safety issues.
In tracking down some unit tests failures, I ended up reading the fine
print[1] regarding Jansson's thread safety.
In short:
1. Ref-counting is non-atomic.
2. json_dumps() and friends are not thread safe.
This patch adds locking where necessary to our ast_json_* wrapper API,
with documentation in json.h describing the thread safety limitations of
the API.
[1]: http://www.digip.org/jansson/doc/2.4/portability.html#thread-safety
Review: https://reviewboard.asterisk.org/r/2716/
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396119 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/cel.c')
| -rw-r--r-- | main/cel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/cel.c b/main/cel.c index befb2b257..ae42a443d 100644 --- a/main/cel.c +++ b/main/cel.c @@ -638,7 +638,7 @@ struct ast_event *ast_cel_create_event(struct ast_channel_snapshot *snapshot, struct ast_json *extra, const char *peer_name) { struct timeval eventtime = ast_tvnow(); - RAII_VAR(char *, extra_txt, NULL, ast_free); + RAII_VAR(char *, extra_txt, NULL, ast_json_free); if (extra) { extra_txt = ast_json_dump_string(extra); } |