mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-09-19 22:08:32 +00:00
76 lines
2.2 KiB
Diff
76 lines
2.2 KiB
Diff
From a58bcbb0a35ac8e26a880be477705d833330ecc5 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Marshall <jmarshall@xbmc.org>
|
|
Date: Tue, 6 May 2014 19:40:17 +1200
|
|
Subject: [PATCH 1/7] [rtmp] check m_rtmp for non-NULL - fixes crashes with
|
|
missing librtmp
|
|
|
|
---
|
|
.../dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp | 16 +++++++++++-----
|
|
1 file changed, 11 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
|
|
index b02792a..93fc6f0 100644
|
|
--- a/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
|
|
+++ b/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
|
|
@@ -104,7 +104,8 @@ CDVDInputStreamRTMP::~CDVDInputStreamRTMP()
|
|
m_sStreamPlaying = NULL;
|
|
|
|
Close();
|
|
- m_libRTMP.Free(m_rtmp);
|
|
+ if (m_rtmp)
|
|
+ m_libRTMP.Free(m_rtmp);
|
|
m_rtmp = NULL;
|
|
m_bPaused = false;
|
|
}
|
|
@@ -139,7 +140,7 @@ bool CDVDInputStreamRTMP::Open(const char* strFile, const std::string& content)
|
|
m_sStreamPlaying = NULL;
|
|
}
|
|
|
|
- if (!CDVDInputStream::Open(strFile, "video/x-flv"))
|
|
+ if (!m_rtmp || !CDVDInputStream::Open(strFile, "video/x-flv"))
|
|
return false;
|
|
|
|
CSingleLock lock(m_RTMPSection);
|
|
@@ -181,7 +182,8 @@ void CDVDInputStreamRTMP::Close()
|
|
CSingleLock lock(m_RTMPSection);
|
|
CDVDInputStream::Close();
|
|
|
|
- m_libRTMP.Close(m_rtmp);
|
|
+ if (m_rtmp)
|
|
+ m_libRTMP.Close(m_rtmp);
|
|
|
|
m_optionvalues.clear();
|
|
m_eof = true;
|
|
@@ -190,6 +192,9 @@ void CDVDInputStreamRTMP::Close()
|
|
|
|
int CDVDInputStreamRTMP::Read(uint8_t* buf, int buf_size)
|
|
{
|
|
+ if (!m_rtmp)
|
|
+ return -1;
|
|
+
|
|
int i = m_libRTMP.Read(m_rtmp, (char *)buf, buf_size);
|
|
if (i < 0)
|
|
m_eof = true;
|
|
@@ -210,7 +215,7 @@ bool CDVDInputStreamRTMP::SeekTime(int iTimeInMsec)
|
|
CLog::Log(LOGNOTICE, "RTMP Seek to %i requested", iTimeInMsec);
|
|
CSingleLock lock(m_RTMPSection);
|
|
|
|
- if (m_libRTMP.SendSeek(m_rtmp, iTimeInMsec))
|
|
+ if (m_rtmp && m_libRTMP.SendSeek(m_rtmp, iTimeInMsec))
|
|
return true;
|
|
|
|
return false;
|
|
@@ -229,7 +234,8 @@ bool CDVDInputStreamRTMP::Pause(double dTime)
|
|
|
|
CLog::Log(LOGNOTICE, "RTMP Pause %s requested", m_bPaused ? "TRUE" : "FALSE");
|
|
|
|
- m_libRTMP.Pause(m_rtmp, m_bPaused);
|
|
+ if (m_rtmp)
|
|
+ m_libRTMP.Pause(m_rtmp, m_bPaused);
|
|
|
|
return true;
|
|
}
|
|
--
|
|
1.9.1
|
|
|