mirror.MikroTik/eworm-de.routeros-scripts
1
0
Fork 0
mirror of https://github.com/eworm-de/routeros-scripts.git synced 2025-07-25 21:34:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

global-functions: $ParseJson: prevent infinite loop...

Browse source 
... which could happen on corrupted or truncated input.
This commit is contained in:
Christian Hesse 2023-10-25 08:57:39 +02:00
parent ff35f0c87f
commit 61834297d7
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
global-functions.rsc
View file

@ -700,6 +700,7 @@
:set ParseJson do={ :set ParseJson do={
:local Input [ :tostr $1 ]; :local Input [ :tostr $1 ];
:local InLen;
:local Return ({}); :local Return ({});
:local Skip 0; :local Skip 0;
@ -707,8 +708,9 @@
:set Input [ :pick $Input 1 ([ :len $Input ] - 1) ]; :set Input [ :pick $Input 1 ([ :len $Input ] - 1) ];
} }
:set Input [ :toarray $Input ]; :set Input [ :toarray $Input ];
:set InLen [ :len $Input ];
:for I from=0 to=[ :len $Input ] do={ :for I from=0 to=$InLen do={
:if ($Skip > 0 || $Input->$I = "\n" || $Input->$I = "\r\n") do={ :if ($Skip > 0 || $Input->$I = "\n" || $Input->$I = "\r\n") do={
:if ($Skip > 0) do={ :if ($Skip > 0) do={
:set $Skip ($Skip - 1); :set $Skip ($Skip - 1);
@ -735,7 +737,7 @@
:set ValX [ :pick $ValX 0 ([ :len $ValX ] - 1) ]; :set ValX [ :pick $ValX 0 ([ :len $ValX ] - 1) ];
} }
:set ($Return->$Key) (($Return->$Key), $ValX); :set ($Return->$Key) (($Return->$Key), $ValX);
} while=($Last = false); } while=($Last = false && $I + $Skip < $InLen);
:set Done true; :set Done true;
} }
:if ($Done = false && $Val1 = ":[]") do={ :if ($Done = false && $Val1 = ":[]") do={