diff options
| author | Henrik Backlund <henrik.backlund@sonyericsson.com> | 2011-09-20 09:54:28 +0200 |
|---|---|---|
| committer | Henrik Baard <henrik.baard@sonymobile.com> | 2012-12-05 09:30:39 +0100 |
| commit | b6f7642496f955da04d1eb9e33df0dab653c9c4e (patch) | |
| tree | 640602cf8534f160138d1d80dda4188fef68c787 /media/libstagefright/rtsp/ARTSPConnection.cpp | |
| parent | f00d40c716fd4741fa56dd2b59813227658e50f2 (diff) | |
| download | frameworks_av-b6f7642496f955da04d1eb9e33df0dab653c9c4e.zip frameworks_av-b6f7642496f955da04d1eb9e33df0dab653c9c4e.tar.gz frameworks_av-b6f7642496f955da04d1eb9e33df0dab653c9c4e.tar.bz2 | |
Fix crash in MyHandler when sockets are not set.
-When going quickly in and out of the video view during an rtsp
streaming session, a race condition occurs and MyHandler tries to
connect to a socket that has been reset. To avoid this,
checks are added.
- If there are errors during setupTrack 1, it is no use
setting up track 2. It will cause new errors.
- No assert for socket connect since there is a normal
status check already.
Change-Id: Ie06221d6c0d78ce0449f76c782ed5120fa646bfd
Diffstat (limited to 'media/libstagefright/rtsp/ARTSPConnection.cpp')
| -rw-r--r-- | media/libstagefright/rtsp/ARTSPConnection.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp index 161bd4f..0606486 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -481,7 +481,6 @@ void ARTSPConnection::onReceiveResponse() { FD_SET(mSocket, &rs); int res = select(mSocket + 1, &rs, NULL, NULL, &tv); - CHECK_GE(res, 0); if (res == 1) { MakeSocketBlocking(mSocket, true); |