diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-06 21:32:42 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-10-06 21:32:42 +0000 |
| commit | 891798ef49ba52fd250c018ae5eaa0c1e0b13993 (patch) | |
| tree | 63ffa8d95553ed67237b9bf4f3a4c164678dd454 /funcs/func_odbc.c | |
| parent | 8ea14a85923f9828ab421d7cbb3069a653e2eccb (diff) | |
Merged revisions 146802 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r146802 | tilghman | 2008-10-06 16:09:05 -0500 (Mon, 06 Oct 2008) | 15 lines
Merged revisions 146799 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@146838 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs/func_odbc.c')
| -rw-r--r-- | funcs/func_odbc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/funcs/func_odbc.c b/funcs/func_odbc.c index b6a17ffa2..edbc1dfd5 100644 --- a/funcs/func_odbc.c +++ b/funcs/func_odbc.c @@ -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); |