bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle invalid value from LanguageNameIndexer::getLanguageData

Browse Source 
Check preg_match return for failure and also check json_decode for
failure by checking for the index key needed for further processing.

Change-Id: Ifecf3fdaf476a05d0dc6fc1c40c3d8a2aa0fa88b
This commit is contained in:
Umherirrender
2020-05-29 18:29:33 +02:00
parent 8cc04469ac
commit 44175839e5
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
data/LanguageNameIndexer.php
View File

@@ -145,9 +145,14 @@ class LanguageNameIndexer extends Maintenance {
private function getLanguageData() {
$file = __DIR__ . '/../lib/jquery.uls/src/jquery.uls.data.js';
$contents = file_get_contents( $file );
preg_match( '/.*\$\.uls\.data = (.*?)} \( jQuery \)/s', $contents, $matches );
if ( !preg_match( '/.*\$\.uls\.data = (.*?)} \( jQuery \)/s', $contents, $matches ) ) {
throw new LogicException( 'Syntax error in jquery.uls.data.js?' );
}
$json = $matches[ 1 ];
$data = json_decode( $json, true );
if ( !$data ) {
throw new LogicException( 'json_decode failed. Syntax error in jquery.uls.data.js?' );
}
return $data;
}