Commit 0fa8bf91 authored by Maria Matejka's avatar Maria Matejka
Browse files

Nest: Several assumptions to tame the static analyzer

parent bbe49ae5
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -278,18 +278,22 @@ nexthop_merge(struct nexthop *x, struct nexthop *y, int rx, int ry, int max, lin
  while ((x || y) && max--)
  {
    int cmp = nexthop_compare_node(x, y);

    if (cmp < 0)
    {
      ASSUME(x);
      *n = rx ? x : nexthop_copy_node(x, lp);
      x = x->next;
    }
    else if (cmp > 0)
    {
      ASSUME(y);
      *n = ry ? y : nexthop_copy_node(y, lp);
      y = y->next;
    }
    else
    {
      ASSUME(x && y);
      *n = rx ? x : (ry ? y : nexthop_copy_node(x, lp));
      x = x->next;
      y = y->next;