diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-23 20:43:43 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-23 20:43:43 +0000 |
| commit | ce9c9fbbdafcf4369b269112425d4f8717730898 (patch) | |
| tree | f49b900ca818888faf5b757a48bda5058558af21 /main/pbx.c | |
| parent | 706999779cb85acb039429a39b738a1424a4873f (diff) | |
Merged revisions 190352 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r190352 | tilghman | 2009-04-23 15:42:11 -0500 (Thu, 23 Apr 2009) | 7 lines
Labels are sometimes (most of the time?) NULL for extensions.
(closes issue #14895)
Reported by: chris-mac
Patches:
20090423__bug14895__2.diff.txt uploaded by tilghman (license 14)
Tested by: lmadsen
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@190354 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/pbx.c')
| -rw-r--r-- | main/pbx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/pbx.c b/main/pbx.c index 99fd47899..bbf41ffb7 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -389,7 +389,7 @@ static int hashtab_compare_exten_labels(const void *ah_a, const void *ah_b) { const struct ast_exten *ac = ah_a; const struct ast_exten *bc = ah_b; - return strcmp(ac->label, bc->label); + return strcmp(S_OR(ac->label, ""), S_OR(bc->label, "")); } unsigned int ast_hashtab_hash_contexts(const void *obj) @@ -417,7 +417,7 @@ static unsigned int hashtab_hash_priority(const void *obj) static unsigned int hashtab_hash_labels(const void *obj) { const struct ast_exten *ac = obj; - return ast_hashtab_hash_string(ac->label); + return ast_hashtab_hash_string(S_OR(ac->label, "")); } |