[Libreoffice-commits] core.git: sfx2/source

[Szymon Kłos (via logerrit)]

 sfx2/source/view/lokhelper.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 8abce26253f3ba6bf74ba419775bf2b4a2f23546
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Mon Feb 13 13:05:26 2023 +0100
Commit:     Henry Castro <hcas...@collabora.com>
CommitDate: Fri May 12 13:22:02 2023 +0200

    lok: escape notifyWindow message
    
    File properties dialog contains problematic characters.
    In lok case and nl language it was constructing incorrect
    message so boost JSON parser was throwing an exception
    and dialog was not created correctly.
    
    Change-Id: I7e81c9407fcbf57355c0890c9540ce1f828904e5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146900
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Henry Castro <hcas...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150042
    Tested-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-by: Szymon Kłos <szymon.k...@collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150389
    Tested-by: Jenkins

diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 6f7f9ee60dd2..22b5ccc10b34 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -579,8 +579,9 @@ void SfxLokHelper::notifyWindow(const SfxViewShell* 
pThisView,
     {
         if (!rItem.first.isEmpty() && !rItem.second.isEmpty())
         {
-            aPayload.append(", \"" + rItem.first + "\": \"" +
-                    rItem.second + "\"");
+            auto aFirst = rItem.first.replaceAll("\"", "\\\"");
+            auto aSecond = rItem.second.replaceAll("\"", "\\\"");
+            aPayload.append(", \"" + aFirst + "\": \"" + aSecond + "\"");
         }
     }
     aPayload.append('}');