svn commit: r337484 - stable/11/lib/libc/locale

[Bryan Drewery]

Author: bdrewery
Date: Wed Aug  8 18:52:37 2018
New Revision: 337484
URL: https://svnweb.freebsd.org/changeset/base/337484

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

Modified:
  stable/11/lib/libc/locale/collate.c
  stable/11/lib/libc/locale/setrunelocale.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/lib/libc/locale/collate.c
==============================================================================
--- stable/11/lib/libc/locale/collate.c	Wed Aug  8 18:51:39 2018	(r337483)
+++ stable/11/lib/libc/locale/collate.c	Wed Aug  8 18:52:37 2018	(r337484)
@@ -124,8 +124,7 @@ __collate_load_tables_l(const char *encoding, struct x
 		return (_LDP_CACHE);
 	}
 
-	asprintf(&buf, "%s/%s/LC_COLLATE", _PathLocale, encoding);
-	if (buf == NULL)
+	if (asprintf(&buf, "%s/%s/LC_COLLATE", _PathLocale, encoding) == -1)
 		return (_LDP_ERROR);
 
 	if ((fd = _open(buf, O_RDONLY)) < 0) {

Modified: stable/11/lib/libc/locale/setrunelocale.c
==============================================================================
--- stable/11/lib/libc/locale/setrunelocale.c	Wed Aug  8 18:51:39 2018	(r337483)
+++ stable/11/lib/libc/locale/setrunelocale.c	Wed Aug  8 18:52:37 2018	(r337484)
@@ -110,9 +110,8 @@ __setrunelocale(struct xlocale_ctype *l, const char *e
 	}
 
 	/* Range checking not needed, encoding length already checked before */
-	asprintf(&path, "%s/%s/LC_CTYPE", _PathLocale, encoding);
-	if (path == NULL)
-		return (0);
+	if (asprintf(&path, "%s/%s/LC_CTYPE", _PathLocale, encoding) == -1)
+		return (errno);
 
 	if ((rl = _Read_RuneMagi(path)) == NULL) {
 		free(path);