diff options
| author | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-20 15:57:14 +0000 |
|---|---|---|
| committer | mnicholson <mnicholson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-09-20 15:57:14 +0000 |
| commit | ad20740c3bd24b0cb800abfa3acbe5f1091bd9ce (patch) | |
| tree | 6a323dffebe4c36aeb9c295bbc0bd6931ac74126 /main | |
| parent | 24f459e1f2de1f56e35bd743a06817216d3243bf (diff) | |
Merged revisions 287558 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
................
r287558 | mnicholson | 2010-09-20 10:56:21 -0500 (Mon, 20 Sep 2010) | 14 lines
Use ast_str when processing hint state changes
Merged revisions 287555 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r287555 | mnicholson | 2010-09-20 10:48:14 -0500 (Mon, 20 Sep 2010) | 5 lines
Use ast_dynamic_str when processing hint state changes
(related to issue #17928)
Reported by: mdu113
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@287559 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -rw-r--r-- | main/pbx.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/main/pbx.c b/main/pbx.c index 1be93f2d7..4251d1207 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -4218,27 +4218,30 @@ int ast_extension_state(struct ast_channel *c, const char *context, const char * static int handle_statechange(void *datap) { struct ast_hint *hint; + struct ast_str *str; struct statechange *sc = datap; + if (!(str = ast_str_create(1024))) { + return -1; + } + ast_rdlock_contexts(); AST_RWLIST_RDLOCK(&hints); AST_RWLIST_TRAVERSE(&hints, hint, list) { struct ast_state_cb *cblist; - /* can't use ast_strdupa() here because we may run out of stack - * space while looping over a large number of large strings */ - char *dup = ast_strdup(ast_get_extension_app(hint->exten)); - char *cur, *parse = dup; + char *cur, *parse; int state; + ast_str_set(&str, 0, "%s", ast_get_extension_app(hint->exten)); + parse = str->str; + while ( (cur = strsep(&parse, "&")) ) { if (!strcasecmp(cur, sc->dev)) { break; } } - ast_free(dup); - if (!cur) { continue; } @@ -4266,6 +4269,7 @@ static int handle_statechange(void *datap) } AST_RWLIST_UNLOCK(&hints); ast_unlock_contexts(); + ast_free(str); ast_free(sc); return 0; } |