fixed crash in wxDb::Open() in Unicode build due to wrong interpretation of BufferLen...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40160 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/changes.txt b/docs/changes.txt
index 33f4128f38befa671d5218ca5143d270e87bdae5..13f25fa595be44a69648ac55ac38ea911800fe73 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -85,6 +85,7 @@ All:
 - Added wxPowerEvent (currently MSW-only).
 - Make wx-config compatible with Bourne shells.
 - Fixed wxDb::Open(wxDbConnectInf) when using connection string (Hellwolf Misty)
+- Fixed crash in wxDb::Open() in Unicode build (Massimiliano Marretta)
 
 All (GUI):
 

diff --git a/src/common/db.cpp b/src/common/db.cpp
index d7843f4f39667bb3088d6d7377d0dbfcbcf6ea9e..a43f461158e5473c0f0c64c5dc2ff55548314883 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -858,7 +858,7 @@ bool wxDb::Open(const wxString& inConnectStr, SQLHWND parentWnd, bool failOnData
 
     retcode = SQLDriverConnect(hdbc, parentWnd, (SQLTCHAR FAR *)inConnectionStr.c_str(),
                         (SWORD)inConnectionStr.length(), (SQLTCHAR FAR *)outConnectBuffer,
-                        sizeof(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE );
+                        WXSIZEOF(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE );
 
     if ((retcode != SQL_SUCCESS) &&
         (retcode != SQL_SUCCESS_WITH_INFO))
@@ -963,7 +963,7 @@ bool wxDb::Open(wxDb *copyDb)
 
         retcode = SQLDriverConnect(hdbc, NULL, (SQLTCHAR FAR *)inConnectionStr.c_str(),
                             (SWORD)inConnectionStr.length(), (SQLTCHAR FAR *)outConnectBuffer,
-                            sizeof(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE);
+                            WXSIZEOF(outConnectBuffer), &outConnectBufferLen, SQL_DRIVER_COMPLETE);
 
         if ((retcode != SQL_SUCCESS) &&
             (retcode != SQL_SUCCESS_WITH_INFO))