[PATCH 0/1] MR5695: odbc32: Allow null handle for SQLSetEnvAttr.

[Daniel Lehman (＠dlehman25)]

can be null for SQL_ATTR_CONNECTION_POOLING

[PATCH 1/1] odbc32: Allow null handle for SQLSetEnvAttr.

[Daniel Lehman]

From: Daniel Lehman

can be null for SQL_ATTR_CONNECTION_POOLING
---
 dlls/odbc32/proxyodbc.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index c1c43ab8641..d5c271bdfa2 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -1273,9 +1273,7 @@ SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute,
     TRACE("(EnvironmentHandle %p, Attribute %d, Value %p, StringLength %d)\n", EnvironmentHandle, Attribute, Value,
           StringLength);

-    if (!handle) return SQL_INVALID_HANDLE;
-
-    params.EnvironmentHandle = handle->unix_handle;
+    params.EnvironmentHandle = handle ? handle->unix_handle : 0;
     ret = ODBC_CALL( SQLSetEnvAttr, &params );
     TRACE("Returning %d\n", ret);
     return ret;

[PATCH 0/1] MR5695: odbc32: Allow null handle for SQLSetEnvAttr. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.