aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-05 21:29:42 +0000
committervda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277>2007-04-05 21:29:42 +0000
commit569a01c37235208ea1d38031378a586dd1349f31 (patch)
tree5052edb7b289a828ce9bfef5e85d568503a5cee7
parent357448c46daec12f0dd7dfa12f1f2f1c1e89fed8 (diff)
downloadbusybox-w32-569a01c37235208ea1d38031378a586dd1349f31.tar.gz
busybox-w32-569a01c37235208ea1d38031378a586dd1349f31.tar.bz2
busybox-w32-569a01c37235208ea1d38031378a586dd1349f31.zip
diff: fix segfault on empty dirs (Peter Korsgaard <peter.korsgaard@barco.com>)
git-svn-id: svn://busybox.net/trunk/busybox@18343 69ca8d6d-28ef-0310-b511-8ec308f3f277
-rw-r--r--coreutils/diff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/coreutils/diff.c b/coreutils/diff.c
index 1903bb151..75557187c 100644
--- a/coreutils/diff.c
+++ b/coreutils/diff.c
@@ -1070,7 +1070,7 @@ static int add_to_dirlist(const char *filename,
1070static char **get_dir(char *path) 1070static char **get_dir(char *path)
1071{ 1071{
1072 dl_count = 0; 1072 dl_count = 0;
1073 dl = NULL; 1073 dl = xzalloc(sizeof(dl[0]));
1074 1074
1075 /* If -r has been set, then the recursive_action function will be 1075 /* If -r has been set, then the recursive_action function will be
1076 * used. Unfortunately, this outputs the root directory along with 1076 * used. Unfortunately, this outputs the root directory along with