Preston_PLB/freeswitch
1
0
Fork 0
forked from Mirrors/freeswitch
Code Pull Requests Activity

[Core] ODBC: Fix large column logic and improve error handling.

Browse Source
This commit is contained in:
Mike Jerris 2020-11-18 00:01:03 +04:00 committed by Andrey Volk
parent 7539921eca
commit 81aa6fa9d0
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/switch_odbc.c
View File

@ -645,12 +645,21 @@ SWITCH_DECLARE(switch_odbc_status_t) switch_odbc_handle_callback_exec_detailed(c
if (truncated) { if (truncated) {
if (StrLen_or_IndPtr && StrLen_or_IndPtr <= 268435456) { if (StrLen_or_IndPtr && StrLen_or_IndPtr <= 268435456) {
int ValLen = strlen((char*)val);
ColumnSize = StrLen_or_IndPtr + 1; ColumnSize = StrLen_or_IndPtr + 1;
vals[y] = malloc(ColumnSize); vals[y] = malloc(ColumnSize);
switch_assert(vals[y]); switch_assert(vals[y]);
memset(vals[y], 0, ColumnSize); memset(vals[y], 0, ColumnSize);
SQLGetData(stmt, x, SQL_C_CHAR, (SQLCHAR *) vals[y], ColumnSize, NULL); strcpy(vals[y], (char*)val);
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SQLGetData large column [%lu]\n", (unsigned long)ColumnSize); rc = SQLGetData(stmt, x, SQL_C_CHAR, (SQLCHAR *)vals[y] + ValLen, ColumnSize - ValLen, NULL);
if (rc != SQL_SUCCESS
#if (ODBCVER >= 0x0300)
&& rc != SQL_NO_DATA
#endif
) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "SQLGetData was truncated and failed to complete.\n");
switch_safe_free(vals[y]);
}
} else { } else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "sql data truncated - %s\n",SqlState); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "sql data truncated - %s\n",SqlState);
vals[y] = NULL; vals[y] = NULL;