summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-07 07:17:05 +0000
committerbertrand <bertrand@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-12-07 07:17:05 +0000
commit5e4118bef39f32ea520fcb4218c3112296f88c2d (patch)
treeeffd82c43e77b88b12db0c4615b45043c30fcc23
parent30a7fa2039307ec39f6886089a598e811e031988 (diff)
downloadmpv-5e4118bef39f32ea520fcb4218c3112296f88c2d.tar.bz2
mpv-5e4118bef39f32ea520fcb4218c3112296f88c2d.tar.xz
Checked the return values on read.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3366 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/network.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/libmpdemux/network.c b/libmpdemux/network.c
index 0f6bde8c9a..627064b526 100644
--- a/libmpdemux/network.c
+++ b/libmpdemux/network.c
@@ -187,6 +187,13 @@ http_read_response( int fd ) {
i = read( fd, response, BUFFER_SIZE );
if( i<0 ) {
printf("Read failed\n");
+ http_free( http_hdr );
+ return NULL;
+ }
+ if( i==0 ) {
+ printf("http_read_response read 0 -ie- EOF\n");
+ http_free( http_hdr );
+ return NULL;
}
http_response_append( http_hdr, response, i );
} while( !http_is_header_entire( http_hdr ) );
@@ -353,7 +360,12 @@ printf("read %d bytes from buffer\n", len );
}
if( len<size ) {
- len += read( fd, buffer+len, size-len );
+ int ret;
+ ret = read( fd, buffer+len, size-len );
+ if( ret==0 ) {
+ printf("nop_streaming_read read 0 -ie- EOF\n");
+ }
+ len += ret;
//printf("read %d bytes from network\n", len );
}