Nikolay Sivov : ntdll/actctx: Accept empty assembly elements.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a81535d8c995d7c29a084f669842d667ea549c25
URL:    https://gitlab.winehq.org/wine/wine/-/commit/a81535d8c995d7c29a084f669842d66...

Author: Nikolay Sivov 
Date:   Wed Sep 13 14:27:28 2023 +0200

ntdll/actctx: Accept empty assembly elements.

Signed-off-by: Nikolay Sivov

---

dlls/kernel32/tests/actctx.c | 1 -
 dlls/ntdll/actctx.c          | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/actctx.c b/dlls/kernel32/tests/actctx.c
index 770c3751a1c..d468777ac2f 100644
--- a/dlls/kernel32/tests/actctx.c
+++ b/dlls/kernel32/tests/actctx.c
@@ -2521,7 +2521,6 @@ static void test_actctx(void)
     /* Empty <assembly/> element. */
     create_manifest_file("empty_assembly.manifest", empty_assembly_manifest, -1, NULL, NULL);
     handle = test_create("empty_assembly.manifest");
-    todo_wine
     ok(handle != INVALID_HANDLE_VALUE, "Failed to create activation context.\n");
     DeleteFileA("empty_assembly.manifest");
     if (handle != INVALID_HANDLE_VALUE)
diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c
index 853ac34d12e..9f2c1d54720 100644
--- a/dlls/ntdll/actctx.c
+++ b/dlls/ntdll/actctx.c
@@ -2708,12 +2708,15 @@ static void parse_assembly_elem( xmlbuf_t *xmlbuf, struct assembly* assembly,
         }
     }

-    if (end || !version)
+    if (!version)
     {
         set_error( xmlbuf );
         return;
     }

+    if (end)
+        return;
+
     while (next_xml_elem(xmlbuf, &elem, parent))
     {
         if (assembly->type == APPLICATION_MANIFEST && xml_elem_cmp(&elem, L"noInherit", asmv1W))