ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-07 14:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix signed shifts in raddbg_markup utf8 decoding; fix quoting of argument strings with spaces in command line target builds

Browse Source
This commit is contained in:
Ryan Fleury
2025-10-20 16:19:22 -07:00
parent b371bff6f2
commit c921645043
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_raddbg_markup/raddbg_markup.h
+6 -3
View File
@@ -170,7 +170,7 @@ raddbg_decode_utf8(char *str, unsigned __int64 max)
case 2: case 2:
if(2 < max) if(2 < max)
{ {
char cont_byte = str[1]; unsigned char cont_byte = str[1];
if(raddbg_utf8_class[cont_byte >> 3] == 0) if(raddbg_utf8_class[cont_byte >> 3] == 0)
{ {
result.codepoint = (byte & 0x0000001f) << 6; result.codepoint = (byte & 0x0000001f) << 6;
@@ -181,7 +181,7 @@ raddbg_decode_utf8(char *str, unsigned __int64 max)
case 3: case 3:
if(2 < max) if(2 < max)
{ {
char cont_byte[2] = {str[1], str[2]}; unsigned char cont_byte[2] = {str[1], str[2]};
if(raddbg_utf8_class[cont_byte[0] >> 3] == 0 && if(raddbg_utf8_class[cont_byte[0] >> 3] == 0 &&
raddbg_utf8_class[cont_byte[1] >> 3] == 0) raddbg_utf8_class[cont_byte[1] >> 3] == 0)
{ {
@@ -194,7 +194,7 @@ raddbg_decode_utf8(char *str, unsigned __int64 max)
case 4: case 4:
if(3 < max) if(3 < max)
{ {
char cont_byte[3] = {str[1], str[2], str[3]}; unsigned char cont_byte[3] = {str[1], str[2], str[3]};
if(raddbg_utf8_class[cont_byte[0] >> 3] == 0 && if(raddbg_utf8_class[cont_byte[0] >> 3] == 0 &&
raddbg_utf8_class[cont_byte[1] >> 3] == 0 && raddbg_utf8_class[cont_byte[1] >> 3] == 0 &&
raddbg_utf8_class[cont_byte[2] >> 3] == 0) raddbg_utf8_class[cont_byte[2] >> 3] == 0)
@@ -431,6 +431,9 @@ raddbg_annotate_vaddr_range__impl(void *ptr, unsigned __int64 size, char *fmt, .
va_list args; va_list args;
va_start(args, fmt); va_start(args, fmt);
buffer_size = RADDBG_MARKUP_VSNPRINTF(buffer, sizeof(buffer), fmt, args); buffer_size = RADDBG_MARKUP_VSNPRINTF(buffer, sizeof(buffer), fmt, args);
buffer_size = ((buffer_size < 0) ? 0 :
(buffer_size > sizeof(buffer)) ? sizeof(buffer) :
buffer_size);
va_end(args); va_end(args);
} }
src/raddbg/raddbg_core.c
+8 -1
View File
@@ -10028,7 +10028,14 @@ rd_init(CmdLine *cmdln)
String8List passthrough_args_list = {0}; String8List passthrough_args_list = {0};
for(String8Node *n = target_args.first->next; n != 0; n = n->next) for(String8Node *n = target_args.first->next; n != 0; n = n->next)
{ {
str8_list_push(scratch.arena, &passthrough_args_list, n->string); if(str8_find_needle(n->string, 0, str8_lit(" "), 0) < n->string.size)
{
str8_list_pushf(scratch.arena, &passthrough_args_list, "\"%S\"", escaped_from_raw_str8(scratch.arena, n->string));
}
else
{
str8_list_push(scratch.arena, &passthrough_args_list, n->string);
}
} }
StringJoin join = {str8_lit(""), str8_lit(" "), str8_lit("")}; StringJoin join = {str8_lit(""), str8_lit(" "), str8_lit("")};
arguments_string = str8_list_join(scratch.arena, &passthrough_args_list, &join); arguments_string = str8_list_join(scratch.arena, &passthrough_args_list, &join);