diff options
| author | marha <marha@users.sourceforge.net> | 2015-05-26 19:43:34 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-05-26 19:43:34 +0200 |
| commit | 912e881bec8b16f2331225960645c3bdf5a8ba2d (patch) | |
| tree | 92afd568d4b3eaab1faf26d8d95d8c6df0173079 /xorg-server/mi/mizerarc.c | |
| parent | 2e00f3764228cfc91180bbe9375a8d85e0e65a5b (diff) | |
| parent | 843964ee791452b197e41dacb0146f5b456ffaa5 (diff) | |
| download | vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.tar.gz vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.tar.bz2 vcxsrv-912e881bec8b16f2331225960645c3bdf5a8ba2d.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi_priv.h
mesalib/src/mesa/drivers/dri/swrast/swrast.c
xorg-server/dix/dispatch.c
xorg-server/os/utils.c
xorg-server/record/record.c
Diffstat (limited to 'xorg-server/mi/mizerarc.c')
| -rw-r--r-- | xorg-server/mi/mizerarc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/mi/mizerarc.c b/xorg-server/mi/mizerarc.c index b216cf43d..e1b5f0c18 100644 --- a/xorg-server/mi/mizerarc.c +++ b/xorg-server/mi/mizerarc.c @@ -671,7 +671,7 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs) numPts = maxPts << 2; dospans = (pGC->fillStyle != FillSolid); if (dospans) { - widths = malloc(sizeof(int) * numPts); + widths = xallocarray(numPts, sizeof(int)); if (!widths) return; maxw = 0; @@ -687,7 +687,7 @@ miZeroPolyArc(DrawablePtr pDraw, GCPtr pGC, int narcs, xArc * parcs) (unsigned char *) pGC->dash, (int) pGC->numInDashList, &dinfo.dashOffsetInit); } - points = malloc(sizeof(DDXPointRec) * numPts); + points = xallocarray(numPts, sizeof(DDXPointRec)); if (!points) { if (dospans) { free(widths); |