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

clean up ast_verbose(), don't hold the lock any longer than needed

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6606 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2005-09-14 23:56:50 +00:00
parent fadae17355
commit f94a1d47d6
1 changed files with 42 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
logger.c
View File

@@ -812,46 +812,60 @@ void ast_log(int level, const char *file, int line, const char *function, const
} }
} }
extern void ast_verbose(const char *fmt, ...) void ast_verbose(const char *fmt, ...)
{ {
static char stuff[4096]; static char stuff[4096];
static int pos = 0, opos; static int len = 0;
static int replacelast = 0, complete; static int replacelast = 0;
int complete;
int olen;
struct msglist *m; struct msglist *m;
struct verb *v; struct verb *v;
time_t t;
struct tm tm;
char date[40];
char *datefmt;
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
ast_mutex_lock(&msglist_lock);
time(&t);
localtime_r(&t, &tm);
strftime(date, sizeof(date), dateformat, &tm);
if (option_timestamp) { if (option_timestamp) {
time_t t;
struct tm tm;
char date[40];
char *datefmt;
time(&t);
localtime_r(&t, &tm);
strftime(date, sizeof(date), dateformat, &tm);
datefmt = alloca(strlen(date) + 3 + strlen(fmt) + 1); datefmt = alloca(strlen(date) + 3 + strlen(fmt) + 1);
if (datefmt) { if (datefmt) {
sprintf(datefmt, "[%s] %s", date, fmt); sprintf(datefmt, "[%s] %s", date, fmt);
fmt = datefmt; fmt = datefmt;
} }
} }
vsnprintf(stuff + pos, sizeof(stuff) - pos, fmt, ap);
opos = pos;
pos = strlen(stuff);
/* this lock is also protecting against multiple threads
being in this function at the same time, so it must be
held before any of the static variables are accessed
*/
ast_mutex_lock(&msglist_lock);
/* there is a potential security problem here: if formatting
the current date using 'dateformat' results in a string
containing '%', then the vsnprintf() call below will
probably try to access random memory
*/
vsnprintf(stuff + len, sizeof(stuff) - len, fmt, ap);
va_end(ap);
olen = len;
len = strlen(stuff);
complete = (stuff[len - 1] == '\n') ? 1 : 0;
if (stuff[strlen(stuff)-1] == '\n')
complete = 1;
else
complete=0;
if (complete) { if (complete) {
if (msgcnt < MAX_MSG_QUEUE) { if (msgcnt < MAX_MSG_QUEUE) {
/* Allocate new structure */ /* Allocate new structure */
m = malloc(sizeof(struct msglist)); if ((m = malloc(sizeof(*m))))
msgcnt++; msgcnt++;
} else { } else {
/* Recycle the oldest entry */ /* Recycle the oldest entry */
m = list; m = list;
@@ -874,22 +888,18 @@ extern void ast_verbose(const char *fmt, ...)
} }
} }
} }
if (verboser) {
v = verboser; for (v = verboser; v; v = v->next)
while(v) { v->verboser(stuff, olen, replacelast, complete);
v->verboser(stuff, opos, replacelast, complete);
v = v->next;
}
} /* else
fprintf(stdout, stuff + opos); */
ast_log(LOG_VERBOSE, "%s", stuff); ast_log(LOG_VERBOSE, "%s", stuff);
if (strlen(stuff)) {
if (stuff[strlen(stuff)-1] != '\n') if (len) {
if (complete)
replacelast = 1; replacelast = 1;
else else
replacelast = pos = 0; replacelast = len = 0;
} }
va_end(ap);
ast_mutex_unlock(&msglist_lock); ast_mutex_unlock(&msglist_lock);
} }