From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Sat, 26 Aug 2017 01:06:09 +0000 (+0200)
Subject: util/ralloc: set prev-pointers correctly in ralloc_adopt
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1e247511e54767667a0a9ac0c06f3206beb005af;p=mesa.git

util/ralloc: set prev-pointers correctly in ralloc_adopt

Found by inspection.

I'm not aware of any actual failures caused by this, but a precise
sequence of ralloc_adopt and ralloc_free should be able to cause
problems.

v2: make the code slightly clearer (Eric)

Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com>
---

diff --git a/src/util/ralloc.c b/src/util/ralloc.c
index bf46439df4e..566f08ad94e 100644
--- a/src/util/ralloc.c
+++ b/src/util/ralloc.c
@@ -311,10 +311,12 @@ ralloc_adopt(const void *new_ctx, void *old_ctx)
    for (child = old_info->child; child->next != NULL; child = child->next) {
       child->parent = new_info;
    }
+   child->parent = new_info;
 
    /* Connect the two lists together; parent them to new_ctx; make old_ctx empty. */
    child->next = new_info->child;
-   child->parent = new_info;
+   if (child->next)
+      child->next->prev = child;
    new_info->child = old_info->child;
    old_info->child = NULL;
 }