From 101524d0da7b5a792e40bdc820b99ec1bc41679c Mon Sep 17 00:00:00 2001 From: Paul Harrison Date: Thu, 30 May 2013 23:47:32 +0100 Subject: [PATCH] StreamView: fix Coverity ID 1026167, 1026168 Dereference null return value --- mythplugins/mythmusic/mythmusic/streamview.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/mythplugins/mythmusic/mythmusic/streamview.cpp b/mythplugins/mythmusic/mythmusic/streamview.cpp index 7832286597a..ace24d42dbd 100644 --- a/mythplugins/mythmusic/mythmusic/streamview.cpp +++ b/mythplugins/mythmusic/mythmusic/streamview.cpp @@ -386,10 +386,11 @@ void StreamView::removeStream(void) { MusicMetadata *mdata = qVariantValue (item->GetData()); - ShowOkPopup(tr("Are you sure you want to delete this Stream?\n" - "Station: %1 - Channel: %2") - .arg(mdata->Station()).arg(mdata->Channel()), - this, SLOT(doRemoveStream(bool)), true); + if (mdata) + ShowOkPopup(tr("Are you sure you want to delete this Stream?\n" + "Station: %1 - Channel: %2") + .arg(mdata->Station()).arg(mdata->Channel()), + this, SLOT(doRemoveStream(bool)), true); } } @@ -402,7 +403,9 @@ void StreamView::doRemoveStream(bool ok) if (item) { MusicMetadata *mdata = qVariantValue (item->GetData()); - deleteStream(mdata); + + if (mdata) + deleteStream(mdata); } }