From 7c2489cc3dc798484e11a449fd0e305210de901b Mon Sep 17 00:00:00 2001 From: gcontini <1121667+gcontini@users.noreply.github.com> Date: 周六, 14 12月 2019 20:12:41 +0800 Subject: [PATCH] fix codacy warnings --- src/library/licensecc.cpp | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/library/licensecc.cpp b/src/library/licensecc.cpp index c7484c3..ff57cb3 100644 --- a/src/library/licensecc.cpp +++ b/src/library/licensecc.cpp @@ -5,8 +5,10 @@ // Copyright : BSD //============================================================================ +#define __STDC_WANT_LIB_EXT1__ 1 #include <fstream> #include <stdio.h> +#include <string.h> #include <stdlib.h> #include <cstring> #include <iostream> @@ -16,6 +18,7 @@ #include <licensecc_properties.h> #include "limits/license_verifier.hpp" +#include "base/StringUtils.h" #include "LicenseReader.hpp" #include "pc-identifiers.h" @@ -23,9 +26,9 @@ void print_error(char out_buffer[256], LicenseInfo* licenseInfo) {} bool identify_pc(IDENTIFICATION_STRATEGY pc_id_method, char* chbuffer, size_t bufSize) { - PcSignature identifier_out; FUNCTION_RETURN result = FUNC_RET_BUFFER_TOO_SMALL; if (bufSize >= sizeof(PcSignature)) { + PcSignature identifier_out; result = generate_user_pc_signature(identifier_out, pc_id_method); strncpy(chbuffer, identifier_out, bufSize); } @@ -53,8 +56,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