Skip to content

Commit cdde496

Browse files
authored
Merge pull request #1277 from pbalcer/l0-coverity-fixes
[L0] fix coverity issues
2 parents 9b97a5f + 05c3b0d commit cdde496

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

source/adapters/level_zero/kernel.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
//===----------------------------------------------------------------------===//
1010

1111
#include "kernel.hpp"
12+
#include "ur_api.h"
1213
#include "ur_level_zero.hpp"
1314

1415
UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
@@ -48,6 +49,10 @@ UR_APIEXPORT ur_result_t UR_APICALL urEnqueueKernelLaunch(
4849
ZeKernel = Kernel->ZeKernel;
4950
} else {
5051
auto It = Kernel->ZeKernelMap.find(ZeDevice);
52+
if (It == Kernel->ZeKernelMap.end()) {
53+
/* kernel and queue don't match */
54+
return UR_RESULT_ERROR_INVALID_QUEUE;
55+
}
5156
ZeKernel = It->second;
5257
}
5358
// Lock automatically releases when this goes out of scope.

source/adapters/level_zero/kernel.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
struct ur_kernel_handle_t_ : _ur_object {
1717
ur_kernel_handle_t_(bool OwnZeHandle, ur_program_handle_t Program)
18-
: Program{Program}, SubmissionsCount{0}, MemAllocs{} {
18+
: Context{nullptr}, Program{Program}, SubmissionsCount{0}, MemAllocs{} {
1919
OwnNativeHandle = OwnZeHandle;
2020
}
2121

source/adapters/level_zero/program.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -462,8 +462,8 @@ UR_APIEXPORT ur_result_t UR_APICALL urProgramLinkExp(
462462
new ur_program_handle_t_(State, hContext, ZeModuleMap.begin()->second,
463463
ZeBuildLogMap.begin()->second);
464464
*phProgram = reinterpret_cast<ur_program_handle_t>(UrProgram);
465-
(*phProgram)->ZeModuleMap = ZeModuleMap;
466-
(*phProgram)->ZeBuildLogMap = ZeBuildLogMap;
465+
(*phProgram)->ZeModuleMap = std::move(ZeModuleMap);
466+
(*phProgram)->ZeBuildLogMap = std::move(ZeBuildLogMap);
467467
} catch (const std::bad_alloc &) {
468468
return UR_RESULT_ERROR_OUT_OF_HOST_MEMORY;
469469
} catch (...) {

0 commit comments

Comments
 (0)