mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 23:10:47 -08:00
Code Issues Projects Releases Wiki Activity

bindat (strz): Null terminate fixed-length strings if there is room

Browse source 
* lisp/emacs-lisp/bindat.el (bindat--pack-strz): For fixed-length strz
fields, explicitly write a null terminator after the packed string if
there is room (bug#56048).
* doc/lispref/processes.texi (Bindat Types): Update documentation.
* test/lisp/emacs-lisp/bindat-tests.el (bindat-test--str-strz-prealloc):
Update tests.
This commit is contained in:
Richard Hansen 2022-06-16 15:21:57 -04:00 • committed by Eli Zaretskii
parent eff42dc0af
commit 55c2102560
3 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

13
lisp/emacs-lisp/bindat.el
View file

@ -443,11 +443,14 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
(defun bindat--pack-strz (len v)
(let* ((v (string-to-unibyte v))
(vlen (length v)))
;; Explicitly write a null terminator (if there's room) in case
;; the user provided a pre-allocated string to `bindat-pack' that
;; wasn't already zeroed.
(when (or (null len) (< vlen len))
(aset bindat-raw (+ bindat-idx vlen) 0))
(if len
;; When len is specified, behave the same as the str type
;; since we don't actually add the terminating zero anyway
;; (because we rely on the fact that `bindat-raw' was
;; presumably initialized with all-zeroes before we started).
;; (except for the null terminator possibly written above).
(bindat--pack-str len v)
(dotimes (i vlen)
(when (= (aref v i) 0)
@ -456,10 +459,6 @@ e.g. corresponding to STRUCT.FIELD1[INDEX2].FIELD3..."
;; need to scan the input string looking for a null byte.
(error "Null byte encountered in input strz string"))
(aset bindat-raw (+ bindat-idx i) (aref v i)))
;; Explicitly write a null terminator in case the user provided
;; a pre-allocated string to `bindat-pack' that wasn't already
;; zeroed.
(aset bindat-raw (+ bindat-idx vlen) 0)
(setq bindat-idx (+ bindat-idx vlen 1)))))
(defun bindat--pack-bits (len v)