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

[fbreader] Fixed crash in ZLTextModel::addText with certain models

Browse source
This commit is contained in:
Slava Monich 2017-08-01 18:15:26 +03:00
parent 1320c9d61d
commit 34ed5ac9ce
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fbreader/fbreader/zlibrary/text/src/model/ZLTextModel.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
@ -187,7 +187,7 @@ void ZLTextModel::addText(const std::vector<std::string> &text) {
memcpy(myLastEntryStart + offset, it->data(), it->length()); memcpy(myLastEntryStart + offset, it->data(), it->length());
offset += it->length(); offset += it->length();
} }
} else { } else if (!myParagraphs.empty()) {
myLastEntryStart = myAllocator.allocate(len + sizeof(size_t) + 1); myLastEntryStart = myAllocator.allocate(len + sizeof(size_t) + 1);
*myLastEntryStart = ZLTextParagraphEntry::TEXT_ENTRY; *myLastEntryStart = ZLTextParagraphEntry::TEXT_ENTRY;
memcpy(myLastEntryStart + 1, &len, sizeof(size_t)); memcpy(myLastEntryStart + 1, &len, sizeof(size_t));