summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Davy <davyaxel0@gmail.com>2018-11-25 14:37:53 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2019-01-11 19:19:08 +0000
commitdf3fd9f73863a47a0928974f17705c64fb7f440a (patch)
treee7615205a3461a577bd24b0f32bf55cbb339a09f
parent00c3af4f0cb37108b64dbec62fe0fd91be4e7788 (diff)
st/nine: Fix volumetexture dtor on ctor failure
The dtor is called on allocation failure, thus we must check the volumes are allocated before trying to release them. Signed-off-by: Axel Davy <davyaxel0@gmail.com> Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de> Cc: mesa-stable@lists.freedesktop.org (cherry picked from commit f91f748fabd7fec8f571124df23296c07102a983)
-rw-r--r--src/gallium/state_trackers/nine/volumetexture9.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/nine/volumetexture9.c b/src/gallium/state_trackers/nine/volumetexture9.c
index 5dec4844864..c7191bce688 100644
--- a/src/gallium/state_trackers/nine/volumetexture9.c
+++ b/src/gallium/state_trackers/nine/volumetexture9.c
@@ -141,7 +141,8 @@ NineVolumeTexture9_dtor( struct NineVolumeTexture9 *This )
if (This->volumes) {
for (l = 0; l <= This->base.base.info.last_level; ++l)
- NineUnknown_Destroy(&This->volumes[l]->base);
+ if (This->volumes[l])
+ NineUnknown_Destroy(&This->volumes[l]->base);
FREE(This->volumes);
}