diff options
| author | marha <marha@users.sourceforge.net> | 2012-06-04 09:40:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-06-04 09:40:31 +0200 |
| commit | 63918271b55923e417b14b9e7add4443582cfab3 (patch) | |
| tree | 59fc1c26991bbdb97d306da11408e98f49e05607 /mesalib/src/glsl/ralloc.c | |
| parent | 7d6bc8457187e6c4284201b3a6625357c4aca9b4 (diff) | |
| parent | 1af6fc1b5d93e54d6674de8b5870448b29f139a7 (diff) | |
| download | vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.tar.gz vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.tar.bz2 vcxsrv-63918271b55923e417b14b9e7add4443582cfab3.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/glsl/ralloc.c')
| -rw-r--r-- | mesalib/src/glsl/ralloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |