summaryrefslogtreecommitdiff
path: root/kernel/src/libk
diff options
context:
space:
mode:
authorAleksa Vuckovic <aleksav013@gmail.com>2022-11-26 00:22:10 +0100
committerAleksa Vuckovic <aleksav013@gmail.com>2022-11-27 01:04:18 +0100
commitd43a3388a976a74ae109c5b8b5a31f82a16b45db (patch)
tree51880414ee600ddfb3c7e3486c3d74beced36bfe /kernel/src/libk
parent5d56d1a5b4d52702eb4e4ea6f05e4b6eebf41ca8 (diff)
fixing issues
1) main.c: order of init (multiboot.c must be after heap & paging because it uses heap to allocate pages for framebuffer) 2) paging.c: zeroing new pages allocated via heap 3) multiboot2.c: invalid pointer arithmetic 4) libk/string.c: check for null pointers in memcpy 5) paging: only page_lvl2 should have FLAG_HUGE 6) keyboard.c: kfree(print_buff)
Diffstat (limited to 'kernel/src/libk')
-rw-r--r--kernel/src/libk/serial_stdio.c2
-rw-r--r--kernel/src/libk/stdio.c1
-rw-r--r--kernel/src/libk/string.c3
3 files changed, 5 insertions, 1 deletions
diff --git a/kernel/src/libk/serial_stdio.c b/kernel/src/libk/serial_stdio.c
index a56750b..fb61ba1 100644
--- a/kernel/src/libk/serial_stdio.c
+++ b/kernel/src/libk/serial_stdio.c
@@ -50,7 +50,7 @@ void serial_printf(const char *s, ...)
else if(s[i] == 'x') serial_print_hex((uint64_t)va_arg(list, uint64_t));
else
{
- serial_print_string("Wrong format using printf\n");
+ serial_print_string("Wrong format using serial_printf\n");
return;
}
}
diff --git a/kernel/src/libk/stdio.c b/kernel/src/libk/stdio.c
index c5c8643..e7e372d 100644
--- a/kernel/src/libk/stdio.c
+++ b/kernel/src/libk/stdio.c
@@ -1,5 +1,6 @@
#include <types.h>
#include <libk/stdio.h>
+#include <libk/serial_stdio.h>
#include <stdarg.h>
#include <libk/string.h>
#include <graphics.h>
diff --git a/kernel/src/libk/string.c b/kernel/src/libk/string.c
index be37ba9..4cee538 100644
--- a/kernel/src/libk/string.c
+++ b/kernel/src/libk/string.c
@@ -70,6 +70,9 @@ void itoh(uint64_t num, char* s)
void memcpy(const void* destptr, const void* srcptr, size_t n)
{
+ if (destptr == NULL || srcptr == NULL)
+ return;
+
uint8_t* dest = (uint8_t*)destptr;
const uint8_t* src = (const uint8_t*)srcptr;