Skip to content
This repository has been archived by the owner on May 16, 2018. It is now read-only.

Fix pcre segmentation fault in Zend_Db_Statement #705

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix pcre segmentation fault in Zend_Db_Statement #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions library/Zend/Db/Statement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,13 +191,13 @@ protected function _stripQuoted($sql)
if (!empty($q)) {
$escapeChar = preg_quote($escapeChar);
// this segfaults only after 65,000 characters instead of 9,000
$sql = preg_replace("/$q([^$q{$escapeChar}]*|($qe)*)*$q/s", '', $sql);
$sql = preg_replace("/$q(?:[^$q{$escapeChar}]*|(?:$qe)*)*$q/s", '', $sql);
}

// get a version of the SQL statement with all quoted
// values and delimited identifiers stripped out
// remove "foo\"bar"
$sql = preg_replace("/\"(\\\\\"|[^\"])*\"/Us", '', $sql);
$sql = preg_replace("/\".*(?<!\\\\)\"/Us", '', $sql);

// get the character for delimited id quotes,
// this is usually " but in MySQL is `
Expand All @@ -209,7 +209,7 @@ protected function _stripQuoted($sql)
$de = substr($de, 1, 2);
$de = preg_quote($de);
// Note: $de and $d where never used..., now they are:
$sql = preg_replace("/$d($de|\\\\{2}|[^$d])*$d/Us", '', $sql);
$sql = preg_replace("/$d(?:$de|\\\\{2}|[^$d])*$d/Us", '', $sql);
return $sql;
}

Expand Down
16 changes: 16 additions & 0 deletions tests/Zend/Db/Statement/MysqliTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,22 @@ public function testStripQuoted()
$this->assertSame($out, $actual, $count . ' - unexpected output');
}
}

public function testStripQuotedForLongQuery()
{
$statementClass = 'Zend_Db_Statement_' . $this->getDriver();

$table = $this->_db->quoteIdentifier('zfproducts');
$column = $this->_db->quoteIdentifier('product_name');

$sql = 'SELECT * FROM `zfproducts` WHERE `product_name` = "%s"';

$columnContent = str_repeat('a', 15000) . '\\"' . str_repeat('b', 15000);
$sql = sprintf($sql, $columnContent);

$stmt = new $statementClass($this->_db, $sql);
$this->assertNotNull($stmt->getDriverStatement());
}

public function testStatementRowCount()
{
Expand Down