aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--NEWS11
-rw-r--r--sunrpc/svc.c4
3 files changed, 12 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 6bca61b..2df497f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-18 Brad Hubbard <bhubbard@redhat.com>
+
+ [BZ #17542]
+ * sunrpc/svc.c (xprt_register): Use calloc to allocate xports.
+
2015-03-17 Alexandre Oliva <aoliva@redhat.com>
[BZ #17090]
diff --git a/NEWS b/NEWS
index 86394b8..4e1e661 100644
--- a/NEWS
+++ b/NEWS
@@ -10,12 +10,11 @@ Version 2.22
* The following bugs are resolved with this release:
4719, 13064, 14094, 14841, 14906, 15319, 15467, 15790, 15969, 16351,
- 16512, 16560, 16783, 17090, 17269, 17523, 17569, 17588, 17620, 17621,
- 17628, 17631, 17711, 17776, 17779, 17792, 17836, 17912, 17916, 17932,
- 17944, 17949, 17964, 17965, 17967, 17969, 17978, 17987, 17991, 17996,
- 17998, 17999, 18019, 18020, 18029, 18030, 18032, 18036, 18038, 18039,
- 18042, 18043, 18046, 18047, 18068, 18080, 18093, 18104, 18110, 18111,
- 18128.
+ 16512, 16560, 16783, 17269, 17523, 17542, 17569, 17588, 17631, 17711,
+ 17776, 17779, 17792, 17836, 17912, 17916, 17932, 17944, 17949, 17964,
+ 17965, 17967, 17969, 17978, 17987, 17991, 17996, 17998, 17999, 18019,
+ 18020, 18029, 18030, 18032, 18036, 18038, 18039, 18042, 18043, 18046,
+ 18047, 18068, 18080, 18093, 18104, 18110, 18111.
* Character encoding and ctype tables were updated to Unicode 7.0.0, using
new generator scripts contributed by Pravin Satpute and Mike FABIAN (Red
diff --git a/sunrpc/svc.c b/sunrpc/svc.c
index 8c4e8a5..c6ccf10 100644
--- a/sunrpc/svc.c
+++ b/sunrpc/svc.c
@@ -97,8 +97,8 @@ xprt_register (SVCXPRT *xprt)
if (xports == NULL)
{
- xports = (SVCXPRT **) malloc (_rpc_dtablesize () * sizeof (SVCXPRT *));
- if (xports == NULL) /* Donīt add handle */
+ xports = (SVCXPRT **) calloc (_rpc_dtablesize (), sizeof (SVCXPRT *));
+ if (xports == NULL) /* Don't add handle */
return;
}