MonetDB: Jan2014 - Add some error checking.

[Sjoerd Mullender]

Changeset: 38d5b34cc231 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38d5b34cc231
Modified Files:
        sql/backends/monet5/sql_cast.c
Branch: Jan2014
Log Message:

Add some error checking.


diffs (39 lines):

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
@@ -460,12 +460,17 @@ SQLstr_cast_(str *res, mvc *m, int eclas
 
        if (tpe != TYPE_str) {
                r = GDKmalloc(sz);
+               if (r == NULL)
+                       throw(SQL, "str_cast", MAL_MALLOC_FAIL);
                sz = convert2str(m, eclass, d, s, has_tz, p, tpe, &r, sz);
        } else {
                str v = (str) p;
                strLength(&sz, v);
-               if (len == 0 || (sz >= 0 && sz <= len))
+               if (len == 0 || (sz >= 0 && sz <= len)) {
                        r = GDKstrdup(v);
+                       if (r == NULL)
+                               throw(SQL, "str_cast", MAL_MALLOC_FAIL);
+               }
        }
        if ((len > 0 && sz > len) || sz < 0) {
                if (r)
@@ -474,6 +479,8 @@ SQLstr_cast_(str *res, mvc *m, int eclas
                        throw(SQL, "str_cast", "22001!value too long for type 
(var)char(%d)", len);
                } else {
                        r = GDKstrdup(str_nil);
+                       if (r == NULL)
+                               throw(SQL, "str_cast", MAL_MALLOC_FAIL);
                }
        }
        *res = r;
@@ -542,6 +549,7 @@ SQLbatstr_cast(Client cntxt, MalBlkPtr m
                        break;
                BUNins(dst, BUNhead(bi, p), r, FALSE);
                GDKfree(r);
+               r = NULL;
        }
        BBPkeepref(*res = dst->batCacheid);
        BBPunfix(b->batCacheid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list