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

Simplify bounds checking logic with snprintf

Browse Source
This commit is contained in:
Evan Miller 2020-08-06 23:58:34 -04:00
parent 47724e50c9
commit 2e1e1ed796
1 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/odbc/odbc.c
View File

@ -749,7 +749,7 @@ static SQLRETURN SQL_API _SQLDescribeCol(
SQLSMALLINT *pibScale,
SQLSMALLINT *pfNullable)
{
int namelen, i;
int i;
struct _hstmt *stmt = (struct _hstmt *) hstmt;
MdbSQL *sql = stmt->sql;
MdbSQLColumn *sqlcol;
@ -777,23 +777,14 @@ static SQLRETURN SQL_API _SQLDescribeCol(
}
ret = SQL_SUCCESS;
namelen = strlen(sqlcol->name);
if (pcbColName)
*pcbColName=namelen;
*pcbColName=strlen(sqlcol->name);
if (szColName) {
if (cbColNameMax < 0) {
strcpy(sqlState, "HY090"); // Invalid string or buffer length
return SQL_ERROR;
}
if (namelen + 1 < cbColNameMax) {
// Including \0
strcpy((char*)szColName, sqlcol->name);
} else {
if (cbColNameMax > 1) {
strncpy((char*)szColName, sqlcol->name, cbColNameMax-1);
szColName[cbColNameMax-1] = '\0';
}
// So there is no \0 if cbColNameMax was 0
if (snprintf(szColName, cbColNameMax, "%s", sqlcol->name) + 1 > cbColNameMax) {
strcpy(sqlState, "01004"); // String data, right truncated
ret = SQL_SUCCESS_WITH_INFO;
}
@ -865,7 +856,7 @@ static SQLRETURN SQL_API _SQLColAttributes(
SQLSMALLINT *pcbDesc,
SQLLEN *pfDesc)
{
int namelen, i;
int i;
struct _hstmt *stmt;
MdbSQL *sql;
MdbSQLColumn *sqlcol;
@ -914,15 +905,7 @@ static SQLRETURN SQL_API _SQLColAttributes(
strcpy(sqlState, "HY090"); // Invalid string or buffer length
return SQL_ERROR;
}
namelen = strlen(sqlcol->name);
if (namelen + 1 < cbDescMax) {
strcpy(rgbDesc, sqlcol->name);
} else {
if (cbDescMax > 1) {
strncpy(rgbDesc, sqlcol->name, cbDescMax-1);
((char*)rgbDesc)[cbDescMax-1] = '\0';
}
// So there is no \0 if cbDescMax was 0
if (snprintf(rgbDesc, cbDescMax, "%s", sqlcol->name) + 1 > cbDescMax) {
strcpy(sqlState, "01004"); // String data, right truncated
ret = SQL_SUCCESS_WITH_INFO;
}