Commit bf109390f82f8e7cd7c6edf520ed8314a8ae12b5
2024-09-29T23:19:32
wip asan
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81
diff --git a/libkc3/facts_with_cursor.c b/libkc3/facts_with_cursor.c
index 24f820a..2495fd5 100644
--- a/libkc3/facts_with_cursor.c
+++ b/libkc3/facts_with_cursor.c
@@ -48,14 +48,16 @@ const s_fact ** facts_with_cursor_next (s_facts_with_cursor *cursor,
s_facts_with_cursor_level *level;
p_facts_spec parent_spec;
assert(cursor);
+ if (! cursor->facts_count) {
+ *dest = NULL;
+ return dest;
+ }
if (pthread_mutex_lock(&cursor->mutex)) {
err_puts("facts_with_cursor_next: pthread_mutex_lock");
assert(! "facts_with_cursor_next: pthread_mutex_lock");
exit(1);
return NULL;
}
- if (! cursor->facts_count)
- goto not_found;
if (cursor->level == cursor->facts_count) {
level = &cursor->levels[cursor->facts_count - 1];
#ifdef DEBUG_FACTS
@@ -86,10 +88,8 @@ const s_fact ** facts_with_cursor_next (s_facts_with_cursor *cursor,
free(level->spec);
level->spec = NULL;
cursor->level--;
- if (! cursor->level) {
- cursor->facts_count = 0;
+ if (! cursor->level)
goto not_found;
- }
cursor->level--;
}
while (cursor->level < cursor->facts_count) {
@@ -128,23 +128,8 @@ const s_fact ** facts_with_cursor_next (s_facts_with_cursor *cursor,
}
free(level->spec);
level->spec = NULL;
- if (! cursor->level) {
- cursor->facts_count = 0;
- free(cursor->levels);
- free(cursor->spec);
- if (pthread_mutex_unlock(&cursor->mutex)) {
- err_puts("facts_with_cursor_next: pthread_mutex_unlock");
- assert(! "facts_with_cursor_next: pthread_mutex_unlock");
- exit(1);
- }
- if (pthread_mutex_destroy(&cursor->mutex)) {
- err_puts("facts_with_cursor_next: pthread_mutex_destroy");
- assert(! "facts_with_cursor_next: pthread_mutex_destroy");
- exit(1);
- }
- *dest = NULL;
- return dest;
- }
+ if (! cursor->level)
+ goto not_found;
cursor->level--;
}
if (pthread_mutex_unlock(&cursor->mutex)) {
@@ -155,10 +140,18 @@ const s_fact ** facts_with_cursor_next (s_facts_with_cursor *cursor,
*dest = fact;
return dest;
not_found:
+ cursor->facts_count = 0;
+ free(cursor->levels);
+ free(cursor->spec);
if (pthread_mutex_unlock(&cursor->mutex)) {
err_puts("facts_with_cursor_next: pthread_mutex_unlock");
assert(! "facts_with_cursor_next: pthread_mutex_unlock");
- exit(1);
+ abort();
+ }
+ if (pthread_mutex_destroy(&cursor->mutex)) {
+ err_puts("facts_with_cursor_next: pthread_mutex_destroy");
+ assert(! "facts_with_cursor_next: pthread_mutex_destroy");
+ abort();
}
*dest = NULL;
return dest;