From 8cda34b5fc165de4c3a08b64ec922ece2c1701a9 Mon Sep 17 00:00:00 2001
From: Tilghman Lesher <tilghman@meg.abyt.es>
Date: Tue, 16 Jan 2007 21:33:57 +0000
Subject: [PATCH] Merged revisions 51159 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r51159 | tilghman | 2007-01-16 15:28:39 -0600 (Tue, 16 Jan 2007) | 10 lines
Merged revisions 51158 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r51158 | tilghman | 2007-01-16 15:26:06 -0600 (Tue, 16 Jan 2007) | 2 lines
Postgres driver doesn't like a NULL pointer when retrieving the length (Bug 8513)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@51160 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
apps/app_voicemail.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 6cb47e7451..f966fbce6d 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -1078,7 +1078,7 @@ static int retrieve_file(char *dir, int msgnum)
}
if (!strcasecmp(coltitle, "recording")) {
off_t offset;
- res = SQLGetData(stmt, x + 1, SQL_BINARY, NULL, 0, &colsize2);
+ res = SQLGetData(stmt, x + 1, SQL_BINARY, rowdata, 0, &colsize2);
fdlen = colsize2;
if (fd > -1) {
char tmp[1]="";
@@ -1090,15 +1090,14 @@ static int retrieve_file(char *dir, int msgnum)
}
/* Read out in small chunks */
for (offset = 0; offset < colsize2; offset += CHUNKSIZE) {
- /* +1 because SQLGetData likes null-terminating binary data */
- if ((fdm = mmap(NULL, CHUNKSIZE + 1, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offset)) == (void *)-1) {
+ if ((fdm = mmap(NULL, CHUNKSIZE, PROT_READ | PROT_WRITE, MAP_SHARED, fd, offset)) == (void *)-1) {
ast_log(LOG_WARNING, "Could not mmap the output file: %s (%d)\n", strerror(errno), errno);
SQLFreeHandle(SQL_HANDLE_STMT, stmt);
ast_odbc_release_obj(obj);
goto yuck;
} else {
- res = SQLGetData(stmt, x + 1, SQL_BINARY, fdm, CHUNKSIZE + 1, NULL);
- munmap(fdm, 0);
+ res = SQLGetData(stmt, x + 1, SQL_BINARY, fdm, CHUNKSIZE, NULL);
+ munmap(fdm, CHUNKSIZE);
if ((res != SQL_SUCCESS) && (res != SQL_SUCCESS_WITH_INFO)) {
ast_log(LOG_WARNING, "SQL Get Data error!\n[%s]\n\n", sql);
unlink(full_fn);
--
GitLab