strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

wsd: do not decode already decoded fields

Browse source 
The different attributes of a document/user
are decoded when the kit receives them.
Decoding them a second time is usually harmless,
unless, that is, they contain '%'.

After the first decoding the '%' character might
not be escaping anything valid (depending on what
follows it). So a second attempt at decoding
might very well fail and throw, since the escape
code is invalid.

Change-Id: I73d56ce995b0237140a54b6c06bd36bde8b387bd
Signed-off-by: Ashod Nakashian <ashod.nakashian@collabora.co.uk>
This commit is contained in:
Ashod Nakashian 2020-12-03 21:36:14 -05:00 committed by Andras Timar
parent d8bda129d7
commit cf965fe4e3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
kit/Kit.cpp
View file

@ -1402,9 +1402,8 @@ private:
// Append name of the user, if any, who opened the document to rendering options
if (!userName.empty())
{
std::string decodedUserName;
URI::decode(userName, decodedUserName);
renderOptsObj->set(".uno:Author", makePropertyValue("string", decodedUserName));
// userName must be decoded already.
renderOptsObj->set(".uno:Author", makePropertyValue("string", userName));
}
if (!spellOnline.empty())