Skip to content

Commit a921b4f

Browse files
fix #2643 - fuzzers are here to get you @lorisdanton
Signed-off-by: Nikolaj Bjorner <[email protected]>
1 parent cc26d49 commit a921b4f

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

src/ast/rewriter/seq_rewriter.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ eautomaton* re2automaton::operator()(expr* e) {
251251
if (r) {
252252
r->compress();
253253
bool_rewriter br(m);
254-
TRACE("seq", display_expr1 disp(m); r->display(tout, disp););
254+
TRACE("seq", display_expr1 disp(m); r->display(tout << mk_pp(e, m) << " -->\n", disp););
255255
}
256256
return r;
257257
}
@@ -348,7 +348,9 @@ eautomaton* re2automaton::re2aut(expr* e) {
348348
return a.detach();
349349
}
350350
else if (u.re.is_intersection(e, e1, e2) && m_sa && (a = re2aut(e1)) && (b = re2aut(e2))) {
351-
return m_sa->mk_product(*a, *b);
351+
eautomaton* r = m_sa->mk_product(*a, *b);
352+
TRACE("seq", display_expr1 disp(m); a->display(tout << "a:", disp); b->display(tout << "b:", disp); r->display(tout << "intersection:", disp););
353+
return r;
352354
}
353355
else {
354356
TRACE("seq", tout << "not handled " << mk_pp(e, m) << "\n";);

src/math/automata/symbolic_automata_def.h

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -381,11 +381,14 @@ typename symbolic_automata<T, M>::automaton_t* symbolic_automata<T, M>::mk_produ
381381
unsigned_vector final;
382382
unsigned_vector a_init, b_init;
383383
a.get_epsilon_closure(a.init(), a_init);
384+
bool a_init_is_final = false, b_init_is_final = false;
384385
for (unsigned ia : a_init) {
385386
if (a.is_final_state(ia)) {
387+
a_init_is_final = true;
386388
b.get_epsilon_closure(b.init(), b_init);
387389
for (unsigned ib : b_init) {
388390
if (b.is_final_state(ib)) {
391+
b_init_is_final = true;
389392
final.push_back(0);
390393
break;
391394
}
@@ -438,8 +441,8 @@ typename symbolic_automata<T, M>::automaton_t* symbolic_automata<T, M>::mk_produ
438441
}
439442

440443
svector<bool> back_reachable(n, false);
441-
for (unsigned i = 0; i < final.size(); ++i) {
442-
back_reachable[final[i]] = true;
444+
for (unsigned f : final) {
445+
back_reachable[f] = true;
443446
}
444447

445448
unsigned_vector stack(final);
@@ -464,7 +467,7 @@ typename symbolic_automata<T, M>::automaton_t* symbolic_automata<T, M>::mk_produ
464467
}
465468
}
466469
if (mvs1.empty()) {
467-
if (a.is_final_state(a.init()) && b.is_final_state(b.init())) {
470+
if (a_init_is_final && b_init_is_final) {
468471
// special case: automaton has no moves, but the initial state is final on both sides
469472
// this results in the automaton which accepts the empty sequence and nothing else
470473
final.clear();

0 commit comments

Comments
 (0)