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

[fbreader] Handle empty XHTML style stack

Browse source
This commit is contained in:
Slava Monich 2016-02-21 13:51:49 +03:00
parent 40bfd59dc5
commit c27cccee7f
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fbreader/fbreader/fbreader/src/formats/xhtml/XHTMLReader.cpp
View file

@ -1,5 +1,6 @@
/*
* Copyright (C) 2004-2010 Geometer Plus <contact@geometerplus.com>
* Copyright (C) 2016 Slava Monich <slava.monich@jolla.com>
*
* 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
@ -751,8 +752,9 @@ void XHTMLReader::characterDataHandler(const char *text, size_t len) {
}
break;
case READ_BODY:
if (myParseStack.back().opacity && !myStyleStack.empty() && !myStyleStack.back().DisplayNone) {
const StyleSheetTable::WhiteSpaceValue whiteSpace = myStyleStack.back().WhiteSpace;
if (myParseStack.back().opacity && (myStyleStack.empty() || !myStyleStack.back().DisplayNone)) {
const StyleSheetTable::WhiteSpaceValue whiteSpace = myStyleStack.empty() ?
StyleSheetTable::WS_UNDEFINED : myStyleStack.back().WhiteSpace;
if (myPreformatted || whiteSpace == StyleSheetTable::WS_PRE || whiteSpace == StyleSheetTable::WS_PRE_WRAP) {
size_t spaceCounter = 0;
while (len > 0 && isspace(*text)) {