mirror of
https://github.com/Ed94/raddebugger.git
synced 2026-11-16 11:10:14 -08:00
radlink: guard against empty input load requests
This commit is contained in:
1 parent
86ec8137d4
commit
7e995e8194
2 files changed
+14
-10
No files matched your search
+12
-8
@@ -969,19 +969,19 @@ lnk_inputer_push_lib_thin(LNK_Inputer *inputer, LNK_Config *config, LNK_InputSou
|
||||
}
|
||||
|
||||
internal B32
|
||||
lnk_inputer_has_items(LNK_Inputer *inputer)
|
||||
lnk_has_pending_input_work(LNK_Inputer *inputer, LNK_Link *link)
|
||||
{
|
||||
if (inputer->new_objs.count > 0) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
for EachIndex(i, ArrayCount(inputer->new_libs)) {
|
||||
if (inputer->new_libs[i].count > 0) {
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
|
||||
return 0;
|
||||
return *link->last_include != 0 ||
|
||||
*link->last_default_lib != 0 ||
|
||||
*link->last_obj_lib != 0;
|
||||
}
|
||||
|
||||
internal LNK_InputPtrArray
|
||||
@@ -1670,7 +1670,9 @@ lnk_link_inputs(TP_Context *tp,
|
||||
for (U64 resolved_members_count = 0; ; resolved_members_count = 0) {
|
||||
ProfBegin("Search Pass");
|
||||
|
||||
lnk_load_inputs(tp, arena, config, inputer, symtab, link);
|
||||
if (lnk_has_pending_input_work(inputer, link)) {
|
||||
lnk_load_inputs(tp, arena, config, inputer, symtab, link);
|
||||
}
|
||||
|
||||
for EachNode(lib_n, LNK_LibNode, link->libs.first) {
|
||||
LNK_Lib *lib = &lib_n->data;
|
||||
@@ -1740,7 +1742,9 @@ lnk_link_inputs(TP_Context *tp,
|
||||
|
||||
ProfBeginV("Search %S", str8_skip_last_slash(lib->path));
|
||||
do {
|
||||
lnk_load_inputs(tp, arena, config, inputer, symtab, link);
|
||||
if (lnk_has_pending_input_work(inputer, link)) {
|
||||
lnk_load_inputs(tp, arena, config, inputer, symtab, link);
|
||||
}
|
||||
|
||||
if (link_whole_archive) {
|
||||
local_persist LNK_Symbol *null_symbol = 0;
|
||||
@@ -1895,7 +1899,7 @@ lnk_link_inputs(TP_Context *tp,
|
||||
}
|
||||
|
||||
resolved_members_count += queued_members.count;
|
||||
} while (lnk_inputer_has_items(inputer));
|
||||
} while (lnk_has_pending_input_work(inputer, link));
|
||||
ProfEnd();
|
||||
}
|
||||
|
||||
@@ -1933,7 +1937,7 @@ lnk_link_inputs(TP_Context *tp,
|
||||
}
|
||||
}
|
||||
|
||||
resolved_members_count = lnk_inputer_has_items(inputer);
|
||||
resolved_members_count = lnk_has_pending_input_work(inputer, link);
|
||||
}
|
||||
|
||||
ProfEnd();
|
||||
|
||||
+2
-2
@@ -376,9 +376,9 @@ internal LNK_Input * lnk_inputer_push_lib(LNK_Inputer *inputer, LNK_InputSourceT
|
||||
internal LNK_Input * lnk_inputer_push_lib_linkgen(LNK_Inputer *inputer, LNK_InputSourceType input_source, String8 path, String8 data);
|
||||
internal LNK_Input * lnk_inputer_push_lib_thin(LNK_Inputer *inputer, LNK_Config *config, LNK_InputSourceType input_source, String8 lib_path);
|
||||
|
||||
internal B32 lnk_inputer_has_items(LNK_Inputer *inputer);
|
||||
internal B32 lnk_has_pending_input_work(LNK_Inputer *inputer, LNK_Link *link);
|
||||
internal LNK_InputPtrArray lnk_inputer_flush(Arena *arena, TP_Context *tp, LNK_Inputer *inputer, LNK_IO_Flags io_flags, LNK_InputList *all_inputs, LNK_InputList *new_inputs);
|
||||
internal void lnk_inputer_release_file_maps(TP_Context *tp, LNK_Inputer *inputer);
|
||||
internal void lnk_inputer_release_file_maps(TP_Context *tp, LNK_Inputer *inputer);
|
||||
|
||||
// --- Link Context ------------------------------------------------------------
|
||||
|
||||
|
||||
Reference in new issue
Block a user