fix bug

PHZ76 · Jan 4, 2021 · 3cf7514 · 3cf7514 · hongson23 · Jan 4, 2021
1 parent 7f35536
commit 3cf7514
Showing 1 changed file with 18 additions and 3 deletions.
diff --git a/src/xop/RtspConnection.cpp b/src/xop/RtspConnection.cpp
@@ -158,8 +158,9 @@ bool RtspConnection::HandleRtspResponse(BufferReader& buffer)
 {
 #if RTSP_DEBUG
 	string str(buffer.Peek(), buffer.ReadableBytes());
-	if(str.find("rtsp")!=string::npos || str.find("RTSP") != string::npos)
+	if (str.find("rtsp") != string::npos || str.find("RTSP") != string::npos) {
 		cout << str << endl;
+	}		
 #endif
 
 	if (rtsp_response_->ParseResponse(&buffer)) {
@@ -360,7 +361,13 @@ void RtspConnection::HandleCmdSetup()
 
 void RtspConnection::HandleCmdPlay()
 {
-	if (auth_info_ != nullptr && !HandleAuthentication()) {
+	if (auth_info_ != nullptr) {
+		if (!HandleAuthentication()) {
+			return;
+		}
+	}
+
+	if (rtp_conn_ == nullptr) {
 		return;
 	}
 
@@ -376,18 +383,26 @@ void RtspConnection::HandleCmdPlay()
 
 void RtspConnection::HandleCmdTeardown()
 {
+	if (rtp_conn_ == nullptr) {
+		return;
+	}
+
 	rtp_conn_->Teardown();
 
 	uint16_t session_id = rtp_conn_->GetRtpSessionId();
 	std::shared_ptr<char> res(new char[2048]);
 	int size = rtsp_request_->BuildTeardownRes(res.get(), 2048, session_id);
 	SendRtspMessage(res, size);
 
-	HandleClose();
+	//HandleClose();
 }
 
 void RtspConnection::HandleCmdGetParamter()
 {
+	if (rtp_conn_ == nullptr) {
+		return;
+	}
+
 	uint16_t session_id = rtp_conn_->GetRtpSessionId();
 	std::shared_ptr<char> res(new char[2048]);
 	int size = rtsp_request_->BuildGetParamterRes(res.get(), 2048, session_id);