semios/semi-libc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

drop lazy plural forms init in dcngettext

Browse Source 
there is no good reason to wait to find and process the plural rules
for a translated message file until a gettext form requesting plural
rule processing is used. it just imposes additional synchronization,
here in the form of clunky use of atomics.

it looks like there may also have been a race condition where nplurals
could be seen without plural_rule being seen, possibly leading to null
pointer dereference. if so, this commit fixes it.
This commit is contained in:
Rich Felker
2018-09-14 13:11:19 -04:00
parent 1281779330
commit 017e67ddde
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/locale/dcngettext.c
+17 -18
View File
@@ -100,8 +100,8 @@ struct msgcat {
struct msgcat *next; struct msgcat *next;
const void *map; const void *map;
size_t map_size; size_t map_size;
void *volatile plural_rule; const char *plural_rule;
volatile int nplurals; int nplurals;
struct binding *binding; struct binding *binding;
const struct __locale_map *lm; const struct __locale_map *lm;
int cat; int cat;
@@ -200,20 +200,7 @@ notrans:
p->lm = lm; p->lm = lm;
p->map = map; p->map = map;
p->map_size = map_size; p->map_size = map_size;
do {
old_cats = cats;
p->next = old_cats;
} while (a_cas_p(&cats, old_cats, p) != old_cats);
}
const char *trans = __mo_lookup(p->map, p->map_size, msgid1);
if (!trans) goto notrans;
/* Non-plural-processing gettext forms pass a null pointer as
* msgid2 to request that dcngettext suppress plural processing. */
if (!msgid2) return (char *)trans;
if (!p->plural_rule) {
const char *rule = "n!=1;"; const char *rule = "n!=1;";
unsigned long np = 2; unsigned long np = 2;
const char *r = __mo_lookup(p->map, p->map_size, ""); const char *r = __mo_lookup(p->map, p->map_size, "");
@@ -237,10 +224,22 @@ notrans:
rule = r+7; rule = r+7;
} }
} }
a_store(&p->nplurals, np); p->nplurals = np;
a_cas_p(&p->plural_rule, 0, (void *)rule); p->plural_rule = rule;
do {
old_cats = cats;
p->next = old_cats;
} while (a_cas_p(&cats, old_cats, p) != old_cats);
} }
if (p->nplurals) {
const char *trans = __mo_lookup(p->map, p->map_size, msgid1);
if (!trans) goto notrans;
/* Non-plural-processing gettext forms pass a null pointer as
* msgid2 to request that dcngettext suppress plural processing. */
if (msgid2 && p->nplurals) {
unsigned long plural = __pleval(p->plural_rule, n); unsigned long plural = __pleval(p->plural_rule, n);
if (plural > p->nplurals) goto notrans; if (plural > p->nplurals) goto notrans;
while (plural--) { while (plural--) {