From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 22 May 2012 02:34:13 +0000 (-0700)
Subject: ralloc: Fix ralloc_parent() of memory allocated out of the NULL context.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1559b2e2d7c0d9ddab0e186fcf855ea847152ef1;p=mesa.git

ralloc: Fix ralloc_parent() of memory allocated out of the NULL context.

If an object is allocated out of the NULL context, info->parent will be
NULL.  Using the PTR_FROM_HEADER macro would be incorrect: it would say
that ralloc_parent(ralloc_context(NULL)) == sizeof(ralloc_header).

Fixes the new "null_parent" unit test.

NOTE: This is a candidate for the 7.9, 7.10, 7.11, and 8.0 branches.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/glsl/ralloc.c b/src/glsl/ralloc.c
index 2f93dcdeaf7..3da09b55929 100644
--- a/src/glsl/ralloc.c
+++ b/src/glsl/ralloc.c
@@ -278,7 +278,7 @@ ralloc_parent(const void *ptr)
       return NULL;
 
    info = get_header(ptr);
-   return PTR_FROM_HEADER(info->parent);
+   return info->parent ? PTR_FROM_HEADER(info->parent) : NULL;
 }
 
 static void *autofree_context = NULL;