Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix infinite while-loop bug when minifying CSS with unclosed body block #59

Closed
wants to merge 1 commit into from
Closed

Fix infinite while-loop bug when minifying CSS with unclosed body block #59

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: 6 additions & 0 deletions src/Minifier.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@

namespace tubalmartin\CssMin;

use InvalidArgumentException;

class Minifier
{
const QUERY_FRACTION = '_CSSMIN_QF_';
Expand Down Expand Up @@ -507,6 +509,7 @@ private function processComments($css)
* Finds, minifies & preserves all rule bodies.
* @param string $css the whole stylesheet.
* @return string
* @throws InvalidArgumentException if $css contains an unclosed block
*/
private function processRuleBodies($css)
{
Expand All @@ -515,6 +518,9 @@ private function processRuleBodies($css)

while (($blockStartPos = strpos($css, '{', $searchOffset)) !== false) {
$blockEndPos = strpos($css, '}', $blockStartPos);
if ($blockEndPos === false) {
throw new InvalidArgumentException("No end to CSS block starting at offset $blockStartPos");
}
$nextBlockStartPos = strpos($css, '{', $blockStartPos + 1);
$ret .= substr($css, $substrOffset, $blockStartPos - $substrOffset);

Expand Down