From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:20 +0000 (-0700)
Subject: Add an ASSERT
X-Git-Tag: stable-10.2.0~390
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af8cf1d9864d41617dc1e53cc1106c71dfbcd8d5;p=thirdparty%2Fopen-vm-tools.git

Add an ASSERT

The issue is classified as "Intentional" since the value in question
will never be negative in practice.  Add an ASSERT to make this clear.

While here, add two missing function entry g_debug statements.
---

diff --git a/open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c b/open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c
index fee0f5edc..f0fc0e105 100644
--- a/open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c
+++ b/open-vm-tools/services/plugins/grabbitmqProxy/grabbitmqProxyPlugin.c
@@ -633,15 +633,18 @@ SendVmxConnectRequest(void)
    struct sockaddr_vm addr;
    socklen_t len = sizeof addr;
    int port;
+   int fd;
    gchar *msg;
 
    g_debug("Entering %s\n", __FUNCTION__);
 
    ASSERT(asock != NULL);
 
+   fd = AsyncSocket_GetFd(asock);
+   ASSERT(fd >= 0);
+
    /* get the listening port */
-   if (getsockname(AsyncSocket_GetFd(asock),
-                   (struct sockaddr *)&addr, &len) == SOCKET_ERROR) {
+   if (getsockname(fd, (struct sockaddr *)&addr, &len) == SOCKET_ERROR) {
       g_warning("Error in socket getsockname: error=%d.\n", sockerr());
       return FALSE;
    }
@@ -688,6 +691,8 @@ SendToVmxRmqProxy(ConnInfo *cli,     // IN
    gboolean mapCreated = FALSE;
    char *ver;
 
+   g_debug("Entering %s\n", __FUNCTION__);
+
    res = DataMap_Create(&map);
    if (res != DMERR_SUCCESS) {
       goto quit;
@@ -801,6 +806,8 @@ ProcessVmxDataPacket(ConnInfo *cli,     // IN
    ErrorCode res;
    int64 cmdType;
 
+   g_debug("Entering %s\n", __FUNCTION__);
+
    res = DataMap_GetInt64(map, RMQPROXYDM_FLD_COMMAND, &cmdType);
    ASSERT(res == DMERR_SUCCESS);