diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-04-21 13:01:56 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-04-21 13:01:56 -0500 |
| commit | 24913e154099aa1a47772aab1193a3751ad55fca (patch) | |
| tree | 136adb4e96e2816baed60bb13c00d4884f83af55 /main | |
| parent | b4dd374bc49cbf13542f51731f51a9ceda98b193 (diff) | |
| parent | c991e5472ef23db6b02abb2f54f53235f9b5ecbe (diff) | |
Merge "lock.c: Check *lt before dereferencing it"
Diffstat (limited to 'main')
| -rw-r--r-- | main/lock.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/main/lock.c b/main/lock.c index 13b8fb388..2b2a80984 100644 --- a/main/lock.c +++ b/main/lock.c @@ -286,17 +286,19 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func, if (wait_time > reported_wait && (wait_time % 5) == 0) { __ast_mutex_logger("%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n", filename, lineno, func, (int) wait_time, mutex_name); - ast_reentrancy_lock(lt); + if (lt) { + ast_reentrancy_lock(lt); #ifdef HAVE_BKTR - __dump_backtrace(<->backtrace[lt->reentrancy], canlog); + __dump_backtrace(<->backtrace[lt->reentrancy], canlog); #endif - __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", - lt->file[ROFFSET], lt->lineno[ROFFSET], - lt->func[ROFFSET], mutex_name); + __ast_mutex_logger("%s line %d (%s): '%s' was locked here.\n", + lt->file[ROFFSET], lt->lineno[ROFFSET], + lt->func[ROFFSET], mutex_name); #ifdef HAVE_BKTR - __dump_backtrace(<->backtrace[ROFFSET], canlog); + __dump_backtrace(<->backtrace[ROFFSET], canlog); #endif - ast_reentrancy_unlock(lt); + ast_reentrancy_unlock(lt); + } reported_wait = wait_time; } usleep(200); |