MonetDB: Oct2020 - Don't forget to free before returning

[Pedro Ferreira]

Changeset: a1fe8f02fbdf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a1fe8f02fbdf
Modified Files:
        common/utils/msabaoth.c
Branch: Oct2020
Log Message:

Don't forget to free before returning


diffs (42 lines):

diff --git a/common/utils/msabaoth.c b/common/utils/msabaoth.c
--- a/common/utils/msabaoth.c
+++ b/common/utils/msabaoth.c
@@ -611,6 +611,7 @@ msab_pickSecret(char **generated_secret)
        if (generated_secret)
        // do not return an error, just continue without a secret
                *generated_secret = NULL;
+       free(secret);
        return NULL;
 #endif
 #endif
@@ -629,6 +630,7 @@ msab_pickSecret(char **generated_secret)
                char err[512];
                snprintf(err, sizeof(err), "unable to open '%s': %s",
                                pathbuf, strerror(errno));
+               free(secret);
                return strdup(err);
        }
        if ((f = fdopen(fd, "w")) == NULL) {
@@ -637,6 +639,7 @@ msab_pickSecret(char **generated_secret)
                                pathbuf, strerror(errno));
                close(fd);
                (void)remove(pathbuf);
+               free(secret);
                return strdup(err);
        }
        if (fwrite(secret, 1, SECRET_LENGTH, f) < SECRET_LENGTH || fclose(f) < 
0) {
@@ -645,11 +648,14 @@ msab_pickSecret(char **generated_secret)
                                strerror(errno));
                fclose(f);
                (void)remove(pathbuf);
+               free(secret);
                return strdup(err);
        }
 
        if (generated_secret)
                *generated_secret = (char*)secret;
+       else
+               free(secret);
        return NULL;
 #endif
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list