summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-11-29 09:14:30 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-29 09:14:30 -0800
commit391daa215831b21f5e5c96598cb08b114263b4d5 (patch)
treef67d16df22a78caeacc7318b9aad0f623ef390e7
parent61c195615176903bb077a10d6b88ba112fefa250 (diff)
parent66665cbcf8668d6c6a77f64c49b6a1d5b439fa2e (diff)
downloadframeworks_av-391daa215831b21f5e5c96598cb08b114263b4d5.zip
frameworks_av-391daa215831b21f5e5c96598cb08b114263b4d5.tar.gz
frameworks_av-391daa215831b21f5e5c96598cb08b114263b4d5.tar.bz2
am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"
* commit '251c04b1f3d048f541832c93347c6604b314e0ea': Unsolicited server responses cause RTSP streaming to crash
-rw-r--r--media/libstagefright/rtsp/ARTSPConnection.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp
index 539a888..161bd4f 100644
--- a/media/libstagefright/rtsp/ARTSPConnection.cpp
+++ b/media/libstagefright/rtsp/ARTSPConnection.cpp
@@ -830,6 +830,7 @@ status_t ARTSPConnection::findPendingRequest(
if (i < 0) {
// This is an unsolicited server->client message.
+ *index = -1;
return OK;
}