From ca082f686fd2dc7ee6f0284421f6212d6d4acee8 Mon Sep 17 00:00:00 2001
From: Anton Kling <anton@kling.gg>
Date: Thu, 11 Apr 2024 17:22:00 +0200
Subject: bug fixes

---
 kernel/fs/ext2.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'kernel/fs/ext2.c')

diff --git a/kernel/fs/ext2.c b/kernel/fs/ext2.c
index e815e79..9a3560f 100644
--- a/kernel/fs/ext2.c
+++ b/kernel/fs/ext2.c
@@ -1,6 +1,7 @@
 #include <assert.h>
 #include <fs/ext2.h>
 #include <fs/vfs.h>
+#include <math.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <typedefs.h>
@@ -251,8 +252,8 @@ int ext2_read_dir(int dir_inode, u8 *buffer, size_t len, size_t offset) {
     u8 *p = (u8 *)&tmp_entry;
     size_t l = sizeof(struct dirent);
 
-    l = (len < l) ? len : l;
-    memcpy(buffer, p, l);
+    l = min(len - rc, l);
+    memcpy(buffer + rc, p, l);
     len -= l;
     rc += l;
   }
-- 
cgit v1.2.3