summaryrefslogtreecommitdiff
path: root/media/libstagefright
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
commit37ddc8fc0f78234b5b3b58886113560cdf98aadf (patch)
tree982cc53349c752f683a00614ffdd9452a19fa495 /media/libstagefright
parent7b7f17dc9b30ff4ecdf0aea9bcfa1c518d4ac1e7 (diff)
parent251c04b1f3d048f541832c93347c6604b314e0ea (diff)
am 251c04b1: Merge "Unsolicited server responses cause RTSP streaming to crash"
* commit '251c04b1f3d048f541832c93347c6604b314e0ea': Unsolicited server responses cause RTSP streaming to crash
Diffstat (limited to 'media/libstagefright')
-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 539a8882..161bd4fb 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;
}