summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsangwan.kwon <sangwan.kwon@samsung.com>2019-02-08 12:28:35 +0900
committersangwan.kwon <sangwan.kwon@samsung.com>2019-02-08 12:29:27 +0900
commit799f7f8df44d808512f2d3a0db7c9f5308ce9156 (patch)
treeec6dda93dd4dc2d41a84d2723bef5c0831883496
parent9fbffe689c7b344f3cc41c529525f3e17526d768 (diff)
parent392e8ffc59a36bdc4e2f61420e1a2c339b44d9ba (diff)
downloadcsr-framework-tizen_5.0.tar.gz
csr-framework-tizen_5.0.tar.bz2
csr-framework-tizen_5.0.zip
Merge branch 'tizen' into tizen_5.0submit/tizen_5.0/20190213.001539tizen_5.0
Change-Id: Ice7a41f13db9a88a740089084f4e3c97d466839d Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>
-rw-r--r--packaging/csr-framework.spec2
-rw-r--r--test/engine/content-screening/sample-engine.cpp4
2 files changed, 4 insertions, 2 deletions
diff --git a/packaging/csr-framework.spec b/packaging/csr-framework.spec
index 31cb121..334333e 100644
--- a/packaging/csr-framework.spec
+++ b/packaging/csr-framework.spec
@@ -22,7 +22,7 @@
Summary: A general purpose content screening and reputation solution
Name: csr-framework
-Version: 2.3.3
+Version: 2.3.4
Release: 0
Source: %{name}-%{version}.tar.gz
License: Apache-2.0 and BSL-1.0
diff --git a/test/engine/content-screening/sample-engine.cpp b/test/engine/content-screening/sample-engine.cpp
index aa7333d..02cb932 100644
--- a/test/engine/content-screening/sample-engine.cpp
+++ b/test/engine/content-screening/sample-engine.cpp
@@ -358,8 +358,10 @@ int csre_cs_context_create(csre_cs_context_h *phandle)
return ret;
auto context = new (std::nothrow) csret_cs_context_s;
- if (context == nullptr)
+ if (context == nullptr) {
+ delete engine;
return CSRE_ERROR_OUT_OF_MEMORY;
+ }
context->engine = engine;