Changeset: d9b17bb6247f for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d9b17bb6247f
Modified Files:
        monetdb5/modules/atoms/url.c
        sql/backends/monet5/sql_cast.c
        sql/backends/monet5/sql_user.c
Branch: Jun2016
Log Message:

Memory leaks.


diffs (52 lines):

diff --git a/monetdb5/modules/atoms/url.c b/monetdb5/modules/atoms/url.c
--- a/monetdb5/modules/atoms/url.c
+++ b/monetdb5/modules/atoms/url.c
@@ -416,6 +416,7 @@ URLgetContent(str *retval, url *Str1)
                (void)memcpy(retbuf + rlen, buf, len);
                rlen += len;
        }
+       mnstr_destroy(f);
        if (len < 0) {
                GDKfree(retbuf);
                throw(MAL, "url.getContent", "read error");
diff --git a/sql/backends/monet5/sql_cast.c b/sql/backends/monet5/sql_cast.c
--- a/sql/backends/monet5/sql_cast.c
+++ b/sql/backends/monet5/sql_cast.c
@@ -325,10 +325,6 @@ str_2_sqlblob(sqlblob **res, const str *
                throw(SQL, "sqlblob", "%s", buf);
        }
        *res = (sqlblob *) p;
-       if (!ATOMextern(TYPE_sqlblob)) {
-               if (p)
-                       GDKfree(p);
-       }
        return MAL_SUCCEED;
 }
 
@@ -370,6 +366,7 @@ batstr_2_sqlblob(bat *res, const bat *bi
                        return msg;
                }
                BUNappend(dst, r, FALSE);
+               GDKfree(r);
        }
        BATseqbase(dst, b->hseqbase);
        BBPkeepref(*res = dst->batCacheid);
diff --git a/sql/backends/monet5/sql_user.c b/sql/backends/monet5/sql_user.c
--- a/sql/backends/monet5/sql_user.c
+++ b/sql/backends/monet5/sql_user.c
@@ -279,6 +279,7 @@ monet5_alter_user(ptr _mvc, str user, st
                        }
                        if (strcmp(username, user) == 0) {
                                /* avoid message about changePassword (from MAL 
level) */
+                               GDKfree(username);
                                if (!enc) {
                                        free(pwd);
                                        free(opwd);
@@ -289,6 +290,7 @@ monet5_alter_user(ptr _mvc, str user, st
                                        "when changing your own password");
                                return (FALSE);
                        }
+                       GDKfree(username);
                        err = AUTHsetPassword(c, &user, &pwd);
                        if (!enc) {
                                free(pwd);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list

Reply via email to