From 1af6fc1b5d93e54d6674de8b5870448b29f139a7 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 4 Jun 2012 09:21:39 +0200
Subject: fontconfig libX11 libXft mesa pixman xserver xkeyboard-config git
 update 4 May 2012

---
 mesalib/src/glsl/ralloc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mesalib/src/glsl/ralloc.c')

diff --git a/mesalib/src/glsl/ralloc.c b/mesalib/src/glsl/ralloc.c
index 2f93dcdea..3da09b559 100644
--- a/mesalib/src/glsl/ralloc.c
+++ b/mesalib/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;
-- 
cgit v1.2.3