From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 18 Nov 2015 20:28:40 +0000 (+0100)
Subject: http client: fix the I/O limit check
X-Git-Tag: v4.2.1~1519
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ae441a33576861c7d37be699c5d187f224bac339;p=thirdparty%2Ftvheadend.git

http client: fix the I/O limit check
---

diff --git a/src/httpc.c b/src/httpc.c
index 3f2d43450..e9f959f7a 100644
--- a/src/httpc.c
+++ b/src/httpc.c
@@ -889,7 +889,7 @@ http_client_run( http_client_t *hc )
   char *buf, *saveptr, *argv[3], *d, *p;
   int ver, res, delimsize = 4;
   ssize_t r;
-  size_t len, limit;
+  size_t len;
 
   if (hc == NULL)
     return 0;
@@ -954,7 +954,6 @@ retry:
     tvhlog_hexdump("httpc", buf, MIN(64, r));
   }
 
-  limit = hc->hc_version == RTSP_VERSION_1_0 ? hc->hc_io_size * 2 : 16*1024;
   if (hc->hc_in_data && !hc->hc_in_rtp_data) {
     res = http_client_data_received(hc, buf, r, 0);
     if (res < 0)
@@ -967,7 +966,7 @@ retry:
   }
 
   if (hc->hc_rsize < r + hc->hc_rpos) {
-    if (hc->hc_rsize + r > limit)
+    if (hc->hc_rsize + r > hc->hc_io_size + 16*1024)
       return http_client_flush(hc, -EMSGSIZE);
     hc->hc_rsize += r;
     hc->hc_rbuf = realloc(hc->hc_rbuf, hc->hc_rsize + 1);