[COMMITTED] nss_nis: Do not call malloc_usable_size [BZ #10432]
diff mbox

Message ID 5613B9BA.80904@redhat.com
State New
Headers show

Commit Message

Florian Weimer Oct. 6, 2015, 12:08 p.m. UTC
This is a namespace violation, and interposed malloc implementations
are not required to interpose malloc_usable_size.

Florian

Patch
diff mbox

2015-10-06  Florian Weimer  <fweimer@redhat.com>

	[BZ #10433]
	* nis/nss_nis/nis-netgrp.c (_nss_nis_setnetgrent): Remove call to
	malloc_usable_size.

diff --git a/NEWS b/NEWS
index 0f3f33f..3852e7f 100644
--- a/NEWS
+++ b/NEWS
@@ -9,16 +9,16 @@  Version 2.23
 
 * The following bugs are resolved with this release:
 
-  887, 2542, 2543, 2558, 2898, 4404, 6803, 14341, 14912, 15367, 15384,
-  15786, 15918, 16141, 16296, 16347, 16415, 16517, 16519, 16520, 16521,
-  16620, 16734, 16973, 16985, 17118, 17243, 17244, 17250, 17441, 17787,
-  17886, 17887, 17905, 18084, 18086, 18240, 18265, 18370, 18421, 18480,
-  18525, 18595, 18610, 18618, 18647, 18661, 18674, 18675, 18681, 18724,
-  18757, 18778, 18781, 18787, 18789, 18790, 18795, 18796, 18803, 18820,
-  18823, 18824, 18825, 18857, 18863, 18870, 18872, 18873, 18875, 18887,
-  18921, 18951, 18952, 18956, 18961, 18966, 18967, 18969, 18970, 18977,
-  18980, 18981, 18985, 19003, 19012, 19016, 19018, 19032, 19046, 19049,
-  19050, 19059, 19071.
+  887, 2542, 2543, 2558, 2898, 4404, 6803, 10432, 14341, 14912, 15367,
+  15384, 15786, 15918, 16141, 16296, 16347, 16415, 16517, 16519, 16520,
+  16521, 16620, 16734, 16973, 16985, 17118, 17243, 17244, 17250, 17441,
+  17787, 17886, 17887, 17905, 18084, 18086, 18240, 18265, 18370, 18421,
+  18480, 18525, 18595, 18610, 18618, 18647, 18661, 18674, 18675, 18681,
+  18724, 18757, 18778, 18781, 18787, 18789, 18790, 18795, 18796, 18803,
+  18820, 18823, 18824, 18825, 18857, 18863, 18870, 18872, 18873, 18875,
+  18887, 18921, 18951, 18952, 18956, 18961, 18966, 18967, 18969, 18970,
+  18977, 18980, 18981, 18985, 19003, 19012, 19016, 19018, 19032, 19046,
+  19049, 19050, 19059, 19071.
 
 * The obsolete header <regexp.h> has been removed.  Programs that require
   this header must be updated to use <regex.h> instead.
diff --git a/nis/nss_nis/nis-netgrp.c b/nis/nss_nis/nis-netgrp.c
index 44faab7..5099d25 100644
--- a/nis/nss_nis/nis-netgrp.c
+++ b/nis/nss_nis/nis-netgrp.c
@@ -70,7 +70,6 @@  _nss_nis_setnetgrent (const char *group, struct __netgrent *netgrp)
 	 and the last byte is filled with NUL.  So we can simply
 	 use that buffer.  */
       assert (len >= 0);
-      assert (malloc_usable_size (netgrp->data) >= len + 1);
       assert (netgrp->data[len] == '\0');
 
       netgrp->data_size = len;