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

Don't silently ignore any suppression contexts beyond the 4th -- instead abort

Browse Source 
with a warning.  Addresses part of bug #77922.

MERGE TO STABLE


git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2946
This commit is contained in:
Nicholas Nethercote 2004-11-08 13:24:25 +00:00
parent 23a3dd3bb9
commit 6c2d25aae6
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
coregrind/vg_errcontext.c
View File

@ -787,7 +787,7 @@ static void load_one_suppressions_file ( Char* filename )
{
# define N_BUF 200
Int fd, i;
Bool eof;
Bool eof, too_many_contexts = False;
Char buf[N_BUF+1];
Char* tool_names;
Char* supp_name;
@ -883,9 +883,13 @@ static void load_one_suppressions_file ( Char* filename )
/* make sure to grab the '}' if the num callers is >=
VG_N_SUPP_CALLERS */
if (!VG_STREQ(buf, "}")) {
do {
eof = VG_(get_line) ( fd, buf, N_BUF );
} while (!eof && !VG_STREQ(buf, "}"));
// Don't just ignore extra lines -- abort. (Someone complained
// about silent ignoring of lines in bug #77922.)
//do {
// eof = VG_(get_line) ( fd, buf, N_BUF );
//} while (!eof && !VG_STREQ(buf, "}"));
too_many_contexts = True;
goto syntax_error;
}
supp->next = vg_suppressions;
@ -899,6 +903,13 @@ static void load_one_suppressions_file ( Char* filename )
VG_(message)(Vg_UserMsg,
"FATAL: in suppressions file `%s': unexpected EOF",
filename );
} else if (too_many_contexts) {
VG_(message)(Vg_UserMsg,
"FATAL: in suppressions file: `%s': at %s:",
filename, buf );
VG_(message)(Vg_UserMsg,
"too many lines (limit of %d contexts in suppressions)",
VG_N_SUPP_CALLERS);
} else {
VG_(message)(Vg_UserMsg,
"FATAL: in suppressions file: `%s': syntax error on: %s",
@ -906,7 +917,7 @@ static void load_one_suppressions_file ( Char* filename )
}
VG_(close)(fd);
VG_(message)(Vg_UserMsg, "exiting now.");
VG_(exit)(1);
VG_(exit)(1);
# undef N_BUF
}