From 4bb7c67e043f5103e63d715ae49fb27c6ae60e1e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 29 Aug 2001 21:37:27 +0000 Subject: [PATCH] (delay_set_stat): Fix off-by-one error in file name size allocation that caused core dumps. From Jan.Djarv@mbox200.swipnet.se. (extract_archive): Use strcpy, not memcpy, for consistency with other code that does similar things. --- src/extract.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/extract.c b/src/extract.c index d1401b3..ee3720d 100644 --- a/src/extract.c +++ b/src/extract.c @@ -281,7 +281,8 @@ delay_set_stat (char const *file_name, struct stat const *stat_info, { size_t file_name_len = strlen (file_name); struct delayed_set_stat *data = - xmalloc (offsetof (struct delayed_set_stat, file_name) + file_name_len); + xmalloc (offsetof (struct delayed_set_stat, file_name) + + file_name_len + 1); data->file_name_len = file_name_len; strcpy (data->file_name, file_name); data->invert_permissions = invert_permissions; @@ -899,11 +900,9 @@ extract_archive (void) close_error (CURRENT_FILE_NAME); else { - size_t filelen = strlen (CURRENT_FILE_NAME); - size_t linklen = strlen (current_link_name); struct delayed_symlink *p = xmalloc (offsetof (struct delayed_symlink, target) - + linklen + 1); + + strlen (current_link_name) + 1); p->next = delayed_symlink_head; delayed_symlink_head = p; p->dev = st.st_dev; @@ -912,10 +911,10 @@ extract_archive (void) p->uid = current_stat.st_uid; p->gid = current_stat.st_gid; p->sources = xmalloc (offsetof (struct string_list, string) - + filelen + 1); + + strlen (CURRENT_FILE_NAME) + 1); p->sources->next = 0; - memcpy (p->sources->string, CURRENT_FILE_NAME, filelen + 1); - memcpy (p->target, current_link_name, linklen + 1); + strcpy (p->sources->string, CURRENT_FILE_NAME); + strcpy (p->target, current_link_name); status = 0; } } -- 2.45.2