Fix crash with invalid length for base16 (#62)

ia0 · Apr 8, 2023 · 61637ba · 61637ba
1 parent 1265f22
commit 61637ba
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/bin/CHANGELOG.md b/bin/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### Patch
+
+- Fix crash with invalid length for base16
+
 ## 0.3.1
 
 ### Minor

diff --git a/bin/src/main.rs b/bin/src/main.rs
@@ -124,11 +124,10 @@ where
         let (next, olen) = match base.decode_mut(&input[0 .. next], &mut output[0 .. mlen]) {
             Ok(olen) => (next, olen),
             Err(mut partial) => {
-                if partial.error.kind != DecodeKind::Length {
+                if partial.error.kind != DecodeKind::Length || ilen == 0 {
                     partial.error.position += pos;
                     return Err(Error::Decode(partial.error));
                 }
-                assert_ne!(ilen, 0);
                 (partial.read, partial.written)
             }
         };

diff --git a/bin/test.sh b/bin/test.sh
@@ -69,6 +69,7 @@ unit "-md -b64 -p= -g'$LF'" \
   "Zg$LF$LF=$LF$LF=Z$LF${LF}m$LF${LF}8=${LF}Zg-=" 'ffo' 'invalid symbol at 19'
 unit "-md -b64 -p= -g'$LF' --block=8" \
   "Zg$LF$LF=$LF$LF=Z$LF${LF}m$LF${LF}8=${LF}Zg-=" ffo 'invalid symbol at 19'
+unit '-md -b16 -gx' 6474y dt 'invalid length at 4'
 echo
 echo -n 'symbol:'
 unit '-md -b64 -p=' Zg==Zm8=Zg-= '' 'invalid symbol at 10'