MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-02 18:18:56 +02:00
Code Issues Releases Wiki Activity

ircd::b64: Improve loop control and range constraints.

Browse source
This commit is contained in:
Jason Volk 2020-08-11 16:02:56 -07:00
parent c941e13ed0
commit 0a542e6424
3 changed files with 26 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/ircd/b64.h
View file

@ -61,7 +61,12 @@ inline size_t
ircd::b64::decode_size(const string_view &in)
noexcept
{
return decode_size(size(in));
const size_t pads
{
endswith_count(in, '=')
};
return decode_size(size(in) - pads);
}
constexpr size_t

2
include/ircd/ircd.h
View file

@ -63,9 +63,9 @@
#include "fpe.h"
#include "rand.h"
#include "crh.h"
#include "stringops.h"
#include "b64.h"
#include "b58.h"
#include "stringops.h"
#include "strl.h"
#include "strn.h"
#include "cmp.h"

28
ircd/b64.cc
View file

@ -181,7 +181,7 @@ noexcept
};
size_t i(0), j(0);
for(; i + 1 < (size(in) / 48) && i < (out_len / 64); ++i)
for(; i + 1 <= (size(in) / 48) && i <= (out_len / 64); ++i)
{
// Destination is indexed at 64 byte stride
const auto di
@ -198,14 +198,14 @@ noexcept
*di = encode_block<dict>(*si);
}
for(; i * 48 < size(in); ++i)
for(; i * 48 < size(in) && i * 64 < out_len; ++i)
{
u8x64 block{0};
for(j = 0; i * 48 + j < size(in); ++j)
u8x64 block {0};
for(j = 0; j < 48 && i * 48 + j < size(in); ++j)
block[j] = in[i * 48 + j];
block = encode_block<dict>(block);
for(j = 0; i * 64 + j < out_len; ++j)
for(j = 0; j < 64 && i * 64 + j < out_len; ++j)
out[i * 64 + j] = block[j];
}
@ -274,13 +274,23 @@ ircd::const_buffer
ircd::b64::decode(const mutable_buffer &out,
const string_view &in)
{
const size_t pads
{
endswith_count(in, '=')
};
const size_t in_len
{
size(in) - pads
};
const size_t out_len
{
std::min(decode_size(in), size(out))
std::min(decode_size(in_len), size(out))
};
size_t i(0), j(0);
for(; i + 1 <= (size(in) / 64) && i + 1 <= (out_len / 48); ++i)
for(; i + 1 <= (in_len / 64) && i + 1 <= (out_len / 48); ++i)
{
// Destination is indexed at 48 byte stride
const auto di
@ -297,10 +307,10 @@ ircd::b64::decode(const mutable_buffer &out,
*di = decode_block(*si);
}
for(; i * 64 < size(in) && i * 48 < out_len; ++i)
for(; i * 64 < in_len && i * 48 < out_len; ++i)
{
u8x64 block {0};
for(j = 0; j < 64 && i * 64 + j < size(in); ++j)
for(j = 0; j < 64 && i * 64 + j < in_len; ++j)
block[j] = in[i * 64 + j];
block = decode_block(block);