From 36ce07093b68b07513149577c209ae7a57ab356b Mon Sep 17 00:00:00 2001
From: Gabriele Contini <contini.mailing@gmail.com>
Date: 周日, 15 3月 2020 16:26:21 +0800
Subject: [PATCH] Merge branch 'feature/pc_identifiers' into develop issues #2 #3 #14 #49
---
src/library/locate/EnvironmentVarData.cpp | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/library/locate/EnvironmentVarData.cpp b/src/library/locate/EnvironmentVarData.cpp
index 0162dbe..707d6a5 100644
--- a/src/library/locate/EnvironmentVarData.cpp
+++ b/src/library/locate/EnvironmentVarData.cpp
@@ -46,15 +46,14 @@
}
const std::string EnvironmentVarData::retrieve_license_content(const std::string &licenseLocation) const {
- string tmpVal = getenv(LCC_LICENSE_LOCATION_ENV_VAR);
+ string env_val = getenv(LCC_LICENSE_LOCATION_ENV_VAR);
if (isBase64) {
int flen = 0;
- unsigned char *raw = unbase64(tmpVal.c_str(), tmpVal.length(), &flen);
- string str = string(reinterpret_cast<char *>(raw));
- free(raw);
+ vector<uint8_t> data = unbase64(env_val);
+ string str = string(reinterpret_cast<char *>(data.data()));
return str;
}
- return tmpVal;
+ return env_val;
}
} // namespace locate
--
Gitblit v1.9.1