From 6ab96bd710d4ac230558975d2fd6f3ea68a9d44a Mon Sep 17 00:00:00 2001 From: Jim Stichnoth Date: Wed, 29 May 2013 22:12:54 -0700 Subject: [PATCH] Fix Coverity 1025910, 1025904, and 1025903. --- mythtv/libs/libmythtv/mythplayer.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mythtv/libs/libmythtv/mythplayer.cpp b/mythtv/libs/libmythtv/mythplayer.cpp index bddcafb8461..55b4d20a182 100644 --- a/mythtv/libs/libmythtv/mythplayer.cpp +++ b/mythtv/libs/libmythtv/mythplayer.cpp @@ -889,7 +889,7 @@ void MythPlayer::CreateDecoder(char *testbuf, int testreadsize) int MythPlayer::OpenFile(uint retries) { // Disable hardware acceleration for second PBP - if ((player_ctx->IsPBP() && !player_ctx->IsPrimaryPBP()) && + if (player_ctx && (player_ctx->IsPBP() && !player_ctx->IsPrimaryPBP()) && FlagIsSet(kDecodeAllowGPU)) { playerFlags = (PlayerFlags)(playerFlags - kDecodeAllowGPU); @@ -2522,7 +2522,8 @@ void MythPlayer::SwitchToProgram(void) { // Restore original ringbuffer ICRingBuffer *ic = dynamic_cast< ICRingBuffer* >(player_ctx->buffer); - player_ctx->buffer = ic->Take(); + if (ic) // should always be true + player_ctx->buffer = ic->Take(); delete ic; } @@ -2664,7 +2665,8 @@ void MythPlayer::JumpToProgram(void) { // Restore original ringbuffer ICRingBuffer *ic = dynamic_cast< ICRingBuffer* >(player_ctx->buffer); - player_ctx->buffer = ic->Take(); + if (ic) // should always be true + player_ctx->buffer = ic->Take(); delete ic; }