Merged revisions 146799 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 6 Oct 2008 21:09:05 +0000 (21:09 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 6 Oct 2008 21:09:05 +0000 (21:09 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r146799 | tilghman | 2008-10-06 15:52:04 -0500 (Mon, 06 Oct 2008) | 8 lines

  Dialplan functions should not actually return 0, unless they have modified the
  workspace.  To signal an error (and no change to the workspace), -1 should be
  returned instead.
  (closes issue #13340)
   Reported by: kryptolus
   Patches:
         20080827__bug13340__2.diff.txt uploaded by Corydon76 (license 14)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@146802 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_speech_utils.c
channels/chan_iax2.c
channels/chan_sip.c
funcs/func_callerid.c
funcs/func_cdr.c
funcs/func_curl.c
funcs/func_groupcount.c
funcs/func_math.c
funcs/func_odbc.c
funcs/func_timeout.c
res/res_smdi.c

index 939a92f..c90bc8b 100644 (file)
@@ -202,6 +202,8 @@ static int speech_text(struct ast_channel *chan, const char *cmd, char *data,
 
        if (result->text != NULL) {
                ast_copy_string(buf, result->text, len);
+       } else {
+               buf[0] = '\0';
        }
 
        return 0;
@@ -230,6 +232,8 @@ static int speech_grammar(struct ast_channel *chan, const char *cmd, char *data,
 
        if (result->grammar != NULL) {
                ast_copy_string(buf, result->grammar, len);
+       } else {
+               buf[0] = '\0';
        }
 
        return 0;
@@ -330,6 +334,8 @@ static int speech_read(struct ast_channel *chan, const char *cmd, char *data,
                        results++;
                snprintf(tmp, sizeof(tmp), "%d", results);
                ast_copy_string(buf, tmp, len);
+       } else {
+               buf[0] = '\0';
        }
 
        return 0;
index 2714bb9..9282aed 100644 (file)
@@ -11899,7 +11899,11 @@ static int function_iaxpeer(struct ast_channel *chan, const char *cmd, char *dat
                }
                if((codec = ast_codec_pref_index(&peer->prefs, atoi(codecnum)))) {
                        ast_copy_string(buf, ast_getformatname(codec), len);
+               } else {
+                       buf[0] = '\0';
                }
+       } else {
+               buf[0] = '\0';
        }
 
        peer_unref(peer);
index 4bebce8..df94684 100644 (file)
@@ -14959,7 +14959,11 @@ static int function_sippeer(struct ast_channel *chan, const char *cmd, char *dat
                codecnum = strsep(&codecnum, "]"); /* trim trailing ']' if any */
                if((codec = ast_codec_pref_index(&peer->prefs, atoi(codecnum)))) {
                        ast_copy_string(buf, ast_getformatname(codec), len);
+               } else {
+                       buf[0] = '\0';
                }
+       } else {
+               buf[0] = '\0';
        }
 
        unref_peer(peer, "unref_peer from function_sippeer, just before return");
index 9dfe0d8..b59f57a 100644 (file)
@@ -51,6 +51,7 @@ static int callerpres_write(struct ast_channel *chan, const char *cmd, char *dat
 static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
                         char *buf, size_t len)
 {
+       int res = -1;
        char *opt = data;
 
        if (!chan)
@@ -64,10 +65,13 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
 
                if (!strncasecmp("all", data, 3)) {
                        snprintf(buf, len, "\"%s\" <%s>", name, num);
+                       res = 0;
                } else if (!strncasecmp("name", data, 4)) {
                        ast_copy_string(buf, name, len);
+                       res = 0;
                } else if (!strncasecmp("num", data, 3)) {
                        ast_copy_string(buf, num, len);
+                       res = 0;
                } else {
                        ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
                }
@@ -78,32 +82,40 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
                        snprintf(buf, len, "\"%s\" <%s>",
                                 S_OR(chan->cid.cid_name, ""),
                                 S_OR(chan->cid.cid_num, ""));
+                       res = 0;
                } else if (!strncasecmp("name", data, 4)) {
                        if (chan->cid.cid_name) {
                                ast_copy_string(buf, chan->cid.cid_name, len);
+                               res = 0;
                        }
                } else if (!strncasecmp("num", data, 3)) {
                        if (chan->cid.cid_num) {
                                ast_copy_string(buf, chan->cid.cid_num, len);
+                               res = 0;
                        }
                } else if (!strncasecmp("ani", data, 3)) {
                        if (!strncasecmp(data + 3, "2", 1)) {
                                snprintf(buf, len, "%d", chan->cid.cid_ani2);
                        } else if (chan->cid.cid_ani) {
                                ast_copy_string(buf, chan->cid.cid_ani, len);
+                               res = 0;
                        }
                } else if (!strncasecmp("dnid", data, 4)) {
                        if (chan->cid.cid_dnid) {
                                ast_copy_string(buf, chan->cid.cid_dnid, len);
+                               res = 0;
                        }
                } else if (!strncasecmp("rdnis", data, 5)) {
                        if (chan->cid.cid_rdnis) {
                                ast_copy_string(buf, chan->cid.cid_rdnis, len);
+                               res = 0;
                        }
                } else if (!strncasecmp("pres", data, 4)) {
                        ast_copy_string(buf, ast_named_caller_presentation(chan->cid.cid_pres), len);
+                       res = 0;
                } else if (!strncasecmp("ton", data, 3)) {
                        snprintf(buf, len, "%d", chan->cid.cid_ton);
+                       res = 0;
                } else {
                        ast_log(LOG_ERROR, "Unknown callerid data type '%s'.\n", data);
                }
@@ -111,7 +123,7 @@ static int callerid_read(struct ast_channel *chan, const char *cmd, char *data,
                ast_channel_unlock(chan);
        }
 
-       return 0;
+       return res;
 }
 
 static int callerid_write(struct ast_channel *chan, const char *cmd, char *data,
index 3ea1a30..9b73d03 100644 (file)
@@ -84,7 +84,7 @@ static int cdr_read(struct ast_channel *chan, const char *cmd, char *parse,
                       ast_test_flag(&flags, OPT_RECURSIVE),
                           ast_test_flag(&flags, OPT_UNPARSED));
 
-       return 0;
+       return ret ? 0 : -1;
 }
 
 static int cdr_write(struct ast_channel *chan, const char *cmd, char *parse,
index 107b4e1..e385ed9 100644 (file)
@@ -397,6 +397,7 @@ AST_THREADSTORAGE_CUSTOM(curl_instance, curl_instance_init, curl_instance_cleanu
 static int acf_curl_exec(struct ast_channel *chan, const char *cmd, char *info, char *buf, size_t len)
 {
        struct ast_str *str = ast_str_create(16);
+       int ret = -1;
        AST_DECLARE_APP_ARGS(args,
                AST_APP_ARG(url);
                AST_APP_ARG(postdata);
@@ -494,13 +495,14 @@ static int acf_curl_exec(struct ast_channel *chan, const char *cmd, char *info,
                } else {
                        ast_copy_string(buf, str->str, len);
                }
+               ret = 0;
        }
        ast_free(str);
 
        if (chan)
                ast_autoservice_stop(chan);
        
-       return 0;
+       return ret;
 }
 
 struct ast_custom_function acf_curl = {
index f0d7df1..b70a42e 100644 (file)
@@ -34,6 +34,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 static int group_count_function_read(struct ast_channel *chan, const char *cmd,
                                     char *data, char *buf, size_t len)
 {
+       int ret = -1;
        int count = -1;
        char group[80] = "", category[80] = "";
 
@@ -59,12 +60,14 @@ static int group_count_function_read(struct ast_channel *chan, const char *cmd,
                ast_app_group_list_unlock();
        }
 
-       if ((count = ast_app_group_get_count(group, category)) == -1)
+       if ((count = ast_app_group_get_count(group, category)) == -1) {
                ast_log(LOG_NOTICE, "No group could be found for channel '%s'\n", chan->name);
-       else
+       } else {
                snprintf(buf, len, "%d", count);
+               ret = 0;
+       }
 
-       return 0;
+       return ret;
 }
 
 static struct ast_custom_function group_count_function = {
@@ -91,9 +94,10 @@ static int group_match_count_function_read(struct ast_channel *chan,
        if (!ast_strlen_zero(group)) {
                count = ast_app_group_match_get_count(group, category);
                snprintf(buf, len, "%d", count);
+               return 0;
        }
 
-       return 0;
+       return -1;
 }
 
 static struct ast_custom_function group_match_count_function = {
@@ -111,6 +115,7 @@ static struct ast_custom_function group_match_count_function = {
 static int group_function_read(struct ast_channel *chan, const char *cmd,
                               char *data, char *buf, size_t len)
 {
+       int ret = -1;
        struct ast_group_info *gi = NULL;
        
        ast_app_group_list_rdlock();
@@ -124,12 +129,14 @@ static int group_function_read(struct ast_channel *chan, const char *cmd,
                        break;
        }
        
-       if (gi)
+       if (gi) {
                ast_copy_string(buf, gi->group, len);
+               ret = 0;
+       }
        
        ast_app_group_list_unlock();
        
-       return 0;
+       return ret;
 }
 
 static int group_function_write(struct ast_channel *chan, const char *cmd,
index 45036d5..3517b16 100644 (file)
@@ -82,14 +82,14 @@ static int math(struct ast_channel *chan, const char *cmd, char *parse,
        );
 
        if (ast_strlen_zero(parse)) {
-               ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
+               ast_log(LOG_WARNING, "Syntax: MATH(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
                return -1;
        }
 
        AST_STANDARD_APP_ARGS(args, parse);
 
        if (args.argc < 1) {
-               ast_log(LOG_WARNING, "Syntax: Math(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
+               ast_log(LOG_WARNING, "Syntax: MATH(<number1><op><number 2>[,<type_of_result>]) - missing argument!\n");
                return -1;
        }
 
index 0925f7c..da7e3ec 100644 (file)
@@ -367,6 +367,7 @@ static int acf_odbc_read(struct ast_channel *chan, const char *cmd, char *s, cha
                if (res == SQL_NO_DATA) {
                        ast_verb(4, "Found no rows [%s]\n", sql->str);
                        res1 = 0;
+                       buf[0] = '\0';
                        ast_copy_string(rowcount, "0", sizeof(rowcount));
                } else {
                        ast_log(LOG_WARNING, "Error %d in FETCH [%s]\n", res, sql->str);
@@ -517,6 +518,8 @@ end_acf_read:
                }
                odbc_store->data = resultset;
                ast_channel_datastore_add(chan, odbc_store);
+       } else {
+               buf[0] = '\0';
        }
        SQLCloseCursor(stmt);
        SQLFreeHandle(SQL_HANDLE_STMT, stmt);
index 33db35e..6250702 100644 (file)
@@ -74,7 +74,7 @@ static int timeout_read(struct ast_channel *chan, const char *cmd, char *data,
 
        default:
                ast_log(LOG_ERROR, "Unknown timeout type specified.\n");
-               break;
+               return -1;
        }
 
        return 0;
index 88f562b..d3440f9 100644 (file)
@@ -1260,7 +1260,7 @@ static int smdi_msg_read(struct ast_channel *chan, const char *cmd, char *data,
 return_error:
        ast_module_user_remove(u);
 
-       return 0;
+       return res;
 }
 
 static struct ast_custom_function smdi_msg_retrieve_function = {