medvedych/harbour-books
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

[fbreader] Improved handling of broken CSS input

Browse source 
Particularly, curly brackets in inline CSS would make the parser crash.
Generally, it's better to stop parsing than crash when we get into an
unexpected state.
This commit is contained in:
Slava Monich 2017-01-20 00:39:24 +02:00
parent b96b822474
commit 83ca0db6bb
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
fbreader/fbreader/fbreader/src/formats/css/StyleSheetParser.cpp
View file

@ -1,6 +1,6 @@
/* /*
* Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com> * Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com>
* Copyright (C) 2015 Slava Monich <slava.monich@jolla.com> * Copyright (C) 2015-2017 Slava Monich <slava.monich@jolla.com>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -90,7 +90,7 @@ void StyleSheetParser::parse(ZLInputStream &stream) {
void StyleSheetParser::parse(const char *text, int len, bool final) { void StyleSheetParser::parse(const char *text, int len, bool final) {
const char *start = text; const char *start = text;
const char *end = text + len; const char *end = text + len;
for (const char *ptr = start; ptr != end; ++ptr) { for (const char *ptr = start; ptr != end && !myStateStack.empty(); ++ptr) {
processChar1(*ptr); processChar1(*ptr);
} }
} }
@ -220,6 +220,9 @@ void StyleSheetParser::processChar4(char c) {
case ';': case ';':
finishAttribute(); finishAttribute();
break; break;
case '{':
myStateStack.push(SKIP_BLOCK_CURLY);
break;
case '}': case '}':
finishRule(); finishRule();
myStateStack.pop(); myStateStack.pop();