Fix garbled diagnostic record on failed SQLDriverConnect

fdcastel · fdcastel · commit c7922bb46a95 · 2026-05-11T17:10:43.000-03:00
Every catch block that handled std::exception followed the same broken
pattern:

    catch ( std::exception &amp;ex ) {
        SQLException &amp;exception = (SQLException&amp;)ex;
        // virtual calls on `exception`...
    }

The C-style cast is a reinterpret_cast. When the caught object was not
in fact a SQLException -- e.g. a std::bad_alloc, a raw FbException that
bypassed the IscDbc rewrap, or anything else that propagated out of
the IscDbc layer -- the subsequent virtual dispatch through `exception`
read through whatever bytes lay where SQLException's vtable pointer
would have been. On Linux that produced a diagnostic record with an
empty SQLSTATE, a non-deterministic native code, and a one-byte message
('[') whose reported length disagreed with its strlen.

This commit introduces a type-safe ExceptionInfo helper and a
postError(state, std::exception&amp;) overload that route every catch
through dynamic_cast, falling back to std::exception::what() when the
caught object is not a SQLException. All 64 occurrences of the broken
pattern across OdbcConnection / OdbcStatement / OdbcDesc / OdbcEnv and
the Windows OdbcJdbcSetup tree are converted to the safe path.

The catch block in OdbcConnection::connect also gains a NULL guard
around connection-&gt;close(): if createConnection() throws before the
assignment, the previous code dereferenced a NULL pointer during
cleanup.
diff --git a/IscDbc/SQLException.h b/IscDbc/SQLException.h
@@ -48,6 +48,26 @@ class DllExport SQLException : public std::exception
 	virtual const char	*getTrace() = 0;
 };
 
+// Type-safe extraction of error information from any std::exception caught
+// across an SQLException-aware boundary. Returns the SQLException's codes and
+// text if the caught exception really is one; otherwise sqlcode/fbcode are 0
+// and text comes from std::exception::what(). Replaces unchecked C-style
+// reinterpret-casts (`SQLException &e = (SQLException&)ex;`) which produced
+// garbled diagnostic records when a non-SQLException reached the catch block.
+struct ExceptionInfo
+{
+	int          sqlcode;
+	int          fbcode;
+	const char  *text;
+};
+
+inline ExceptionInfo extractExceptionInfo(std::exception &ex)
+{
+	if (SQLException *sqlEx = dynamic_cast<SQLException*>(&ex))
+		return { sqlEx->getSqlcode(), sqlEx->getFbcode(), sqlEx->getText() };
+	return { 0, 0, ex.what() };
+}
+
 }; // end namespace IscDbcLibrary
 
 #endif
diff --git a/OdbcConnection.cpp b/OdbcConnection.cpp
@@ -1028,8 +1028,7 @@ SQLRETURN OdbcConnection::sqlNativeSql( SQLCHAR * inStatementText, SQLINTEGER te
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError( "HY000", exception );
+		postError( "HY000", ex );
 		return SQL_ERROR;
 	}
 
@@ -1134,8 +1133,7 @@ SQLRETURN OdbcConnection::sqlDisconnect()
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError ("01002", exception);
+		postError ("01002", ex);
 		connection = NULL;
 		connected = false;
 		return SQL_SUCCESS_WITH_INFO;
@@ -1711,17 +1709,21 @@ SQLRETURN OdbcConnection::connect(const char *sharedLibrary, const char * databa
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
+		ExceptionInfo info = extractExceptionInfo(ex);
+
 		if ( env->envShare )
 			env->envShare = NULL;
 
 		if ( properties )
 			properties->release();
 
-		connection->close();
-		connection = NULL;
+		if ( connection )
+		{
+			connection->close();
+			connection = NULL;
+		}
 
-		return sqlReturn( SQL_ERROR, "08004", exception.getText(), exception.getSqlcode() );
+		return sqlReturn( SQL_ERROR, "08004", info.text, info.sqlcode );
 	}
 
 	connected = true;
@@ -1748,8 +1750,7 @@ SQLRETURN OdbcConnection::sqlEndTran(int operation)
 		}
 		catch ( std::exception &ex )
 		{
-			SQLException &exception = (SQLException&)ex;
-			postError ("S1000", exception);
+			postError ("S1000", ex);
 			return SQL_ERROR;
 		}
 
@@ -1766,8 +1767,7 @@ SQLRETURN OdbcConnection::sqlExecuteCreateDatabase(const char * sqlString)
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError( "HY000", exception );
+		postError( "HY000", ex );
 		return SQL_ERROR;
 	}
 
@@ -2180,8 +2180,7 @@ void OdbcConnection::initUserEvents( PODBC_EVENTS_BLOCK_INFO infoEvents )
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError( "HY000", exception );
+		postError( "HY000", ex );
 	}
 }
 
@@ -2201,8 +2200,7 @@ void OdbcConnection::updateResultEvents( char *updated )
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError( "HY000", exception );
+		postError( "HY000", ex );
 	}
 }
 
@@ -2214,8 +2212,7 @@ void OdbcConnection::requeueEvents()
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError( "HY000", exception );
+		postError( "HY000", ex );
 	}
 }
 
diff --git a/OdbcDesc.cpp b/OdbcDesc.cpp
@@ -807,8 +807,7 @@ SQLRETURN OdbcDesc::sqlGetDescField(int recNumber, int fieldId, SQLPOINTER ptr,
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError ("HY000", exception);
+		postError ("HY000", ex);
 		return SQL_ERROR;
 	}
 
@@ -1218,8 +1217,7 @@ SQLRETURN OdbcDesc::sqlGetDescRec(	SQLSMALLINT recNumber,
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError ("HY000", exception);
+		postError ("HY000", ex);
 		return SQL_ERROR;
 	}
 
@@ -1266,8 +1264,7 @@ SQLRETURN OdbcDesc::sqlSetDescRec(	SQLSMALLINT	recNumber,
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError ("HY000", exception);
+		postError ("HY000", ex);
 		return SQL_ERROR;
 	}
 
diff --git a/OdbcEnv.cpp b/OdbcEnv.cpp
@@ -134,8 +134,7 @@ SQLRETURN OdbcEnv::sqlEndTran(int operation)
 		}
 		catch ( std::exception &ex )
 		{
-			SQLException &exception = (SQLException&)ex;
-			postError ("HY000", exception);
+			postError ("HY000", ex);
 			return SQL_ERROR;
 		}
 
@@ -194,8 +193,7 @@ SQLRETURN OdbcEnv::sqlGetEnvAttr(int attribute, SQLPOINTER ptr, int bufferLength
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError ("HY000", exception);
+		postError ("HY000", ex);
 		return SQL_ERROR;
 	}
 
@@ -224,8 +222,7 @@ SQLRETURN OdbcEnv::sqlSetEnvAttr(int attribute, SQLPOINTER value, int length)
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		postError ("HY000", exception);
+		postError ("HY000", ex);
 		return SQL_ERROR;
 	}
 			
diff --git a/OdbcJdbcSetup/DsnDialog.cpp b/OdbcJdbcSetup/DsnDialog.cpp
@@ -791,9 +791,9 @@ void CDsnDialog::OnTestConnection( HWND hDlg )
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
+		ExceptionInfo info = extractExceptionInfo(ex);
 		char buffer[2048];
-		JString text = exception.getText();
+		JString text = info.text;
 
 		sprintf( buffer, "%s\n%s", _TR( IDS_MESSAGE_02, "Connection failed!" ), (const char*)text );
 		removeNameFileDBfromMessage ( buffer );
diff --git a/OdbcJdbcSetup/ServiceClient.cpp b/OdbcJdbcSetup/ServiceClient.cpp
@@ -86,8 +86,8 @@ bool CServiceClient::initServices( const char *sharedLibrary )
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		JString text = exception.getText();
+		ExceptionInfo info = extractExceptionInfo(ex);
+		JString text = info.text;
 
 		if ( services )
 		{
@@ -145,8 +145,8 @@ bool CServiceClient::createDatabase()
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		JString text = exception.getText();
+		ExceptionInfo info = extractExceptionInfo(ex);
+		JString text = info.text;
 
 		if ( connection )
 			connection->close();
@@ -189,8 +189,8 @@ bool CServiceClient::dropDatabase()
 	}
 	catch ( std::exception &ex )
 	{
-		SQLException &exception = (SQLException&)ex;
-		JString text = exception.getText();
+		ExceptionInfo info = extractExceptionInfo(ex);
+		JString text = info.text;
 
 		if ( connection )
 			connection->close();
diff --git a/OdbcJdbcSetup/ServiceTabBackup.cpp b/OdbcJdbcSetup/ServiceTabBackup.cpp
@@ -236,14 +236,14 @@ void CServiceTabBackup::onStartBackup()
 	}
 	catch ( std::exception &ex )
 	{
+		ExceptionInfo info = extractExceptionInfo(ex);
 		writeFooterToLogFile();
 		EnableWindow( GetDlgItem( hDlg, IDOK ), TRUE );
 		EnableWindow( GetDlgItem( hDlg, IDC_BUTTON_VIEW_LOG ), !logPathFile.IsEmpty() );
 
 		char buffer[1024];
-		SQLException &exception = (SQLException&)ex;
-		JString text = exception.getText();
-		sprintf(buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+		JString text = info.text;
+		sprintf(buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 		MessageBox( NULL, buffer, TEXT( "Error!" ), MB_ICONERROR | MB_OK );
 	}
 
diff --git a/OdbcJdbcSetup/ServiceTabRepair.cpp b/OdbcJdbcSetup/ServiceTabRepair.cpp
@@ -303,14 +303,14 @@ void CServiceTabRepair::startRepairDatabase()
 	}
 	catch ( std::exception &ex )
 	{
+		ExceptionInfo info = extractExceptionInfo(ex);
 		writeFooterToLogFile();
 		EnableWindow( GetDlgItem( hDlg, IDOK ), TRUE );
 		EnableWindow( GetDlgItem( hDlg, IDC_BUTTON_VIEW_LOG ), !logPathFile.IsEmpty() );
 
 		char buffer[1024];
-		SQLException &exception = (SQLException&)ex;
-		JString text = exception.getText();
-		sprintf(buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+		JString text = info.text;
+		sprintf(buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 		MessageBox( NULL, buffer, TEXT( "Error!" ), MB_ICONERROR | MB_OK );
 	}
 
diff --git a/OdbcJdbcSetup/ServiceTabRestore.cpp b/OdbcJdbcSetup/ServiceTabRestore.cpp
@@ -265,14 +265,14 @@ void CServiceTabRestore::onStartRestore()
 	}
 	catch ( std::exception &ex )
 	{
+		ExceptionInfo info = extractExceptionInfo(ex);
 		writeFooterToLogFile();
 		EnableWindow( GetDlgItem( hDlg, IDOK ), TRUE );
 		EnableWindow( GetDlgItem( hDlg, IDC_BUTTON_VIEW_LOG ), !logPathFile.IsEmpty() );
 
 		char buffer[1024];
-		SQLException &exception = (SQLException&)ex;
-		JString text = exception.getText();
-		sprintf(buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+		JString text = info.text;
+		sprintf(buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 		MessageBox( NULL, buffer, TEXT( "Error!" ), MB_ICONERROR | MB_OK );
 	}
 
diff --git a/OdbcJdbcSetup/ServiceTabStatistics.cpp b/OdbcJdbcSetup/ServiceTabStatistics.cpp
@@ -221,14 +221,14 @@ void CServiceTabStatistics::onStartStatistics()
 	}
 	catch ( std::exception &ex )
 	{
+		ExceptionInfo info = extractExceptionInfo(ex);
 		writeFooterToLogFile();
 		EnableWindow( GetDlgItem( hDlg, IDOK ), TRUE );
 		EnableWindow( GetDlgItem( hDlg, IDC_BUTTON_VIEW_LOG ), !logPathFile.IsEmpty() );
 
 		char buffer[1024];
-		SQLException &exception = (SQLException&)ex;
-		JString text = exception.getText();
-		sprintf(buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+		JString text = info.text;
+		sprintf(buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 		MessageBox( NULL, buffer, TEXT( "Error!" ), MB_ICONERROR | MB_OK );
 	}
 
diff --git a/OdbcJdbcSetup/Setup.cpp b/OdbcJdbcSetup/Setup.cpp
@@ -1070,10 +1070,10 @@ bool Setup::addDsn()
 				}
 				catch ( std::exception &ex )
 				{
+					ExceptionInfo info = extractExceptionInfo(ex);
 					char buffer[1024];
-					SQLException &exception = (SQLException&)ex;
-					JString text = exception.getText();
-					sprintf( buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+					JString text = info.text;
+					sprintf( buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 					SQLPostInstallerError( ODBC_ERROR_CREATE_DSN_FAILED, buffer );
 				}
 			}
@@ -1130,10 +1130,10 @@ bool Setup::addDsn()
 				}
 				catch ( std::exception &ex )
 				{
+					ExceptionInfo info = extractExceptionInfo(ex);
 					char buffer[1024];
-					SQLException &exception = (SQLException&)ex;
-					JString text = exception.getText();
-					sprintf( buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+					JString text = info.text;
+					sprintf( buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 					SQLPostInstallerError( ODBC_ERROR_CREATE_DSN_FAILED, buffer );
 				}
 			}
@@ -1170,10 +1170,10 @@ bool Setup::addDsn()
 				}
 				catch ( std::exception &ex )
 				{
+					ExceptionInfo info = extractExceptionInfo(ex);
 					char buffer[1024];
-					SQLException &exception = (SQLException&)ex;
-					JString text = exception.getText();
-					sprintf( buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+					JString text = info.text;
+					sprintf( buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 					SQLPostInstallerError( ODBC_ERROR_CREATE_DSN_FAILED, buffer );
 				}
 			}
@@ -1340,10 +1340,10 @@ bool Setup::removeDsn()
 				}
 				catch ( std::exception &ex )
 				{
+					ExceptionInfo info = extractExceptionInfo(ex);
 					char buffer[1024];
-					SQLException &exception = (SQLException&)ex;
-					JString text = exception.getText();
-					sprintf( buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+					JString text = info.text;
+					sprintf( buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 					SQLPostInstallerError( ODBC_ERROR_CREATE_DSN_FAILED, buffer );
 				}
 			}
@@ -1400,10 +1400,10 @@ bool Setup::removeDsn()
 				}
 				catch ( std::exception &ex )
 				{
+					ExceptionInfo info = extractExceptionInfo(ex);
 					char buffer[1024];
-					SQLException &exception = (SQLException&)ex;
-					JString text = exception.getText();
-					sprintf( buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+					JString text = info.text;
+					sprintf( buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 					SQLPostInstallerError( ODBC_ERROR_CREATE_DSN_FAILED, buffer );
 				}
 			}
@@ -1440,10 +1440,10 @@ bool Setup::removeDsn()
 				}
 				catch ( std::exception &ex )
 				{
+					ExceptionInfo info = extractExceptionInfo(ex);
 					char buffer[1024];
-					SQLException &exception = (SQLException&)ex;
-					JString text = exception.getText();
-					sprintf( buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );
+					JString text = info.text;
+					sprintf( buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );
 					SQLPostInstallerError( ODBC_ERROR_CREATE_DSN_FAILED, buffer );
 				}
 			}
diff --git a/OdbcJdbcSetup/UsersTabUsers.cpp b/OdbcJdbcSetup/UsersTabUsers.cpp
diff --git a/OdbcObject.cpp b/OdbcObject.cpp
diff --git a/OdbcObject.h b/OdbcObject.h
diff --git a/OdbcStatement.cpp b/OdbcStatement.cpp

Original file line number	Diff line number	Diff line change
`@@ -1028,8 +1028,7 @@ SQLRETURN OdbcConnection::sqlNativeSql( SQLCHAR * inStatementText, SQLINTEGER te`
`1028`	`1028`	`}`
`1029`	`1029`	`catch ( std::exception &ex )`
`1030`	`1030`	`{`
`1031`		`- SQLException &exception = (SQLException&)ex;`
`1032`		`- postError( "HY000", exception );`
	`1031`	`+ postError( "HY000", ex );`
`1033`	`1032`	`return SQL_ERROR;`
`1034`	`1033`	`}`
`1035`	`1034`
`@@ -1134,8 +1133,7 @@ SQLRETURN OdbcConnection::sqlDisconnect()`
`1134`	`1133`	`}`
`1135`	`1134`	`catch ( std::exception &ex )`
`1136`	`1135`	`{`
`1137`		`- SQLException &exception = (SQLException&)ex;`
`1138`		`- postError ("01002", exception);`
	`1136`	`+ postError ("01002", ex);`
`1139`	`1137`	`connection = NULL;`
`1140`	`1138`	`connected = false;`
`1141`	`1139`	`return SQL_SUCCESS_WITH_INFO;`
`@@ -1711,17 +1709,21 @@ SQLRETURN OdbcConnection::connect(const char sharedLibrary, const char databa`
`1711`	`1709`	`}`
`1712`	`1710`	`catch ( std::exception &ex )`
`1713`	`1711`	`{`
`1714`		`- SQLException &exception = (SQLException&)ex;`
	`1712`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
	`1713`	`+`
`1715`	`1714`	`if ( env->envShare )`
`1716`	`1715`	`env->envShare = NULL;`
`1717`	`1716`
`1718`	`1717`	`if ( properties )`
`1719`	`1718`	`properties->release();`
`1720`	`1719`
`1721`		`- connection->close();`
`1722`		`- connection = NULL;`
	`1720`	`+ if ( connection )`
	`1721`	`+ {`
	`1722`	`+ connection->close();`
	`1723`	`+ connection = NULL;`
	`1724`	`+ }`
`1723`	`1725`
`1724`		`- return sqlReturn( SQL_ERROR, "08004", exception.getText(), exception.getSqlcode() );`
	`1726`	`+ return sqlReturn( SQL_ERROR, "08004", info.text, info.sqlcode );`
`1725`	`1727`	`}`
`1726`	`1728`
`1727`	`1729`	`connected = true;`
`@@ -1748,8 +1750,7 @@ SQLRETURN OdbcConnection::sqlEndTran(int operation)`
`1748`	`1750`	`}`
`1749`	`1751`	`catch ( std::exception &ex )`
`1750`	`1752`	`{`
`1751`		`- SQLException &exception = (SQLException&)ex;`
`1752`		`- postError ("S1000", exception);`
	`1753`	`+ postError ("S1000", ex);`
`1753`	`1754`	`return SQL_ERROR;`
`1754`	`1755`	`}`
`1755`	`1756`
`@@ -1766,8 +1767,7 @@ SQLRETURN OdbcConnection::sqlExecuteCreateDatabase(const char * sqlString)`
`1766`	`1767`	`}`
`1767`	`1768`	`catch ( std::exception &ex )`
`1768`	`1769`	`{`
`1769`		`- SQLException &exception = (SQLException&)ex;`
`1770`		`- postError( "HY000", exception );`
	`1770`	`+ postError( "HY000", ex );`
`1771`	`1771`	`return SQL_ERROR;`
`1772`	`1772`	`}`
`1773`	`1773`
`@@ -2180,8 +2180,7 @@ void OdbcConnection::initUserEvents( PODBC_EVENTS_BLOCK_INFO infoEvents )`
`2180`	`2180`	`}`
`2181`	`2181`	`catch ( std::exception &ex )`
`2182`	`2182`	`{`
`2183`		`- SQLException &exception = (SQLException&)ex;`
`2184`		`- postError( "HY000", exception );`
	`2183`	`+ postError( "HY000", ex );`
`2185`	`2184`	`}`
`2186`	`2185`	`}`
`2187`	`2186`
`@@ -2201,8 +2200,7 @@ void OdbcConnection::updateResultEvents( char *updated )`
`2201`	`2200`	`}`
`2202`	`2201`	`catch ( std::exception &ex )`
`2203`	`2202`	`{`
`2204`		`- SQLException &exception = (SQLException&)ex;`
`2205`		`- postError( "HY000", exception );`
	`2203`	`+ postError( "HY000", ex );`
`2206`	`2204`	`}`
`2207`	`2205`	`}`
`2208`	`2206`
`@@ -2214,8 +2212,7 @@ void OdbcConnection::requeueEvents()`
`2214`	`2212`	`}`
`2215`	`2213`	`catch ( std::exception &ex )`
`2216`	`2214`	`{`
`2217`		`- SQLException &exception = (SQLException&)ex;`
`2218`		`- postError( "HY000", exception );`
	`2215`	`+ postError( "HY000", ex );`
`2219`	`2216`	`}`
`2220`	`2217`	`}`
`2221`	`2218`
Original file line number	Diff line number	Diff line change
`@@ -807,8 +807,7 @@ SQLRETURN OdbcDesc::sqlGetDescField(int recNumber, int fieldId, SQLPOINTER ptr,`
`807`	`807`	`}`
`808`	`808`	`catch ( std::exception &ex )`
`809`	`809`	`{`
`810`		`- SQLException &exception = (SQLException&)ex;`
`811`		`- postError ("HY000", exception);`
	`810`	`+ postError ("HY000", ex);`
`812`	`811`	`return SQL_ERROR;`
`813`	`812`	`}`
`814`	`813`
`@@ -1218,8 +1217,7 @@ SQLRETURN OdbcDesc::sqlGetDescRec( SQLSMALLINT recNumber,`
`1218`	`1217`	`}`
`1219`	`1218`	`catch ( std::exception &ex )`
`1220`	`1219`	`{`
`1221`		`- SQLException &exception = (SQLException&)ex;`
`1222`		`- postError ("HY000", exception);`
	`1220`	`+ postError ("HY000", ex);`
`1223`	`1221`	`return SQL_ERROR;`
`1224`	`1222`	`}`
`1225`	`1223`
`@@ -1266,8 +1264,7 @@ SQLRETURN OdbcDesc::sqlSetDescRec( SQLSMALLINT recNumber,`
`1266`	`1264`	`}`
`1267`	`1265`	`catch ( std::exception &ex )`
`1268`	`1266`	`{`
`1269`		`- SQLException &exception = (SQLException&)ex;`
`1270`		`- postError ("HY000", exception);`
	`1267`	`+ postError ("HY000", ex);`
`1271`	`1268`	`return SQL_ERROR;`
`1272`	`1269`	`}`
`1273`	`1270`
Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,7 @@ SQLRETURN OdbcEnv::sqlEndTran(int operation)`
`134`	`134`	`}`
`135`	`135`	`catch ( std::exception &ex )`
`136`	`136`	`{`
`137`		`- SQLException &exception = (SQLException&)ex;`
`138`		`- postError ("HY000", exception);`
	`137`	`+ postError ("HY000", ex);`
`139`	`138`	`return SQL_ERROR;`
`140`	`139`	`}`
`141`	`140`
`@@ -194,8 +193,7 @@ SQLRETURN OdbcEnv::sqlGetEnvAttr(int attribute, SQLPOINTER ptr, int bufferLength`
`194`	`193`	`}`
`195`	`194`	`catch ( std::exception &ex )`
`196`	`195`	`{`
`197`		`- SQLException &exception = (SQLException&)ex;`
`198`		`- postError ("HY000", exception);`
	`196`	`+ postError ("HY000", ex);`
`199`	`197`	`return SQL_ERROR;`
`200`	`198`	`}`
`201`	`199`
`@@ -224,8 +222,7 @@ SQLRETURN OdbcEnv::sqlSetEnvAttr(int attribute, SQLPOINTER value, int length)`
`224`	`222`	`}`
`225`	`223`	`catch ( std::exception &ex )`
`226`	`224`	`{`
`227`		`- SQLException &exception = (SQLException&)ex;`
`228`		`- postError ("HY000", exception);`
	`225`	`+ postError ("HY000", ex);`
`229`	`226`	`return SQL_ERROR;`
`230`	`227`	`}`
`231`	`228`
Original file line number	Diff line number	Diff line change
`@@ -791,9 +791,9 @@ void CDsnDialog::OnTestConnection( HWND hDlg )`
`791`	`791`	`}`
`792`	`792`	`catch ( std::exception &ex )`
`793`	`793`	`{`
`794`		`- SQLException &exception = (SQLException&)ex;`
	`794`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
`795`	`795`	`char buffer[2048];`
`796`		`- JString text = exception.getText();`
	`796`	`+ JString text = info.text;`
`797`	`797`
`798`	`798`	`sprintf( buffer, "%s\n%s", _TR( IDS_MESSAGE_02, "Connection failed!" ), (const char*)text );`
`799`	`799`	`removeNameFileDBfromMessage ( buffer );`
Original file line number	Diff line number	Diff line change
`@@ -86,8 +86,8 @@ bool CServiceClient::initServices( const char *sharedLibrary )`
`86`	`86`	`}`
`87`	`87`	`catch ( std::exception &ex )`
`88`	`88`	`{`
`89`		`- SQLException &exception = (SQLException&)ex;`
`90`		`- JString text = exception.getText();`
	`89`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
	`90`	`+ JString text = info.text;`
`91`	`91`
`92`	`92`	`if ( services )`
`93`	`93`	`{`
`@@ -145,8 +145,8 @@ bool CServiceClient::createDatabase()`
`145`	`145`	`}`
`146`	`146`	`catch ( std::exception &ex )`
`147`	`147`	`{`
`148`		`- SQLException &exception = (SQLException&)ex;`
`149`		`- JString text = exception.getText();`
	`148`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
	`149`	`+ JString text = info.text;`
`150`	`150`
`151`	`151`	`if ( connection )`
`152`	`152`	`connection->close();`
`@@ -189,8 +189,8 @@ bool CServiceClient::dropDatabase()`
`189`	`189`	`}`
`190`	`190`	`catch ( std::exception &ex )`
`191`	`191`	`{`
`192`		`- SQLException &exception = (SQLException&)ex;`
`193`		`- JString text = exception.getText();`
	`192`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
	`193`	`+ JString text = info.text;`
`194`	`194`
`195`	`195`	`if ( connection )`
`196`	`196`	`connection->close();`
Original file line number	Diff line number	Diff line change
`@@ -236,14 +236,14 @@ void CServiceTabBackup::onStartBackup()`
`236`	`236`	`}`
`237`	`237`	`catch ( std::exception &ex )`
`238`	`238`	`{`
	`239`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
`239`	`240`	`writeFooterToLogFile();`
`240`	`241`	`EnableWindow( GetDlgItem( hDlg, IDOK ), TRUE );`
`241`	`242`	`EnableWindow( GetDlgItem( hDlg, IDC_BUTTON_VIEW_LOG ), !logPathFile.IsEmpty() );`
`242`	`243`
`243`	`244`	`char buffer[1024];`
`244`		`- SQLException &exception = (SQLException&)ex;`
`245`		`- JString text = exception.getText();`
`246`		`- sprintf(buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );`
	`245`	`+ JString text = info.text;`
	`246`	`+ sprintf(buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );`
`247`	`247`	`MessageBox( NULL, buffer, TEXT( "Error!" ), MB_ICONERROR \| MB_OK );`
`248`	`248`	`}`
`249`	`249`
Original file line number	Diff line number	Diff line change
`@@ -303,14 +303,14 @@ void CServiceTabRepair::startRepairDatabase()`
`303`	`303`	`}`
`304`	`304`	`catch ( std::exception &ex )`
`305`	`305`	`{`
	`306`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
`306`	`307`	`writeFooterToLogFile();`
`307`	`308`	`EnableWindow( GetDlgItem( hDlg, IDOK ), TRUE );`
`308`	`309`	`EnableWindow( GetDlgItem( hDlg, IDC_BUTTON_VIEW_LOG ), !logPathFile.IsEmpty() );`
`309`	`310`
`310`	`311`	`char buffer[1024];`
`311`		`- SQLException &exception = (SQLException&)ex;`
`312`		`- JString text = exception.getText();`
`313`		`- sprintf(buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );`
	`312`	`+ JString text = info.text;`
	`313`	`+ sprintf(buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );`
`314`	`314`	`MessageBox( NULL, buffer, TEXT( "Error!" ), MB_ICONERROR \| MB_OK );`
`315`	`315`	`}`
`316`	`316`
Original file line number	Diff line number	Diff line change
`@@ -265,14 +265,14 @@ void CServiceTabRestore::onStartRestore()`
`265`	`265`	`}`
`266`	`266`	`catch ( std::exception &ex )`
`267`	`267`	`{`
	`268`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
`268`	`269`	`writeFooterToLogFile();`
`269`	`270`	`EnableWindow( GetDlgItem( hDlg, IDOK ), TRUE );`
`270`	`271`	`EnableWindow( GetDlgItem( hDlg, IDC_BUTTON_VIEW_LOG ), !logPathFile.IsEmpty() );`
`271`	`272`
`272`	`273`	`char buffer[1024];`
`273`		`- SQLException &exception = (SQLException&)ex;`
`274`		`- JString text = exception.getText();`
`275`		`- sprintf(buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );`
	`274`	`+ JString text = info.text;`
	`275`	`+ sprintf(buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );`
`276`	`276`	`MessageBox( NULL, buffer, TEXT( "Error!" ), MB_ICONERROR \| MB_OK );`
`277`	`277`	`}`
`278`	`278`
Original file line number	Diff line number	Diff line change
`@@ -221,14 +221,14 @@ void CServiceTabStatistics::onStartStatistics()`
`221`	`221`	`}`
`222`	`222`	`catch ( std::exception &ex )`
`223`	`223`	`{`
	`224`	`+ ExceptionInfo info = extractExceptionInfo(ex);`
`224`	`225`	`writeFooterToLogFile();`
`225`	`226`	`EnableWindow( GetDlgItem( hDlg, IDOK ), TRUE );`
`226`	`227`	`EnableWindow( GetDlgItem( hDlg, IDC_BUTTON_VIEW_LOG ), !logPathFile.IsEmpty() );`
`227`	`228`
`228`	`229`	`char buffer[1024];`
`229`		`- SQLException &exception = (SQLException&)ex;`
`230`		`- JString text = exception.getText();`
`231`		`- sprintf(buffer, "sqlcode %d, fbcode %d - %s", exception.getSqlcode(), exception.getFbcode(), (const char*)text );`
	`230`	`+ JString text = info.text;`
	`231`	`+ sprintf(buffer, "sqlcode %d, fbcode %d - %s", info.sqlcode, info.fbcode, (const char*)text );`
`232`	`232`	`MessageBox( NULL, buffer, TEXT( "Error!" ), MB_ICONERROR \| MB_OK );`
`233`	`233`	`}`
`234`	`234`