[PATCH 0/2] MR4382: quartz/winegstreamer: Remove redundant NULL checks

[PATCH 1/2] winegstreamer: Remove redundant NULL check before free().

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/winegstreamer/wg_parser.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c
index 5a526b15712..247810b7796 100644
--- a/dlls/winegstreamer/wg_parser.c
+++ b/dlls/winegstreamer/wg_parser.c
@@ -1747,11 +1747,8 @@ static NTSTATUS wg_parser_disconnect(void *args)

for (i = 0; i < ARRAY_SIZE(parser->input_cache_chunks); i++)
     {
-        if (parser->input_cache_chunks[i].data)
-        {
-            free(parser->input_cache_chunks[i].data);
-            parser->input_cache_chunks[i].data = NULL;
-        }
+        free(parser->input_cache_chunks[i].data);
+        parser->input_cache_chunks[i].data = NULL;
     }

return S_OK;

[PATCH 2/2] quartz: Remove redudant NULL checks before CoTaskMemFree().

[Michael Stefaniuc]

From: Michael Stefaniuc

---
 dlls/quartz/tests/mpegsplit.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c
index f002d0228e2..73d021b6297 100644
--- a/dlls/quartz/tests/mpegsplit.c
+++ b/dlls/quartz/tests/mpegsplit.c
@@ -2004,9 +2004,7 @@ static void test_streamselect(IAMStreamSelect *sel)
     todo_wine ok(name && !wcscmp(name, L"Stream(E0)"), "Got name %ls.\n", name ? name : L"(null)");
     todo_wine ok(object == unk_video, "Got object %p, expected %p.\n", object, unk_video);
     ok(unk == NULL, "Got unknown %p.\n", unk);
-
-    if (name)
-        CoTaskMemFree(name);
+    CoTaskMemFree(name);
     if (mt)
         DeleteMediaType(mt);
     if (object)
@@ -2023,9 +2021,7 @@ static void test_streamselect(IAMStreamSelect *sel)
     todo_wine ok(name && !wcscmp(name, L"Stream(C0)"), "Got name %ls.\n", name ? name : L"(null)");
     todo_wine ok(object == unk_audio, "Got object %p, expected %p.\n", object, unk_audio);
     ok(unk == NULL, "Got unknown %p.\n", unk);
-
-    if (name)
-        CoTaskMemFree(name);
+    CoTaskMemFree(name);
     if (mt)
         DeleteMediaType(mt);
     if (object)

[PATCH 0/2] MR4382: quartz/winegstreamer: Remove redundant NULL checks - approved

[Zebediah Figura (＠zfigura)]

This merge request was approved by Zebediah Figura.