haraldwolff
/
collabora-online
mirror of https://github.com/CollaboraOnline/online.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wsd: fix crash on renderfont when the doc broker has no tile cache 

Happens when renderfont is called without first loading a document.

Signed-off-by: Miklos Vajna <vmiklos@collabora.com>
Change-Id: I1152d1f4b3f610364e22c406cda5494672f20aed
pull/1063/head
Miklos Vajna 2020-12-21 09:34:03 +01:00
parent b678a1a5f9
commit f77c8076a7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
fuzzer/data/crash-b092e7d8d59d3e583428558c52bf1fc7c4b630ec 100644
View File

Binary file not shown.

11
wsd/ClientSession.cpp
View File

@ -884,11 +884,14 @@ bool ClientSession::sendFontRendering(const char *buffer, int length, const Stri
getTokenString(tokens[2], "char", text);
TileCache::Tile cachedTile = docBroker->tileCache().lookupCachedStream(TileCache::StreamType::Font, font+text);
if (cachedTile)
if (docBroker->hasTileCache())
{
const std::string response = "renderfont: " + tokens.cat(' ', 1) + '\n';
return sendTile(response, cachedTile);
TileCache::Tile cachedTile = docBroker->tileCache().lookupCachedStream(TileCache::StreamType::Font, font+text);
if (cachedTile)
{
const std::string response = "renderfont: " + tokens.cat(' ', 1) + '\n';
return sendTile(response, cachedTile);
}
}
return forwardToChild(std::string(buffer, length), docBroker);