aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/base64.c50
-rw-r--r--tests/test_server.c19
2 files changed, 56 insertions, 13 deletions
diff --git a/src/base64.c b/src/base64.c
index bc64f40..082101f 100644
--- a/src/base64.c
+++ b/src/base64.c
@@ -1,23 +1,47 @@
#include "base64.h"
#include "server_util.h"
+#include <stdint.h>
+
char *base64_encode(const unsigned char *src, size_t n) {
static const char tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ size_t max_groups = (SIZE_MAX - 1) / 4;
+ if (n > max_groups * 3)
+ die_oom();
+
size_t out_len = ((n + 2) / 3) * 4;
char *out = xmalloc(out_len + 1);
- size_t o = 0;
- for (size_t i = 0; i < n; i += 3) {
- unsigned v = (unsigned)src[i] << 16;
- int remain = (int)(n - i);
- if (remain > 1)
- v |= (unsigned)src[i + 1] << 8;
- if (remain > 2)
- v |= (unsigned)src[i + 2];
- out[o++] = tbl[(v >> 18) & 63];
- out[o++] = tbl[(v >> 12) & 63];
- out[o++] = remain > 1 ? tbl[(v >> 6) & 63] : '=';
- out[o++] = remain > 2 ? tbl[v & 63] : '=';
+ const unsigned char *p = src;
+ const unsigned char *end = src + (n / 3) * 3;
+ char *q = out;
+
+ while (p < end) {
+ uint32_t v = ((uint32_t)p[0] << 16) | ((uint32_t)p[1] << 8) | (uint32_t)p[2];
+ q[0] = tbl[(v >> 18) & 63];
+ q[1] = tbl[(v >> 12) & 63];
+ q[2] = tbl[(v >> 6) & 63];
+ q[3] = tbl[v & 63];
+ p += 3;
+ q += 4;
}
- out[o] = '\0';
+
+ size_t rem = n - (size_t)(p - src);
+ if (rem == 1) {
+ uint32_t v = (uint32_t)p[0] << 16;
+ q[0] = tbl[(v >> 18) & 63];
+ q[1] = tbl[(v >> 12) & 63];
+ q[2] = '=';
+ q[3] = '=';
+ q += 4;
+ } else if (rem == 2) {
+ uint32_t v = ((uint32_t)p[0] << 16) | ((uint32_t)p[1] << 8);
+ q[0] = tbl[(v >> 18) & 63];
+ q[1] = tbl[(v >> 12) & 63];
+ q[2] = tbl[(v >> 6) & 63];
+ q[3] = '=';
+ q += 4;
+ }
+
+ *q = '\0';
return out;
}
diff --git a/tests/test_server.c b/tests/test_server.c
index 6a558ae..81ed4f2 100644
--- a/tests/test_server.c
+++ b/tests/test_server.c
@@ -45,6 +45,24 @@ static void test_base64_rfc4648(void) {
}
}
+static void test_base64_binary_vectors(void) {
+ static const struct {
+ unsigned char bytes[5];
+ size_t n;
+ const char *out;
+ } cases[] = {
+ {{0xff}, 1, "/w=="},
+ {{0xff, 0xee}, 2, "/+4="},
+ {{0xff, 0xee, 0xdd}, 3, "/+7d"},
+ {{0x00, 0x01, 0x02, 0x03, 0x04}, 5, "AAECAwQ="},
+ };
+ for (size_t i = 0; i < sizeof(cases) / sizeof(cases[0]); i++) {
+ char *got = base64_encode(cases[i].bytes, cases[i].n);
+ TEST_ASSERT(strcmp(got, cases[i].out) == 0);
+ free(got);
+ }
+}
+
static void test_sbuf_growth_and_formatting(void) {
sbuf b = {0};
sbuf_puts(&b, "ab");
@@ -1125,6 +1143,7 @@ static void test_http_server(void) {
int main(void) {
test_base64_rfc4648();
+ test_base64_binary_vectors();
test_sbuf_growth_and_formatting();
test_json_error_body_escaping();
test_job_set_422_replaces_response();