treemerge: tolerate zero input paths

sahib · Jun 20, 2023 · c4b4662 · c4b4662
1 parent 6696a60
commit c4b4662
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/lib/treemerge.c b/lib/treemerge.c
@@ -191,8 +191,10 @@ static bool rm_tm_count_files(RmTrie *count_tree, const RmCfg *const cfg) {
     g_assert(cfg);
     guint path_count = cfg->path_count;
 
-    g_assert(path_count);
     g_assert(path_count == g_slist_length(cfg->paths));
+    if(path_count == 0) {
+        return true;
+    }
 
     const char **const path_vec = malloc(sizeof(*path_vec) * (path_count + 1));
     if(!path_vec) {

diff --git a/tests/test_options/test_stdin.py b/tests/test_options/test_stdin.py
@@ -82,9 +82,10 @@ def test_path_starting_with_dash():
 
 # Regression test for https://github.com/sahib/rmlint/issues/400
 # Do not search in current directory when piped empty input.
-@parameterized([("-", ), ("-0", )])
+# Also, treemerge should not fail if given zero paths.
+@parameterized([('-',), ('-0',), ('-D', '-')])
 @with_setup(usual_setup_func, usual_teardown_func)
-def test_stdin_empty(stdin_opt):
+def test_stdin_empty(*opts):
     create_file('1234', 'a')
     create_file('1234', 'b')
 
@@ -93,7 +94,7 @@ def test_stdin_empty(stdin_opt):
     try:
         os.chdir(TESTDIR_NAME)
         proc = subprocess.Popen(
-            [cwd + '/rmlint', stdin_opt, '-o', 'json'],
+            [cwd + '/rmlint', *opts, '-o', 'json'],
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE
         )