Merge pull request #254 from Gottox/fix/arm-fuzzer-crash

traversal: push element to the stack as soon as possible
Gottox · Jun 2, 2024 · de79964 · de79964
2 parents 8131bea + 09b9579
commit de79964
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/libsqsh/src/tree/traversal.c b/libsqsh/src/tree/traversal.c
@@ -75,6 +75,8 @@ push_stack(struct SqshTreeTraversal *traversal) {
 		rv = -SQSH_ERROR_MALLOC_FAILED;
 		goto out;
 	}
+	element->next = traversal->stack;
+	traversal->stack = element;
 
 	struct SqshArchive *archive = traversal->base_file->archive;
 	const uint32_t dir_inode = sqsh_file_inode(traversal->current_file);
@@ -88,9 +90,6 @@ push_stack(struct SqshTreeTraversal *traversal) {
 	if (rv < 0) {
 		goto out;
 	}
-	element->next = traversal->stack;
-	traversal->stack = element;
-
 	traversal->current_file = &element->file;
 	traversal->state = SQSH_TREE_TRAVERSAL_STATE_DIRECTORY_BEGIN;
 out:

diff --git a/test/fuzzer/crash-148c92a263a7778ab27cc68ddfe0bd5c1880bb80 b/test/fuzzer/crash-148c92a263a7778ab27cc68ddfe0bd5c1880bb80
diff --git a/test/fuzzer/meson.build b/test/fuzzer/meson.build
@@ -1,4 +1,5 @@
 fuzzer_repro = files(
+    'crash-148c92a263a7778ab27cc68ddfe0bd5c1880bb80',
     'crash-cabfb77fc6783dc1021720ca328e923aa2cc834b',
     'crash_0c006fc7bbbab8ba82abca1f01cc1f95714aaf98',
     'crash_0f300b1e2028a520e74e06b9d598b97d15b34062',