summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorMarco Nelissen <marcone@google.com>2011-06-09 10:36:24 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-06-09 10:36:24 -0700
commit90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f (patch)
treef9627827e1d23450bb59efcdc833524d6d088fa4 /media
parent17574b9a0a7cc1cf215935fce2474ca30d387046 (diff)
parenta02d9bf9c3ff22cd449da21ff7c23170488ebd8e (diff)
downloadframeworks_base-90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f.zip
frameworks_base-90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f.tar.gz
frameworks_base-90dc22fa09c4cddb94926b8a8f08fd3d0a404f7f.tar.bz2
am a02d9bf9: Make sure we don\'t read from invalid fds
* commit 'a02d9bf9c3ff22cd449da21ff7c23170488ebd8e': Make sure we don't read from invalid fds
Diffstat (limited to 'media')
-rw-r--r--media/libstagefright/HTTPStream.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libstagefright/HTTPStream.cpp b/media/libstagefright/HTTPStream.cpp
index 4c322bf..42664b2 100644
--- a/media/libstagefright/HTTPStream.cpp
+++ b/media/libstagefright/HTTPStream.cpp
@@ -130,6 +130,9 @@ static ssize_t MySendReceive(
int s, void *data, size_t size, int flags, bool sendData) {
ssize_t result = 0;
+ if (s < 0) {
+ return -1;
+ }
while (size > 0) {
fd_set rs, ws, es;
FD_ZERO(&rs);