[PATCH] ole32: Remove redundant NULL check before CoTaskMemFree()

[Michael Stefaniuc]

Signed-off-by: Michael Stefaniuc 
---
 dlls/ole32/oleobj.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c
index 44e15e551f..13a873655f 100644
--- a/dlls/ole32/oleobj.c
+++ b/dlls/ole32/oleobj.c
@@ -41,11 +41,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);

static void release_statdata(STATDATA *data)
 {
-    if(data->formatetc.ptd)
-    {
-        CoTaskMemFree(data->formatetc.ptd);
-        data->formatetc.ptd = NULL;
-    }
+    CoTaskMemFree(data->formatetc.ptd);
+    data->formatetc.ptd = NULL;

if(data->pAdvSink)
     {

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=46898

Your paranoid android.

=== debian9 (32 bit report) ===

ole32:
clipboard.c:1049: Test failed: OleIsCurrentClipboard returned 0
clipboard.c:1117: Test failed: 1 WM_DRAWCLIPBOARD received

=== debian9 (32 bit Chinese:China report) ===

ole32:
clipboard.c:1049: Test failed: OleIsCurrentClipboard returned 0
clipboard.c:1117: Test failed: 1 WM_DRAWCLIPBOARD received

[Michael Stefaniuc]

On 1/29/19 8:45 PM, Marvin wrote:
> Hi,
>
> While running your changed tests on Windows, I think I found new failures.
> Being a bot and all I'm not very good at pattern recognition, so I might be
> wrong, but could you please double-check?
>
> Full results can be found at:
> https://testbot.winehq.org/JobDetails.pl?Key=46898
>
> Your paranoid android.
>
> === debian9 (32 bit report) ===
>
> ole32:
> clipboard.c:1049: Test failed: OleIsCurrentClipboard returned 0
> clipboard.c:1117: Test failed: 1 WM_DRAWCLIPBOARD received
>
> === debian9 (32 bit Chinese:China report) ===
>
> ole32:
> clipboard.c:1049: Test failed: OleIsCurrentClipboard returned 0
> clipboard.c:1117: Test failed: 1 WM_DRAWCLIPBOARD received

Flaky tests
https://test.winehq.org/data/ca29ac4650f7f9a96cfaa75a7919ef007306cbbb/index_...
I saw it too but a rerun passed just fine.

bye
    michael

[Huw Davies]

Signed-off-by: Huw Davies