python-ecosys/aiohttp: Use readexactly.

Signed-off-by: FuNK3Y <fun__key@hotmail.com>

Author: FuNK3Y

python-ecosys/aiohttp/aiohttp/__init__.py

@@ -44,11 +44,8 @@ def _decode(self, data):
     async def read(self, sz=-1):
         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)
+        else:
+            return self._decode(await self.content.readexactly(sz))
 
     async def text(self, encoding="utf-8"):
         return (await self.read(int(self._get_header("content-length", -1)))).decode(encoding)
@@ -72,13 +69,13 @@ async def read(self, sz=4 * 1024 * 1024):
             self.chunk_size = int(l, 16)
             if self.chunk_size == 0:
                 # End of message
-                sep = await self.content.read(2)
+                sep = await self.content.readexactly(2)
                 assert sep == b"\r\n"
                 return b""
-        data = await self.content.read(min(sz, self.chunk_size))
+        data = await self.content.readexactly(min(sz, self.chunk_size))
         self.chunk_size -= len(data)
         if self.chunk_size == 0:
-            sep = await self.content.read(2)
+            sep = await self.content.readexactly(2)
             assert sep == b"\r\n"
         return self._decode(data)
 

python-ecosys/aiohttp/aiohttp/aiohttp_ws.py

@@ -189,24 +189,21 @@ async def close(self):
             await self.send(b"", self.CLOSE)
 
     async def _read_frame(self):
-        header = await self.reader.read(2)
+        header = await self.reader.readexactly(2)
         if len(header) != 2:  # pragma: no cover
             # raise OSError(32, "Websocket connection closed")
             opcode = self.CLOSE
             payload = b""
             return opcode, payload
         fin, opcode, has_mask, length = self._parse_frame_header(header)
         if length == 126:  # Magic number, length header is 2 bytes
-            (length,) = struct.unpack("!H", await self.reader.read(2))
+            (length,) = struct.unpack("!H", await self.reader.readexactly(2))
         elif length == 127:  # Magic number, length header is 8 bytes
-            (length,) = struct.unpack("!Q", await self.reader.read(8))
+            (length,) = struct.unpack("!Q", await self.reader.readexactly(8))
 
         if has_mask:  # pragma: no cover
-            mask = await self.reader.read(4)
-        payload = bytearray()
-        while length > 0:
-            payload.extend(await self.reader.read(length))
-            length -= len(payload)
+            mask = await self.reader.readexactly(4)
+        payload = await self.reader.readexactly(length)
         if has_mask:  # pragma: no cover
             payload = bytes(x ^ mask[i % 4] for i, x in enumerate(payload))
         return opcode, payload