[asterisk-commits] tilghman: trunk r63567 - in /trunk: ./ apps/app_directory.c

[asterisk-commits at lists.digium.com]

Author: tilghman
Date: Wed May  9 09:52:13 2007
New Revision: 63567

URL: http://svn.digium.com/view/asterisk?view=rev&rev=63567
Log:
Merged revisions 63566 via svnmerge from 
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)

........

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

Modified:
    trunk/   (props changed)
    trunk/apps/app_directory.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/apps/app_directory.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_directory.c?view=diff&rev=63567&r1=63566&r2=63567
==============================================================================
--- trunk/apps/app_directory.c (original)
+++ trunk/apps/app_directory.c Wed May  9 09:52:13 2007
@@ -98,7 +98,7 @@
 	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 @@
 				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]="";