Merge pull request #2506 from pqarmitage/updates

Fix segfault due to non-existant iproute2 directories with Busybox
acassen · Nov 10, 2024 · 130368b · 130368b
2 parents 48dbf3d + 042dc49
commit 130368b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/INSTALL b/INSTALL
@@ -97,8 +97,10 @@ For ipset support
 To build using clang/llvm
 	apt install clang llvm
 
-Alpine Linux
+Alpine Linux (apk add ...)
 ------------
+For building packages
+	automake autoconf alpine-sdk
 The following libraries need to be installed:
 	linux-headers iptables-dev ipset-dev libnl3-dev musl-dev libnftnl-dev and openssl-dev or libressl-dev
 For magic file identification support:

diff --git a/lib/rttables.c b/lib/rttables.c
@@ -412,8 +412,9 @@ initialise_list(list_head_t *l, const char *file_name, const rt_entry_t *default
 
 			read_file(path, l, max);
 		}
+
+		closedir(dir);
 	}
-	closedir(dir);
 #endif
 
 	/* Now read the entries in the IPROUTE_ETC_DIR subdirectory */
@@ -425,8 +426,9 @@ initialise_list(list_head_t *l, const char *file_name, const rt_entry_t *default
 
 			read_file(path, l, max);
 		}
+
+		closedir(dir);
 	}
-	closedir(dir);
 
 	FREE_PTR(path);
 #ifdef IPROUTE_USR_DIR