Avoid direct writes to contents member of struct Lisp_Vector.

* lisp.h (vcopy): New function to copy data into vector.
* dispnew.c (Fframe_or_buffer_changed_p): Use AREF and ASET.
* fns.c (Ffillarray): Use ASET.
* keyboard.c (timer_check_2): Use AREF and ASET.
(append_tool_bar_item, Frecent_keys): Use vcopy.
* lread.c (read_vector): Use ASET.
* msdos.c (Frecent_doskeys): Use vcopy.
* xface.c (Finternal_copy_lisp_face): Use vcopy.
(Finternal_merge_in_global_face): Use ASET and vcopy.
* xfont.c (xfont_list_pattern): Likewise.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/xfont.c b/src/xfont.c
index 072bce7bb0a..cbb24622ae9 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -390,7 +390,7 @@ xfont_list_pattern (Display *display, const char *pattern,
       Lisp_Object scripts = Qnil;
 
       for (i = 0; i < ASIZE (xfont_scratch_props); i++)
-        props[i] = Qnil;
+        ASET (xfont_scratch_props, i, Qnil);
       for (i = 0; i < num_fonts; i++)
         indices[i] = names[i];
       qsort (indices, num_fonts, sizeof (char *), compare_font_names);
@@ -467,9 +467,9 @@ xfont_list_pattern (Display *display, const char *pattern,
                       word_size * 7)
               || ! EQ (AREF (entity, FONT_SPACING_INDEX), props[7]))
             {
-              memcpy (props, aref_addr (entity, FONT_FOUNDRY_INDEX),
-                      word_size * 7);
-              props[7] = AREF (entity, FONT_SPACING_INDEX);
+              vcopy (xfont_scratch_props, 0,
+                     aref_addr (entity, FONT_FOUNDRY_INDEX), 7);
+              ASET (xfont_scratch_props, 7, AREF (entity, FONT_SPACING_INDEX));
               scripts = xfont_supported_scripts (display, indices[i],
                                                  xfont_scratch_props, encoding);
             }