From: Quentin Young <qlyoung@cumulusnetworks.com>
Date: Wed, 14 Jun 2017 14:06:01 +0000 (+0000)
Subject: zebra: fix divide-by-zero
X-Git-Tag: reindent-master-before~46^2~3^2~1
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=6196c77a4f4facc2f6df34cdf2ce02f3d5f5083c;p=matthieu%2Ffrr.git

zebra: fix divide-by-zero

x % 0 = FPE

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
---

diff --git a/zebra/irdp_interface.c b/zebra/irdp_interface.c
index 5cabe7e62f..6ea14b3058 100644
--- a/zebra/irdp_interface.c
+++ b/zebra/irdp_interface.c
@@ -476,18 +476,14 @@ DEFUN (ip_irdp_minadvertinterval,
   zi=ifp->info;
   irdp=&zi->irdp;
 
-  if( (unsigned) atoi(argv[idx_number]->arg) <= irdp->MaxAdvertInterval) {
+  if((unsigned) atoi(argv[idx_number]->arg) < irdp->MaxAdvertInterval) {
       irdp->MinAdvertInterval = atoi(argv[idx_number]->arg);
-
       return CMD_SUCCESS;
   }
-
-  vty_out (vty, "ICMP warning maxadvertinterval is greater or equal than minadvertinterval%s",
-	     VTY_NEWLINE);
-
-  vty_out (vty, "Please correct!%s",
-	     VTY_NEWLINE);
-  return CMD_WARNING;
+  else {
+      vty_out (vty, "%% MinAdvertInterval must be less than MaxAdvertInterval");
+      return CMD_WARNING;
+  }
 }
 
 DEFUN (ip_irdp_maxadvertinterval,
@@ -506,19 +502,14 @@ DEFUN (ip_irdp_maxadvertinterval,
   zi=ifp->info;
   irdp=&zi->irdp;
 
-
-  if( irdp->MinAdvertInterval <= (unsigned) atoi(argv[idx_number]->arg) ) {
-    irdp->MaxAdvertInterval = atoi(argv[idx_number]->arg);
-
+  if(irdp->MinAdvertInterval < (unsigned) atoi(argv[idx_number]->arg)) {
+      irdp->MaxAdvertInterval = atoi(argv[idx_number]->arg);
       return CMD_SUCCESS;
   }
-
-  vty_out (vty, "ICMP warning maxadvertinterval is greater or equal than minadvertinterval%s",
-	     VTY_NEWLINE);
-
-  vty_out (vty, "Please correct!%s",
-	     VTY_NEWLINE);
-  return CMD_WARNING;
+  else {
+      vty_out (vty, "%% MaxAdvertInterval must be greater than MinAdvertInterval");
+      return CMD_WARNING;
+  }
 }
 
 /* DEFUN needs to be fixed for negative ranages...
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index 7fa4ad4cbe..8f1647c9db 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -234,7 +234,8 @@ int irdp_send_thread(struct thread *t_advert)
       }
 
   tmp = irdp->MaxAdvertInterval-irdp->MinAdvertInterval;
-  timer =  (random () % tmp ) + 1;
+  assert (tmp > 0);
+  timer = (random () % tmp) + 1;
   timer = irdp->MinAdvertInterval + timer;
 
   if(irdp->irdp_sent <  MAX_INITIAL_ADVERTISEMENTS &&