[vlc-devel] commit: Qt4: fix pontential NULL dereference and show the right containing forlder. ( Rémi Duraffort )

git version control git at videolan.org
Thu Feb 18 18:24:07 CET 2010


vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Thu Feb 18 18:15:19 2010 +0100| [012e93a73382df07238a122f9de884b5270c252e] | committer: Rémi Duraffort 

Qt4: fix pontential NULL dereference and show the right containing forlder.

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

 .../gui/qt4/components/playlist/playlist_model.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index fdb9f28..8345c0e 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -1013,11 +1013,11 @@ void PLModel::popupExplore()
            char  *psz_path;
            input_SplitMRL( &psz_access, &psz_demux, &psz_path, psz_meta );
 
-           if( EMPTY_STR( psz_access ) ||
-               !strncasecmp( psz_access, "file", 4 ) ||
-               !strncasecmp( psz_access, "dire", 4 ) )
+           if( !EMPTY_STR( psz_access ) && (
+                   !strncasecmp( psz_access, "file", 4 ) ||
+                   !strncasecmp( psz_access, "dire", 4 ) ))
            {
-               QFileInfo info( qfu( psz_meta ) );
+               QFileInfo info( qfu( psz_path ) );
                QDesktopServices::openUrl(
                                QUrl::fromLocalFile( info.absolutePath() ) );
            }




More information about the vlc-devel mailing list