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

__setrunelocale: Fix asprintf(3) failure not returning an error.

Browse Source 
Also fix the style of the asprintf(3) call in __collate_load_tables_l().
Both of these lines were modified away from snprintf(3) during the
import from DragonFly/Illumos.

Reviewed by:	jilles (briefly over shoulder)
MFC after:	2 weeks
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-09-29 16:30:50 +00:00
parent 51bcc337dd
commit dc8507e1f7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=324103
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/libc/locale/collate.c
View File

@ -125,8 +125,7 @@ __collate_load_tables_l(const char *encoding, struct xlocale_collate *table)
return (_LDP_CACHE); return (_LDP_CACHE);
} }
asprintf(&buf, "%s/%s/LC_COLLATE", _PathLocale, encoding); if (asprintf(&buf, "%s/%s/LC_COLLATE", _PathLocale, encoding) == -1)
if (buf == NULL)
return (_LDP_ERROR); return (_LDP_ERROR);
if ((fd = _open(buf, O_RDONLY)) < 0) { if ((fd = _open(buf, O_RDONLY)) < 0) {

5
lib/libc/locale/setrunelocale.c
View File

@ -110,9 +110,8 @@ __setrunelocale(struct xlocale_ctype *l, const char *encoding)
} }
/* Range checking not needed, encoding length already checked before */ /* Range checking not needed, encoding length already checked before */
asprintf(&path, "%s/%s/LC_CTYPE", _PathLocale, encoding); if (asprintf(&path, "%s/%s/LC_CTYPE", _PathLocale, encoding) == -1)
if (path == NULL) return (errno);
return (0);
if ((rl = _Read_RuneMagi(path)) == NULL) { if ((rl = _Read_RuneMagi(path)) == NULL) {
free(path); free(path);