storm/w3m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use Strcatc and Strnulterm in base64_encode

Browse Source
This commit is contained in:
Tatsuya Kinoshita
2021-04-05 22:37:33 +09:00
parent fbaa526b8b
commit 99d11d347c
1 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
etc.c
+16 -11
View File
@@ -2026,6 +2026,10 @@ base64_encode(const unsigned char *src, size_t len)
return Strnew(); return Strnew();
dest = Strnew_size(k); dest = Strnew_size(k);
if (dest->area_size <= k) {
Strfree(dest);
return Strnew();
}
in = src; in = src;
@@ -2036,10 +2040,10 @@ base64_encode(const unsigned char *src, size_t len)
j = j << 8 | *in++; j = j << 8 | *in++;
j = j << 8 | *in++; j = j << 8 | *in++;
Strcat_char(dest, Base64Table[(j >> 18) & 0x3f]); Strcatc(dest, Base64Table[(j >> 18) & 0x3f]);
Strcat_char(dest, Base64Table[(j >> 12) & 0x3f]); Strcatc(dest, Base64Table[(j >> 12) & 0x3f]);
Strcat_char(dest, Base64Table[(j >> 6) & 0x3f]); Strcatc(dest, Base64Table[(j >> 6) & 0x3f]);
Strcat_char(dest, Base64Table[j & 0x3f]); Strcatc(dest, Base64Table[j & 0x3f]);
} }
if (src + len - in) { if (src + len - in) {
@@ -2047,17 +2051,18 @@ base64_encode(const unsigned char *src, size_t len)
if (src + len - in) { if (src + len - in) {
j = j << 8 | *in++; j = j << 8 | *in++;
j = j << 8; j = j << 8;
Strcat_char(dest, Base64Table[(j >> 18) & 0x3f]); Strcatc(dest, Base64Table[(j >> 18) & 0x3f]);
Strcat_char(dest, Base64Table[(j >> 12) & 0x3f]); Strcatc(dest, Base64Table[(j >> 12) & 0x3f]);
Strcat_char(dest, Base64Table[(j >> 6) & 0x3f]); Strcatc(dest, Base64Table[(j >> 6) & 0x3f]);
} else { } else {
j = j << 8; j = j << 8;
j = j << 8; j = j << 8;
Strcat_char(dest, Base64Table[(j >> 18) & 0x3f]); Strcatc(dest, Base64Table[(j >> 18) & 0x3f]);
Strcat_char(dest, Base64Table[(j >> 12) & 0x3f]); Strcatc(dest, Base64Table[(j >> 12) & 0x3f]);
Strcat_char(dest, '='); Strcatc(dest, '=');
} }
Strcat_char(dest, '='); Strcatc(dest, '=');
} }
Strnulterm(dest);
return dest; return dest;
} }