commit 15c950ba38b8f41d1c4301e5a42286385d1dde45
author The Android Automerger <android-build@android.com> Thu Jun 09 13:45:38 2011 -0700
committer The Android Automerger <android-build@android.com> Thu Jun 09 13:45:38 2011 -0700
tree 1b79471d705401b82579df036be55bd4c2aef796
parent 2bb7e36e78521f49d2550aab34b34c25c23f7435
parent 380e88a9ef232d14e4062f9ee6b0e572faf10536

merge in gingerbread-release history after reset to gingerbread

media/libstagefright/HTTPStream.cpp

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 @@
         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);