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

Fix a crash when trying to duplicate a locale that contains some implicit C locale components.

Browse Source 
Reported by:	Michael Butler
Approved by:	dim (mentor)
This commit is contained in:
David Chisnall 2011-11-22 14:11:42 +00:00
parent 54cf919857
commit 2013459487
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/locale/xlocale.c
View File

@ -200,8 +200,13 @@ static int dupcomponent(int type, locale_t base, locale_t new)
if (new->components[type]) {
strncpy(new->components[type]->locale, src->locale, ENCODING_LEN);
}
} else {
} else if (base->components[type]) {
new->components[type] = xlocale_retain(base->components[type]);
} else {
/* If the component was NULL, return success - if base is a valid
* locale then the flag indicating that this isn't present should be
* set. If it isn't a valid locale, then we're stuck anyway. */
return 1;
}
return (0 != new->components[type]);
}