From: 오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Date: Fri, 30 Aug 2019 07:32:17 +0000 (+0900)
Subject: Check dladdr return value (#7061)
X-Git-Tag: accepted/tizen/unified/20190903.052428~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee0c10c9b9ceea0a8e3c4f142998a97ab3ed89dd;p=platform%2Fcore%2Fml%2Fnnfw.git

Check dladdr return value (#7061)

Check dladdr return value and log if fail to load

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
---

diff --git a/runtimes/libs/nnapi/v1.1/include/NeuralNetworksLoadHelpers.h b/runtimes/libs/nnapi/v1.1/include/NeuralNetworksLoadHelpers.h
index fe9c8e2..201465f 100644
--- a/runtimes/libs/nnapi/v1.1/include/NeuralNetworksLoadHelpers.h
+++ b/runtimes/libs/nnapi/v1.1/include/NeuralNetworksLoadHelpers.h
@@ -113,8 +113,15 @@ inline void* loadFunction(const char* name) {
   else {
 #ifdef _GNU_SOURCE
     Dl_info info;
-    dladdr(fn, &info);
-    NNAPI_LOG("nnapi function '%s' is loaded from '%s' ", name, info.dli_fname);
+    if (dladdr(fn, &info))
+    {
+      NNAPI_LOG("nnapi function '%s' is loaded from '%s' ", name, info.dli_fname);
+    }
+    else
+    {
+      NNAPI_LOG("nnapi function '%s' is failed to load", name);
+    }
+
 #endif // _GNU_SOURCE
   }
   return fn;
diff --git a/runtimes/libs/nnapi/v1.2/include/NeuralNetworksLoadHelpers.h b/runtimes/libs/nnapi/v1.2/include/NeuralNetworksLoadHelpers.h
index da9ba88..1c482b5 100644
--- a/runtimes/libs/nnapi/v1.2/include/NeuralNetworksLoadHelpers.h
+++ b/runtimes/libs/nnapi/v1.2/include/NeuralNetworksLoadHelpers.h
@@ -111,8 +111,14 @@ inline void* loadFunction(const char* name) {
   else {
 #ifdef _GNU_SOURCE
     Dl_info info;
-    dladdr(fn, &info);
-    NNAPI_LOG("nnapi function '%s' is loaded from '%s' ", name, info.dli_fname);
+    if (dladdr(fn, &info))
+    {
+      NNAPI_LOG("nnapi function '%s' is loaded from '%s' ", name, info.dli_fname);
+    }
+    else
+    {
+      NNAPI_LOG("nnapi function '%s' is failed to load", name);
+    }
 #endif // _GNU_SOURCE
   }
   return fn;