From 37276d1636a7473290dda6dbfe64230ea037468b Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 7 Aug 2014 14:57:12 +0100
Subject: move null termination outside ifdefs for both branches

so the strncpy branch is guaranteed null terminated too

Change-Id: I79df96d69633a4db76f865301690c7ce7533fce9
---
 sal/osl/unx/socket.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'sal')

diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c
index 2bbe95a093fa..d28413bba552 100644
--- a/sal/osl/unx/socket.c
+++ b/sal/osl/unx/socket.c
@@ -1057,11 +1057,10 @@ oslSocketResult SAL_CALL osl_psz_getLocalHostname (
 
         strncpy(LocalHostname, uts.nodename, sizeof( LocalHostname ));
 #else  /* BSD compatible */
-
         if (gethostname(LocalHostname, sizeof(LocalHostname)-1) != 0)
             return osl_Socket_Error;
-        LocalHostname[sizeof(LocalHostname)-1] = 0;
 #endif /* SYSV */
+        LocalHostname[sizeof(LocalHostname)-1] = 0;
 
         /* check if we have an FQDN */
         if (strchr(LocalHostname, '.') == NULL)
@@ -1256,7 +1255,6 @@ oslSocketResult SAL_CALL osl_psz_getHostnameOfSocketAddr(oslSocketAddr pAddr,
     if (pHostAddr)
     {
         strncpy(pBuffer, pHostAddr->pHostName, BufferSize);
-
         pBuffer[BufferSize - 1] = '\0';
 
         osl_destroyHostAddr(pHostAddr);
-- 
cgit