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/base/base64.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/library/base/base64.cpp b/src/library/base/base64.cpp
index a8f1c4c..f508d4a 100644
--- a/src/library/base/base64.cpp
+++ b/src/library/base/base64.cpp
@@ -111,7 +111,7 @@
int cb = 0;
int charNo;
int pad = 0;
- int len = tmp_str.size();
+ size_t len = tmp_str.size();
if (len < 2) { // 2 accesses below would be OOB.
// catch empty string, return NULL as result.
@@ -121,7 +121,7 @@
if (safeAsciiPtr[len - 1] == '=') ++pad;
if (safeAsciiPtr[len - 2] == '=') ++pad;
- unsigned int flen = 3 * len / 4 - pad;
+ size_t flen = 3 * len / 4 - pad;
bin.reserve(flen);
for (charNo = 0; charNo <= len - 4 - pad; charNo += 4) {
--
Gitblit v1.9.1