smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #642 from kiwix/deadlock_in_Library_writeBookmarksToFile

This commit is contained in:
Matthieu Gautier 2021-12-06 11:37:02 +01:00 committed by GitHub
parent fa8d0f8e07 e1db9164c8
commit 27414f7731
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/library.cpp
View File

@ -274,11 +274,8 @@ bool Library::writeToFile(const std::string& path) const
bool Library::writeBookmarksToFile(const std::string& path) const bool Library::writeBookmarksToFile(const std::string& path) const
{ {
LibXMLDumper dumper(this); LibXMLDumper dumper(this);
std::string xml; // NOTE: LibXMLDumper::dumpLibXMLBookmark uses Library in a thread-safe way
{ const std::string xml = dumper.dumpLibXMLBookmark();
std::lock_guard<std::mutex> lock(m_mutex);
xml = dumper.dumpLibXMLBookmark();
};
return writeTextFile(path, xml); return writeTextFile(path, xml);
} }

2
src/libxml_dumper.cpp
View File

@ -91,7 +91,7 @@ void LibXMLDumper::handleBookmark(Bookmark bookmark, pugi::xml_node root_node) {
auto book_node = entry_node.append_child("book"); auto book_node = entry_node.append_child("book");
try { try {
auto book = library->getBookById(bookmark.getBookId()); auto book = library->getBookByIdThreadSafe(bookmark.getBookId());
ADD_TEXT_ENTRY(book_node, "id", book.getId()); ADD_TEXT_ENTRY(book_node, "id", book.getId());
ADD_TEXT_ENTRY(book_node, "title", book.getTitle()); ADD_TEXT_ENTRY(book_node, "title", book.getTitle());
ADD_TEXT_ENTRY(book_node, "language", book.getLanguage()); ADD_TEXT_ENTRY(book_node, "language", book.getLanguage());