authorgravatar for 124872+jedisct1@users.noreply.github.comFrank Denis <124872+jedisct1@users.noreply.github.com> 2026-10-16 08:22:49+02:00
committergravatar for 124872+jedisct1@users.noreply.github.comFrank Denis <124872+jedisct1@users.noreply.github.com> 2026-10-16 08:22:49+02:00
logfc78a22b96035b023c4fb138baee0ac9dcc4c42b
tree451a8e6c2398ef576cfea560df29cefeafc4b521
parentbd51e91a9a934c915219b985549bb4fc060c0357
parent9ae66b7d1a83474010bc3612c5b22c85526c85fd

Merge pull request 'std.base64: fix bogus decoderWithIgnore() definitions' (#37093) from jedisct1/zig:base64fix into master

Reviewed-on: https://codeberg.org/ziglang/zig/pulls/37093

1 files changed, 22 insertions(+), 2 deletions(-)

lib/std/base64.zig+22-2
...@@ -31,6 +31,9 @@ pub const standard_alphabet_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopq...@@ -31,6 +31,9 @@ pub const standard_alphabet_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopq
31fn standardBase64DecoderWithIgnore(ignore: []const u8) Base64DecoderWithIgnore {31fn standardBase64DecoderWithIgnore(ignore: []const u8) Base64DecoderWithIgnore {
32 return Base64DecoderWithIgnore.init(standard_alphabet_chars, '=', ignore);32 return Base64DecoderWithIgnore.init(standard_alphabet_chars, '=', ignore);
33}33}
34fn standardNoPadBase64DecoderWithIgnore(ignore: []const u8) Base64DecoderWithIgnore {
35 return Base64DecoderWithIgnore.init(standard_alphabet_chars, null, ignore);
36}
3437
35/// Standard Base64 codecs, with padding, as defined in38/// Standard Base64 codecs, with padding, as defined in
36/// [RFC 4648 section 4](https://datatracker.ietf.org/doc/html/rfc4648#section-4).39/// [RFC 4648 section 4](https://datatracker.ietf.org/doc/html/rfc4648#section-4).
...@@ -47,7 +50,7 @@ pub const standard = Codecs{...@@ -47,7 +50,7 @@ pub const standard = Codecs{
47pub const standard_no_pad = Codecs{50pub const standard_no_pad = Codecs{
48 .alphabet_chars = standard_alphabet_chars,51 .alphabet_chars = standard_alphabet_chars,
49 .pad_char = null,52 .pad_char = null,
50 .decoderWithIgnore = standardBase64DecoderWithIgnore,53 .decoderWithIgnore = standardNoPadBase64DecoderWithIgnore,
51 .Encoder = Base64Encoder.init(standard_alphabet_chars, null),54 .Encoder = Base64Encoder.init(standard_alphabet_chars, null),
52 .Decoder = Base64Decoder.init(standard_alphabet_chars, null),55 .Decoder = Base64Decoder.init(standard_alphabet_chars, null),
53};56};
...@@ -56,6 +59,9 @@ pub const standard_no_pad = Codecs{...@@ -56,6 +59,9 @@ pub const standard_no_pad = Codecs{
56/// [RFC 4648 section 5](https://datatracker.ietf.org/doc/html/rfc4648#section-5).59/// [RFC 4648 section 5](https://datatracker.ietf.org/doc/html/rfc4648#section-5).
57pub const url_safe_alphabet_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_".*;60pub const url_safe_alphabet_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_".*;
58fn urlSafeBase64DecoderWithIgnore(ignore: []const u8) Base64DecoderWithIgnore {61fn urlSafeBase64DecoderWithIgnore(ignore: []const u8) Base64DecoderWithIgnore {
62 return Base64DecoderWithIgnore.init(url_safe_alphabet_chars, '=', ignore);
63}
64fn urlSafeNoPadBase64DecoderWithIgnore(ignore: []const u8) Base64DecoderWithIgnore {
59 return Base64DecoderWithIgnore.init(url_safe_alphabet_chars, null, ignore);65 return Base64DecoderWithIgnore.init(url_safe_alphabet_chars, null, ignore);
60}66}
6167
...@@ -74,7 +80,7 @@ pub const url_safe = Codecs{...@@ -74,7 +80,7 @@ pub const url_safe = Codecs{
74pub const url_safe_no_pad = Codecs{80pub const url_safe_no_pad = Codecs{
75 .alphabet_chars = url_safe_alphabet_chars,81 .alphabet_chars = url_safe_alphabet_chars,
76 .pad_char = null,82 .pad_char = null,
77 .decoderWithIgnore = urlSafeBase64DecoderWithIgnore,83 .decoderWithIgnore = urlSafeNoPadBase64DecoderWithIgnore,
78 .Encoder = Base64Encoder.init(url_safe_alphabet_chars, null),84 .Encoder = Base64Encoder.init(url_safe_alphabet_chars, null),
79 .Decoder = Base64Decoder.init(url_safe_alphabet_chars, null),85 .Decoder = Base64Decoder.init(url_safe_alphabet_chars, null),
80};86};
...@@ -401,6 +407,20 @@ test "base64 url_safe_no_pad" {...@@ -401,6 +407,20 @@ test "base64 url_safe_no_pad" {
401 try comptime testAllApis(url_safe_no_pad, "comptime", "Y29tcHRpbWU");407 try comptime testAllApis(url_safe_no_pad, "comptime", "Y29tcHRpbWU");
402}408}
403409
410test "base64 standard_no_pad" {
411 @setEvalBranchQuota(8000);
412 try testAllApis(standard_no_pad, "f", "Zg");
413 try comptime testAllApis(standard_no_pad, "comptime", "Y29tcHRpbWU");
414 try testError(standard_no_pad, "Zg==", error.InvalidCharacter);
415}
416
417test "base64 url_safe" {
418 @setEvalBranchQuota(8000);
419 try testAllApis(url_safe, "f", "Zg==");
420 try comptime testAllApis(url_safe, "comptime", "Y29tcHRpbWU=");
421 try testError(url_safe, "Zg", error.InvalidPadding);
422}
423
404fn testBase64() !void {424fn testBase64() !void {
405 const codecs = standard;425 const codecs = standard;
406426