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

[Stephan Bergmann]

 svl/source/items/cintitem.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce84922f7b08ad431a6cca1cac32df0ba78f7915
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Jan 22 16:34:49 2018 +0100

    Assume this wants to SAL_WARN for the sal_uInt16 range, actually
    
    Change-Id: Icdda5cbc39fc2878c869ec01349135fd56a15363
    Reviewed-on: https://gerrit.libreoffice.org/48349
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx
index f38fa524175f..7254d0be75d6 100644
--- a/svl/source/items/cintitem.cxx
+++ b/svl/source/items/cintitem.cxx
@@ -122,7 +122,7 @@ bool CntUInt16Item::PutValue(const css::uno::Any& rVal, sal_uInt8)
     sal_Int32 nValue = 0;
     if (rVal >>= nValue)
     {
-        SAL_WARN_IF(nValue > USHRT_MAX, "svl.items", "Overflow in UInt16 value!");
+        SAL_WARN_IF(nValue < 0 || nValue > SAL_MAX_UINT16, "svl.items", "Overflow in UInt16 value!");
         m_nValue = static_cast<sal_uInt16>(nValue);
         return true;
     }