[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - sd/source

Juergen Funk juergen.funk_ml at cib.de
Tue Apr 28 09:17:47 PDT 2015


 sd/source/ui/remotecontrol/BluetoothServer.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit e88dde1f6e9198d4ed4b62f80c27bdc8b7ab88dd
Author: Juergen Funk <juergen.funk_ml at cib.de>
Date:   Tue Apr 28 14:12:39 2015 +0200

    Fix tdf#90911 wrong parameter size on getsockname
    
    This was crashing on selected versions for Windows.
    
    Change-Id: I7e9dd39db06f6ed93d2ae0d49275387e53983a89
    Reviewed-on: https://gerrit.libreoffice.org/15559
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 84c73c983577e33dda266bbfcdd89b9e1202906b)
    Reviewed-on: https://gerrit.libreoffice.org/15560
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>
    Tested-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index d5bf966..b5f30e5 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -1345,7 +1345,7 @@ void SAL_CALL BluetoothServer::run()
     }
 
     SOCKADDR aName;
-    int aNameSize = sizeof(aAddr);
+    int aNameSize = sizeof(aName);
     getsockname( aSocket, &aName, &aNameSize ); // Retrieve the local address and port
 
     CSADDR_INFO aAddrInfo;


More information about the Libreoffice-commits mailing list