From cd279f99fc3249c731ced737ca88fb66f9c3801c Mon Sep 17 00:00:00 2001
From: Jan Willamowius <jan@willamowius.de>
Date: 周三, 24 4月 2019 05:33:23 +0800
Subject: [PATCH] fix switch to add extra_data to license, revert change that broke copying of nul byte at end of date
---
src/library/LicenseReader.cpp | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/library/LicenseReader.cpp b/src/library/LicenseReader.cpp
index 2c6a179..d880979 100644
--- a/src/library/LicenseReader.cpp
+++ b/src/library/LicenseReader.cpp
@@ -89,7 +89,7 @@
license->expiry_date[0] = '\0';
license->days_left = 999999;
} else {
- strncpy(license->expiry_date, to_date.c_str(), 11-1);
+ strncpy(license->expiry_date, to_date.c_str(), 11);
double secs = difftime(
seconds_from_epoch(to_date.c_str()),
time(NULL));
@@ -160,9 +160,11 @@
FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
int to_sw_version = ini.GetLongValue(productNamePtr,
"to_sw_version", FullLicenseInfo::UNUSED_SOFTWARE_VERSION);
+ string extra_data = trim_copy(
+ ini.GetValue(productNamePtr, "extra_data", ""));
FullLicenseInfo licInfo(*it, product, license_signature,
(int) license_version, from_date, to_date, client_signature,
- from_sw_version, to_sw_version);
+ from_sw_version, to_sw_version, extra_data);
licenseInfoOut.push_back(licInfo);
atLeastOneLicenseComplete = true;
} else {
--
Gitblit v1.9.1