LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-4.3 patch 35

Browse Source
This commit is contained in:
Chet Ramey
2015-05-19 14:55:27 -04:00
parent 8daea13bac
commit e57a256f4e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/sh/unicode.c
View File

@@ -78,13 +78,15 @@ stub_charset ()
s = strrchr (locale, '.'); s = strrchr (locale, '.');
if (s) if (s)
{ {
strcpy (charsetbuf, s+1); strncpy (charsetbuf, s+1, sizeof (charsetbuf) - 1);
charsetbuf[sizeof (charsetbuf) - 1] = '\0';
t = strchr (charsetbuf, '@'); t = strchr (charsetbuf, '@');
if (t) if (t)
*t = 0; *t = 0;
return charsetbuf; return charsetbuf;
} }
strcpy (charsetbuf, locale); strncpy (charsetbuf, locale, sizeof (charsetbuf) - 1);
charsetbuf[sizeof (charsetbuf) - 1] = '\0';
return charsetbuf; return charsetbuf;
} }
#endif #endif

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 34 #define PATCHLEVEL 35
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */