zenithsiz/ftmemsim-valgrind
1
0
Fork 0
mirror of https://github.com/Zenithsiz/ftmemsim-valgrind.git synced 2026-02-03 18:13:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not modify a character string that could be a readonly

Browse Source 
string literal.


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14485
This commit is contained in:
Florian Krohm 2014-09-06 20:40:28 +00:00
parent e3765bf29d
commit 9b1a9ea4d4
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
coregrind/m_options.c
View File

@ -204,32 +204,24 @@ HChar* VG_(expand_file_name)(const HChar* option_name, const HChar* format)
i++;
if ('{' == format[i]) {
// Get the env var name, print its contents.
const HChar* qualname;
HChar* qual;
i++;
qualname = &format[i];
HChar *qual;
Int begin_qualname = ++i;
while (True) {
if (0 == format[i]) {
VG_(fmsg)("%s: malformed %%q specifier\n", option_name);
goto bad;
} else if ('}' == format[i]) {
// Temporarily replace the '}' with NUL to extract var
// name.
// FIXME: this is not safe as FORMAT is sometimes a
// string literal which may reside in read-only memory
((HChar *)format)[i] = 0;
Int qualname_len = i - begin_qualname;
HChar qualname[qualname_len + 1];
VG_(strncpy)(qualname, format + begin_qualname,
qualname_len);
qualname[qualname_len] = '\0';
qual = VG_(getenv)(qualname);
if (NULL == qual) {
VG_(fmsg)("%s: environment variable %s is not set\n",
option_name, qualname);
// FIXME: this is not safe as FORMAT is sometimes a
// string literal which may reside in read-only memory
((HChar *)format)[i] = '}'; // Put the '}' back.
goto bad;
}
// FIXME: this is not safe as FORMAT is sometimes a
// string literal which may reside in read-only memory
((HChar *)format)[i] = '}'; // Put the '}' back.
i++;
break;
}