d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Put a quick bandaid on internal citrus locking.

Browse Source 
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:
Alexander Kabaev 2011-06-19 13:35:46 +00:00
parent e1e52afa08
commit 472d2173ba
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=223296
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libc/iconv/citrus_mapper.c
View File

@ -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);

2
lib/libc/iconv/iconv.c
View File

@ -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] == '/') {