[PATCH v2 0/1] MR6102: odbc32: Handle NULL attribute in SQLColAttributeW.

[Daniel Lehman (＠dlehman25)]

--
  v2: odbc32: Handle NULL attribute in SQLColAttribute[W].

https://gitlab.winehq.org/wine/wine/-/merge_requests/6102

[PATCH v2 1/1] odbc32: Handle NULL attribute in SQLColAttribute[W].

[Daniel Lehman]

From: Daniel Lehman

---
 dlls/odbc32/proxyodbc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 46f96651b1d..ac0ecd6134c 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -669,7 +669,7 @@ static SQLRETURN col_attribute_unix_a( struct handle *handle, SQLUSMALLINT col,
     SQLRETURN ret;
     INT64 attr;
     struct SQLColAttribute_params params = { handle->unix_handle, col, field_id, char_attr, buflen, retlen, &attr };
-    if (SUCCESS((ret = ODBC_CALL( SQLColAttribute, &params )))) *num_attr = attr;
+    if (SUCCESS((ret = ODBC_CALL( SQLColAttribute, &params ))) && num_attr) *num_attr = attr;
     return ret;
 }

@@ -3928,7 +3928,7 @@ static SQLRETURN col_attribute_unix_w( struct handle *handle, SQLUSMALLINT col,
     INT64 attr;
     struct SQLColAttributeW_params params = { handle->unix_handle, col, field_id, char_attr, buflen, retlen, &attr };

-    if (SUCCESS((ret = ODBC_CALL( SQLColAttributeW, &params )))) *num_attr = attr;
+    if (SUCCESS((ret = ODBC_CALL( SQLColAttributeW, &params ))) && num_attr) *num_attr = attr;

if (ret == SQL_SUCCESS && SQLColAttributes_KnownStringAttribute(field_id) && char_attr &&
         retlen && *retlen != wcslen( char_attr ) * sizeof(WCHAR))

[PATCH v2 1/1] odbc32: Handle NULL attribute in SQLColAttribute[W].

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=147170

Your paranoid android.

=== debian11b (64 bit WoW report) ===

Report validation errors:
dxgi:dxgi has unaccounted for todo messages
dxgi:dxgi has unaccounted for skip messages
The report seems to have been truncated

[PATCH v2 0/1] MR6102: odbc32: Handle NULL attribute in SQLColAttributeW. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.