starnakin/42_KFS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: strcmp protection with NULL args

Browse Source
This commit is contained in:
0x35c 2024-09-27 12:03:52 +02:00
parent 0bcc99997a
commit f65d5ce418
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbozo/src/string/strcmp.c
View File

@ -4,6 +4,8 @@ int strcmp(const char *s1, const char *s2)
{ {
size_t i = 0; size_t i = 0;
if (!s1 || !s2)
return -1;
while (s1[i] == s2[i] && s1[i] != '\0') while (s1[i] == s2[i] && s1[i] != '\0')
i++; i++;
return s1[i] - s2[i]; return s1[i] - s2[i];

11
src/shell/commands/color_cmd.c
View File

@ -1,10 +1,9 @@
#include "kprintf.h" #include "kprintf.h"
#include "string.h" #include "string.h"
#include "terminal.h" #include "terminal.h"
#include "utils.h"
#include <stdint.h> #include <stdint.h>
#define ARRAY_SIZE(array) sizeof(array) / sizeof(array[0])
void color_cmd(char *arg) void color_cmd(char *arg)
{ {
uint8_t tmp_color; uint8_t tmp_color;
@ -21,16 +20,14 @@ void color_cmd(char *arg)
} }
} }
tmp_color = terminal_get_default_color(); tmp_color = terminal_get_default_color();
kprintf(KERN_WARNING "Invalid argument\navailable color: "); kprintf(KERN_WARNING "Invalid argument\n");
kprintf("Available colors: ");
for (size_t i = 0; i < ARRAY_SIZE(colors); i++) { for (size_t i = 0; i < ARRAY_SIZE(colors); i++) {
terminal_set_default_fg_color(i); terminal_set_default_fg_color(i);
// Unai the STRING MERGE argument of kprintf cause me a
// cramptissue. I lost all my skibidi aura to fix it but it work
// (;
kprintf(colors[i]); kprintf(colors[i]);
if (i != ARRAY_SIZE(colors) - 1) if (i != ARRAY_SIZE(colors) - 1)
kprintf(", "); kprintf(", ");
} }
terminal_set_default_fg_color(tmp_color); terminal_set_default_fg_color(tmp_color);
kprintf("\n"); kprintf("\n");
} }