rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Resolves: #1349906

Browse Source 
- Properly handle more invalid --install-langs arguments (#1349906).
This commit is contained in:
Carlos O'Donell 2016-06-24 13:50:22 -04:00
parent 22e8257c2d
commit 0ce3b29d56
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build-locale-archive.c
View File

@ -642,7 +642,7 @@ int main (int argc, char *argv[])
int install_langs_count = 0; int install_langs_count = 0;
int i; int i;
char *install_langs_arg, *ila_start; char *install_langs_arg, *ila_start;
char **install_langs_list; char **install_langs_list = NULL;
unsigned int cnt = 0; unsigned int cnt = 0;
struct locarhandle tmpl_ah; struct locarhandle tmpl_ah;
char *new_locar_fname = NULL; char *new_locar_fname = NULL;
@ -711,6 +711,11 @@ int main (int argc, char *argv[])
install_langs_arg = NULL; install_langs_arg = NULL;
} }
free (ila_start); free (ila_start);
/* Reject an entire string made up of delimiters. */
if (install_langs_count == 0)
break;
/* Copy the list. */ /* Copy the list. */
install_langs_list = (char **)xmalloc (sizeof(char *) * install_langs_count); install_langs_list = (char **)xmalloc (sizeof(char *) * install_langs_count);
install_langs_arg = ila_start = strdup (optarg); install_langs_arg = ila_start = strdup (optarg);

5
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.23-499-ga3b4733 %define glibcsrcdir glibc-2.23-499-ga3b4733
%define glibcversion 2.23.90 %define glibcversion 2.23.90
%define glibcrelease 24%{?dist} %define glibcrelease 25%{?dist}
# Pre-release tarballs are pulled in from git using a command that is # Pre-release tarballs are pulled in from git using a command that is
# effectively: # effectively:
# #
@ -2069,6 +2069,9 @@ rm -f *.filelist*
%endif %endif
%changelog %changelog
* Fri Jun 24 2016 Carlos O'Donell <carlos@redhat.com> - 2.23.90-25
- Properly handle more invalid --install-langs arguments (#1349906).
* Tue Jun 21 2016 Florian Weimer <fweimer@redhat.com> - 2.23.90-24 * Tue Jun 21 2016 Florian Weimer <fweimer@redhat.com> - 2.23.90-24
- Auto-sync with upstream master, commit - Auto-sync with upstream master, commit
a3b473373ee43a292f5ec68a7fda6b9cfb26a9b0, fixing these bugs: a3b473373ee43a292f5ec68a7fda6b9cfb26a9b0, fixing these bugs: