From edd954f9f31863710f404ef3e6f0ebd2a16ce489 Mon Sep 17 00:00:00 2001
From: gcontini <1121667+gcontini@users.noreply.github.com>
Date: 周六, 01 2月 2020 03:25:18 +0800
Subject: [PATCH] add google verification
---
src/library/licensecc.cpp | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp
index 8860311..63330cb 100644
--- a/src/library/licensecc.cpp
+++ b/src/library/licensecc.cpp
@@ -1,12 +1,14 @@
//============================================================================
-// Name : license-manager-cpp.cpp
+// Name : licensecc.cpp
// Author :
// Version :
// Copyright : BSD
//============================================================================
+#define __STDC_WANT_LIB_EXT1__ 1
#include <fstream>
#include <stdio.h>
+#include <string.h>
#include <stdlib.h>
#include <cstring>
#include <iostream>
@@ -16,18 +18,22 @@
#include <licensecc_properties.h>
#include "limits/license_verifier.hpp"
+#include "base/StringUtils.h"
#include "LicenseReader.hpp"
#include "pc-identifiers.h"
using namespace std;
-void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {}
-bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t bufSize) {
+void print_error(char out_buffer[ERROR_BUFFER_SIZE], LicenseInfo* licenseInfo) {}
+
+bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t* bufSize) {
FUNCTION_RETURN result = FUNC_RET_BUFFER_TOO_SMALL;
- if (bufSize >= sizeof(PcSignature)) {
+ if (*bufSize > sizeof(PcSignature)) {
PcSignature identifier_out;
result = generate_user_pc_signature(identifier_out, pc_id_method);
- strncpy(chbuffer, identifier_out, bufSize);
+ strncpy(chbuffer, identifier_out, *bufSize);
+ } else {
+ *bufSize = sizeof(PcSignature) + 1;
}
return result == FUNC_RET_OK;
}
@@ -53,8 +59,10 @@
const license::LicenseReader lr = license::LicenseReader(licenseLocation);
vector<license::FullLicenseInfo> licenses;
string project;
- if (callerInformation != nullptr && strlen(callerInformation->project_name) > 0) {
- project = string(callerInformation->project_name);
+ size_t str_size;
+ if (callerInformation != nullptr &&
+ (str_size = license::mstrnlen_s(callerInformation->project_name, sizeof callerInformation->project_name)) > 0) {
+ project = string(callerInformation->project_name, str_size);
} else {
project = string(LCC_PROJECT_NAME);
}
--
Gitblit v1.9.1