[Libreoffice-commits] online.git: loolwsd/ChildSession.cpp

Ashod Nakashian ashod.nakashian at collabora.co.uk
Sun Oct 23 21:00:02 UTC 2016


 loolwsd/ChildSession.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 85c1a0d8686774adefd304536374b1b6a14402ba
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri Oct 21 22:00:10 2016 -0400

    loolwsd: no warning for a fairly common case
    
    Change-Id: Ic461de074295eda4f15b6b7a8f787fc2624908ce
    Reviewed-on: https://gerrit.libreoffice.org/30193
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/ChildSession.cpp b/loolwsd/ChildSession.cpp
index 15fe4c5..7ce377b 100644
--- a/loolwsd/ChildSession.cpp
+++ b/loolwsd/ChildSession.cpp
@@ -1003,8 +1003,8 @@ void ChildSession::loKitCallback(const int nType, const std::string& rPayload)
                 }
                 catch (const std::out_of_range&)
                 {
-                    // something went wrong, invalidate everything
-                    Log::warn("Ignoring integer values out of range: " + rPayload);
+                    // We might get INT_MAX +/- some delta that
+                    // can overflow signed int and we end up here.
                     x = 0;
                     y = 0;
                     width = INT_MAX;


More information about the Libreoffice-commits mailing list