Merged revisions 167840 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 8 Jan 2009 22:37:20 +0000 (22:37 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 8 Jan 2009 22:37:20 +0000 (22:37 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r167840 | tilghman | 2009-01-08 16:08:56 -0600 (Thu, 08 Jan 2009) | 6 lines

  Don't truncate database results at 255 chars.
  (closes issue #14069)
   Reported by: evandro
   Patches:
         20081214__bug14069.diff.txt uploaded by Corydon76 (license 14)
........

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

res/res_agi.c

index 21b5548..926d4d9 100644 (file)
@@ -1849,16 +1849,32 @@ static int handle_verbose(struct ast_channel *chan, AGI *agi, int argc, char **a
 static int handle_dbget(struct ast_channel *chan, AGI *agi, int argc, char **argv)
 {
        int res;
-       char tmp[256];
+       struct ast_str *buf;
 
        if (argc != 4)
                return RESULT_SHOWUSAGE;
-       res = ast_db_get(argv[2], argv[3], tmp, sizeof(tmp));
+
+       if (!(buf = ast_str_create(16))) {
+               ast_agi_send(agi->fd, chan, "200 result=-1\n");
+               return RESULT_SUCCESS;
+       }
+
+       do {
+               res = ast_db_get(argv[2], argv[3], ast_str_buffer(buf), ast_str_size(buf));
+               if (ast_str_strlen(buf) < ast_str_size(buf) - 1) {
+                       break;
+               }
+               if (ast_str_make_space(&buf, ast_str_size(buf) * 2)) {
+                       break;
+               }
+       } while (1);
+       
        if (res)
                ast_agi_send(agi->fd, chan, "200 result=0\n");
        else
-               ast_agi_send(agi->fd, chan, "200 result=1 (%s)\n", tmp);
+               ast_agi_send(agi->fd, chan, "200 result=1 (%s)\n", ast_str_buffer(buf));
 
+       ast_free(buf);
        return RESULT_SUCCESS;
 }