From 9fb8f6347fffff8b91201d95c3a73319ff9e69c1 Mon Sep 17 00:00:00 2001
From: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Date: Fri, 24 Aug 2018 09:11:10 +0000
Subject: [PATCH] core: don't call std::string(NULL)

---
 modules/core/src/system.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
index bfa7a13cfb..23c9bfd5a6 100644
--- a/modules/core/src/system.cpp
+++ b/modules/core/src/system.cpp
@@ -1655,12 +1655,7 @@ cv::String utils::getConfigurationParameterString(const char* name, const char*
 #else
     const char* envValue = getenv(name);
 #endif
-    if (envValue == NULL)
-    {
-        return defaultValue;
-    }
-    cv::String value = envValue;
-    return value;
+    return envValue ? cv::String(envValue) : (defaultValue ? cv::String(defaultValue) : cv::String());
 }