[vlc-commits] direct3d11: fix multiple subpicture reusing crash

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at gmail.com> | Tue Aug 11 15:32:50 2015 +0200| [403f43f44e4d2520e08b8b9acca698336f3bbd2b] | committer: Jean-Baptiste Kempf

direct3d11: fix multiple subpicture reusing crash

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=403f43f44e4d2520e08b8b9acca698336f3bbd2b
---

 modules/video_output/msw/direct3d11.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_output/msw/direct3d11.c b/modules/video_output/msw/direct3d11.c
index 889ed31..9b96cc1 100644
--- a/modules/video_output/msw/direct3d11.c
+++ b/modules/video_output/msw/direct3d11.c
@@ -1680,7 +1680,7 @@ static int Direct3D11MapSubpicture(vout_display_t *vd, int *subpicture_region_co
     for (subpicture_region_t *r = subpicture->p_region; r; r = r->p_next, i++) {
         for (int j = 0; j < sys->d3dregion_count; j++) {
             picture_t *cache = sys->d3dregions[j];
-            if (((d3d_quad_t *) cache->p_sys)->pTexture) {
+            if (cache != NULL && ((d3d_quad_t *) cache->p_sys)->pTexture) {
                 ID3D11Texture2D_GetDesc( ((d3d_quad_t *) cache->p_sys)->pTexture, &texDesc );
                 if (texDesc.Format == sys->d3dregion_format &&
                     texDesc.Width  == r->fmt.i_visible_width &&