[quagga-dev,15558,08/16] ospfd: fix double assignment in ospf_vl_set_timers

Message ID 1465927630-27768-8-git-send-email-chris@opensourcerouting.org
State Under Review
Headers show
Series
  • [quagga-dev,15552,01/16] zebra: fix null pointer dereference in zsend_ipv4_nexthop_lookup_mrib
Related show

Commit Message

Christian Franke June 14, 2016, 6:07 p.m.
From: Christian Franke <nobody@nowhere.ws>

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
---
 ospfd/ospf_vty.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Donald Sharp June 15, 2016, 4:13 p.m. | #1
Acked-by: Donald Sharp <sharpd@cumulusnetworks.com>

On Tue, Jun 14, 2016 at 2:07 PM, Christian Franke <
chris@opensourcerouting.org> wrote:

> From: Christian Franke <nobody@nowhere.ws>
>
> Signed-off-by: Christian Franke <chris@opensourcerouting.org>
> ---
>  ospfd/ospf_vty.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
> index fb17dff..a118794 100644
> --- a/ospfd/ospf_vty.c
> +++ b/ospfd/ospf_vty.c
> @@ -886,7 +886,7 @@ static int
>  ospf_vl_set_timers (struct ospf_vl_data *vl_data,
>                     struct ospf_vl_config_data *vl_config)
>  {
> -  struct interface *ifp = ifp = vl_data->vl_oi->ifp;
> +  struct interface *ifp = vl_data->vl_oi->ifp;
>    /* Virtual Link data initialised to defaults, so only set
>       if a value given */
>    if (vl_config->hello_interval)
> --
> 2.8.0
>
>
> _______________________________________________
> Quagga-dev mailing list
> Quagga-dev@lists.quagga.net
> https://lists.quagga.net/mailman/listinfo/quagga-dev
>

Patch hide | download patch | download mbox

diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index fb17dff..a118794 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -886,7 +886,7 @@  static int
 ospf_vl_set_timers (struct ospf_vl_data *vl_data,
 		    struct ospf_vl_config_data *vl_config)
 {
-  struct interface *ifp = ifp = vl_data->vl_oi->ifp;
+  struct interface *ifp = vl_data->vl_oi->ifp;
   /* Virtual Link data initialised to defaults, so only set
      if a value given */
   if (vl_config->hello_interval)