Skip to content

Fix EDN BLOB decode to use exact SQLite blob size #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
delaneyj wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix EDN BLOB decode to use exact SQLite blob size #13

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions src/sqlite4clj/impl/encoding.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@

(defn- decode-edn
"Decode Clojure data."
[^MemorySegment blob]
;; This is faster than using read-once
[^MemorySegment blob size]
;; Read exactly `size` bytes from the BLOB payload. Relying on C-string
;; null terminators can leak random trailing bytes into EDN decoding.
(edn/read-string
(.getString (.reinterpret ^MemorySegment blob Integer/MAX_VALUE) 0)))
(String. (.toArray (mem/slice blob 0 size)
java.lang.foreign.ValueLayout/JAVA_BYTE)
"UTF-8")))

;; -----------------------------
;; Public API
Expand All @@ -39,7 +42,7 @@
(let [f-byte (mem/read-byte blob)
blob (mem/slice blob 1)]
(if (= f-byte ENCODED_BLOB)
(decode-edn blob)
(decode-edn blob (dec size))
;; Otherwise
(.toArray blob java.lang.foreign.ValueLayout/JAVA_BYTE)))
(byte-array 0)))