[Libreoffice-commits] core.git: include/oox

Caolán McNamara caolanm at redhat.com
Fri Jul 7 10:08:26 UTC 2017


 include/oox/export/utils.hxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dde903aeb0e495c04b23e2169b3e733549f438af
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 7 09:23:16 2017 +0100

    turn BS macro into an inline
    
    maybe this will clear coverity#1413007 Out-of-bounds access
    
    Change-Id: I26a0d83df543c1e9dab98b0f1219dadef5c8502d
    Reviewed-on: https://gerrit.libreoffice.org/39679
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index a66941f9dc07..05ee6a750281 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -29,7 +29,7 @@ inline OString I64S_(sal_Int64 x) { return OString::number(x); }
 #define I32S(x) I32S_(x).getStr()
 #define I64S(x) I64S_(x).getStr()
 #define IS(x) OString::number( x ).getStr()
-#define BS(x) (x ? "1":"0")
+inline const char* BS(bool x) { return x ? "1" : "0"; }
 #define USS(x) OUStringToOString( x, RTL_TEXTENCODING_UTF8 ).getStr()
 
 static inline sal_Int64 PPTtoEMU( sal_Int32 nPPT )


More information about the Libreoffice-commits mailing list