Merge pull request #6510 from montegoulding/bugfix-21051

livecodepanos · web-flow · commit dc7766889acc · 2018-05-22T16:52:02.000+01:00
[[ Bug 21051 ]] Handle wchar_t size differences for ODBC
diff --git a/docs/notes/bugfix-21051.md b/docs/notes/bugfix-21051.md
@@ -0,0 +1 @@
+# Ensure revDataFromQuery on an ODBC database does not return incomplete unicode strings
diff --git a/revdb/src/dbodbc.h b/revdb/src/dbodbc.h
@@ -98,7 +98,7 @@ class DBConnection_ODBC: public CDBConnection
 	int getConnectionType(void) { return -1; }
 protected:
 	void SetError(SQLHSTMT tcursor);
-	Bool BindVariables(SQLHSTMT tcursor, DBString *args, int numargs, int *paramsizes, PlaceholderMap *p_placeholder_map);
+	Bool BindVariables(SQLHSTMT tcursor, DBString *args, int numargs, SQLLEN *paramsizes, PlaceholderMap *p_placeholder_map);
 	bool ExecuteQuery(char *p_query, DBString *p_arguments, int p_argument_count, SQLHSTMT &p_statement, SQLRETURN &p_result);
 	bool handleDataAtExecutionParameters(SQLHSTMT p_statement);
 	bool useDataAtExecution(void);
diff --git a/revdb/src/odbc_connection.cpp b/revdb/src/odbc_connection.cpp
@@ -399,8 +399,7 @@ bool DBConnection_ODBC::ExecuteQuery(char *p_query, DBString *p_arguments, int p
 #endif
 		if (t_result == SQL_SUCCESS || t_result == SQL_SUCCESS_WITH_INFO)
 		{
-			int *t_argument_sizes = NULL;
-			t_argument_sizes = new (nothrow) int[t_placeholder_map . length];
+			SQLLEN *t_argument_sizes = new (nothrow) SQLLEN[t_placeholder_map . length];
 			if (BindVariables(t_statement, p_arguments, p_argument_count, t_argument_sizes, &t_placeholder_map))
 			{
 				t_result = SQLExecute(t_statement);
@@ -528,7 +527,7 @@ char *DBConnection_ODBC::getErrorMessage(Bool p_last)
 
 
 /*BindVariables-parses querystring and binds variables*/
-Bool DBConnection_ODBC::BindVariables(SQLHSTMT p_cursor, DBString *p_arguments, int p_argument_count, int *p_argument_sizes, PlaceholderMap *p_placeholder_map)
+Bool DBConnection_ODBC::BindVariables(SQLHSTMT p_cursor, DBString *p_arguments, int p_argument_count, SQLLEN *p_argument_sizes, PlaceholderMap *p_placeholder_map)
 {
 	if (p_argument_count == 0)
 		return True;
@@ -564,15 +563,14 @@ Bool DBConnection_ODBC::BindVariables(SQLHSTMT p_cursor, DBString *p_arguments,
 
 			// MW-2008-07-30: [[ Bug 6415 ]] Inserting data into SQL Server doesn't work.
 			//   This is because the bind parameter call was only being issued for binary columns!
-			SQLLEN t_argument_size;
-			t_result = SQLBindParameter(p_cursor, i + 1, SQL_PARAM_INPUT,
+            
+            SQLLEN * t_argument_size = &p_argument_sizes[i];
+            t_result = SQLBindParameter(p_cursor, i + 1, SQL_PARAM_INPUT,
 				t_value -> isbinary ? SQL_C_BINARY : SQL_C_CHAR, t_data_type,
-				t_value -> length, 0, (void *)t_value -> sptr, t_value -> length, &t_argument_size);
+				t_value -> length, 0, (void *)t_value -> sptr, t_value -> length, t_argument_size);
 
 			if (!(t_result == SQL_SUCCESS || t_result == SQL_SUCCESS_WITH_INFO))
 				return False;
-
-			p_argument_sizes[i] = t_argument_size;
 		}
 		else
 		{
diff --git a/revdb/src/odbc_cursor.cpp b/revdb/src/odbc_cursor.cpp
@@ -36,6 +36,7 @@ last - move to last row of resultset
 */
 
 #include <stdio.h>
+#include <stdint.h>
 #include "dbodbc.h"
 
 char DBCursor_ODBC::errmsg[512];
@@ -542,6 +543,37 @@ Bool DBCursor_ODBC::getRowData()
 					ofield->dataSize = offset;
 				}
 			}
+            
+            if (ofield -> fieldType == FT_WSTRING && sizeof(SQLWCHAR) != sizeof(uint16_t))
+            {
+                uint16_t * t_buffer = static_cast<uint16_t *>(malloc(ofield -> dataSize));
+            
+                size_t t_in_offset;
+                size_t t_out_offset = 0;
+                for (t_in_offset = 0; t_in_offset < size_t(ofield -> dataSize); t_in_offset += sizeof(uint32_t))
+                {
+                    uint32_t t_codepoint = *(uint32_t*)&ofield -> data[t_in_offset];
+                    if (t_codepoint < 0x10000)
+                    {
+                        t_buffer[t_out_offset] = uint16_t(t_codepoint);
+                        t_out_offset += 1;
+                    }
+                    else
+                    {
+                        uint16_t t_lead, t_trail;
+                        t_lead =  uint16_t((t_codepoint - 0x10000) >> 10) + 0xD800;
+                        t_trail = uint16_t((t_codepoint - 0x10000) & 0x3FF) + 0xDC00;
+                        t_buffer[t_out_offset] = t_lead;
+                        t_buffer[t_out_offset + 1] = t_trail;
+                        t_out_offset += 2;
+                    }
+                }
+                
+                memcpy(ofield->data, t_buffer, t_out_offset * sizeof(uint16_t));
+                free(t_buffer);
+                
+                ofield -> dataSize = t_out_offset * sizeof(uint16_t);
+            }
 		}
 	}
 	return True;

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Ensure revDataFromQuery on an ODBC database does not return incomplete unicode strings`