[PATCH 0/1] MR10711: odbc32: Add missing object unlock on return in SQLSetEnvAttr().

[Nikolay Sivov (＠nsivov)]

Signed-off-by: Nikolay Sivov <[e-mail]>

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

[PATCH 1/1] odbc32: Add missing object unlock on return in SQLSetEnvAttr().

[Nikolay Sivov]

From: Nikolay Sivov <[e-mail]>

Signed-off-by: Nikolay Sivov <[e-mail]>
---
 dlls/odbc32/proxyodbc.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 15d69035d37..9f1d3f1377f 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -4178,15 +4178,21 @@ SQLRETURN WINAPI SQLSetEnvAttr(SQLHENV EnvironmentHandle, SQLINTEGER Attribute,
         return SQL_SUCCESS;
     }
 
+    if (!env)
+        return SQL_INVALID_HANDLE;
+
     switch (Attribute)
     {
     case SQL_ATTR_ODBC_VERSION:
         if (!list_empty( &env->hdr.children ))
         {
             FIXME( "report S1010 error\n" );
-            return SQL_ERROR;
+            ret = SQL_ERROR;
+        }
+        else
+        {
+            env->attr_version = (UINT32)(ULONG_PTR)Value;
         }
-        env->attr_version = (UINT32)(ULONG_PTR)Value;
         break;
 
     case SQL_ATTR_CONNECTION_POOLING:
-- 
GitLab

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

[PATCH 0/1] MR10711: odbc32: Add missing object unlock on return in SQLSetEnvAttr(). - approved

[Piotr Caban (＠piotr)]

This merge request was approved by Piotr Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10711

[PATCH 0/1] MR10711: odbc32: Add missing object unlock on return in SQLSetEnvAttr(). - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10711