1 files changed, 16 insertions, 3 deletions

diff --git a/src/pdb.c b/src/pdb.c
index 3f89611..7f37c34 100644
--- a/src/pdb.c
+++ b/src/pdb.c
@@ -129,6 +129,7 @@ void open_pdb(const char* pdb_path, struct module* module) {
     ReadFile(pdb_file, (void*)&DBI_block, sizeof(DBI_block), (LPDWORD)&b_read, NULL);
     struct DBI_stream_header* DBI_stream_header = (struct DBI_stream_header*)DBI_block;
 
+    // Read Module Info Substreams
     i32 byte_index = sizeof(*DBI_stream_header);
     for (u32 module_index = 0U; byte_index < DBI_stream_header->mod_info_size; module_index++) {
         modules_info[module_index] = (struct mod_info*)&DBI_block[byte_index];
@@ -147,14 +148,14 @@ void open_pdb(const char* pdb_path, struct module* module) {
         module_info_size = ((module_info_size + 3U) / 4U) * 4U;
         byte_index += module_info_size;
 
-        // Module Info Stream
+        // Read curren Module Info Stream
         u8 module_info_block[4096U] = { 0U };
         SetFilePointer(pdb_file, stream_blocks_indices[modules_info[module_index]->ModuleSymStream][0U] * sizeof(module_info_block), NULL, FILE_BEGIN);
         ReadFile(pdb_file, (void*)&module_info_block, sizeof(module_info_block), (LPDWORD)&b_read, NULL);
 
         u8* symbols = &module_info_block[4U];
         u8* cur_sym = symbols;
-        while ((u32)(cur_sym - symbols) < modules_info[module_index]->SymByteSize) {
+        while ((u32)(cur_sym - symbols) < modules_info[module_index]->SymByteSize - 4U) {
             struct SYMTYPE* rec = (struct SYMTYPE*)cur_sym;
             if (rec->rectyp == S_END) {
                 print("END SYMBOL\n");
@@ -180,7 +181,17 @@ void open_pdb(const char* pdb_path, struct module* module) {
                 StringCchLengthA((PCNZCH)proc->name, STRSAFE_MAX_CCH, &length);
                 StringCchCopyA((LPSTR)string_stack_current, STRSAFE_MAX_CCH, (LPCSTR)proc->name);
                 string_stack_current[length] = '\0';
-                insert_elem(&module->symbols, proc->off + module->nt_header.OptionalHeader.BaseOfCode, proc->len + module->nt_header.OptionalHeader.BaseOfCode, (u64)string_stack_current);
+                u32 start_address = proc->off + module->nt_header.OptionalHeader.BaseOfCode;
+#ifdef HASHMAP
+                insert_elem(&module->symbols, start_address, proc->len + module->nt_header.OptionalHeader.BaseOfCode, (u64)string_stack_current);
+#else
+                for (u32 index = 0U; index < module->functions_count; index++) {
+                    if (module->functions_start[index] == start_address) {
+                        module->functions_name[index] = string_stack_current;
+                        break;
+                    }
+                }
+#endif
                 string_stack_current += length + 1U;
             } else if (rec->rectyp == S_REGREL32) {
                 struct REGREL32* regrel = (struct REGREL32*)cur_sym;
@@ -220,4 +231,6 @@ void open_pdb(const char* pdb_path, struct module* module) {
     // Public Symbol Stream
     SetFilePointer(pdb_file, stream_blocks_indices[DBI_stream_header->public_stream_index][0U] * sizeof(block), NULL, FILE_BEGIN);
     ReadFile(pdb_file, (void*)&block, sizeof(block), (LPDWORD)&b_read, NULL);
+
+    CloseHandle(pdb_file);
 }