Skip to content

Commit 9773a79

Browse files
authored
Merge pull request #730 from kbenzie/benie/fix-coverity-18-07-2023
Fix coverity issues from 18/07/2023
2 parents e002ca8 + 38141b3 commit 9773a79

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

source/loader/layers/validation/ur_validation_layer.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ namespace ur_validation_layer {
2020
///////////////////////////////////////////////////////////////////////////////
2121
class __urdlllocal context_t : public proxy_layer_context_t {
2222
public:
23-
bool enableParameterValidation;
24-
bool enableLeakChecking;
23+
bool enableParameterValidation = false;
24+
bool enableLeakChecking = false;
2525
logger::Logger logger;
2626

2727
ur_dditable_t urDdiTable = {};

test/layers/validation/fixtures.hpp

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,24 @@
1212
struct urTest : ::testing::Test {
1313

1414
void SetUp() override {
15-
ur_loader_config_handle_t config;
16-
ASSERT_EQ(urLoaderConfigCreate(&config), UR_RESULT_SUCCESS);
17-
ASSERT_EQ(urLoaderConfigEnableLayer(config, "UR_LAYER_FULL_VALIDATION"),
15+
ASSERT_EQ(urLoaderConfigCreate(&loader_config), UR_RESULT_SUCCESS);
16+
ASSERT_EQ(urLoaderConfigEnableLayer(loader_config,
17+
"UR_LAYER_FULL_VALIDATION"),
1818
UR_RESULT_SUCCESS);
19-
2019
ur_device_init_flags_t device_flags = 0;
21-
ASSERT_EQ(urInit(device_flags, config), UR_RESULT_SUCCESS);
22-
ASSERT_EQ(urLoaderConfigRelease(config), UR_RESULT_SUCCESS);
20+
ASSERT_EQ(urInit(device_flags, loader_config), UR_RESULT_SUCCESS);
21+
ASSERT_EQ(urLoaderConfigRelease(loader_config), UR_RESULT_SUCCESS);
2322
}
2423

2524
void TearDown() override {
25+
if (loader_config) {
26+
ASSERT_EQ(urLoaderConfigRelease(loader_config), UR_RESULT_SUCCESS);
27+
}
2628
ur_tear_down_params_t tear_down_params{};
2729
ASSERT_EQ(urTearDown(&tear_down_params), UR_RESULT_SUCCESS);
2830
}
31+
32+
ur_loader_config_handle_t loader_config = nullptr;
2933
};
3034

3135
struct valPlatformsTest : urTest {

test/loader/loader_config/urLoaderConfigCreate.cpp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,18 @@
55

66
#include "fixtures.hpp"
77

8-
struct LoaderConfigCreateTest : ::testing::Test {};
8+
struct LoaderConfigCreateTest : ::testing::Test {
9+
void TearDown() override {
10+
if (loaderConfig) {
11+
ASSERT_SUCCESS(urLoaderConfigRelease(loaderConfig));
12+
}
13+
}
914

10-
TEST_F(LoaderConfigCreateTest, Success) {
1115
ur_loader_config_handle_t loaderConfig = nullptr;
16+
};
17+
18+
TEST_F(LoaderConfigCreateTest, Success) {
1219
ASSERT_SUCCESS(urLoaderConfigCreate(&loaderConfig));
13-
ASSERT_SUCCESS(urLoaderConfigRelease(loaderConfig));
1420
}
1521

1622
TEST_F(LoaderConfigCreateTest, InvalidNullPointerLoaderConfig) {

0 commit comments

Comments
 (0)