diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-07 14:57:12 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-07 18:00:47 +0100 |
| commit | 37276d1636a7473290dda6dbfe64230ea037468b (patch) | |
| tree | de1637c5169a46426a6b192efd5cf5726213fa0a /sal | |
| parent | eb8d96fe7f6379e72c1c5cf945511cc3e3b2f152 (diff) | |
move null termination outside ifdefs for both branches
so the strncpy branch is guaranteed null terminated too
Change-Id: I79df96d69633a4db76f865301690c7ce7533fce9
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/socket.c | 4 |
1 files changed, 1 insertions, 3 deletions
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); |