Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

luci-base: cbi.js: properly handle non-strings in %h and %q formats

Browse source 
Only replace null, objects and function values with the empty string but
return booleans and numbers as strings.

Spotted while debugging #5587.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2021-12-09 16:25:50 +01:00
parent 4381816315
commit 008bd89310
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/luci-base/htdocs/luci-static/resources/cbi.js
View file

@ -521,9 +521,14 @@ String.prototype.format = function()
var quot_esc = [/"/g, '&#34;', /'/g, '&#39;']; var quot_esc = [/"/g, '&#34;', /'/g, '&#39;'];
function esc(s, r) { function esc(s, r) {
if (typeof(s) !== 'string' && !(s instanceof String)) var t = typeof(s);
if (s == null || t === 'object' || t === 'function')
return ''; return '';
if (t !== 'string')
s = String(s);
for (var i = 0; i < r.length; i += 2) for (var i = 0; i < r.length; i += 2)
s = s.replace(r[i], r[i+1]); s = s.replace(r[i], r[i+1]);