[PATCH 2/4] msi: Do not attempt to copy a not string property in MsiSummaryInfoGetProperty.

Dmitry Timoshkov dmitry at baikal.ru
Wed Sep 19 00:27:57 CDT 2018


This patch fixes the crashes when running the tests under Wine.
Currently the crashes are hidden by a custom action exception handler.

Signed-off-by: Dmitry Timoshkov <dmitry at baikal.ru>
---
 dlls/msi/suminfo.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/msi/suminfo.c b/dlls/msi/suminfo.c
index af3458a0a8..98f6330d9f 100644
--- a/dlls/msi/suminfo.c
+++ b/dlls/msi/suminfo.c
@@ -758,8 +758,10 @@ UINT WINAPI MsiSummaryInfoGetPropertyA(
         }
         __ENDTRY
 
-        if (!r)
+        if (!r && buf)
+        {
             r = msi_strncpyWtoA( buf, -1, szValueBuf, pcchValueBuf, TRUE );
+        }
 
         midl_user_free( buf );
         return r;
@@ -808,7 +810,7 @@ UINT WINAPI MsiSummaryInfoGetPropertyW(
         }
         __ENDTRY
 
-        if (!r)
+        if (!r && buf)
             r = msi_strncpyW( buf, -1, szValueBuf, pcchValueBuf );
 
         midl_user_free( buf );
-- 
2.17.1




More information about the wine-devel mailing list