[vlc-commits] Qt: fix NULL dereference on undescribed string var

Francois Cartegnie git at videolan.org
Tue Aug 11 02:35:42 CEST 2015


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Mon Aug 10 23:18:55 2015 +0200| [b5acac3bf0bce5e0d07a1cbe3e70ecd84dd05d84] | committer: Francois Cartegnie

Qt: fix NULL dereference on undescribed string var

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

 modules/gui/qt4/components/preferences_widgets.cpp |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index bc6b6cc..c3a9c54 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -214,8 +214,8 @@ StringConfigControl::StringConfigControl( vlc_object_t *_p_this,
                                           bool pwd ) :
                            VStringConfigControl( _p_this, _p_item )
 {
-    label = new QLabel( qtr(p_item->psz_text), _parent );
-    text = new QLineEdit( qfu(p_item->value.psz), _parent );
+    label = new QLabel( p_item->psz_text ? qtr(p_item->psz_text) : "", _parent );
+    text = new QLineEdit( p_item->value.psz ? qfu(p_item->value.psz) : "", _parent );
     if( pwd ) text->setEchoMode( QLineEdit::Password );
     finish();
 }



More information about the vlc-commits mailing list