(ASET): Check bounds.

4b75ffab · Stefan Monnier · 250962b3 · 4b75ffab · 4b75ffab
Commit 4b75ffab authored Feb 10, 2008 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/lisp.h src/lisp.h +5 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+2008-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* lisp.h (ASET): Check bounds.
+
 2008-02-10  Glenn Morris  <rgm@gnu.org>

 	* buffer.c (mode-name): Doc fix.

--- a/src/lisp.h
+++ b/src/lisp.h
@@ -589,8 +589,12 @@ extern size_t pure_size;
 /* Convenience macros for dealing with Lisp arrays.  */

 #define AREF(ARRAY, IDX)	XVECTOR ((ARRAY))->contents[IDX]
-#define ASET(ARRAY, IDX, VAL)	(AREF ((ARRAY), (IDX)) = (VAL))
 #define ASIZE(ARRAY)		XVECTOR ((ARRAY))->size
+/* The IDX==IDX tries to detect when the macro argument is side-effecting.  */
+#define ASET(ARRAY, IDX, VAL)	\
+  (eassert ((IDX) == (IDX)),				\
+   eassert ((IDX) >= 0 && (IDX) < ASIZE (ARRAY)),	\
+   ASLOT ((ARRAY), (IDX)) = (VAL))

 /* Convenience macros for dealing with Lisp strings.  */