diff options
| author |   doug <doug@openbsd.org> | 2014-12-13 21:05:32 +0000 |
|---|---|---|
| committer | doug <doug@openbsd.org> | 2014-12-13 21:05:32 +0000 |
| commit | f8238f3e71a8eb02e65b90db598fa2664cb0a2c7 (patch) | |
| tree | d1d22656f8480e9375f3f277691d9ca2527e7d8e /sys/arch/sgi/dev/impact.c | |
| parent | Sort members by size to reduce structure padding (diff) | |
| download | wireguard-openbsd-f8238f3e71a8eb02e65b90db598fa2664cb0a2c7.tar.xz wireguard-openbsd-f8238f3e71a8eb02e65b90db598fa2664cb0a2c7.zip | |
yet more mallocarray() changes.
ok tedu@ deraadt@
Diffstat (limited to 'sys/arch/sgi/dev/impact.c')
| -rw-r--r-- | sys/arch/sgi/dev/impact.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/sgi/dev/impact.c b/sys/arch/sgi/dev/impact.c index 633f85888d8..dc5481fcbb9 100644 --- a/sys/arch/sgi/dev/impact.c +++ b/sys/arch/sgi/dev/impact.c @@ -1,4 +1,4 @@ -/* $OpenBSD: impact.c,v 1.6 2014/07/12 18:44:42 tedu Exp $ */ +/* $OpenBSD: impact.c,v 1.7 2014/12/13 21:05:32 doug Exp $ */ /* * Copyright (c) 2010, 2012 Miodrag Vallat. @@ -192,7 +192,6 @@ int impact_init_screen(struct impact_screen *scr) { struct rasops_info *ri = &scr->ri; - size_t bssize; int i; uint32_t c, r, g, b; @@ -211,9 +210,9 @@ impact_init_screen(struct impact_screen *scr) * be able to fulfill scrolling requests. */ if (scr->bs == NULL) { - bssize = ri->ri_rows * ri->ri_cols * - sizeof(struct wsdisplay_charcell); - scr->bs = malloc(bssize, M_DEVBUF, M_NOWAIT | M_ZERO); + scr->bs = mallocarray(ri->ri_rows, + ri->ri_cols * sizeof(struct wsdisplay_charcell), M_DEVBUF, + M_NOWAIT | M_ZERO); if (scr->bs == NULL) return ENOMEM; } |