Changeset: 3ecd2916b706 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3ecd2916b706
Modified Files:
        sql/backends/monet5/sql.c
Branch: Dec2025
Log Message:

Free strings after failure.


diffs (23 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -5355,8 +5355,7 @@ str_vacuum_callback_args_free(int argc, 
        // free up sname, tname, cname. First pointer points to sqlstore so 
leave it.
        GDKfree(argv[1]); // sname
        GDKfree(argv[2]); // tname
-       if (argv[3])
-               GDKfree(argv[3]); // cname
+       GDKfree(argv[3]); // cname
        return GDK_SUCCEED;
 }
 
@@ -5406,6 +5405,9 @@ SQLstr_auto_vacuum(Client cntxt, MalBlkP
                throw(SQL, "sql.str_auto_vacuum", SQLSTATE(42000) "Cannot 
vacuum compressed column");
 
        if (!(sname_copy = GDKstrdup(sname)) || !(tname_copy = 
GDKstrdup(tname)) || (cname && !(cname_copy = GDKstrdup(cname)))) {
+               GDKfree(sname_copy);
+               GDKfree(tname_copy);
+               GDKfree(cname_copy);
                throw(SQL, "sql.str_auto_vacuum", SQLSTATE(HY013) 
MAL_MALLOC_FAIL);
        }
        void *argv[4] = {m->store, sname_copy, tname_copy, cname_copy};
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to