From 5a1320b923ec4db1cde00f9fc1be590022178b7f Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
Date: Thu, 27 Jun 2019 17:50:43 +0100
Subject: COMPMID-2429: Unexpected exception in destructor

Change-Id: I863d7dea4da2c032e4b878180397bd1f6082f0a1
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1439
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Michalis Spyrou <michalis.spyrou@arm.com>
---
 src/runtime/CL/CLMemoryRegion.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'src/runtime')

diff --git a/src/runtime/CL/CLMemoryRegion.cpp b/src/runtime/CL/CLMemoryRegion.cpp
index 9578d73934..2976903c93 100644
--- a/src/runtime/CL/CLMemoryRegion.cpp
+++ b/src/runtime/CL/CLMemoryRegion.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 ARM Limited.
+ * Copyright (c) 2018-2019 ARM Limited.
  *
  * SPDX-License-Identifier: MIT
  *
@@ -105,9 +105,15 @@ ICLSVMMemoryRegion::~ICLSVMMemoryRegion()
 {
     if(_ptr != nullptr)
     {
-        clFinish(CLScheduler::get().queue().get());
-        _mem = cl::Buffer();
-        clSVMFree(_ctx.get(), _ptr);
+        try
+        {
+            clFinish(CLScheduler::get().queue().get());
+            _mem = cl::Buffer();
+            clSVMFree(_ctx.get(), _ptr);
+        }
+        catch(...)
+        {
+        }
     }
 }
 
-- 
cgit v1.2.1