iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-03 12:02:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a unsigned vs signed issue with Base64Decode()

Browse Source 
git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@534 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
prozacx
2005-09-26 02:59:34 +00:00
parent 0e126ee090
commit a88cea430b
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
String.cpp
View File

@@ -473,12 +473,24 @@ CString CString::Format(const CString& sFormatStr, ...) {
return "";
}
CString CString::Base64Encode_n(unsigned int uWrap) const {
CString sRet;
Base64Encode(sRet, uWrap);
return sRet;
}
CString CString::Base64Decode_n() const {
CString sRet;
Base64Decode(sRet);
return sRet;
}
bool CString::Base64Encode(CString& sRet, unsigned int uWrap) const {
static char b64table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
sRet.clear();
size_t len = size();
const char* input = c_str();
char *output, *p;
const unsigned char* input = (const unsigned char*) c_str();
unsigned char *output, *p;
size_t i = 0, mod = len % 3, toalloc;
toalloc = (len / 3) * 4 + (3 - mod) % 3 + 1 + 8;
@@ -494,7 +506,7 @@ bool CString::Base64Encode(CString& sRet, unsigned int uWrap) const {
}
//p = output = (unsigned char *)malloc(toalloc);
p = output = new char [toalloc];
p = output = new unsigned char [toalloc];
if (!p) {
return false;
@@ -519,7 +531,7 @@ bool CString::Base64Encode(CString& sRet, unsigned int uWrap) const {
*p = 0;
sRet = output;
sRet = (char*) output;
delete[] output;
return true;
} else {
@@ -535,7 +547,7 @@ bool CString::Base64Encode(CString& sRet, unsigned int uWrap) const {
*p = 0;
sRet = output;
sRet = (char*) output;
delete[] output;
return true;
} else {
@@ -547,14 +559,14 @@ bool CString::Base64Encode(CString& sRet, unsigned int uWrap) const {
}
*p = 0;
sRet = output;
sRet = (char*) output;
delete[] output;
return true;
}
}
sRet = output;
free(output);
sRet = (char*) output;
delete[] output;
return true;
}