MonetDB: Dec2023 - Minor fixes to make coverity happier.

[Sjoerd Mullender via checkin-list]

Changeset: d662aa1707fe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/d662aa1707fe
Modified Files:
        monetdb5/mal/mal_listing.c
        monetdb5/modules/kernel/algebra.c
        monetdb5/modules/mal/mal_mapi.c
Branch: Dec2023
Log Message:

Minor fixes to make coverity happier.


diffs (92 lines):

diff --git a/monetdb5/mal/mal_listing.c b/monetdb5/mal/mal_listing.c
--- a/monetdb5/mal/mal_listing.c
+++ b/monetdb5/mal/mal_listing.c
@@ -301,7 +301,7 @@ fmtRemark(MalBlkPtr mb, MalStkPtr stk, I
        if (!copystring(&t, "# ", &len))
                return base;
 
-       if (pci && pci->argc == 3) {
+       if (pci->argc == 3) {
                if (getFunctionId(pci)) {
                        char *arg1 = renderTerm(mb, stk, pci, 1, flg);
                        char *arg2 = renderTerm(mb, stk, pci, 2, flg);
diff --git a/monetdb5/modules/kernel/algebra.c 
b/monetdb5/modules/kernel/algebra.c
--- a/monetdb5/modules/kernel/algebra.c
+++ b/monetdb5/modules/kernel/algebra.c
@@ -413,12 +413,11 @@ ALGmarkselect(bat *r1, bat *r2, const ba
        assert(g->tsorted);
        oid *ri1 = Tloc(res1, 0);
        bit *ri2 = Tloc(res2, 0);
-       oid *gi = Tloc(g, 0);
        bit *mi = Tloc(m, 0);
        bit *pi = Tloc(p, 0);
        oid cur = oid_nil;
 
-       if (!gi) { /* void case ? */
+       if (g->ttype == TYPE_void) { /* void case ? */
                oid c = g->hseqbase;
                for (BUN n = 0; n < nr; n++, c++) {
                        ri1[q] = c;
@@ -430,6 +429,7 @@ ALGmarkselect(bat *r1, bat *r2, const ba
                        q++;
                }
        } else {
+               oid *gi = Tloc(g, 0);
                oid c = g->hseqbase;
                if (nr)
                        cur = gi[0];
@@ -507,12 +507,11 @@ ALGouterselect(bat *r1, bat *r2, const b
        assert(g->tsorted);
        oid *ri1 = Tloc(res1, 0);
        bit *ri2 = Tloc(res2, 0);
-       oid *gi = Tloc(g, 0);
        bit *mi = Tloc(m, 0);
        bit *pi = Tloc(p, 0);
        oid cur = oid_nil;
 
-       if (!gi) { /* void case ? */
+       if (g->ttype == TYPE_void) { /* void case ? */
                oid c = g->hseqbase;
                for (BUN n = 0; n < nr; n++, c++) {
                        ri1[q] = c;
@@ -520,6 +519,7 @@ ALGouterselect(bat *r1, bat *r2, const b
                        q++;
                }
        } else {
+               oid *gi = Tloc(g, 0);
                oid c = g->hseqbase;
                if (nr)
                        cur = gi[0];
diff --git a/monetdb5/modules/mal/mal_mapi.c b/monetdb5/modules/mal/mal_mapi.c
--- a/monetdb5/modules/mal/mal_mapi.c
+++ b/monetdb5/modules/mal/mal_mapi.c
@@ -704,7 +704,13 @@ SERVERlisten(int port, const char *usock
                }
                char sport[10];
                snprintf(sport, sizeof(sport), "%d", port);
-               GDKsetenv("mapi_port", sport);
+               if (GDKsetenv("mapi_port", sport) != GDK_SUCCEED) {
+                       for (int i = 0; i < 3; i++) {
+                               if (socks[i] != INVALID_SOCKET)
+                                       closesocket(socks[i]);
+                       }
+                       throw(MAL, "mal_mapi.listen", GDK_EXCEPTION);
+               }
        }
 
 #ifdef HAVE_SYS_UN_H
@@ -814,7 +820,13 @@ SERVERlisten(int port, const char *usock
                                GDKfree(usockfilenew);
                        return buf;
                }
-               GDKsetenv("mapi_usock", usockfile);
+               if (GDKsetenv("mapi_usock", usockfile) != GDK_SUCCEED) {
+                       for (int i = 0; i < 3; i++) {
+                               if (socks[i] != INVALID_SOCKET)
+                                       closesocket(socks[i]);
+                       }
+                       throw(MAL, "mal_mapi.listen", GDK_EXCEPTION);
+               }
        }
 #endif
 
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org