From: Jason Ekstrand <jason.ekstrand@intel.com>
Date: Wed, 16 Aug 2017 23:50:46 +0000 (-0700)
Subject: ralloc: Allow reparenting to a NULL context
X-Git-Tag: upstream/18.1.0~5165
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3d54d03757fcb656cc4839a2c7978d97f75508d;p=platform%2Fupstream%2Fmesa.git

ralloc: Allow reparenting to a NULL context

Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Ian Romanick <idr@freedesktop.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/util/ralloc.c b/src/util/ralloc.c
index 9cce9e0..42cfa2e 100644
--- a/src/util/ralloc.c
+++ b/src/util/ralloc.c
@@ -285,7 +285,7 @@ ralloc_steal(const void *new_ctx, void *ptr)
       return;
 
    info = get_header(ptr);
-   parent = get_header(new_ctx);
+   parent = new_ctx ? get_header(new_ctx) : NULL;
 
    unlink_block(info);