python-ecosys/aiohttp: Fix partial reads.

Author: FuNK3Y

python-ecosys/aiohttp/aiohttp/__init__.py

@@ -42,7 +42,13 @@ def _decode(self, data):
         return data
 
     async def read(self, sz=-1):
-        return self._decode(await self.content.read(sz))
+        if sz == -1:
+            return self._decode(await self.content.read(sz))
+        data=bytearray()
+        while sz > 0:
+            data.extend(await self.content.read(sz))
+            sz -= len(data)
+        return self._decode(data)
 
     async def text(self, encoding="utf-8"):
         return (await self.read(int(self._get_header("content-length", -1)))).decode(encoding)

python-ecosys/aiohttp/aiohttp/aiohttp_ws.py

@@ -203,7 +203,10 @@ async def _read_frame(self):
 
         if has_mask:  # pragma: no cover
             mask = await self.reader.read(4)
-        payload = await self.reader.read(length)
+        payload = bytearray()
+        while length > 0:
+            payload.extend(await self.reader.read(length))
+            length -= len(payload)
         if has_mask:  # pragma: no cover
             payload = bytes(x ^ mask[i % 4] for i, x in enumerate(payload))
         return opcode, payload
@@ -267,3 +270,4 @@ async def __aenter__(self):
     async def __aexit__(self, *args):
         await self.client._reader.aclose()
         return await asyncio.sleep(0)
+