pike.git/ src/ gc.c

Branch: Tag:

2014-01-12

2014-01-12 02:00:55 by Tobias S. Josefowitz <tobij@tobij.de>

gc: avoid lsh overflow in lookahead block check

4578:    * blocked because they are acyclic and don't contain refs to anything    * but strings and other types. */    + static INLINE int mc_lookahead_blocked(unsigned INT16 type) { +  if (type < sizeof(TYPE_FIELD)*8) { +  return !!(mc_block_lookahead & ((TYPE_FIELD)1 << type)); +  } +  +  return 0; + } +    static int mc_block_strings;      static int mc_enqueued_noninternal;
5125:    ref_to->flags = ref_to_flags;    ref_to->la_count = ref_to_la_count;    -  if (mc_block_lookahead & (1 << type_from_visit_fn (visit_fn))) { +  if (mc_lookahead_blocked(type_from_visit_fn (visit_fn))) {    MC_DEBUG_MSG (ref_to, "type is blocked - not enqueued");    return;    }
5149:       /* Normal handling. */    -  if (mc_block_lookahead & (1 << type_from_visit_fn (visit_fn))) { +  if (mc_lookahead_blocked(type_from_visit_fn (visit_fn))) {    ref_to->flags = ref_to_flags;    ref_to->la_count = ref_to_la_count;    MC_DEBUG_MSG (ref_to, "type is blocked - not enqueued");
5820:    assert (!(m->flags & MC_FLAG_INTERNAL));    assert (m->flags & MC_FLAG_LA_VISITED);    assert (list != &mc_incomplete || !(m->flags & MC_FLAG_CANDIDATE)); -  if (mc_block_lookahead & (1 << type)) +  if (mc_lookahead_blocked(type))    MC_DEBUG_MSG (m, "type is blocked - not visiting");    else {   #ifdef MEMORY_COUNT_DEBUG
5863:    assert (!(m->flags & (MC_FLAG_INTERNAL | MC_FLAG_INT_VISITED)));    m->flags |= MC_FLAG_INTERNAL;    assert (m->flags & (MC_FLAG_CANDIDATE | MC_FLAG_LA_VISITED)); -  assert (!(mc_block_lookahead & -  (1 << type_from_visit_fn (m->visit_fn)))); +  assert (!(mc_lookahead_blocked(type_from_visit_fn (m->visit_fn))));    /* The following assertion implies that the lookahead count    * already has been raised as it should. */    assert (m->flags & MC_FLAG_CANDIDATE_REF);