Chewing_Bever
/
lander
1
0
Fork 0
Code Issues 30 Packages Projects 1 Activity

fix: fixed segfault

generic-data-trie
Jef Roosens 2022-12-07 13:29:21 +01:00
parent a153c4e22d
commit 01eb5ece55
Signed by: Jef Roosens
GPG Key ID: B75D4F293C7052DB
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -43,6 +43,11 @@ prod: cmake-release
run: build run: build
@ LANDER_DATA_DIR=data LANDER_BASE_URL=http://localhost:18080/ LANDER_API_KEY=test ./build/Debug/lander @ LANDER_DATA_DIR=data LANDER_BASE_URL=http://localhost:18080/ LANDER_API_KEY=test ./build/Debug/lander
.PHONY: valgrind
valgrind: build
@ LANDER_DATA_DIR=data LANDER_BASE_URL=http://localhost:18080/ LANDER_API_KEY=test \
valgrind --tool=memcheck --error-exitcode=1 --track-origins=yes --leak-check=full ./build/Debug/lander
.PHONY: gdb .PHONY: gdb
gdb: build gdb: build
@ LANDER_DATA_DIR=data LANDER_BASE_URL=http://localhost:18080/ LANDER_API_KEY=test gdb --args ./build/Debug/lander @ LANDER_DATA_DIR=data LANDER_BASE_URL=http://localhost:18080/ LANDER_API_KEY=test gdb --args ./build/Debug/lander

15
trie/src/trie.c
View File

@ -28,10 +28,9 @@ TrieExitCode trie_init(Trie **trie_ptr, const char *file_path) {
trie->root = tnode_init(); trie->root = tnode_init();
pthread_rwlock_init(&trie->lock, NULL); pthread_rwlock_init(&trie->lock, NULL);
*trie_ptr = trie;
if (file_path == NULL) { if (file_path == NULL) {
trie->file_path = NULL; trie->file_path = NULL;
*trie_ptr = trie;
return Ok; return Ok;
} }
@ -50,7 +49,7 @@ TrieExitCode trie_init(Trie **trie_ptr, const char *file_path) {
Entry *entry; Entry *entry;
char *string; char *string;
int i, j; int i, j;
int entries = 0; TrieExitCode status;
while (fgets(buffer, 8192, fp)) { while (fgets(buffer, 8192, fp)) {
i = 0; i = 0;
@ -76,13 +75,18 @@ TrieExitCode trie_init(Trie **trie_ptr, const char *file_path) {
buffer[j] = '\0'; buffer[j] = '\0';
entry = entry_new(type, buffer + i + 3); entry = entry_new(type, buffer + i + 3);
trie_add_no_lock(trie, buffer, entry); status = trie_add_no_lock(trie, buffer, entry);
entries++; if (status != Ok) {
trie_free(trie);
return status;
}
} }
fclose(fp); fclose(fp);
*trie_ptr = trie;
return Ok; return Ok;
} }
@ -266,6 +270,7 @@ TrieExitCode trie_add_no_lock(Trie *trie, const char *string, Entry *entry) {
} }
(*child_node_ptr)->represents = true; (*child_node_ptr)->represents = true;
(*child_node_ptr)->entry = entry;
trie->size++; trie->size++;
return Ok; return Ok;
} }