wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-09-25 03:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

(bug 31379) Don't use the $errcontext parameter of a PHP error handler to get information for error display, this introduces an unexpected, difficult-to-maintain data flow which leads to bugs like the referenced one above.

Browse source
This commit is contained in:
Tim Starling 2011-10-05 23:31:34 +00:00
parent f440e7e7ad
commit da936e9bfe
Notes: Raimond Spekking 2012-03-12 20:46:25 +00:00 
https://mediawiki.org/wiki/Special:Code/MediaWiki/99059
1 changed files with 34 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
AbuseFilter.parser.php
View file

@ -216,12 +216,13 @@ class AFPData {
$pattern .= 'i';
}
$handler = new AFPRegexErrorHandler( $pattern, $pos );
try {
set_error_handler( array( 'AbuseFilterParser', 'regexErrorHandler' ) );
$handler->install();
$result = preg_match( $pattern, $str );
restore_error_handler();
$handler->restore();
} catch ( Exception $e ) {
restore_error_handler();
$handler->restore();
throw $e;
}
return new AFPData( self::DBool, (bool)$result );
@ -394,6 +395,32 @@ class AFPUserVisibleException extends AFPException {
}
}
class AFPRegexErrorHandler {
function __construct( $regex, $pos ) {
$this->regex = $regex;
$this->pos = $pos;
}
function handleError( $errno, $errstr, $errfile, $errline, $context ) {
if ( error_reporting() == 0 ) {
return true;
}
throw new AFPUserVisibleException(
'regexfailure',
$this->pos,
array( $errstr, $this->regex )
);
}
function install() {
set_error_handler( array( $this, 'handleError' ) );
}
function restore() {
restore_error_handler();
}
}
class AbuseFilterParser {
var $mParams, $mVars, $mCode, $mTokens, $mPos, $mCur, $mShortCircuit, $mAllowShort;
@ -1477,12 +1504,13 @@ class AbuseFilterParser {
$matches = array();
$handler = new AFPRegexErrorHandler( $needle, $this->mCur->pos );
try {
set_error_handler( array( 'AbuseFilterParser', 'regexErrorHandler' ) );
$handler->install();
$count = preg_match_all( $needle, $haystack, $matches );
restore_error_handler();
$handler->restore();
} catch ( Exception $e ) {
restore_error_handler();
$handler->restore();
throw $e;
}
}
@ -1766,17 +1794,6 @@ class AbuseFilterParser {
return AFPData::castTypes( $val, AFPData::DBool );
}
public static function regexErrorHandler( $errno, $errstr, $errfile, $errline, $context ) {
if ( error_reporting() == 0 ) {
return true;
}
throw new AFPUserVisibleException(
'regexfailure',
$context['pos'],
array( $errstr, $context['regex'] )
);
}
}
# Taken from http://au2.php.net/manual/en/function.fnmatch.php#71725