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

Stephan Bergmann sbergman at redhat.com
Tue Nov 29 10:33:40 UTC 2016


 sal/osl/unx/socket.cxx |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

New commits:
commit 5bda4c35c2224946ad3a224b09f82b0013bf887f
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Nov 29 11:33:08 2016 +0100

    Don't change ustrHostname in case of error
    
    Change-Id: I78e85db2794b01286be49e1be70b53ac4f058cbe

diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index a2b36ad..23c8a2a 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -1227,8 +1227,10 @@ oslSocketResult SAL_CALL osl_getHostnameOfSocketAddr(oslSocketAddr Addr, rtl_uSt
     pszHostname[0] = '\0';
 
     Result = osl_psz_getHostnameOfSocketAddr(Addr,pszHostname,sizeof(pszHostname));
-
-    rtl_uString_newFromAscii(ustrHostname,pszHostname);
+    if (Result == osl_Socket_Ok)
+    {
+        rtl_uString_newFromAscii(ustrHostname,pszHostname);
+    }
 
     return Result;
 }


More information about the Libreoffice-commits mailing list