summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorBasil L. Contovounesios <contovob@tcd.ie>2019-04-17 14:24:31 +0100
committerBasil L. Contovounesios <contovob@tcd.ie>2019-04-18 16:07:55 +0100
commita4ad7bed187493c1c230f223b52c71f5c34f7c89 (patch)
tree21ac3a6019b8c4ecc13f9679c0edcca0b521c643 /lisp
parenta1c53d4294550380de76d6a6c4e29e9e8f6f9133 (diff)
downloademacs-a4ad7bed187493c1c230f223b52c71f5c34f7c89.tar.gz
Fix off-by-one-link error in image--set-property
* lisp/image.el (image--set-property): Ensure new value is set even in the unlikely case that the plist is empty. Fix off-by-one-link error when deleting a property. (bug#35285) * test/lisp/image-tests.el: New file. (image--set-property): New test.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/image.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/image.el b/lisp/image.el
index 9d2045de610..585e6e10be2 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -452,10 +452,10 @@ Internal use only."
;; plist. Decouple plist entries where the key matches
;; the property.
(if (eq (cadr image) property)
- (setcdr image (cddr image))
+ (setcdr image (cdddr image))
(setq image (cddr image))))
;; Just enter the new value.
- (plist-put (cdr image) property value))
+ (setcdr image (plist-put (cdr image) property value)))
value)
(defun image-property (image property)