diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-17 05:53:17 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-17 05:53:17 +0000 |
commit | 22e7c82ddf718a00671065d4b2284953a843e0e3 (patch) | |
tree | 4805a7cdcf17dd306f0c6417b488f4836d97706c | |
parent | d51a9e14e9fa9200e79a3dafcf1eaa13fc53e023 (diff) |
Merged revisions 182450 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r182450 | tilghman | 2009-03-17 00:51:54 -0500 (Tue, 17 Mar 2009) | 14 lines
Merged revisions 182449 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r182449 | tilghman | 2009-03-17 00:50:52 -0500 (Tue, 17 Mar 2009) | 7 lines
Fix race in astdb
The underlying db1 implementation does not fully isolate the pages retrieved
from astdb, so the lock protecting accesses needs to be extended until the
copy from the shared memory structure is done.
(closes issue #14682)
Reported by: makoto
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@182451 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | main/db.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -180,10 +180,8 @@ int ast_db_get(const char *family, const char *keys, char *value, int valuelen) memset(value, 0, valuelen); key.data = fullkey; key.size = fullkeylen + 1; - + res = astdb->get(astdb, &key, &data, 0); - - ast_mutex_unlock(&dblock); /* Be sure to NULL terminate our data either way */ if (res) { @@ -200,6 +198,11 @@ int ast_db_get(const char *family, const char *keys, char *value, int valuelen) ast_log(LOG_NOTICE, "Strange, empty value for /%s/%s\n", family, keys); } } + + /* Data is not fully isolated for concurrency, so the lock must be extended + * to after the copy to the output buffer. */ + ast_mutex_unlock(&dblock); + return res; } |