diff options
| author | Stefan Saraev <stefan@saraev.ca> | 2015-12-06 23:08:21 +0200 |
|---|---|---|
| committer | Stefan Saraev <stefan@saraev.ca> | 2015-12-07 15:21:37 +0200 |
| commit | a836b030be619c249c85cc6e459c20ba96334b4a (patch) | |
| tree | ebf89aa06a0bfb2596f5b2f7300dca670cb18ed9 | |
| parent | 26515da9933adcb3f02afda8f17376cc244e66f0 (diff) | |
[music] fix leaking credentials in logs
| -rw-r--r-- | xbmc/BackgroundInfoLoader.cpp | 5 | ||||
| -rw-r--r-- | xbmc/music/infoscanner/MusicInfoScanner.cpp | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/xbmc/BackgroundInfoLoader.cpp b/xbmc/BackgroundInfoLoader.cpp index b309d2989a..1f327a7b54 100644 --- a/xbmc/BackgroundInfoLoader.cpp +++ b/xbmc/BackgroundInfoLoader.cpp @@ -22,6 +22,7 @@ #include "FileItem.h" #include "threads/SingleLock.h" #include "utils/log.h" +#include "URL.h" CBackgroundInfoLoader::CBackgroundInfoLoader() : m_thread (NULL) { @@ -61,7 +62,7 @@ void CBackgroundInfoLoader::Run() } catch (...) { - CLog::Log(LOGERROR, "CBackgroundInfoLoader::LoadItemCached - Unhandled exception for item %s", pItem->GetPath().c_str()); + CLog::Log(LOGERROR, "CBackgroundInfoLoader::LoadItemCached - Unhandled exception for item %s", CURL::GetRedacted(pItem->GetPath()).c_str()); } } @@ -81,7 +82,7 @@ void CBackgroundInfoLoader::Run() } catch (...) { - CLog::Log(LOGERROR, "CBackgroundInfoLoader::LoadItemLookup - Unhandled exception for item %s", pItem->GetPath().c_str()); + CLog::Log(LOGERROR, "CBackgroundInfoLoader::LoadItemLookup - Unhandled exception for item %s", CURL::GetRedacted(pItem->GetPath()).c_str()); } } } diff --git a/xbmc/music/infoscanner/MusicInfoScanner.cpp b/xbmc/music/infoscanner/MusicInfoScanner.cpp index 9d541d5007..6bbe6e4460 100644 --- a/xbmc/music/infoscanner/MusicInfoScanner.cpp +++ b/xbmc/music/infoscanner/MusicInfoScanner.cpp @@ -459,9 +459,9 @@ bool CMusicInfoScanner::DoScan(const std::string& strDirectory) if ((m_flags & SCAN_RESCAN) || !m_musicDatabase.GetPathHash(strDirectory, dbHash) || dbHash != hash) { // path has changed - rescan if (dbHash.empty()) - CLog::Log(LOGDEBUG, "%s Scanning dir '%s' as not in the database", __FUNCTION__, strDirectory.c_str()); + CLog::Log(LOGDEBUG, "%s Scanning dir '%s' as not in the database", __FUNCTION__, CURL::GetRedacted(strDirectory).c_str()); else - CLog::Log(LOGDEBUG, "%s Rescanning dir '%s' due to change", __FUNCTION__, strDirectory.c_str()); + CLog::Log(LOGDEBUG, "%s Rescanning dir '%s' due to change", __FUNCTION__, CURL::GetRedacted(strDirectory).c_str()); // filter items in the sub dir (for .cue sheet support) items.FilterCueItems(); @@ -479,7 +479,7 @@ bool CMusicInfoScanner::DoScan(const std::string& strDirectory) } else { // path is the same - no need to rescan - CLog::Log(LOGDEBUG, "%s Skipping dir '%s' due to no change", __FUNCTION__, strDirectory.c_str()); + CLog::Log(LOGDEBUG, "%s Skipping dir '%s' due to no change", __FUNCTION__, CURL::GetRedacted(strDirectory).c_str()); m_currentItem += CountFiles(items, false); // false for non-recursive // updated the dialog with our progress @@ -1071,7 +1071,7 @@ INFO_RET CMusicInfoScanner::DownloadAlbumInfo(const CAlbum& album, const ADDON:: CNfoFile nfoReader; if (XFILE::CFile::Exists(strNfo)) { - CLog::Log(LOGDEBUG,"Found matching nfo file: %s", strNfo.c_str()); + CLog::Log(LOGDEBUG,"Found matching nfo file: %s", CURL::GetRedacted(strNfo).c_str()); result = nfoReader.Create(strNfo, info); if (result == CNfoFile::FULL_NFO) { @@ -1292,7 +1292,7 @@ INFO_RET CMusicInfoScanner::DownloadArtistInfo(const CArtist& artist, const ADDO CNfoFile nfoReader; if (XFILE::CFile::Exists(strNfo)) { - CLog::Log(LOGDEBUG,"Found matching nfo file: %s", strNfo.c_str()); + CLog::Log(LOGDEBUG,"Found matching nfo file: %s", CURL::GetRedacted(strNfo).c_str()); result = nfoReader.Create(strNfo, info); if (result == CNfoFile::FULL_NFO) { |