You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2017/05/11 20:56:32 UTC
[1/2] incubator-trafodion git commit: [TRAFODION-2536] memory out of
bound when fetch LONGVARCHAR UCS2 column with a TIMESTAMP_STRUCT
Repository: incubator-trafodion
Updated Branches:
refs/heads/master 821655032 -> 279ab343e
[TRAFODION-2536] memory out of bound when fetch LONGVARCHAR UCS2 column with a TIMESTAMP_STRUCT
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a8d197a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a8d197a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a8d197a6
Branch: refs/heads/master
Commit: a8d197a66f9cbaa8d253e252cd1b857b48074955
Parents: acc3b34
Author: Weixin Xu <we...@esgyn.cn>
Authored: Tue May 2 18:18:49 2017 +0800
Committer: Weixin Xu <we...@esgyn.cn>
Committed: Tue May 2 18:18:49 2017 +0800
----------------------------------------------------------------------
core/conn/unixodbc/odbc/odbcclient/unixcli/cli/sqltocconv.cpp | 4 ++++
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 6 ++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a8d197a6/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/sqltocconv.cpp
----------------------------------------------------------------------
diff --git a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/sqltocconv.cpp b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/sqltocconv.cpp
index d7d8ec1..d33ffe3 100644
--- a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/sqltocconv.cpp
+++ b/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/sqltocconv.cpp
@@ -1555,6 +1555,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(DATE_STRUCT);
}
else
{
@@ -1582,6 +1583,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(DATE_STRUCT);
}
else
{
@@ -2018,6 +2020,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(TIMESTAMP_STRUCT);
}
else
{
@@ -2045,6 +2048,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(TIMESTAMP_STRUCT);
}
else
{
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a8d197a6/win-odbc64/odbcclient/drvr35/sqltocconv.cpp
----------------------------------------------------------------------
diff --git a/win-odbc64/odbcclient/drvr35/sqltocconv.cpp b/win-odbc64/odbcclient/drvr35/sqltocconv.cpp
index ab56ccf..c1c1484 100644
--- a/win-odbc64/odbcclient/drvr35/sqltocconv.cpp
+++ b/win-odbc64/odbcclient/drvr35/sqltocconv.cpp
@@ -1469,6 +1469,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(DATE_STRUCT);
}
else
{
@@ -1496,6 +1497,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(DATE_STRUCT);
}
else
{
@@ -1716,6 +1718,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(TIME_STRUCT);
}
else
{
@@ -1744,6 +1747,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(TIME_STRUCT);
}
else
{
@@ -1935,6 +1939,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(TIMESTAMP_STRUCT);
}
else
{
@@ -1963,6 +1968,7 @@ unsigned long ODBC::ConvertSQLToC(SQLINTEGER ODBCAppVersion,
return IDS_22_003;
}
srcLength = TransStringLength + 1;
+ DataLen = sizeof(TIMESTAMP_STRUCT);
}
else
{
[2/2] incubator-trafodion git commit: Merge [TRAFODION-2602] PR 1078
Fix out of bounds error for UCS2 LONGVARCHAR
Posted by db...@apache.org.
Merge [TRAFODION-2602] PR 1078 Fix out of bounds error for UCS2 LONGVARCHAR
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/279ab343
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/279ab343
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/279ab343
Branch: refs/heads/master
Commit: 279ab343ebf78f63f4d9c24238229ac9ed3a8888
Parents: 8216550 a8d197a
Author: Dave Birdsall <db...@apache.org>
Authored: Thu May 11 20:55:43 2017 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Thu May 11 20:55:43 2017 +0000
----------------------------------------------------------------------
core/conn/unixodbc/odbc/odbcclient/unixcli/cli/sqltocconv.cpp | 4 ++++
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 6 ++++++
2 files changed, 10 insertions(+)
----------------------------------------------------------------------