From b7b3f87719a201007e5dc0730bf73141fd908c6a Mon Sep 17 00:00:00 2001 From: bptato <60043228+bptato@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:44:33 +0200 Subject: [PATCH] Fix std/base64.decode out of bounds read (#23526) inputLen may end up as 0 in the loop if the input string only includes trailing characters. e.g. without the patch, decode(" ") would panic. (cherry picked from commit 30cf570af997a0c705f7b3f194eea7337cb44185) --- lib/pure/base64.nim | 2 +- tests/stdlib/tbase64.nim | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/pure/base64.nim b/lib/pure/base64.nim index fd586d4775..470ea7d884 100644 --- a/lib/pure/base64.nim +++ b/lib/pure/base64.nim @@ -239,7 +239,7 @@ proc decode*(s: string): string = inputLen = s.len inputEnds = 0 # strip trailing characters - while s[inputLen - 1] in {'\n', '\r', ' ', '='}: + while inputLen > 0 and s[inputLen - 1] in {'\n', '\r', ' ', '='}: dec inputLen # hot loop: read 4 characters at at time inputEnds = inputLen - 4 diff --git a/tests/stdlib/tbase64.nim b/tests/stdlib/tbase64.nim index d829611ead..3be3bae168 100644 --- a/tests/stdlib/tbase64.nim +++ b/tests/stdlib/tbase64.nim @@ -17,6 +17,8 @@ template main() = doAssert encode("") == "" doAssert decode("") == "" + doAssert decode(" ") == "" + const testInputExpandsTo76 = "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++" const testInputExpands = "++++++++++++++++++++++++++++++" const longText = """Man is distinguished, not only by his reason, but by this