[vlc-commits] OpenGL: remove potential NULL dereference

Rémi Denis-Courmont git at videolan.org
Sat Nov 15 11:43:07 CET 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Nov 15 12:42:44 2014 +0200| [267d8be5f35b8a33bf5e634ff5087a8ab9788019] | committer: Rémi Denis-Courmont

OpenGL: remove potential NULL dereference

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

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

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index b35c074..de4a936 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -592,7 +592,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
         vgl->tex_type     = GL_UNSIGNED_SHORT;
     }
     vgl->chroma = vlc_fourcc_GetChromaDescription(vgl->fmt.i_chroma);
-    vgl->use_multitexture = vgl->chroma->plane_count > 1;
+    vgl->use_multitexture = vgl->chroma && vgl->chroma->plane_count > 1;
 
     /* Texture size */
     for (unsigned j = 0; j < vgl->chroma->plane_count; j++) {



More information about the vlc-commits mailing list