diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2015-06-04 23:30:43 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2018-12-08 10:06:42 -0800 |
| commit | 6d1dc1f6169ebf0ba71785d461bd98129c65c862 (patch) | |
| tree | 404077a4e254637baa658c474f5216a99538cdb9 /src/Region.c | |
| parent | bcf7b5aa06c23aee00af7999b58cb96a8571ac42 (diff) | |
| download | xorg-lib-libX11-6d1dc1f6169ebf0ba71785d461bd98129c65c862.tar.gz | |
Convert main src directory to use reallocarray()
Diffstat (limited to 'src/Region.c')
| -rw-r--r-- | src/Region.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/Region.c b/src/Region.c index d5dd5561..d6d9da9d 100644 --- a/src/Region.c +++ b/src/Region.c @@ -77,6 +77,7 @@ SOFTWARE. #include "Xutil.h" #include <X11/Xregion.h> #include "poly.h" +#include "reallocarray.h" #ifdef DEBUG #include <stdio.h> @@ -521,8 +522,8 @@ miRegionCopy( { BOX *prevRects = dstrgn->rects; - dstrgn->rects = Xrealloc(dstrgn->rects, - rgn->numRects * (sizeof(BOX))); + dstrgn->rects = Xreallocarray(dstrgn->rects, + rgn->numRects, sizeof(BOX)); if (! dstrgn->rects) { Xfree(prevRects); dstrgn->size = 0; @@ -790,7 +791,7 @@ miRegionOp( */ newReg->size = max(reg1->numRects,reg2->numRects) * 2; - if (! (newReg->rects = Xmalloc (sizeof(BoxRec) * newReg->size))) { + if (! (newReg->rects = Xmallocarray (newReg->size, sizeof(BoxRec)))) { newReg->size = 0; return; } @@ -980,8 +981,8 @@ miRegionOp( if (REGION_NOT_EMPTY(newReg)) { BoxPtr prev_rects = newReg->rects; - newReg->rects = Xrealloc (newReg->rects, - sizeof(BoxRec) * newReg->numRects); + newReg->rects = Xreallocarray (newReg->rects, + newReg->numRects, sizeof(BoxRec)); if (! newReg->rects) newReg->rects = prev_rects; else |