lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2025-04-05 20:31:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Try another SQLGetData fix

Browse Source 
Set the length of the return value to include the NUL termination
charaacter.
This commit is contained in:
Evan Miller 2020-08-11 07:30:33 -04:00
parent e330feebd6
commit 71e10395fd
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/odbc/odbc.c
View File

@ -1641,21 +1641,22 @@ SQLRETURN SQL_API SQLGetData(
return SQL_ERROR;
}
if (pcbValue) {
*pcbValue = len - stmt->pos;
*pcbValue = len + 1 - stmt->pos;
}
if (cbValueMax == 0) {
free(str);
str = NULL;
return SQL_SUCCESS_WITH_INFO;
}
snprintf(rgbValue, cbValueMax, "%s", str + stmt->pos);
if (stmt->pos + cbValueMax < len + 1) {
stmt->pos += cbValueMax - 1;
memcpy(rgbValue, str + stmt->pos, MIN(len - stmt->pos, cbValueMax-1));
((char *)rgbValue)[MIN(len - stmt->pos, cbValueMax-1)] = '\0';
stmt->pos += MIN(len - stmt->pos, cbValueMax-1);
if (cbValueMax - 1 < len - stmt->pos) {
if (col->col_type != MDB_OLE) { free(str); str = NULL; }
strcpy(sqlState, "01004"); // truncated
return SQL_SUCCESS_WITH_INFO;
}
stmt->pos = len;
free(str);
str = NULL;
break;