automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@63607 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_directory.c b/apps/app_directory.c
index c2764a2229bd2b2b4a02ed4d7ee218aeff9396b6..65a946d5502bcc6736063901fb4dd7780193ebef 100644 (file)
--- a/apps/app_directory.c
+++ b/apps/app_directory.c
@@ -97,7 +97,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];
@@ -148,7 +148,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]="";