Fix warnings from cppcheck.

diff --git a/src/graph.c b/src/graph.c
index d68a973ba854f33a94814060af9fbabef649076a..e2ef8b1a7a5e038061f0b1e4e36ab84c3b9e80ff 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -315,7 +315,7 @@ void dump_graph(void) {
        node_t *n;
        edge_t *e;
        char *filename = NULL, *tmpname = NULL;
        node_t *n;
        edge_t *e;
        char *filename = NULL, *tmpname = NULL;

-       FILE *file;
+       FILE *file, *pipe;

        
        if(!graph_changed || !get_config_string(lookup_config(config_tree, "GraphDumpFile"), &filename))
                return;
        
        if(!graph_changed || !get_config_string(lookup_config(config_tree, "GraphDumpFile"), &filename))
                return;


@@ -325,7 +325,7 @@ void dump_graph(void) {
        ifdebug(PROTOCOL) logger(LOG_NOTICE, "Dumping graph");
        
        if(filename[0] == '|') {
        ifdebug(PROTOCOL) logger(LOG_NOTICE, "Dumping graph");
        
        if(filename[0] == '|') {

-               file = popen(filename + 1, "w");
+               file = pipe = popen(filename + 1, "w");

        } else {
                xasprintf(&tmpname, "%s.new", filename);
                file = fopen(tmpname, "w");
        } else {
                xasprintf(&tmpname, "%s.new", filename);
                file = fopen(tmpname, "w");


@@ -354,7 +354,7 @@ void dump_graph(void) {
        fprintf(file, "}\n");   
        
        if(filename[0] == '|') {
        fprintf(file, "}\n");   
        
        if(filename[0] == '|') {

-               pclose(file);
+               pclose(pipe);

        } else {
                fclose(file);
 #ifdef HAVE_MINGW
        } else {
                fclose(file);
 #ifdef HAVE_MINGW

diff --git a/src/net_setup.c b/src/net_setup.c
index a28ab7ad147c7e3989bba3c3231861028098d1c4..3e435ddaebfd87b125f016298f10ead62aa1381d 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -55,7 +55,8 @@ proxytype_t proxytype;
 
 bool read_rsa_public_key(connection_t *c) {
        FILE *fp;
 
 bool read_rsa_public_key(connection_t *c) {
        FILE *fp;

-       char *fname;
+       char *pubname;
+       char *hcfname;

        char *key;
 
        if(!c->rsa_key) {
        char *key;
 
        if(!c->rsa_key) {


@@ -77,80 +78,79 @@ bool read_rsa_public_key(connection_t *c) {
 
        /* Else, check for PublicKeyFile statement and read it */
 
 
        /* Else, check for PublicKeyFile statement and read it */
 

-       if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &fname)) {
-               fp = fopen(fname, "r");
+       if(get_config_string(lookup_config(c->config_tree, "PublicKeyFile"), &pubname)) {
+               fp = fopen(pubname, "r");

 
                if(!fp) {
 
                if(!fp) {

-                       logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-                                  fname, strerror(errno));
-                       free(fname);
+                       logger(LOG_ERR, "Error reading RSA public key file `%s': %s", pubname, strerror(errno));
+                       free(pubname);

                        return false;
                }
 
                        return false;
                }
 

-               free(fname);

                c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
                fclose(fp);
 
                c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
                fclose(fp);
 

-               if(c->rsa_key)
+               if(c->rsa_key) {
+                       free(pubname);

                        return true;            /* Woohoo. */
                        return true;            /* Woohoo. */

+               }

 
                /* If it fails, try PEM_read_RSA_PUBKEY. */
 
                /* If it fails, try PEM_read_RSA_PUBKEY. */

-               fp = fopen(fname, "r");
+               fp = fopen(pubname, "r");

 
                if(!fp) {
 
                if(!fp) {

-                       logger(LOG_ERR, "Error reading RSA public key file `%s': %s",
-                                  fname, strerror(errno));
-                       free(fname);
+                       logger(LOG_ERR, "Error reading RSA public key file `%s': %s", pubname, strerror(errno));
+                       free(pubname);

                        return false;
                }
 
                        return false;
                }
 

-               free(fname);

                c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
                fclose(fp);
 
                if(c->rsa_key) {
 //                             RSA_blinding_on(c->rsa_key, NULL);
                c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
                fclose(fp);
 
                if(c->rsa_key) {
 //                             RSA_blinding_on(c->rsa_key, NULL);

+                       free(pubname);

                        return true;
                }
 
                        return true;
                }
 

-               logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s",
-                          fname, strerror(errno));
+               logger(LOG_ERR, "Reading RSA public key file `%s' failed: %s", pubname, strerror(errno));
+               free(pubname);

                return false;
        }
 
        /* Else, check if a harnessed public key is in the config file */
 
                return false;
        }
 
        /* Else, check if a harnessed public key is in the config file */
 

-       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-       fp = fopen(fname, "r");
+       xasprintf(&hcfname, "%s/hosts/%s", confbase, c->name);
+       fp = fopen(hcfname, "r");

 
        if(!fp) {
 
        if(!fp) {

-               logger(LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
-               free(fname);
+               logger(LOG_ERR, "Error reading RSA public key file `%s': %s", hcfname, strerror(errno));
+               free(hcfname);

                return false;
        }
 
        c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
        fclose(fp);
                return false;
        }
 
        c->rsa_key = PEM_read_RSAPublicKey(fp, &c->rsa_key, NULL, NULL);
        fclose(fp);

-       free(fname);

 
 

-       if(c->rsa_key)
+       if(c->rsa_key) {
+               free(hcfname);

                return true;
                return true;

+       }

 
        /* Try again with PEM_read_RSA_PUBKEY. */
 
 
        /* Try again with PEM_read_RSA_PUBKEY. */
 

-       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-       fp = fopen(fname, "r");
+       fp = fopen(hcfname, "r");

 
        if(!fp) {
 
        if(!fp) {

-               logger(LOG_ERR, "Error reading RSA public key file `%s': %s", fname, strerror(errno));
-               free(fname);
+               logger(LOG_ERR, "Error reading RSA public key file `%s': %s", hcfname, strerror(errno));
+               free(hcfname);

                return false;
        }
 
                return false;
        }
 

+       free(hcfname);

        c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
 //     RSA_blinding_on(c->rsa_key, NULL);
        fclose(fp);
        c->rsa_key = PEM_read_RSA_PUBKEY(fp, &c->rsa_key, NULL, NULL);
 //     RSA_blinding_on(c->rsa_key, NULL);
        fclose(fp);

-       free(fname);

 
        if(c->rsa_key)
                return true;
 
        if(c->rsa_key)
                return true;

diff --git a/src/tincd.c b/src/tincd.c
index 566031a3ddeb170645e1a17736ae467fb023963e..53f91e87367fca00e234688c6edcf14ca3346ada 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -338,7 +338,7 @@ static bool keygen(int bits) {
        RSA *rsa_key;
        FILE *f;
        char *name = get_name();
        RSA *rsa_key;
        FILE *f;
        char *name = get_name();

-       char *filename;
+       char *pubname, *privname;

 
        fprintf(stderr, "Generating %d bits keys:\n", bits);
        rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
 
        fprintf(stderr, "Generating %d bits keys:\n", bits);
        rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);


@@ -349,8 +349,9 @@ static bool keygen(int bits) {
        } else
                fprintf(stderr, "Done.\n");
 
        } else
                fprintf(stderr, "Done.\n");
 

-       xasprintf(&filename, "%s/rsa_key.priv", confbase);
-       f = ask_and_open(filename, "private RSA key");
+       xasprintf(&privname, "%s/rsa_key.priv", confbase);
+       f = ask_and_open(privname, "private RSA key");
+       free(privname);

 
        if(!f)
                return false;
 
        if(!f)
                return false;


@@ -363,14 +364,14 @@ static bool keygen(int bits) {
        fputc('\n', f);
        PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
        fclose(f);
        fputc('\n', f);
        PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
        fclose(f);

-       free(filename);

 
        if(name)
 
        if(name)

-               xasprintf(&filename, "%s/hosts/%s", confbase, name);
+               xasprintf(&pubname, "%s/hosts/%s", confbase, name);

        else
        else

-               xasprintf(&filename, "%s/rsa_key.pub", confbase);
+               xasprintf(&pubname, "%s/rsa_key.pub", confbase);

 
 

-       f = ask_and_open(filename, "public RSA key");
+       f = ask_and_open(pubname, "public RSA key");
+       free(pubname);

 
        if(!f)
                return false;
 
        if(!f)
                return false;


@@ -378,7 +379,6 @@ static bool keygen(int bits) {
        fputc('\n', f);
        PEM_write_RSAPublicKey(f, rsa_key);
        fclose(f);
        fputc('\n', f);
        PEM_write_RSAPublicKey(f, rsa_key);
        fclose(f);

-       free(filename);

        free(name);
 
        return true;
        free(name);
 
        return true;