holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Circumvent a bug in some distributions of apache/mod_php, where an apache

Browse Source 
child, that has executed a php script with mbstring.func_overload=7 once, will
overload substr() in a later execution of another php script, even if the
Location context of that script has mbstring.func_overload=0 set. Since the
WBXML decoder works byte-by-byte to determine substring length, it fails, if
mb_substr() is used. This patch prevents this.
This commit is contained in:
Carsten Wolff 2008-02-19 09:57:01 +00:00
parent 0fca3cab3a
commit 8d066e2c0b
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
phpgwapi/inc/horde/XML/WBXML/Decoder.php
View File

@ -245,7 +245,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
function retrieveStringTable($input) function retrieveStringTable($input)
{ {
$size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos); $size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
$this->_stringTable = substr($input, $this->_strpos, $size); $this->_stringTable = $this->_substr($input, $this->_strpos, $size);
$this->_strpos += $size; $this->_strpos += $size;
// print "stringtable($size):" . $this->_stringTable ."\n"; // print "stringtable($size):" . $this->_stringTable ."\n";
} }
@ -371,7 +371,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
// Section 5.8.4.6 // Section 5.8.4.6
$size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos); $size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
// print "opaque of size $size\n"; // @todo remove debug // print "opaque of size $size\n"; // @todo remove debug
$b = substr($input, $this->_strpos, $size); $b = $this->_substr($input, $this->_strpos, $size);
#$b = mb_substr($input, $this->_strpos, $size, 'ISO-8859-1'); #$b = mb_substr($input, $this->_strpos, $size, 'ISO-8859-1');
$this->_strpos += $size; $this->_strpos += $size;
@ -542,7 +542,7 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
case XML_WBXML_GLOBAL_TOKEN_OPAQUE: case XML_WBXML_GLOBAL_TOKEN_OPAQUE:
// Section 5.8.4.6 // Section 5.8.4.6
$size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos); $size = XML_WBXML::MBUInt32ToInt($input, $this->_strpos);
$b = substr($input, $this->_strpos, $this->_strpos + $size); $b = $this->_substr($input, $this->_strpos, $this->_strpos + $size);
$this->_strpos += $size; $this->_strpos += $size;
$value .= $b; $value .= $b;
@ -664,5 +664,21 @@ class XML_WBXML_Decoder extends XML_WBXML_ContentHandler {
return $str; return $str;
} }
/**
* imitate substr()
* This circumvents a bug in the mbstring overloading in some distributions,
* where the mbstring.func_overload=0 INI-setting does not work, if mod_php
* has another value for that setting in another directory-context
*/
function _substr($input,$start,$size)
{
$ret = "";
if (!$input) return $ret;
for ($i = $start; $i < $start+$size; $i++) {
$ret .= $input[$i];
}
return $ret;
}
} }