From 6a11f71758e151d85eaf1bb611808f2420717ef7 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 4 Aug 2016 11:45:04 +0200 Subject: [PATCH] luci-base: cbi.js: handle undefined arguments in formatting Fix the JavaScript String.format() to not trigger an exception if the argument for an escaped format like %h or %q is undefined. Signed-off-by: Jo-Philipp Wich --- modules/luci-base/htdocs/luci-static/resources/cbi.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/luci-base/htdocs/luci-static/resources/cbi.js b/modules/luci-base/htdocs/luci-static/resources/cbi.js index b285ee26c..5790e303d 100644 --- a/modules/luci-base/htdocs/luci-static/resources/cbi.js +++ b/modules/luci-base/htdocs/luci-static/resources/cbi.js @@ -1300,6 +1300,9 @@ String.prototype.format = function() var quot_esc = [/"/g, '"', /'/g, ''']; function esc(s, r) { + if (typeof(s) !== 'string' && !(s instanceof String)) + return ''; + for( var i = 0; i < r.length; i += 2 ) s = s.replace(r[i], r[i+1]); return s; -- 2.11.0