make sure null pointer won't be dereferenced

Song::Empty() does the check.
master
Andrzej Rybczak 17 years ago
parent 08cb912424
commit 01c138e680
  1. 5
      src/song.cpp
  2. 6
      src/status.cpp

@ -122,7 +122,7 @@ void MPD::Song::Clear()
bool MPD::Song::Empty() const
{
return !itsSong;// || (!itsSong->file && !itsSong->title && !itsSong->artist && !itsSong->album && !itsSong->date && !itsSong->track && !itsSong->genre && !itsSong->composer && !itsSong->performer && !itsSong->disc && !itsSong->comment);
return !itsSong;
}
bool MPD::Song::isFromDB() const
@ -482,7 +482,10 @@ MPD::Song &MPD::Song::operator=(const MPD::Song &s)
return *this;
if (itsSong)
mpd_song_free(itsSong);
if (itsFile)
delete [] itsFile;
itsSong = s.copyPtr ? s.itsSong : (s.itsSong ? mpd_song_dup(s.itsSong) : 0);
itsFile = s.itsFile ? strdup(s.itsFile) : 0;
itsNewName = s.itsNewName;
itsSlash = s.itsSlash;
itsHash = s.itsHash;

@ -193,8 +193,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
{
if (!Playlist::BlockUpdate)
{
np = Mpd.GetCurrentSong();
if (Mpd.isPlaying())
if (!(np = Mpd.GetCurrentSong()).Empty())
WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
bool was_filtered = myPlaylist->Items->isFiltered();
@ -297,7 +296,8 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
}
case psPlay:
{
WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
if (!np.Empty())
WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
player_state = Config.new_design ? "[playing]" : "Playing: ";
Playlist::ReloadRemaining = 1;
changed.ElapsedTime = 1;

Loading…
Cancel
Save