Merged revisions 63566 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Wed, 9 May 2007 14:52:13 +0000 (14:52 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Wed, 9 May 2007 14:52:13 +0000 (14:52 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r63566 | tilghman | 2007-05-09 09:50:33 -0500 (Wed, 09 May 2007) | 10 lines

Merged revisions 63565 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r63565 | tilghman | 2007-05-09 09:48:06 -0500 (Wed, 09 May 2007) | 2 lines

Replicate fix from 51158 (app_voicemail) to app_directory (Issue 9224)

........

................

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

apps/app_directory.c

index b14915e..8a62c65 100644 (file)
@@ -98,7 +98,7 @@ static void retrieve_file(char *dir)
        void *fdm = MAP_FAILED;
        SQLHSTMT stmt;
        char sql[256];
-       char fmt[80]="";
+       char fmt[80]="", empty[10] = "";
        char *c;
        SQLLEN colsize;
        char full_fn[256];
@@ -149,7 +149,7 @@ static void retrieve_file(char *dir)
                                break;
                        }
 
-                       res = SQLGetData(stmt, 1, SQL_BINARY, NULL, 0, &colsize);
+                       res = SQLGetData(stmt, 1, SQL_BINARY, empty, 0, &colsize);
                        fdlen = colsize;
                        if (fd > -1) {
                                char tmp[1]="";