alarsyo/spot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

* src/tgbaparse/tgbaparse.yy: Add `%destructor's so the parser

Browse source 
does not leak on errors.
* src/tgbatest/ltl2tgba.cc: Free the automata if it could not be
fully parsed.
This commit is contained in:
Alexandre Duret-Lutz 2004-11-08 14:43:10 +00:00
parent 86ff462fa4
commit 7afd10420a
3 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
2004-11-08 Alexandre Duret-Lutz <adl@src.lip6.fr> 2004-11-08 Alexandre Duret-Lutz <adl@src.lip6.fr>
* src/tgbaparse/tgbaparse.yy: Add `%destructor's so the parser
does not leak on errors.
* src/tgbatest/ltl2tgba.cc: Free the automata if it could not be
fully parsed.
* src/tgbaalgos/gtec/ce.cc (couvreur99_check_result::accepting_run): * src/tgbaalgos/gtec/ce.cc (couvreur99_check_result::accepting_run):
Remove spurious FIXME. Remove spurious FIXME.

11
src/tgbaparse/tgbaparse.yy
View file

@ -1,4 +1,4 @@
/* Copyright (C) 2003 Laboratoire d'Informatique de Paris 6 (LIP6), /* Copyright (C) 2003, 2004 Laboratoire d'Informatique de Paris 6 (LIP6),
** département Systèmes Répartis Coopératifs (SRC), Université Pierre ** département Systèmes Répartis Coopératifs (SRC), Université Pierre
** et Marie Curie. ** et Marie Curie.
** **
@ -63,6 +63,15 @@ typedef std::pair<bool, spot::ltl::formula*> pair;
%type <list> acc_list %type <list> acc_list
%token ACC_DEF %token ACC_DEF
%destructor { delete $$; } STRING UNTERMINATED_STRING IDENT strident string
%destructor { spot::ltl::destroy($$); } condition
%destructor {
for (std::list<spot::ltl::formula*>::iterator i = $$->begin();
i != $$->end(); ++i)
spot::ltl::destroy(*i);
delete $$;
} acc_list
%% %%
tgba: acceptance_decl lines | lines; tgba: acceptance_decl lines | lines;

6
src/tgbatest/ltl2tgba.cc
View file

@ -410,7 +410,11 @@ main(int argc, char** argv)
spot::tgba_explicit* e; spot::tgba_explicit* e;
to_free = a = e = spot::tgba_parse(input, pel, dict, env, debug_opt); to_free = a = e = spot::tgba_parse(input, pel, dict, env, debug_opt);
if (spot::format_tgba_parse_errors(std::cerr, pel)) if (spot::format_tgba_parse_errors(std::cerr, pel))
return 2; {
delete to_free;
delete dict;
return 2;
}
e->merge_transitions(); e->merge_transitions();
} }
else else