Addressed klocwork_dpctl_issues

Author: oleksandr-pavlyk

dpctl-capi/source/dpctl_sycl_context_interface.cpp

@@ -141,10 +141,12 @@ DPCTLContext_GetDevices(__dpctl_keep const DPCTLSyclContextRef CRef)
         }
         return wrap(DevicesVectorPtr);
     } catch (std::bad_alloc const &ba) {
+        delete DevicesVectorPtr;
         // \todo log error
         std::cerr << ba.what() << '\n';
         return nullptr;
     } catch (const runtime_error &re) {
+        delete DevicesVectorPtr;
         // \todo log error
         std::cerr << re.what() << '\n';
         return nullptr;

dpctl-capi/source/dpctl_sycl_device_interface.cpp

@@ -587,13 +587,18 @@ DPCTLDevice_CreateSubDevicesEqually(__dpctl_keep const DPCTLSyclDeviceRef DRef,
                 Devices->emplace_back(wrap(new device(sd)));
             }
         } catch (std::bad_alloc const &ba) {
+            delete Devices;
             std::cerr << ba.what() << '\n';
             return nullptr;
         } catch (feature_not_supported const &fnse) {
+            delete Devices;
             std::cerr << fnse.what() << '\n';
+            return nullptr;
         } catch (runtime_error const &re) {
+            delete Devices;
             // \todo log error
             std::cerr << re.what() << '\n';
+            return nullptr;
         }
     }
     return wrap(Devices);
@@ -617,13 +622,18 @@ DPCTLDevice_CreateSubDevicesByCounts(__dpctl_keep const DPCTLSyclDeviceRef DRef,
                 Devices->emplace_back(wrap(new device(sd)));
             }
         } catch (std::bad_alloc const &ba) {
+            delete Devices;
             std::cerr << ba.what() << '\n';
             return nullptr;
         } catch (feature_not_supported const &fnse) {
+            delete Devices;
             std::cerr << fnse.what() << '\n';
+            return nullptr;
         } catch (runtime_error const &re) {
+            delete Devices;
             // \todo log error
             std::cerr << re.what() << '\n';
+            return nullptr;
         }
     }
     return wrap(Devices);
@@ -646,13 +656,18 @@ __dpctl_give DPCTLDeviceVectorRef DPCTLDevice_CreateSubDevicesByAffinity(
                 Devices->emplace_back(wrap(new device(sd)));
             }
         } catch (std::bad_alloc const &ba) {
+            delete Devices;
             std::cerr << ba.what() << '\n';
             return nullptr;
         } catch (feature_not_supported const &fnse) {
+            delete Devices;
             std::cerr << fnse.what() << '\n';
+            return nullptr;
         } catch (runtime_error const &re) {
+            delete Devices;
             // \todo log error
             std::cerr << re.what() << '\n';
+            return nullptr;
         }
     }
     return wrap(Devices);

dpctl-capi/source/dpctl_sycl_device_manager.cpp

@@ -123,10 +123,13 @@ DPCTLDeviceMgr_GetCachedContext(__dpctl_keep const DPCTLSyclDeviceRef DRef)
     auto &cache = DeviceCacheBuilder::getDeviceCache();
     auto entry = cache.find(*Device);
     if (entry != cache.end()) {
+        context *ContextPtr = nullptr;
         try {
-            CRef = wrap(new context(entry->second));
+            ContextPtr = new context(entry->second);
+            CRef = wrap(ContextPtr);
         } catch (std::bad_alloc const &ba) {
             std::cerr << ba.what() << std::endl;
+            delete ContextPtr;
             CRef = nullptr;
         }
     }
@@ -144,6 +147,7 @@ DPCTLDeviceMgr_GetDevices(int device_identifier)
     try {
         Devices = new vector_class<DPCTLSyclDeviceRef>();
     } catch (std::bad_alloc const &ba) {
+        delete Devices;
         return nullptr;
     }
     const auto &root_devices = device::get_devices();

dpctl-capi/source/dpctl_sycl_platform_interface.cpp

@@ -79,14 +79,16 @@ __dpctl_give DPCTLSyclPlatformRef DPCTLPlatform_CreateFromSelector(
     DPCTLSyclPlatformRef PRef = nullptr;
     auto DS = unwrap(DSRef);
     if (DS) {
+        platform *P = nullptr;
         try {
-            auto P = new platform(*DS);
+            P = new platform(*DS);
             PRef = wrap(P);
         } catch (std::bad_alloc const &ba) {
+            delete P;
             std::cerr << ba.what() << '\n';
         } catch (runtime_error const &re) {
+            delete P;
             std::cerr << re.what() << '\n';
-            return nullptr;
         }
     }
     else {

dpctl-capi/source/dpctl_sycl_queue_interface.cpp

@@ -234,10 +234,13 @@ DPCTLQueue_CreateForDevice(__dpctl_keep const DPCTLSyclDeviceRef DRef,
     // will be the case for non-root devices, i.e., sub-devices, a new context
     // will be allocated. Note that any newly allocated context is not cached.
     if (!CRef) {
+        context *ContextPtr = nullptr;
         try {
-            CRef = wrap(new context(*Device));
+            ContextPtr = new context(*Device);
+            CRef = wrap(ContextPtr);
         } catch (std::bad_alloc const &ba) {
             std::cerr << ba.what() << std::endl;
+            delete ContextPtr;
             return QRef;
         }
     }

dpctl-capi/source/dpctl_vector_templ.cpp

@@ -39,10 +39,12 @@ DEFINE_SIMPLE_CONVERSION_FUNCTIONS(vector_class<SYCLREF(EL)>, VECTOR(EL))
  */
 __dpctl_give VECTOR(EL) FN(EL, Create)()
 {
+    vector_class<SYCLREF(EL)> *Vec = nullptr;
     try {
-        auto Vec = new vector_class<SYCLREF(EL)>();
+        Vec = new vector_class<SYCLREF(EL)>();
         return wrap(Vec);
     } catch (std::bad_alloc const &ba) {
+        delete Vec;
         return nullptr;
     }
 }
@@ -56,15 +58,17 @@ __dpctl_give VECTOR(EL) FN(EL, Create)()
 __dpctl_give VECTOR(EL)
     FN(EL, CreateFromArray)(size_t n, __dpctl_keep SYCLREF(EL) * elems)
 {
+    vector_class<SYCLREF(EL)> *Vec = nullptr;
     try {
-        auto Vec = new vector_class<SYCLREF(EL)>();
+        Vec = new vector_class<SYCLREF(EL)>();
         for (size_t i = 0; i < n; ++i) {
             auto Ref = unwrap(elems[i]);
             Vec->emplace_back(
                 wrap(new std::remove_pointer<decltype(Ref)>::type(*Ref)));
         }
         return wrap(Vec);
     } catch (std::bad_alloc const &ba) {
+        delete Vec;
         return nullptr;
     }
 }
@@ -125,13 +129,20 @@ SYCLREF(EL) FN(EL, GetAt)(__dpctl_keep VECTOR(EL) VRef, size_t index)
     auto Vec = unwrap(VRef);
     SYCLREF(EL) copy = nullptr;
     if (Vec) {
+        SYCLREF(EL) ret;
         try {
-            auto ret = Vec->at(index);
-            auto Ref = unwrap(ret);
-            copy = wrap(new std::remove_pointer<decltype(Ref)>::type(*Ref));
+            ret = Vec->at(index);
         } catch (std::out_of_range const &oor) {
             std::cerr << oor.what() << '\n';
+            return nullptr;
+        }
+        auto Ref = unwrap(ret);
+        std::remove_pointer<decltype(Ref)>::type *elPtr = nullptr;
+        try {
+            elPtr = new std::remove_pointer<decltype(Ref)>::type(*Ref);
+            copy = wrap(elPtr);
         } catch (std::bad_alloc const &ba) {
+            delete elPtr;
             // \todo log error
             std::cerr << ba.what() << '\n';
             return nullptr;