stupidcomputer
/
jsfw
mirror of https://github.com/stupidcomputer/jsfw.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix hex color parsing bug

This commit is contained in:
viandoxdev 2023-02-12 14:17:23 +01:00
parent 749c8f6c01
commit a4b69eb0a1
No known key found for this signature in database
GPG Key ID: AF1410C5BC10AA25
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -1,3 +1,7 @@
.ccls-cache .ccls-cache
objects objects
jsfw jsfw
# configs used for testings
client_config.json
server_config.json

16
util.c
View File

@ -149,22 +149,18 @@ void tsf_hex_to_color(void *arg, void *ptr) {
return; return;
} }
uint8_t digit[6] = {0};
uint8_t *color = ptr; uint8_t *color = ptr;
for (int i = 1; i < 7; i++) { for (int i = 0; i < 3; i++) {
digit[i] = hex_digit(s[i]); uint8_t digits[2] = {hex_digit(s[1 + 2 * i]), hex_digit(s[2 + 2 * i])};
if (digit[i] == 16) {
printf("JSON: illegal character in hex color: '%c'\n", s[i]); if (digits[0] == 16 || digits[1] == 16) {
printf("JSON: illegal character in hex color: '%.7s'\n", s);
free(s); free(s);
return; return;
} }
if (i % 2 == 0) { color[i] = (digits[0] << 4) | digits[1];
uint8_t c = digit[i];
uint8_t p = digit[i - 1];
color[i / 2] = (p << 4) | c;
}
} }
free(s); free(s);