Merge [TRAFODION-2891] PR-1394 fix the bufoverrun Critical error checked by TScanCode
Project: http://git-wip-us.apache.org/repos/asf/trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/trafodion/commit/b0d0d53a Tree: http://git-wip-us.apache.org/repos/asf/trafodion/tree/b0d0d53a Diff: http://git-wip-us.apache.org/repos/asf/trafodion/diff/b0d0d53a Branch: refs/heads/master Commit: b0d0d53a9248587350f1e58c704c194447a1ee83 Parents: b0dcf60 1fe8890 Author: Suresh Subbiah <[email protected]> Authored: Mon Jan 22 15:50:58 2018 +0000 Committer: Suresh Subbiah <[email protected]> Committed: Mon Jan 22 15:50:58 2018 +0000 ---------------------------------------------------------------------- core/conn/odb/src/odb.c | 12 ++--- core/conn/odbc/src/odbc/Common/ExpConvMxcs.cpp | 4 +- core/conn/odbc/src/odbc/Common/linux/sqmem.cpp | 2 +- core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp | 6 +-- .../odbc/src/odbc/nsksrvrcore/srvrothers.cpp | 4 +- .../odbc/odbcclient/unixcli/cli/ctosqlconv.cpp | 2 +- .../odbcclient/unixcli/common/ExpConvMxcs.cpp | 4 +- .../sqf/src/seatrans/tm/hbasetmlib2/hbasetm.cpp | 8 ++-- core/sqf/src/seatrans/tm/hbasetmlib2/hbasetm.h | 6 +-- core/sqf/src/stfs/common/stfs_msgbuff.cpp | 48 ++++++++++---------- core/sql/arkcmp/CompException.h | 8 ++-- core/sql/common/BaseTypes.h | 2 +- core/sql/common/csconvert.cpp | 2 +- core/sql/executor/ExExeUtilGetStats.cpp | 4 +- core/sql/exp/ExpConvMxcs.cpp | 4 +- core/sql/exp/exp_conv.cpp | 4 +- core/sql/optimizer/NATable.cpp | 12 ++--- core/sql/regress/tools/logsort_src/tokstr.c | 2 +- core/sql/sqlmsg/ComDiagsMsg.cpp | 2 +- win-odbc64/Common/ExpConvMxcs.cpp | 4 +- win-odbc64/odbcclient/drvr35/ctosqlconv.cpp | 2 +- win-odbc64/odbcclient/drvr35/diagfunctions.cpp | 7 ++- win-odbc64/sql/common/csconvert.cpp | 2 +- 23 files changed, 76 insertions(+), 75 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/b0d0d53a/core/conn/odb/src/odb.c ---------------------------------------------------------------------- diff --cc core/conn/odb/src/odb.c index 48de0f3,d9da4b0..5f8db45 --- a/core/conn/odb/src/odb.c +++ b/core/conn/odb/src/odb.c @@@ -9424,15 -9405,8 +9424,15 @@@ static void OloadJson(int eid } } + /* alocate valuebuf */ + if ((valuebuf = calloc(1, etab[eid].buffsz + 1)) == (void *)NULL) { + fprintf(stderr, "odb [OloadJson(%d)] - Error allocating field buffer: [%d] %s\n", + __LINE__, errno, strerror(errno)); + goto oloadJson_exit; + } + /* Open input file */ - for (i = j = 0; etab[eid].src[i] && i < sizeof(buff); i++) { + for (i = j = 0; i < sizeof(buff) && etab[eid].src[i]; i++) { switch (etab[eid].src[i]) { case '%': switch (etab[eid].src[++i]) { http://git-wip-us.apache.org/repos/asf/trafodion/blob/b0d0d53a/core/conn/odbc/src/odbc/nsksrvr/SrvrConnect.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/b0d0d53a/core/conn/odbc/src/odbc/nsksrvrcore/srvrothers.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/b0d0d53a/core/conn/unixodbc/odbc/odbcclient/unixcli/cli/ctosqlconv.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafodion/blob/b0d0d53a/win-odbc64/odbcclient/drvr35/ctosqlconv.cpp ----------------------------------------------------------------------
