From f08cb113f3a981d778bc5bf77c163189848659cb Mon Sep 17 00:00:00 2001 From: Hafez Date: Mon, 8 Aug 2022 22:13:27 +0200 Subject: [PATCH] fix: remove data URI scheme parameters before other text parsing --- modules/04_base64.js | 5 +++-- modules/04_base64.ts | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/04_base64.js b/modules/04_base64.js index 58563aa..fdd658a 100644 --- a/modules/04_base64.js +++ b/modules/04_base64.js @@ -48,8 +48,9 @@ function Base64_encode_pass(input) { function Base64_decode(input) { var o = ""; var c1 = 0, c2 = 0, c3 = 0, e1 = 0, e2 = 0, e3 = 0, e4 = 0; - input = input.replace(/[^\w\+\/\=]/g, "") - .replace(/^data:.+\/.+;base64\,/,''); + input = input.replace(/^data:.+\/.+;base64\,/,'') + .replace(/[^\w\+\/\=]/g, "") + for (var i = 0; i < input.length; ) { e1 = Base64_map.indexOf(input.charAt(i++)); e2 = Base64_map.indexOf(input.charAt(i++)); diff --git a/modules/04_base64.ts b/modules/04_base64.ts index 295a553..adbd40a 100644 --- a/modules/04_base64.ts +++ b/modules/04_base64.ts @@ -40,8 +40,8 @@ function Base64_encode_pass(input: string): string { function Base64_decode(input: string): string { var o = ""; var c1=0, c2=0, c3=0, e1=0, e2=0, e3=0, e4=0; - input = input.replace(/[^\w\+\/\=]/g, "") - .replace(/^data:.+\/.+;base64\,/,''); + input = input.replace(/^data:.+\/.+;base64\,/,'') + .replace(/[^\w\+\/\=]/g, "") for(var i = 0; i < input.length;) { e1 = Base64_map.indexOf(input.charAt(i++)); e2 = Base64_map.indexOf(input.charAt(i++));