From: Sergey Poznyakoff <gray@gnu.org>
Date: Sat, 17 Jun 2023 08:16:12 +0000 (+0300)
Subject: Make sure each delayed link entry is visited once
X-Git-Tag: v1.35~10
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=826c5eb64eb40a8c75bf50de0b266513d00003d0;p=thirdparty%2Ftar.git

Make sure each delayed link entry is visited once

* src/extract.c (create_placeholder_file): Use FLEXNSIZEOF (overlooked
by c542d3d0c8)
(apply_delayed_links): Don't follow the "next" chain after its entries
have been applied.
---

diff --git a/src/extract.c b/src/extract.c
index 3bf407bc..030c0d49 100644
--- a/src/extract.c
+++ b/src/extract.c
@@ -1441,9 +1441,8 @@ create_placeholder_file (char *file_name, bool is_symlink, bool *interdir_made,
     {
       struct delayed_set_stat *h;
       struct delayed_link *p =
-	xmalloc (offsetof (struct delayed_link, target)
-		 + strlen (current_stat_info.link_name)
-		 + 1);
+	xmalloc (FLEXNSIZEOF (struct delayed_link, target,
+			      strlen (current_stat_info.link_name) + 1));
       if (prev)
 	{
 	  p->next = prev->next;
@@ -1950,19 +1949,25 @@ apply_delayed_links (void)
   if (!delayed_link_table)
     return;
 
-  for (struct delayed_link *dl = hash_get_first (delayed_link_table);
-       dl;
-       dl = dl->next ? dl->next : hash_get_next (delayed_link_table, dl))
-    if (!dl->has_predecessor)
-      {
-	struct delayed_link *ds = dl;
-	do
-	  {
-	    apply_delayed_link (ds);
-	    ds = ds->next;
-	  }
-	while (ds);
-      }
+  for (struct delayed_link *dl = hash_get_first (delayed_link_table); dl;)
+    {
+      struct delayed_link *ds = dl;
+      if (!ds->has_predecessor)
+	{
+	  do
+	    {
+	      apply_delayed_link (ds);
+	      ds = ds->next;
+	    }
+	  while (ds);
+	}
+      else if (dl->next)
+	{
+	  dl = dl->next;
+	  continue;
+	}
+      dl = hash_get_next (delayed_link_table, dl);
+    }
 
   if (false)
     {