commit fd9d6a72f903e167255caa0aff7d0875dbb66184
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 25 20:43:06 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 25 20:43:06 2021 +0000
tree 521b775834c6a1fa7231ad3f6d61506a26d8e02c
parent d650d81cdb36d8a02a20f8468c8033e3aaf53787
parent d17fd7afc97e085f942ce9a25b3111395535a5be

Merge "VT: fixes possible nullptr case in ARTPConnection."

media/libstagefright/rtsp/ARTPConnection.cpp

diff --git a/media/libstagefright/rtsp/ARTPConnection.cpp b/media/libstagefright/rtsp/ARTPConnection.cpp
index 74acdda..ffccbb1 100644
--- a/media/libstagefright/rtsp/ARTPConnection.cpp
+++ b/media/libstagefright/rtsp/ARTPConnection.cpp
@@ -467,14 +467,16 @@
 
             if (err == -ECONNRESET) {
                 // socket failure, this stream is dead, Jim.
-                sp<AMessage> notify = it->mNotifyMsg->dup();
-                notify->setInt32("rtcp-event", 1);
-                notify->setInt32("payload-type", 400);
-                notify->setInt32("feedback-type", 1);
-                notify->setInt32("sender", it->mSources.valueAt(0)->getSelfID());
-                notify->post();
+                for (size_t i = 0; i < it->mSources.size(); ++i) {
+                    sp<AMessage> notify = it->mNotifyMsg->dup();
+                    notify->setInt32("rtcp-event", 1);
+                    notify->setInt32("payload-type", 400);
+                    notify->setInt32("feedback-type", 1);
+                    notify->setInt32("sender", it->mSources.valueAt(i)->getSelfID());
+                    notify->post();
 
-                ALOGW("failed to receive RTP/RTCP datagram.");
+                    ALOGW("failed to receive RTP/RTCP datagram.");
+                }
                 it = mStreams.erase(it);
                 continue;
             }