BPI/luci
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-samba4: prevent calling split() on array or null values

Browse Source 
Since `uci.get()` may return null or array values, we cannot blindly call
split() on the result. Use the safe `L.toArray()` helper which is intended
to deal with such situations.

Also clean up whitespace while we're at.

Fixes: #5080
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit c4cdfcbe5121d5959dac1e18ed11b8611a86fb9e)
This commit is contained in:
Jo-Philipp Wich 2021-05-31 11:25:54 +02:00
parent 09329fe7bb
commit 81f41819a5
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/luci-app-samba4/htdocs/luci-static/resources/view/samba4.js
View File

@ -35,7 +35,7 @@ return view.extend({
_('Listen only on the given interface or, if unspecified, on lan')); _('Listen only on the given interface or, if unspecified, on lan'));
o.multiple = true; o.multiple = true;
o.cfgvalue = function(section_id) { o.cfgvalue = function(section_id) {
return uci.get('samba4', section_id, 'interface').split(' '); return L.toArray(uci.get('samba4', section_id, 'interface'));
}; };
o.write = function(section_id, formvalue) { o.write = function(section_id, formvalue) {
var cfgvalue = this.cfgvalue(section_id), var cfgvalue = this.cfgvalue(section_id),