diff options
author | Gert Faller <gertfaller@aliceadsl.fr> | 2010-11-01 09:38:06 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-01 09:38:06 +0000 |
commit | 6698ddb93999097587c9be6ba0c908cf847b1400 (patch) | |
tree | 83399abd419d6fa2f39f9b0427d106c5fc4ba7d8 | |
parent | cfa878447fd2c4c396631c6bbea86edf9888c344 (diff) |
fix cppcheck realloc warning
-rw-r--r-- | sal/osl/os2/socket.c | 7 | ||||
-rw-r--r-- | sal/osl/unx/socket.c | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sal/osl/os2/socket.c b/sal/osl/os2/socket.c index 613fe3225af7..20212c72b6ad 100644 --- a/sal/osl/os2/socket.c +++ b/sal/osl/os2/socket.c @@ -917,12 +917,15 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName) * full qualified name to the unqualified host name */ if ( !bHostsAreEqual ) { + sal_Char *pTmp; + OSL_TRACE("_osl_getFullQualifiedDomainName: " "suspect FQDN: %s\n", pFullQualifiedName); - pFullQualifiedName[ nLengthOfHostName ] = '\0'; - pFullQualifiedName = (sal_Char*)realloc ( pFullQualifiedName, + pTmp = (sal_Char*)realloc ( pFullQualifiedName, (nLengthOfHostName + 1) * sizeof( sal_Char )); + if (pTmp) + pFullQualifiedName = pTmp; } } diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c index 5bdd0446241a..bf6e4d633ac0 100644 --- a/sal/osl/unx/socket.c +++ b/sal/osl/unx/socket.c @@ -958,12 +958,16 @@ static sal_Char* _osl_getFullQualifiedDomainName (const sal_Char *pHostName) * full qualified name to the unqualified host name */ if ( !bHostsAreEqual ) { + sal_Char *pTmp; + OSL_TRACE("_osl_getFullQualifiedDomainName: " "suspect FQDN: %s\n", pFullQualifiedName); pFullQualifiedName[ nLengthOfHostName ] = '\0'; - pFullQualifiedName = (sal_Char*)realloc ( pFullQualifiedName, + pTmp = (sal_Char*)realloc ( pFullQualifiedName, (nLengthOfHostName + 1) * sizeof( sal_Char )); + if (pTmp) + pFullQualifiedName = pTmp; } } |