vbox的更動 63285 路徑 trunk/src/VBox/NetworkServices

時間撮記:

2016-8-10 下午03:04:27 (8 年 以前)

作者:

vboxsync

訊息:

NetworkServices: warnings

位置:

trunk/src/VBox/NetworkServices

檔案:

• NAT/proxy_pollmgr.c (修改) (1 筆差異)
• NetLib/VBoxNetPortForwardString.cpp (修改) (3 筆差異)

trunk/src/VBox/NetworkServices/NAT/proxy_pollmgr.c

@@ -491 +491 @@
                 --pollmgr.nfds;
 
-                if ((nfds_t)delfirst == last) {
+                if (delfirst == (SOCKET)last) {
                     /* congruent to delnext >= pollmgr.nfds test below */
                     delfirst = INVALID_SOCKET; /* done */

trunk/src/VBox/NetworkServices/NetLib/VBoxNetPortForwardString.cpp

@@ -83 +83 @@
 
         if (cchField != 0)
-            RTStrCopy(pszAddress, RT_MIN(cchField + 1, cbAddress), pszRaw);
+            RTStrCopy(pszAddress, RT_MIN(cchField + 1, (size_t)cbAddress), pszRaw);
         else if (!fEmptyAcceptable)
             return -1;
@@ -246 +246 @@
 int netPfStrToPf(const char *pcszStrPortForward, bool fIPv6, PPORTFORWARDRULE pPfr)
 {
-/** r=bird: Redo from scratch?  This is very hard to read. */
+/** r=bird: Redo from scratch?  This is very hard to read.  And it's going about
+ *  things in a very complicated, potentially leaky (pszRaw) fashion. */
 
     int  proto;
@@ -286 +287 @@
         cbToken = pszEndOfName - pszRaw; /* don't take : into account */
         /* XXX it's unacceptable to have only name entry in PF */
-        AssertReturn(cbToken < cchRaw, VERR_INVALID_PARAMETER);
+        AssertReturn(cbToken < (ssize_t)cchRaw, VERR_INVALID_PARAMETER);
 
         if (   cbToken < 0