MonetDB: default - Plug a hole.

[Sjoerd Mullender]

Changeset: 0217af419cdf for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0217af419cdf
Modified Files:
        monetdb5/modules/kernel/batstr.c
Branch: default
Log Message:

Plug a hole.


diffs (59 lines):

diff --git a/monetdb5/modules/kernel/batstr.c b/monetdb5/modules/kernel/batstr.c
--- a/monetdb5/modules/kernel/batstr.c
+++ b/monetdb5/modules/kernel/batstr.c
@@ -1191,6 +1191,7 @@ do_batstr_batint_conststr_str(Client cnt
                }
        }
 bailout:
+       GDKfree(buf);
        finalize_ouput(res, bn, msg, nils, q);
        unfix_inputs(4, left, ls, right, rs);
        return msg;
@@ -1648,13 +1649,13 @@ bailout:
 }
 
 static str
-STRbatPrefix(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci) 
+STRbatPrefix(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        return prefix_or_suffix(cntxt, mb, stk, pci, "batstr.startsWith", 
str_is_prefix);
 }
 
 static str
-STRbatSuffix(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci) 
+STRbatSuffix(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
 {
        return prefix_or_suffix(cntxt, mb, stk, pci, "batstr.endsWith", 
str_is_suffix);
 }
@@ -2976,13 +2977,13 @@ STRbatSubstitute(Client cntxt, MalBlkPtr
                msg = createException(MAL, "batstr.substritute", 
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
                goto bailout;
        }
-       if ((sid1 && !is_bat_nil(*sid1) && !(arg1s = BATdescriptor(*sid1))) || 
(sid2 && !is_bat_nil(*sid2) && !(arg2s = BATdescriptor(*sid2))) || 
+       if ((sid1 && !is_bat_nil(*sid1) && !(arg1s = BATdescriptor(*sid1))) || 
(sid2 && !is_bat_nil(*sid2) && !(arg2s = BATdescriptor(*sid2))) ||
                (sid3 && !is_bat_nil(*sid3) && !(arg2s = BATdescriptor(*sid3))) 
|| (sid4 && !is_bat_nil(*sid4) && !(arg4s = BATdescriptor(*sid4)))) {
                msg = createException(MAL, "batstr.substritute", 
SQLSTATE(HY005) RUNTIME_OBJECT_MISSING);
                goto bailout;
        }
        q = canditer_init(&ci1, arg1, arg1s);
-       if (canditer_init(&ci2, arg2, arg2s) != q || ci1.hseq != ci2.hseq || 
canditer_init(&ci3, arg3, arg3s) != q || 
+       if (canditer_init(&ci2, arg2, arg2s) != q || ci1.hseq != ci2.hseq || 
canditer_init(&ci3, arg3, arg3s) != q ||
                ci2.hseq != ci3.hseq || canditer_init(&ci4, arg4, arg4s) != q 
|| ci3.hseq != ci4.hseq) {
                msg = createException(MAL, "batstr.substritute", 
ILLEGAL_ARGUMENT " Requires bats of identical size");
                goto bailout;
@@ -3572,13 +3573,13 @@ STRbatInsert(Client cntxt, MalBlkPtr mb,
                msg = createException(MAL, "batstr.insert", SQLSTATE(HY005) 
RUNTIME_OBJECT_MISSING);
                goto bailout;
        }
-       if ((sid1 && !is_bat_nil(*sid1) && !(ls = BATdescriptor(*sid1))) || 
(sid2 && !is_bat_nil(*sid2) && !(rs = BATdescriptor(*sid2))) || 
+       if ((sid1 && !is_bat_nil(*sid1) && !(ls = BATdescriptor(*sid1))) || 
(sid2 && !is_bat_nil(*sid2) && !(rs = BATdescriptor(*sid2))) ||
                (sid3 && !is_bat_nil(*sid3) && !(ss = BATdescriptor(*sid3))) || 
(sid4 && !is_bat_nil(*sid4) && !(ns = BATdescriptor(*sid4)))) {
                msg = createException(MAL, "batstr.insert", SQLSTATE(HY005) 
RUNTIME_OBJECT_MISSING);
                goto bailout;
        }
        q = canditer_init(&ci1, left, ls);
-       if (canditer_init(&ci2, start, ss) != q || ci1.hseq != ci2.hseq || 
canditer_init(&ci3, nchars, ns) != q || 
+       if (canditer_init(&ci2, start, ss) != q || ci1.hseq != ci2.hseq || 
canditer_init(&ci3, nchars, ns) != q ||
                ci2.hseq != ci3.hseq || canditer_init(&ci4, right, rs) != q || 
ci3.hseq != ci4.hseq) {
                msg = createException(MAL, "batstr.insert", ILLEGAL_ARGUMENT " 
Requires bats of identical size");
                goto bailout;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list