diff options
| author | jmarshallnz <jcmarsha@gmail.com> | 2014-05-06 12:46:10 +1200 |
|---|---|---|
| committer | jmarshallnz <jcmarsha@gmail.com> | 2014-05-06 12:46:10 +1200 |
| commit | 9bbaf11bcbaaa483e02facccd3dc86c62bbf7d79 (patch) | |
| tree | 0743434690839b0a599675193c4efeef4f132e2a | |
| parent | 231e018fa2e9d1f2fc9cccd4bf8a697c1619fa86 (diff) | |
| parent | b48326805c1f72b39a2ff2bc801306e8ac1e349c (diff) | |
Merge pull request #4652 from cg110/CoverityFixes3
A couple of fixes from this weeks coverity scan.
| -rw-r--r-- | xbmc/interfaces/Builtins.cpp | 4 | ||||
| -rw-r--r-- | xbmc/windowing/WinEventsX11.cpp | 7 |
2 files changed, 4 insertions, 7 deletions
diff --git a/xbmc/interfaces/Builtins.cpp b/xbmc/interfaces/Builtins.cpp index 1201cd67d9..26aacb0ad7 100644 --- a/xbmc/interfaces/Builtins.cpp +++ b/xbmc/interfaces/Builtins.cpp @@ -687,8 +687,8 @@ int CBuiltins::Execute(const CStdString& execString) break; } - CGUIViewState *state = CGUIViewState::GetViewState(containsVideo ? WINDOW_VIDEO_NAV : WINDOW_MUSIC, items); - if (state) + auto_ptr<CGUIViewState> state(CGUIViewState::GetViewState(containsVideo ? WINDOW_VIDEO_NAV : WINDOW_MUSIC, items)); + if (state.get()) items.Sort(state->GetSortMethod()); else items.Sort(SortByLabel, SortOrderAscending); diff --git a/xbmc/windowing/WinEventsX11.cpp b/xbmc/windowing/WinEventsX11.cpp index 3586a6a79e..6603dcafed 100644 --- a/xbmc/windowing/WinEventsX11.cpp +++ b/xbmc/windowing/WinEventsX11.cpp @@ -177,11 +177,8 @@ CWinEventsX11Imp::CWinEventsX11Imp() CWinEventsX11Imp::~CWinEventsX11Imp() { - if (m_keybuf); - { - free(m_keybuf); - m_keybuf = 0; - } + free(m_keybuf); + m_keybuf = 0; if (m_xic) { |