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

Fix a number of problems with ast_sched_report().

Browse Source 
1) It had numerous coding guidelines violations with regards to formatting.

2) It allocated memory using ast_calloc() that was never freed.

3) It didn't check for failure from the allocation.

4) It used sprintf() and strcat() to build the result, doing zero checking to
   prevent writing past the end of the provided buffer.

The function also lacks API documentation, but that has not been addressed in
this commit.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@175829 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Russell Bryant
2009-02-15 20:56:27 +00:00
parent cbe45a6e06
commit ca9d3b8ac9
3 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
main/sched.c
View File

@@ -528,41 +528,34 @@ int _ast_sched_del(struct sched_context *con, int id, const char *file, int line
return 0;
}
char *ast_sched_report(struct sched_context *con, char *buf, int bufsiz, struct ast_cb_names *cbnames)
void ast_sched_report(struct sched_context *con, struct ast_str **buf, struct ast_cb_names *cbnames)
{
int *countlist,i;
int i;
struct sched *cur;
char buf2[1200];
ast_sched_cb xxx = NULL;
buf[0] = 0;
sprintf(buf, " Highwater = %d\n schedcnt = %d\n", con->highwater, con->schedcnt);
countlist = ast_calloc(sizeof(int),cbnames->numassocs+1);
int countlist[cbnames->numassocs + 1];
ast_str_set(buf, 0, " Highwater = %d\n schedcnt = %d\n", con->highwater, con->schedcnt);
AST_DLLIST_TRAVERSE(&con->schedq, cur, list) {
/* match the callback to the cblist */
for (i=0;i<cbnames->numassocs;i++) {
if (cur->callback == cbnames->cblist[i])
for (i = 0; i < cbnames->numassocs; i++) {
if (cur->callback == cbnames->cblist[i]) {
break;
}
}
if (i < cbnames->numassocs)
if (i < cbnames->numassocs) {
countlist[i]++;
else {
xxx = cur->callback;
} else {
countlist[cbnames->numassocs]++;
}
}
for (i=0;i<cbnames->numassocs;i++) {
sprintf(buf2," %s : %d\n", cbnames->list[i], countlist[i]);
strcat(buf, buf2);
for (i = 0; i < cbnames->numassocs; i++) {
ast_str_append(buf, 0, " %s : %d\n", cbnames->list[i], countlist[i]);
}
sprintf(buf2," <unknown:%p> : %d\n", xxx, countlist[cbnames->numassocs]);
strcat( buf, buf2);
return buf;
ast_str_append(buf, 0, " <unknown> : %d\n", countlist[cbnames->numassocs]);
}
/*! \brief Dump the contents of the scheduler to LOG_DEBUG */
void ast_sched_dump(const struct sched_context *con)