[REFACTOR] Improve SSL parser, reduce memory allocations

captchanjack · Jan 30, 2022 · 226ff5d · 226ff5d · captchanjack · Jan 30, 2022
1 parent 9881a08
commit 226ff5d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Jedis"
 uuid = "b89ccfe0-2c5f-46f6-b89b-da3e1c2e286f"
 authors = ["Jack Chan <[email protected]>"]
-version = "0.2.9"
+version = "0.2.10"
 
 [deps]
 MbedTLS = "739be429-bea8-5141-9913-cc70e7f3736d"

diff --git a/src/protocol.jl b/src/protocol.jl
@@ -57,7 +57,7 @@ function parse_bulk_string(io, x)
         return nothing
     end
 
-    x = parse(Int, x) + 2
+    x = parse(Int64, x) + 2
     buffer = Vector{UInt8}(undef, x)
     readbytes!(io, buffer, x)
     return String(buffer[1:end-2])
@@ -109,5 +109,8 @@ Copies all available decrypted bytes from an MbedTLS.SSLContext into an IOBuffer
 """
 function recv(io::MbedTLS.SSLContext)
     MbedTLS.wait_for_decrypted_data(io)
-    return recv(IOBuffer(readavailable(io)))
+    nb = bytesavailable(io)
+    buffer = IOBuffer(Vector{UInt8}(undef, nb))
+    readbytes!(io, buffer.data, nb)
+    return recv(buffer)
 end