Skip to content

Commit cb88af7

Browse files
add locks around extensions registry ops
1 parent 92fb896 commit cb88af7

File tree

1 file changed

+31
-3
lines changed

1 file changed

+31
-3
lines changed

src/registry.c

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
#include <stdatomic.h>
12
#include <stdint.h>
23
#include <stdlib.h>
34
#include <string.h>
45

56
#include "cmark-gfm_config.h"
67
#include "cmark-gfm.h"
8+
#include "mutex.h"
79
#include "syntax_extension.h"
810
#include "registry.h"
911
#include "plugin.h"
@@ -12,6 +14,9 @@ extern cmark_mem CMARK_DEFAULT_MEM_ALLOCATOR;
1214

1315
static cmark_llist *syntax_extensions = NULL;
1416

17+
static pthread_mutex_t extensions_lock;
18+
static atomic_int extensions_latch = 0;
19+
1520
void cmark_register_plugin(cmark_plugin_init_func reg_fn) {
1621
cmark_plugin *plugin = cmark_plugin_new();
1722

@@ -23,41 +28,64 @@ void cmark_register_plugin(cmark_plugin_init_func reg_fn) {
2328
cmark_llist *syntax_extensions_list = cmark_plugin_steal_syntax_extensions(plugin),
2429
*it;
2530

31+
initialize_mutex_once(&extensions_lock, &extensions_latch);
32+
pthread_mutex_lock(&extensions_lock);
33+
2634
for (it = syntax_extensions_list; it; it = it->next) {
2735
syntax_extensions = cmark_llist_append(&CMARK_DEFAULT_MEM_ALLOCATOR, syntax_extensions, it->data);
2836
}
37+
38+
pthread_mutex_unlock(&extensions_lock);
2939

3040
cmark_llist_free(&CMARK_DEFAULT_MEM_ALLOCATOR, syntax_extensions_list);
3141
cmark_plugin_free(plugin);
3242
}
3343

3444
void cmark_release_plugins(void) {
45+
initialize_mutex_once(&extensions_lock, &extensions_latch);
46+
pthread_mutex_lock(&extensions_lock);
47+
3548
if (syntax_extensions) {
3649
cmark_llist_free_full(
3750
&CMARK_DEFAULT_MEM_ALLOCATOR,
3851
syntax_extensions,
3952
(cmark_free_func) cmark_syntax_extension_free);
4053
syntax_extensions = NULL;
4154
}
55+
56+
pthread_mutex_unlock(&extensions_lock);
4257
}
4358

4459
cmark_llist *cmark_list_syntax_extensions(cmark_mem *mem) {
4560
cmark_llist *it;
4661
cmark_llist *res = NULL;
4762

63+
initialize_mutex_once(&extensions_lock, &extensions_latch);
64+
pthread_mutex_lock(&extensions_lock);
65+
4866
for (it = syntax_extensions; it; it = it->next) {
4967
res = cmark_llist_append(mem, res, it->data);
5068
}
69+
70+
pthread_mutex_unlock(&extensions_lock);
5171
return res;
5272
}
5373

5474
cmark_syntax_extension *cmark_find_syntax_extension(const char *name) {
5575
cmark_llist *tmp;
76+
cmark_syntax_extension *res = NULL;
5677

78+
initialize_mutex_once(&extensions_lock, &extensions_latch);
79+
pthread_mutex_lock(&extensions_lock);
80+
5781
for (tmp = syntax_extensions; tmp; tmp = tmp->next) {
5882
cmark_syntax_extension *ext = (cmark_syntax_extension *) tmp->data;
59-
if (!strcmp(ext->name, name))
60-
return ext;
83+
if (!strcmp(ext->name, name)) {
84+
res = ext;
85+
break;
86+
}
6187
}
62-
return NULL;
88+
89+
pthread_mutex_unlock(&extensions_lock);
90+
return res;
6391
}

0 commit comments

Comments
 (0)