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

fix: nvm strcmp should crash on NULL, color cmd is now protected though

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

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

@ -4,8 +4,6 @@ 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];

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

@ -13,12 +13,16 @@ void color_cmd(char *arg)
"DARK_GREY", "LIGHT_BLUE", "LIGHT_GREEN", "LIGHT_CYAN", "DARK_GREY", "LIGHT_BLUE", "LIGHT_GREEN", "LIGHT_CYAN",
"LIGHT_RED", "LIGHT_MAGENTA", "LIGHT_YELLOW", "WHITE", "LIGHT_RED", "LIGHT_MAGENTA", "LIGHT_YELLOW", "WHITE",
}; };
if (!arg)
goto invalid;
for (size_t i = 0; i < ARRAY_SIZE(colors); i++) { for (size_t i = 0; i < ARRAY_SIZE(colors); i++) {
if (strcmp(colors[i], arg) == 0) { if (strcmp(colors[i], arg) == 0) {
terminal_change_default_fg_color(i); terminal_change_default_fg_color(i);
return; return;
} }
} }
invalid:
tmp_color = terminal_get_default_color(); tmp_color = terminal_get_default_color();
kprintf(KERN_WARNING "Invalid argument\n"); kprintf(KERN_WARNING "Invalid argument\n");
kprintf("Available colors: "); kprintf("Available colors: ");