procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

bindat (strz): Fix off-by-one bug in computed length

Browse source 
* lisp/emacs-lisp/bindat.el (strz): Include null terminator when
computing packed string length.
* test/lisp/emacs-lisp/bindat-tests.el (strz): Mark tests as passing.
This commit is contained in:
Richard Hansen 2022-05-28 23:10:44 -04:00 • committed by Stefan Monnier
parent 916492cb6d
commit e66d6b3793
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -688,9 +688,9 @@ is the name of a variable that will hold the value we need to pack.")
('unpack `(bindat--unpack-strz ,len))
(`(length ,val)
`(cl-incf bindat-idx ,(cond
((null len) `(length ,val))
((null len) `(1+ (length ,val)))
((numberp len) len)
(t `(or ,len (length ,val))))))
(t `(or ,len (1+ (length ,val)))))))
(`(pack . ,args)
(macroexp-let2 nil len len
`(if ,len

2
test/lisp/emacs-lisp/bindat-tests.el
View file

@ -191,12 +191,10 @@
(let ((spec (bindat-type strz)))
(ert-deftest bindat-test--strz-varlen-len ()
:expected-result :failed
(should (equal (bindat-length spec "") 1))
(should (equal (bindat-length spec "abc") 4)))
(ert-deftest bindat-test--strz-varlen-pack ()
:expected-result :failed
(should (equal (bindat-pack spec "") "\0"))
(should (equal (bindat-pack spec "abc") "abc\0")))