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

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie  | Mon Aug 
10 23:18:55 2015 +0200| [420c42512a9ce56bbf788e63e0ba070afcf3968b] | committer: 
Jean-Baptiste Kempf

Qt: fix NULL dereference on undescribed string var

(cherry picked from commit b5acac3bf0bce5e0d07a1cbe3e70ecd84dd05d84)
Signed-off-by: Jean-Baptiste Kempf 

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

 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 a79621b..8da328c 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();
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

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

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie fcvlc...@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();
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits