[PATCH 1/4] opcservices: Improve error handling (Coverity)

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/opcservices/package.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c
index 5534fe6783..06bbb3d37c 100644
--- a/dlls/opcservices/package.c
+++ b/dlls/opcservices/package.c
@@ -1723,7 +1723,8 @@ static HRESULT opc_package_collect_content_types(IOpcPackage *package, struct co
         if (FAILED(hr))
             break;
 
-        IOpcPartEnumerator_MoveNext(enumerator, &has_next);
+        if (FAILED(hr = IOpcPartEnumerator_MoveNext(enumerator, &has_next)))
+            break;
     }
 
     IOpcPartEnumerator_Release(enumerator);
-- 
2.19.0

[PATCH 2/4] opcservices: Add missing error check (Coverity)

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/opcservices/package.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c
index 06bbb3d37c..5f4f955253 100644
--- a/dlls/opcservices/package.c
+++ b/dlls/opcservices/package.c
@@ -1941,7 +1941,8 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations
     if (SUCCEEDED(hr))
         hr = IXmlWriter_Flush(writer);
 
-    hr = IOpcUri_GetRelationshipsPartUri(uri, &rels_uri);
+    if (SUCCEEDED(hr))
+        hr = IOpcUri_GetRelationshipsPartUri(uri, &rels_uri);
     if (SUCCEEDED(hr))
         hr = IOpcPartUri_GetRawUri(rels_uri, &rels_part_uri);
     if (SUCCEEDED(hr))
-- 
2.19.0

[PATCH 3/4] opcservices: Fix potential uninitialized memory access (Coverity)

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/opcservices/package.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/opcservices/package.c b/dlls/opcservices/package.c
index 5f4f955253..9bdd4b1f15 100644
--- a/dlls/opcservices/package.c
+++ b/dlls/opcservices/package.c
@@ -1891,8 +1891,8 @@ static HRESULT opc_package_write_rels(struct zip_archive *archive, IOpcRelations
             'p','a','c','k','a','g','e','/','2','0','0','6','/','r','e','l','a','t','i','o','n','s','h','i','p','s',0};
     static const WCHAR relationshipsW[] = {'R','e','l','a','t','i','o','n','s','h','i','p','s',0};
     IOpcRelationshipEnumerator *enumerator;
+    BSTR rels_part_uri = NULL;
     IOpcPartUri *rels_uri;
-    BSTR rels_part_uri;
     IStream *content;
     BOOL has_next;
     HRESULT hr;
-- 
2.19.0

[PATCH 4/4] opcservices/tests: Add missing return value test (Coverity)

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
---
 dlls/opcservices/tests/opcservices.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/opcservices/tests/opcservices.c b/dlls/opcservices/tests/opcservices.c
index 6bb0c54c62..9792302f7e 100644
--- a/dlls/opcservices/tests/opcservices.c
+++ b/dlls/opcservices/tests/opcservices.c
@@ -1115,6 +1115,7 @@ static void test_combine_uri(void)
             hr = IOpcFactory_CreatePackageRootUri(factory, &uri);
         else
             hr = IOpcFactory_CreatePartUri(factory, uriW, (IOpcPartUri **)&uri);
+        ok(SUCCEEDED(hr), "%u: failed to create uri, hr %#x.\n", i, hr);
 
         hr = CreateUri(relativeW, Uri_CREATE_ALLOW_RELATIVE, 0, &relative_uri);
         ok(SUCCEEDED(hr), "%u: failed to create relative uri, hr %#x.\n", i, hr);
-- 
2.19.0