diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:10:57 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2023-04-27 14:10:57 +0200 |
| commit | 91d9218c0cc659f40918af6ac6c035c6c48d2c6d (patch) | |
| tree | 79054df1730d4723658b02cec311bc8ba7655662 /nx-X11/lib/src/PolyReg.c | |
| parent | a502149a844736dcc7f7dedd7c63229c74a448ee (diff) | |
| parent | 4875a15ca61358a1c95b156b2279fce092451278 (diff) | |
| download | nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.tar.gz nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.tar.bz2 nx-libs-91d9218c0cc659f40918af6ac6c035c6c48d2c6d.zip | |
Merge branch 'uli42-pr/update_libX11_2022' into 3.6.x
Attributes GH PR #1037: https://github.com/ArcticaProject/nx-libs/pull/1037
Diffstat (limited to 'nx-X11/lib/src/PolyReg.c')
| -rw-r--r-- | nx-X11/lib/src/PolyReg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nx-X11/lib/src/PolyReg.c b/nx-X11/lib/src/PolyReg.c index cb30f8422..ce2138cfe 100644 --- a/nx-X11/lib/src/PolyReg.c +++ b/nx-X11/lib/src/PolyReg.c @@ -55,6 +55,7 @@ SOFTWARE. #include "Xutil.h" #include <nx-X11/Xregion.h> #include "poly.h" +#include "reallocarray.h" /* * InsertEdgeInET @@ -409,7 +410,7 @@ static int PtsToRegion( numRects = ((numFullPtBlocks * NUMPTSTOBUFFER) + iCurPtBlock) >> 1; - if (!(reg->rects = Xrealloc(reg->rects, sizeof(BOX) * numRects))) { + if (!(reg->rects = Xreallocarray(reg->rects, numRects, sizeof(BOX)))) { Xfree(prevRects); return(0); } @@ -519,7 +520,7 @@ XPolygonRegion( if (Count < 2) return region; - if (! (pETEs = Xmalloc(sizeof(EdgeTableEntry) * Count))) { + if (! (pETEs = Xmallocarray(Count, sizeof(EdgeTableEntry)))) { XDestroyRegion(region); return (Region) NULL; } |