Merge branch 'devel' into 2208-merge-dnssd

.github/actions/retry-action/action.yml

@@ -1,5 +1,5 @@
 name: Retry Step
-description: 'Retry a step on failure or timeout'
+description: "Retry a step on failure or timeout"
 inputs:
   timeout_minutes:
     description: Minutes to wait before attempt times out.  Must only specify either minutes or seconds
@@ -50,5 +50,5 @@ outputs:
   exit_error:
     description: The final error returned by the command
 runs:
-  using: 'node16'
-  main: 'dist/index.js'
+  using: "node20"
+  main: "dist/index.js"

.github/actions/retry-action/package.json

@@ -35,7 +35,7 @@
 		"@types/babel-generator": "^6.25.7",
 		"@types/jest": "^28.1.6",
 		"@types/milliseconds": "0.0.30",
-		"@types/node": "^16.11.7",
+		"@types/node": "^20.11.24",
 		"@typescript-eslint/eslint-plugin": "^5.32.0",
 		"@typescript-eslint/parser": "^5.32.0",
 		"@vercel/ncc": "^0.38.1",

Data/ODBC/src/ConnectionHandle.cpp

@@ -97,7 +97,7 @@ void ConnectionHandle::setTimeouts(SQLULEN loginTimeout, SQLULEN timeout)
 	{
 		try
 		{
-			setTimeout(timeout);
+			setTimeout(static_cast<int>(timeout));
 		}
 		catch(const NotSupportedException&) {}
 	}
@@ -145,7 +145,7 @@ bool ConnectionHandle::connect(const std::string& connectString, SQLULEN loginTi
 		// for Oracle) flat out refuse to set login timeout and return error - that's why these calls
 		// are wrapped in try/catch and silently ignore errors.
 		if (getTimeout() != timeout)
-			setTimeout(timeout);
+			setTimeout(static_cast<int>(timeout));
 		if (getLoginTimeout() != loginTimeout)
 			setLoginTimeout(loginTimeout);
 	}

Data/ODBC/src/SessionImpl.cpp

@@ -248,7 +248,7 @@ inline Poco::Any SessionImpl::getCursorUse(const std::string&) const
 void SessionImpl::setConnectionTimeout(std::size_t timeout)
 {
 	SQLULEN value = static_cast<SQLUINTEGER>(timeout);
-	_db.setTimeout(value);
+	_db.setTimeout(static_cast<int>(value));
 }
 
 

Data/ODBC/src/Unicode_UNIXODBC.cpp

@@ -14,6 +14,7 @@
 
 #include "Poco/Data/ODBC/ODBC.h"
 #include "Poco/Data/ODBC/Unicode_UNIXODBC.h"
+#include "Poco/Data/ODBC/Utility.h"
 #include "Poco/TextConverter.h"
 #include "Poco/UTF8Encoding.h"
 #include "Poco/UTF16Encoding.h"
@@ -73,6 +74,12 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt,
 	SQLSMALLINT*   pcbCharAttr,
 	NumAttrPtrType pNumAttr)
 {
+	SQLSMALLINT cbCharAttr = 0;
+	if (!pcbCharAttr) pcbCharAttr = &cbCharAttr;
+
+	SQLSMALLINT cbCharAttr;
+	if (!pcbCharAttr) pcbCharAttr = &cbCharAttr;
+
 	if (isString(pCharAttr, cbCharAttrMax))
 	{
 		Buffer<SQLWCHAR> buffer(stringLength(pCharAttr, cbCharAttrMax));
@@ -85,7 +92,9 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt,
 			pcbCharAttr,
 			pNumAttr);
 
-		makeUTF8(buffer, *pcbCharAttr, pCharAttr, cbCharAttrMax);
+		if (!Utility::isError(rc))
+			makeUTF8(buffer, *pcbCharAttr, pCharAttr, cbCharAttrMax);
+
 		return rc;
 	}
 
@@ -107,6 +116,11 @@ SQLRETURN SQLColAttributes(SQLHSTMT hstmt,
 	SQLSMALLINT* pcbDesc,
 	SQLLEN*      pfDesc)
 {
+	SQLSMALLINT cbDesc = 0;
+	if (!pcbDesc) pcbDesc = &cbDesc;
+	SQLLEN fDesc = 0;
+	if (!pfDesc) pfDesc = &fDesc;
+
 	return SQLColAttribute(hstmt,
 		icol,
 		fDescType,
@@ -151,6 +165,17 @@ SQLRETURN SQLDescribeCol(SQLHSTMT hstmt,
 	SQLSMALLINT* pibScale,
 	SQLSMALLINT* pfNullable)
 {
+	SQLSMALLINT cbColName = 0;
+	if (!pcbColName) pcbColName = &cbColName;
+	SQLSMALLINT fSqlType = 0;
+	if (!pfSqlType) pfSqlType = &fSqlType;
+	SQLULEN cbColDef = 0;
+	if (!pcbColDef) pcbColDef = &cbColDef;
+	SQLSMALLINT ibScale = 0;
+	if (!pibScale) pibScale = &ibScale;
+	SQLSMALLINT fNullable = 0;
+	if (!pfNullable) pfNullable = &fNullable;
+
 	Buffer<SQLWCHAR> buffer(cbColNameMax);
 	SQLRETURN rc = SQLDescribeColW(hstmt,
 		icol,
@@ -162,7 +187,9 @@ SQLRETURN SQLDescribeCol(SQLHSTMT hstmt,
 		pibScale,
 		pfNullable);
 
-	makeUTF8(buffer, *pcbColName * sizeof(SQLWCHAR), szColName, cbColNameMax);
+	if (!Utility::isError(rc))
+		makeUTF8(buffer, *pcbColName * sizeof(SQLWCHAR), szColName, cbColNameMax);
+
 	return rc;
 }
 
@@ -198,6 +225,9 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc,
 	SQLINTEGER  cbValueMax,
 	SQLINTEGER* pcbValue)
 {
+	SQLINTEGER cbValue = 0;
+	if (!pcbValue) pcbValue = &cbValue;
+
 	if (isString(rgbValue, cbValueMax))
 	{
 		Buffer<SQLWCHAR> buffer(stringLength(rgbValue, cbValueMax));
@@ -208,7 +238,8 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc,
 				(SQLINTEGER) buffer.sizeBytes(),
 				pcbValue);
 
-		makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
+		if (!Utility::isError(rc))
+			makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
 		return rc;
 	}
 
@@ -263,6 +294,9 @@ SQLRETURN SQLGetDescField(SQLHDESC hdesc,
 	SQLINTEGER	cbValueMax,
 	SQLINTEGER* pcbValue)
 {
+	SQLINTEGER cbValue = 0;
+	if (!pcbValue) pcbValue = &cbValue;
+
 	if (isString(rgbValue, cbValueMax))
 	{
 		Buffer<SQLWCHAR> buffer(stringLength(rgbValue, cbValueMax));
@@ -274,7 +308,8 @@ SQLRETURN SQLGetDescField(SQLHDESC hdesc,
 			(SQLINTEGER) buffer.sizeBytes(),
 			pcbValue);
 
-		makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
+		if (!Utility::isError(rc))
+			makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax);
 
 		return rc;
 	}
@@ -312,6 +347,9 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType,
 	SQLSMALLINT  cbDiagInfoMax,
 	SQLSMALLINT* pcbDiagInfo)
 {
+	SQLSMALLINT cbDiagInfo = 0;
+	if (!pcbDiagInfo) pcbDiagInfo = &cbDiagInfo;
+
 	if (isString(rgbDiagInfo, cbDiagInfoMax))
 	{
 		Buffer<SQLWCHAR> buffer(stringLength(rgbDiagInfo, cbDiagInfoMax));
@@ -324,7 +362,8 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType,
 			(SQLSMALLINT) buffer.sizeBytes(),
 			pcbDiagInfo);
 
-		makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax);
+		if (!Utility::isError(rc))
+			makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax);
 
 		return rc;
 	}
@@ -348,6 +387,11 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType,
 	SQLSMALLINT  cbErrorMsgMax,
 	SQLSMALLINT* pcbErrorMsg)
 {
+	SQLINTEGER fNativeError = 0;
+	if (!pfNativeError) pfNativeError = &fNativeError;
+	SQLSMALLINT cbErrorMsg = 0;
+	if (!pcbErrorMsg) pcbErrorMsg = &cbErrorMsg;
+
 	const SQLINTEGER stateLen = SQL_SQLSTATE_SIZE + 1;
 	Buffer<SQLWCHAR> bufState(stateLen);
 	Buffer<SQLWCHAR> bufErr(cbErrorMsgMax);
@@ -361,8 +405,11 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType,
 		(SQLSMALLINT) bufErr.size(),
 		pcbErrorMsg);
 
-	makeUTF8(bufState, stateLen * sizeof(SQLWCHAR), szSqlState, stateLen);
-	makeUTF8(bufErr, *pcbErrorMsg * sizeof(SQLWCHAR), szErrorMsg, cbErrorMsgMax);
+	if (!Utility::isError(rc))
+	{
+		makeUTF8(bufState, stateLen * sizeof(SQLWCHAR), szSqlState, stateLen);
+		makeUTF8(bufErr, *pcbErrorMsg * sizeof(SQLWCHAR), szErrorMsg, cbErrorMsgMax);
+	}
 
 	return rc;
 }
@@ -433,6 +480,9 @@ SQLRETURN SQLGetStmtAttr(SQLHSTMT hstmt,
 	SQLINTEGER  cbValueMax,
 	SQLINTEGER* pcbValue)
 {
+	SQLINTEGER cbValue = 0;
+	if (!pcbValue) pcbValue = &cbValue;
+
 	if (isString(rgbValue, cbValueMax))
 	{
 		Buffer<SQLWCHAR> buffer(stringLength(rgbValue, cbValueMax));
@@ -476,6 +526,9 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc,
 	SQLSMALLINT  cbInfoValueMax,
 	SQLSMALLINT* pcbInfoValue)
 {
+	SQLSMALLINT cbInfoValue = 0;
+	if (!pcbInfoValue) pcbInfoValue = &cbInfoValue;
+
 	if (cbInfoValueMax)
 	{
 		Buffer<SQLWCHAR> buffer(cbInfoValueMax);
@@ -486,7 +539,8 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc,
 			(SQLSMALLINT) buffer.sizeBytes(),
 			pcbInfoValue);
 
-		makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax);
+		if (!Utility::isError(rc))
+			makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax);
 
 		return rc;
 	}
@@ -561,6 +615,10 @@ SQLRETURN SQLDataSources(SQLHENV henv,
 	SQLSMALLINT  cbDescMax,
 	SQLSMALLINT* pcbDesc)
 {
+	SQLSMALLINT cbDSN = 0, cbDesc = 0;
+	if (!pcbDSN) pcbDSN = &cbDSN;
+	if (!pcbDesc) pcbDesc = &cbDesc;
+
 	Buffer<SQLWCHAR> bufDSN(cbDSNMax);
 	Buffer<SQLWCHAR> bufDesc(cbDescMax);
 
@@ -573,8 +631,11 @@ SQLRETURN SQLDataSources(SQLHENV henv,
 		(SQLSMALLINT) bufDesc.size(),
 		pcbDesc);
 
-	makeUTF8(bufDSN, *pcbDSN * sizeof(SQLWCHAR), szDSN, cbDSNMax);
-	makeUTF8(bufDesc, *pcbDesc * sizeof(SQLWCHAR), szDesc, cbDescMax);
+	if (!Utility::isError(rc))
+	{
+		makeUTF8(bufDSN, *pcbDSN * sizeof(SQLWCHAR), szDSN, cbDSNMax);
+		makeUTF8(bufDesc, *pcbDesc * sizeof(SQLWCHAR), szDesc, cbDescMax);
+	}
 
 	return rc;
 }
@@ -589,6 +650,9 @@ SQLRETURN SQLDriverConnect(SQLHDBC hdbc,
 	SQLSMALLINT* pcbConnStrOut,
 	SQLUSMALLINT fDriverCompletion)
 {
+	SQLSMALLINT cbConnStrOut = 0;
+	if (!pcbConnStrOut) pcbConnStrOut = &cbConnStrOut;
+
 	SQLSMALLINT len = cbConnStrIn;
 	if (SQL_NTS == len)
 		len = (SQLSMALLINT) std::strlen((const char*) szConnStrIn) + 1;
@@ -606,7 +670,8 @@ SQLRETURN SQLDriverConnect(SQLHDBC hdbc,
 		pcbConnStrOut,
 		fDriverCompletion);
 
-	makeUTF8(out, *pcbConnStrOut * sizeof(SQLWCHAR), pcbConnStrOut, cbConnStrOutMax);
+	if (!Utility::isError(rc))
+		makeUTF8(out, *pcbConnStrOut * sizeof(SQLWCHAR), pcbConnStrOut, cbConnStrOutMax);
 
 	return rc;
 }
@@ -619,6 +684,9 @@ SQLRETURN SQLBrowseConnect(SQLHDBC hdbc,
 	SQLSMALLINT  cbConnStrOutMax,
 	SQLSMALLINT* pcbConnStrOut)
 {
+	SQLSMALLINT cbConnStrOut = 0;
+	if (!pcbConnStrOut) pcbConnStrOut = &cbConnStrOut;
+
 	std::string str;
 	makeUTF16(szConnStrIn, cbConnStrIn, str);
 
@@ -631,7 +699,8 @@ SQLRETURN SQLBrowseConnect(SQLHDBC hdbc,
 		(SQLSMALLINT) bufConnStrOut.size(),
 		pcbConnStrOut);
 
-	makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(SQLWCHAR), szConnStrOut, cbConnStrOutMax);
+	if (!Utility::isError(rc))
+		makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(SQLWCHAR), szConnStrOut, cbConnStrOutMax);
 
 	return rc;
 }
@@ -676,6 +745,9 @@ SQLRETURN SQLNativeSql(SQLHDBC hdbc,
 	SQLINTEGER  cbSqlStrMax,
 	SQLINTEGER* pcbSqlStr)
 {
+	SQLINTEGER cbSqlStr = 0;
+	if (!pcbSqlStr) pcbSqlStr = &cbSqlStr;
+
 	std::string str;
 	makeUTF16(szSqlStrIn, cbSqlStrIn, str);
 
@@ -688,7 +760,8 @@ SQLRETURN SQLNativeSql(SQLHDBC hdbc,
 		(SQLINTEGER) bufSQLOut.size(),
 		pcbSqlStr);
 
-	makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(SQLWCHAR), szSqlStr, cbSqlStrMax);
+	if (!Utility::isError(rc))
+		makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(SQLWCHAR), szSqlStr, cbSqlStrMax);
 
 	return rc;
 }
@@ -753,6 +826,10 @@ SQLRETURN SQLDrivers(SQLHENV henv,
 	SQLSMALLINT  cbDrvrAttrMax,
 	SQLSMALLINT* pcbDrvrAttr)
 {
+	SQLSMALLINT cbDriverDesc = 0, cbDrvrAttr = 0;
+	if (!pcbDriverDesc) pcbDriverDesc = &cbDriverDesc;
+	if (!pcbDrvrAttr) pcbDrvrAttr = &cbDrvrAttr;
+
 	Buffer<SQLWCHAR> bufDriverDesc(cbDriverDescMax);
 	Buffer<SQLWCHAR> bufDriverAttr(cbDrvrAttrMax);
 
@@ -765,8 +842,11 @@ SQLRETURN SQLDrivers(SQLHENV henv,
 		(SQLSMALLINT) bufDriverAttr.size(),
 		pcbDrvrAttr);
 
-	makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(SQLWCHAR), szDriverDesc, cbDriverDescMax);
-	makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(SQLWCHAR), szDriverAttributes, cbDrvrAttrMax);
+	if (!Utility::isError(rc))
+	{
+		makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(SQLWCHAR), szDriverDesc, cbDriverDescMax);
+		makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(SQLWCHAR), szDriverAttributes, cbDrvrAttrMax);
+	}
 
 	return rc;
 }