From 1559b2e2d7c0d9ddab0e186fcf855ea847152ef1 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 21 May 2012 19:34:13 -0700 Subject: [PATCH] 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 --- src/glsl/ralloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/ralloc.c b/src/glsl/ralloc.c index 2f93dcd..3da09b5 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; -- 2.7.4