diff options
| author | Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | 2014-09-18 23:55:46 +0200 |
|---|---|---|
| committer | Thomas Hindoe Paaboel Andersen <phomes@gmail.com> | 2014-09-19 00:15:39 +0200 |
| commit | 66a16e7e9fc501d371b57cbe2ae5d130fe930c6d (patch) | |
| tree | e6f0795d6a49f0abdf3f9ea880644f52d74a6510 | |
| parent | 2f905e821e0342c36f5a5d3a51d53aabccc800bd (diff) | |
nss: remove dead code
c > 0 is already guaranteed from earlier checks.
We go from
ms = ALIGN(l+1) +
sizeof(char*) +
(c > 0 ? c : 1) * ALIGN(alen) +
(c > 0 ? c+1 : 2) * sizeof(char*);
to
ms = ALIGN(l+1) +
sizeof(char*) +
c * ALIGN(alen) +
(c+1) * sizeof(char*);
to
ms = ALIGN(l+1) + c * ALIGN(alen) + (c+2) * sizeof(char*);
Found by coverity. Fixes: CID#1237570 and CID#1237610
| -rw-r--r-- | src/nss-mymachines/nss-mymachines.c | 5 | ||||
| -rw-r--r-- | src/nss-resolve/nss-resolve.c | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/nss-mymachines/nss-mymachines.c b/src/nss-mymachines/nss-mymachines.c index abeb8253c..9476ad169 100644 --- a/src/nss-mymachines/nss-mymachines.c +++ b/src/nss-mymachines/nss-mymachines.c @@ -289,10 +289,7 @@ enum nss_status _nss_mymachines_gethostbyname3_r( alen = FAMILY_ADDRESS_SIZE(af); l = strlen(name); - ms = ALIGN(l+1) + - sizeof(char*) + - (c > 0 ? c : 1) * ALIGN(alen) + - (c > 0 ? c+1 : 2) * sizeof(char*); + ms = ALIGN(l+1) + c * ALIGN(alen) + (c+2) * sizeof(char*); if (buflen < ms) { *errnop = ENOMEM; diff --git a/src/nss-resolve/nss-resolve.c b/src/nss-resolve/nss-resolve.c index 39b73203d..6a029a331 100644 --- a/src/nss-resolve/nss-resolve.c +++ b/src/nss-resolve/nss-resolve.c @@ -404,10 +404,7 @@ enum nss_status _nss_resolve_gethostbyname3_r( alen = FAMILY_ADDRESS_SIZE(af); l = strlen(canonical); - ms = ALIGN(l+1) + - sizeof(char*) + - (c > 0 ? c : 1) * ALIGN(alen) + - (c > 0 ? c+1 : 2) * sizeof(char*); + ms = ALIGN(l+1) + c * ALIGN(alen) + (c+2) * sizeof(char*); if (buflen < ms) { *errnop = ENOMEM; |