[vlc-devel] commit: Fix NULL dereference with -no-embedded-video (fixes: #3180) ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Dec 14 16:41:10 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Dec 14 17:40:43 2009 +0200| [3eec6e9cd24903a01c6815cb33f3c5b2640499a3] | committer: Rémi Denis-Courmont 

Fix NULL dereference with -no-embedded-video (fixes: #3180)

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

 modules/gui/qt4/main_interface.cpp |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index 8832702..86bffe7 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -702,7 +702,12 @@ void MainInterface::debug()
 {
 #ifndef NDEBUG
     msg_Dbg( p_intf, "Stack Size: %i - %i", stackCentralW->size().height(), size().width() );
-    msg_Dbg( p_intf, "Stack Size: %i - %i", stackCentralW->widget( VIDEO_TAB )->size().height(), stackCentralW->widget( VIDEO_TAB )->size().width() );
+    if( videoEmbeddedFlag )
+        msg_Dbg( p_intf, "Stack Size: %i - %i",
+                 stackCentralW->widget( VIDEO_TAB )->size().height(),
+                 stackCentralW->widget( VIDEO_TAB )->size().width() );
+    else
+        msg_Dbg( p_intf, "no embedded video" );
 
     msg_Dbg( p_intf, "size: %i - %i", size().height(), size().width() );
     msg_Dbg( p_intf, "sizeHint: %i - %i", sizeHint().height(), sizeHint().width() );




More information about the vlc-devel mailing list