From a56db3439f26c4bda09fe7fdd665641680a6dad7 Mon Sep 17 00:00:00 2001 From: okan Date: Mon, 8 Jul 2013 15:48:16 +0000 Subject: replace a few (x)malloc with (x)calloc to prevent potential integer overflows; from Tiago Cunha --- group.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'group.c') diff --git a/group.c b/group.c index bf8f694..9a66e74 100644 --- a/group.c +++ b/group.c @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: group.c,v 1.76 2013/05/06 16:03:11 okan Exp $ + * $OpenBSD: group.c,v 1.77 2013/07/08 15:48:16 okan Exp $ */ #include @@ -430,8 +430,8 @@ group_update_names(struct screen_ctx *sc) } } - strings = xmalloc((nstrings < CALMWM_NGROUPS ? CALMWM_NGROUPS : - nstrings) * sizeof(*strings)); + strings = xcalloc((nstrings < CALMWM_NGROUPS ? CALMWM_NGROUPS : + nstrings), sizeof(*strings)); p = (char *)prop_ret; while (n < nstrings) { -- cgit v1.2.3-2-gb3c3