[Libreoffice-commits] core.git: sal/osl

Stephan Bergmann sbergman at redhat.com
Fri Sep 30 11:28:00 UTC 2016


 sal/osl/unx/socket.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit def490468df794166ce7bba1ec2d2feb410278ab
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Sep 30 13:24:13 2016 +0200

    osl_getSocketOption shall return the new length
    
    regression introduced with c89f22ffcd4191f7cb8ef0e68adb2a0f0ec6c74e
    "INTEGRATION: CWS pj72"
    
    Change-Id: Icea8bc43e346dbe4cf7cbfdf1176704d52b339f4

diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index 02000fb..a2b36ad 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -2161,7 +2161,7 @@ sal_Int32 SAL_CALL osl_getSocketOption(oslSocket pSocket,
         return -1;
     }
 
-    return BufferLen;
+    return nOptLen;
 }
 
 sal_Bool SAL_CALL osl_setSocketOption(oslSocket pSocket,


More information about the Libreoffice-commits mailing list