diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-08-03 19:29:05 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2019-08-04 11:23:20 -0700 |
| commit | ddbee30d3525cdd66b84056affc407601680cc29 (patch) | |
| tree | ae251a90a3e4cd3420d361edba93a4ea3656babc /src/bitmap/bitmaputil.c | |
| parent | f54470dab5b392380df61a22b4b4bef685b6cee2 (diff) | |
Convert multiplying malloc calls to use mallocarray instead
Introduces mallocarray as a macro calling reallocarray with a NULL
pointer for the old allocation.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Diffstat (limited to 'src/bitmap/bitmaputil.c')
| -rw-r--r-- | src/bitmap/bitmaputil.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bitmap/bitmaputil.c b/src/bitmap/bitmaputil.c index 232729f..c2135a0 100644 --- a/src/bitmap/bitmaputil.c +++ b/src/bitmap/bitmaputil.c @@ -30,6 +30,7 @@ from The Open Group. #include <config.h> #endif #include "libxfontint.h" +#include "src/util/replace.h" #include <X11/fonts/fntfilst.h> #include <X11/fonts/bitmap.h> @@ -210,7 +211,7 @@ bitmapAddInkMetrics(FontPtr pFont) int i; bitmapFont = (BitmapFontPtr) pFont->fontPrivate; - bitmapFont->ink_metrics = malloc(bitmapFont->num_chars * sizeof(xCharInfo)); + bitmapFont->ink_metrics = mallocarray(bitmapFont->num_chars, sizeof(xCharInfo)); if (!bitmapFont->ink_metrics) { fprintf(stderr, "Error: Couldn't allocate ink_metrics (%d*%ld)\n", bitmapFont->num_chars, (unsigned long)sizeof(xCharInfo)); |