From ad356e3239635db5304fd81bda6ffca94634666f Mon Sep 17 00:00:00 2001 From: berak Date: Wed, 24 Oct 2018 12:37:01 +0200 Subject: [PATCH] dnn/samples: handle not set env vars gracefully --- samples/dnn/common.hpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/dnn/common.hpp b/samples/dnn/common.hpp index a0ca012645..fce7f9fbb9 100644 --- a/samples/dnn/common.hpp +++ b/samples/dnn/common.hpp @@ -58,10 +58,12 @@ std::string findFile(const std::string& filename) if (filename.empty() || utils::fs::exists(filename)) return filename; - std::string extraPaths[] = {getenv("OPENCV_DNN_TEST_DATA_PATH"), + const char* extraPaths[] = {getenv("OPENCV_DNN_TEST_DATA_PATH"), getenv("OPENCV_TEST_DATA_PATH")}; for (int i = 0; i < 2; ++i) { + if (extraPaths[i] == NULL) + continue; std::string absPath = utils::fs::join(extraPaths[i], utils::fs::join("dnn", filename)); if (utils::fs::exists(absPath)) return absPath;