summaryrefslogtreecommitdiffstats
path: root/src/glsl/ralloc.c
diff options
context:
space:
mode:
authorKenneth Graunke <kenneth@whitecape.org>2012-05-21 19:34:13 -0700
committerKenneth Graunke <kenneth@whitecape.org>2012-05-30 21:49:40 -0700
commit1559b2e2d7c0d9ddab0e186fcf855ea847152ef1 (patch)
tree44243209a8bbe9084cf68aa3d1c0a415be41164b /src/glsl/ralloc.c
parent2224fb6047dd96cbc11d7f2093319e5eb49c0b6b (diff)
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>
Diffstat (limited to 'src/glsl/ralloc.c')
-rw-r--r--src/glsl/ralloc.c2
1 files changed, 1 insertions, 1 deletions
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;