Attachment 139093 Details for Bug 106230 – panoramiX: grow depths visuals dynamically

[patch] panoramiX: grow depths visuals dynamically

panoramiX-grow-depths-visuals-dynamically.patch (text/plain), 1.69 KB, created by Marco Trevisan (Treviño) on 2018-04-25 05:18:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marco Trevisan (Treviño)

Created: 2018-04-25 05:18:54 UTC

Size: 1.69 KB

patch

obsolete

>From 14058a13323855bc33c8af888b7b5095cdfbe71f Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
>Date: Wed, 25 Apr 2018 00:15:41 -0500
>Subject: [PATCH] panoramiX: grow depths visuals dynamically
>
>We need to ensure we've enough elements where writing the Visual depths
>or we could end up in a memory error.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=106230
>---
> Xext/panoramiX.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
>diff --git a/Xext/panoramiX.c b/Xext/panoramiX.c
>index 844ea49ce..59947d61d 100644
>--- a/Xext/panoramiX.c
>+++ b/Xext/panoramiX.c
>@@ -750,12 +750,8 @@ PanoramiXMaybeAddDepth(DepthPtr pDepth)
>     PanoramiXDepths = reallocarray(PanoramiXDepths,
>                                    PanoramiXNumDepths, sizeof(DepthRec));
>     PanoramiXDepths[j].depth = pDepth->depth;
>+    PanoramiXDepths[j].vids = NULL;
>     PanoramiXDepths[j].numVids = 0;
>-    /* XXX suboptimal, should grow these dynamically */
>-    if (pDepth->numVids)
>-        PanoramiXDepths[j].vids = xallocarray(pDepth->numVids, sizeof(VisualID));
>-    else
>-        PanoramiXDepths[j].vids = NULL;
> }
> 
> static void
>@@ -796,6 +792,9 @@ PanoramiXMaybeAddVisual(VisualPtr pVisual)
> 
>     for (k = 0; k < PanoramiXNumDepths; k++) {
>         if (PanoramiXDepths[k].depth == pVisual->nplanes) {
>+            PanoramiXDepths[k].vids = reallocarray(PanoramiXDepths[k].vids,
>+                                                   PanoramiXDepths[k].numVids + 1,
>+                                                   sizeof(VisualID));
>             PanoramiXDepths[k].vids[PanoramiXDepths[k].numVids] = pVisual->vid;
>             PanoramiXDepths[k].numVids++;
>             break;
>-- 
>2.17.0

Actions: View | Splinter Review

Attachments on bug 106230: 139093

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.