MonetDB: Jan2014 - Some Coverity induced fixes.

[Sjoerd Mullender]

Changeset: e0a96c3b3654 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e0a96c3b3654
Modified Files:
        tools/merovingian/daemon/client.c
        tools/merovingian/daemon/controlrunner.c
        tools/merovingian/daemon/proxy.c
Branch: Jan2014
Log Message:

Some Coverity induced fixes.


diffs (38 lines):

diff --git a/tools/merovingian/daemon/client.c 
b/tools/merovingian/daemon/client.c
--- a/tools/merovingian/daemon/client.c
+++ b/tools/merovingian/daemon/client.c
@@ -226,7 +226,7 @@ handleClient(int sock, char isusock)
                }
        }
 
-       if (*database == '\0') {
+       if (database == NULL || *database == '\0') {
                /* we need to have a database, if we haven't gotten one,
                 * complain */
                mnstr_printf(fout, "!monetdbd: please specify a database\n");
diff --git a/tools/merovingian/daemon/controlrunner.c 
b/tools/merovingian/daemon/controlrunner.c
--- a/tools/merovingian/daemon/controlrunner.c
+++ b/tools/merovingian/daemon/controlrunner.c
@@ -570,6 +570,7 @@ static void ctl_handle_client(
                                }
 
                                val = strchr(p, '=');
+                               assert(val != NULL); /* see above */
                                *val++ = '\0';
                                if (*val == '\0')
                                        val = NULL;
diff --git a/tools/merovingian/daemon/proxy.c b/tools/merovingian/daemon/proxy.c
--- a/tools/merovingian/daemon/proxy.c
+++ b/tools/merovingian/daemon/proxy.c
@@ -185,7 +185,10 @@ startProxy(int psock, stream *cfdin, str
                }
                /* block until the server acknowledges that it has psock
                 * connected with itself */
-               recv(ssock, buf, 1, 0);
+               if (recv(ssock, buf, 1, 0) < 0) {
+                       close(ssock);
+                       return(newErr("could not receive initial byte: %s", 
strerror(errno)));
+               }
                close(ssock);
                close(psock);
                close_stream(cfdin);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list