Put a quick bandaid on internal citrus locking.
The code is not quite right still, but it programs from deadlocking on themselves if one enables new citrus code by mistake.
This commit is contained in:
parent
e1e52afa08
commit
472d2173ba
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=223296
@ -337,7 +337,9 @@ _citrus_mapper_open(struct _citrus_mapper_area *__restrict ma,
|
||||
goto quit;
|
||||
|
||||
/* open mapper */
|
||||
UNLOCK;
|
||||
ret = mapper_open(ma, &cm, module, variable);
|
||||
WLOCK;
|
||||
if (ret)
|
||||
goto quit;
|
||||
cm->cm_key = strdup(mapname);
|
||||
|
@ -85,7 +85,7 @@ _iconv_open(const char *out, const char *in, struct _citrus_iconv *prealloc)
|
||||
errno = ENOMEM;
|
||||
return ((iconv_t)-1);
|
||||
}
|
||||
|
||||
|
||||
p = out_truncated;
|
||||
while (*p != 0) {
|
||||
if (p[0] == '/' && p[1] == '/') {
|
||||
|
Loading…
Reference in New Issue
Block a user