ead: clean up

Remove unused variables
Correct some (non important) memory leaks
Remove fclose(NULL)
Correct possible out of bound access

spotted with cppcheck

Signed-off-by: Etienne CHAMPETIER <etienne.champetier@free.fr>
SVN-Revision: 39994

diff --git a/package/network/services/ead/src/ead.c b/package/network/services/ead/src/ead.c
index 36235207bcb398abc2198c5fdb5fdbf78e631886..d1847c1b5e756897cdd00150d867c965ead901b4 100644 (file)
--- a/package/network/services/ead/src/ead.c
+++ b/package/network/services/ead/src/ead.c
@@ -120,8 +120,8 @@ set_recv_type(pcap_t *p, bool rx)
 #ifdef PACKET_RECV_TYPE
        struct sockaddr_ll sll;
        struct ifreq ifr;
-       int ifindex, mask;
-       int fd, ret;
+       int mask;
+       int fd;
 
        fd = pcap_get_selectable_fd(p);
        if (fd < 0)
@@ -132,7 +132,7 @@ set_recv_type(pcap_t *p, bool rx)
        else
                mask = 0;
 
-       ret = setsockopt(fd, SOL_PACKET, PACKET_RECV_TYPE, &mask, sizeof(mask));
+       setsockopt(fd, SOL_PACKET, PACKET_RECV_TYPE, &mask, sizeof(mask));
 #endif
 }
 
@@ -841,7 +841,7 @@ static int
 check_bridge_port(const char *br, const char *port, void *arg)
 {
        struct ead_instance *in;
-       struct list_head *p, *tmp;
+       struct list_head *p;
 
        list_for_each(p, &instances) {
                in = list_entry(p, struct ead_instance, list);
@@ -873,7 +873,7 @@ check_all_interfaces(void)
 {
 #ifdef linux
        struct ead_instance *in;
-       struct list_head *p, *tmp;
+       struct list_head *p;
 
        br_foreach_bridge(check_bridge, NULL);
 

diff --git a/package/network/services/ead/src/tinysrp/bn_mul.c b/package/network/services/ead/src/tinysrp/bn_mul.c
index d2d9fc55717df4145b4133b9244009d298f908ff..92330e5ecf4213b6eac2c770de27ac88036a0a54 100644 (file)
--- a/package/network/services/ead/src/tinysrp/bn_mul.c
+++ b/package/network/services/ead/src/tinysrp/bn_mul.c
@@ -68,10 +68,6 @@ int BN_mul(BIGNUM *r, BIGNUM *a, BIGNUM *b, BN_CTX *ctx)
 #if defined(BN_MUL_COMBA) || defined(BN_RECURSION)
        int i;
 #endif
-#ifdef BN_RECURSION
-       BIGNUM *t;
-       int j,k;
-#endif
 
 #ifdef BN_COUNT
        printf("BN_mul %d * %d\n",a->top,b->top);

diff --git a/package/network/services/ead/src/tinysrp/clitest.c b/package/network/services/ead/src/tinysrp/clitest.c
index faaa5dd90d47d712476659e3a081a52c49246fe7..338f41ff4e21692fdf3c07eae98707719af97131 100644 (file)
--- a/package/network/services/ead/src/tinysrp/clitest.c
+++ b/package/network/services/ead/src/tinysrp/clitest.c
@@ -50,8 +50,6 @@ main()
   int index;
   struct t_client * tc;
   struct t_preconf *tcp;
-  struct t_num n;
-  struct t_num g;
   struct t_num s;
   struct t_num B;
   char username[MAXUSERLEN];

diff --git a/package/network/services/ead/src/tinysrp/t_client.c b/package/network/services/ead/src/tinysrp/t_client.c
index ebdd203af5c6ad178c290cfcfe8e90d2595dd344..692215a3694f61edbfc02c55204c9bf4a2faf31d 100644 (file)
--- a/package/network/services/ead/src/tinysrp/t_client.c
+++ b/package/network/services/ead/src/tinysrp/t_client.c
@@ -58,8 +58,6 @@ t_clientopen(u, n, g, s)
   int i, validated;
   struct t_preconf * tpc;
 
-  BigInteger nn, gg, n12, r;
-
   validated = 0;
   if(n->len < MIN_MOD_BYTES)
     return 0;

diff --git a/package/network/services/ead/src/tinysrp/t_conv.c b/package/network/services/ead/src/tinysrp/t_conv.c
index d3fe246c41a38c5e4504a2fe64f686f8ddf860a1..3be6d85b5412c28650e8a7cb8e66f95d797f0936 100644 (file)
--- a/package/network/services/ead/src/tinysrp/t_conv.c
+++ b/package/network/services/ead/src/tinysrp/t_conv.c
@@ -161,7 +161,7 @@ t_fromb64(dst, src)
       break;
   }
 
-  while(a[j] == 0 && j <= size)
+  while(j <= size && a[j] == 0)
     ++j;
 
   memcpy(dst, a + j, size - j + 1);

diff --git a/package/network/services/ead/src/tinysrp/tphrase.c b/package/network/services/ead/src/tinysrp/tphrase.c
index 1aede0c83237671286c4d80a772b40fdc05a6010..0ab1e085c1776f2f8b3f9c42bbae7f651b18a14d 100644 (file)
--- a/package/network/services/ead/src/tinysrp/tphrase.c
+++ b/package/network/services/ead/src/tinysrp/tphrase.c
@@ -62,7 +62,6 @@ void doit(char *name)
 {
        char passphrase[128], passphrase1[128];
        FILE *f;
-       struct t_conf *tc;
        struct t_confent *tcent;
        struct t_pw eps_passwd;
 
@@ -152,7 +151,8 @@ t_changepw(pwname, diff)
   if((bakfp = fopen(bakfile2, "wb")) == NULL &&
      (unlink(bakfile2) < 0 || (bakfp = fopen(bakfile2, "wb")) == NULL)) {
     fclose(passfp);
-    fclose(bakfp);
+    free(bakfile);
+    free(bakfile2);
     return -1;
   }
 
@@ -169,10 +169,16 @@ t_changepw(pwname, diff)
 
 #ifdef USE_RENAME
   unlink(bakfile);
-  if(rename(pwname, bakfile) < 0)
+  if(rename(pwname, bakfile) < 0) {
+    free(bakfile);
+    free(bakfile2);
     return -1;
-  if(rename(bakfile2, pwname) < 0)
+  }
+  if(rename(bakfile2, pwname) < 0) {
+    free(bakfile);
+    free(bakfile2);
     return -1;
+  }
 #else
   unlink(bakfile);
   link(pwname, bakfile);