kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-26 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "lock.c: Check *lt before dereferencing it"

Browse Source
This commit is contained in:
zuul
2016-04-21 13:01:56 -05:00
committed by Gerrit Code Review
parent b4dd374bc4 c991e5472e
commit 24913e1540
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/lock.c
View File

@@ -286,6 +286,7 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
if (wait_time > reported_wait && (wait_time % 5) == 0) { if (wait_time > reported_wait && (wait_time % 5) == 0) {
__ast_mutex_logger("%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n", __ast_mutex_logger("%s line %d (%s): Deadlock? waited %d sec for mutex '%s'?\n",
filename, lineno, func, (int) wait_time, mutex_name); filename, lineno, func, (int) wait_time, mutex_name);
if (lt) {
ast_reentrancy_lock(lt); ast_reentrancy_lock(lt);
#ifdef HAVE_BKTR #ifdef HAVE_BKTR
__dump_backtrace(&lt->backtrace[lt->reentrancy], canlog); __dump_backtrace(&lt->backtrace[lt->reentrancy], canlog);
@@ -297,6 +298,7 @@ int __ast_pthread_mutex_lock(const char *filename, int lineno, const char *func,
__dump_backtrace(&lt->backtrace[ROFFSET], canlog); __dump_backtrace(&lt->backtrace[ROFFSET], canlog);
#endif #endif
ast_reentrancy_unlock(lt); ast_reentrancy_unlock(lt);
}
reported_wait = wait_time; reported_wait = wait_time;
} }
usleep(200); usleep(200);