[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - vcl/aqua

Tor Lillqvist tml at collabora.com
Tue Mar 25 10:05:20 PDT 2014


 vcl/aqua/source/app/salsys.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6308a43f76169af4eb2b08f4913ddbe766ab534d
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Dec 26 18:00:28 2013 +0200

    WaE: format string is not a string literal (potentially insecure)
    
    (cherry picked from commit 765cd0ebaabf9cf7948ae1424681de144c7d267e)
    Signed-off-by: Tor Lillqvist <tml at collabora.com>
    
    Change-Id: I568817c33aa555bc8aef93105e6a00be1d4b501d
    Reviewed-on: https://gerrit.libreoffice.org/8753
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/aqua/source/app/salsys.cxx b/vcl/aqua/source/app/salsys.cxx
index 3cfcb3c..8058a95 100644
--- a/vcl/aqua/source/app/salsys.cxx
+++ b/vcl/aqua/source/app/salsys.cxx
@@ -155,7 +155,7 @@ int AquaSalSystem::ShowNativeMessageBox( const OUString& rTitle,
     }
 
 
-    int nResult = NSRunAlertPanel( pTitle, pMessage, pDefText, pAltText, pOthText );
+    int nResult = NSRunAlertPanel( pTitle, @"%@", pDefText, pAltText, pOthText, pMessage );
 
     if( pTitle )
         [pTitle release];


More information about the Libreoffice-commits mailing list