lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-02-26 05:33:03 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from nyalldawson/free_str

Browse Source 
Fix incorrect early free of str when reading ole fields
This commit is contained in:
Evan Miller
2020-08-11 20:03:01 -04:00
committed by GitHub
parent b25eb73648 68d3104134
commit ef3a9f99a8
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/odbc/odbc.c
View File

@@ -1649,14 +1649,19 @@ SQLRETURN SQL_API SQLGetData(
return SQL_SUCCESS_WITH_INFO; return SQL_SUCCESS_WITH_INFO;
} }
memcpy(rgbValue, str + stmt->pos, MIN(len - stmt->pos, cbValueMax-1)); const int totalSizeRemaining = len - stmt->pos;
((char *)rgbValue)[MIN(len - stmt->pos, cbValueMax-1)] = '\0'; const int partsRemain = cbValueMax - 1 < totalSizeRemaining;
stmt->pos += MIN(len - stmt->pos, cbValueMax-1); const int sizeToReadThisPart = partsRemain ? cbValueMax - 1 : totalSizeRemaining;
if (cbValueMax - 1 < len - stmt->pos) { memcpy(rgbValue, str + stmt->pos, sizeToReadThisPart);
((char *)rgbValue)[sizeToReadThisPart] = '\0';
if (partsRemain) {
stmt->pos += cbValueMax - 1;
if (col->col_type != MDB_OLE) { free(str); str = NULL; } if (col->col_type != MDB_OLE) { free(str); str = NULL; }
strcpy(sqlState, "01004"); // truncated strcpy(sqlState, "01004"); // truncated
return SQL_SUCCESS_WITH_INFO; return SQL_SUCCESS_WITH_INFO;
} }
stmt->pos = len;
free(str); free(str);
str = NULL; str = NULL;
break; break;