From patchwork Mon Jun 10 13:45:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Niklas_S=C3=B6derlund?= X-Patchwork-Id: 1380 Return-Path: Received: from vsp-unauthed02.binero.net (vsp-unauthed02.binero.net [195.74.38.227]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 565C261942 for ; Mon, 10 Jun 2019 15:45:37 +0200 (CEST) X-Halon-ID: 04f24ce3-8b86-11e9-8d05-005056917f90 Authorized-sender: niklas@soderlund.pp.se Received: from bismarck.berto.se (unknown [89.233.230.99]) by bin-vsp-out-02.atm.binero.net (Halon) with ESMTPA id 04f24ce3-8b86-11e9-8d05-005056917f90; Mon, 10 Jun 2019 15:45:36 +0200 (CEST) From: =?utf-8?q?Niklas_S=C3=B6derlund?= To: libcamera-devel@lists.libcamera.org Date: Mon, 10 Jun 2019 15:45:31 +0200 Message-Id: <20190610134531.17316-1-niklas.soderlund@ragnatech.se> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] libcamera: ipa_manager: Fix handling of unset LIBCAMERA_IPA_MODULE_PATH X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2019 13:45:37 -0000 If the environment variable LIBCAMERA_IPA_MODULE_PATH is not set utils::secure_getenv() will return a nullptr. Assigning a nullptr to a std::string is not valid and results in a crash, terminate called after throwing an instance of 'std::logic_error' what(): basic_string::_M_construct null not valid Fix this by first checking if the char array return from utils::secure_getenv() is empty before creating a std::string from it. Signed-off-by: Niklas Söderlund --- src/libcamera/ipa_manager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/libcamera/ipa_manager.cpp b/src/libcamera/ipa_manager.cpp index f689aa69b7284092..7ea7a8cbff5f15a0 100644 --- a/src/libcamera/ipa_manager.cpp +++ b/src/libcamera/ipa_manager.cpp @@ -34,10 +34,11 @@ IPAManager::IPAManager() { addDir(IPA_MODULE_DIR); - std::string modulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH"); - if (modulePaths.empty()) + const char *envModulePaths = utils::secure_getenv("LIBCAMERA_IPA_MODULE_PATH"); + if (!envModulePaths) return; + std::string modulePaths = envModulePaths; for (size_t pos = 0, delim = 0; delim != std::string::npos; pos = delim + 1) { delim = modulePaths.find(':', pos);