issue #5789
authorRussell Bryant <russell@russellbryant.com>
Mon, 21 Nov 2005 13:41:28 +0000 (13:41 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 21 Nov 2005 13:41:28 +0000 (13:41 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7171 65c4cc65-6c06-0410-ace0-fbb531ad65f3

ChangeLog
apps/app_osplookup.c

index 8916ffd..7675e7b 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2005-11-21  Russell Bryant  <russell@digium.com>
 
+       * apps/app_osplookup.c: Properly populate the number of results. (issue #5789)
+
        * Makefile: Don't hard-code that poll functionality needs to be provided on Darwin.
        * apps/Makefile: Fix incorrect portion of the patch to fix 'make install' on Solaris.
 
index d4f2c53..2fe2d01 100755 (executable)
@@ -217,6 +217,10 @@ static int ospnext_exec(struct ast_channel *chan, void *data)
        temp = pbx_builtin_getvar_helper(chan, "OSPHANDLE");
        result.handle = -1;
        if (!ast_strlen_zero(temp) && (sscanf(temp, "%d", &result.handle) == 1) && (result.handle > -1)) {
+               temp = pbx_builtin_getvar_helper(chan, "OSPRESULTS");
+               if (ast_strlen_zero(temp) || (sscanf(temp, "%d", &result.numresults) != 1)) {
+                       result.numresults = 0;
+               }
                if ((res = ast_osp_next(&result, cause)) > 0) {
                        char tmp[80];
                        snprintf(tmp, sizeof(tmp), "%d", result.handle);