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

時間撮記:

2016-8-10 下午02:41:40 (8 年 以前)

作者:

vboxsync

訊息:

proxy_tftpd.c: Our RTStrPrintf sucks a little, sorry.

檔案:

• trunk/src/VBox/NetworkServices/NAT/proxy_tftpd.c (修改) (3 筆差異)

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

@@ -282 +282 @@
 
             if (xfer->oack != NULL) {
-                pbuf_realloc(xfer->oack, xfer->oack->len - len);
+                Assert((u16_t)(xfer->oack->len - len) == xfer->oack->len - len);
+                pbuf_realloc(xfer->oack, (u16_t)(xfer->oack->len - len));
             }
         }
@@ -618 +619 @@
     }
 
-    status = RTStrPrintf(pathname, len, "%s/%s", tftpd.root, xfer->filename);
-    if (status < 0) {
-        return tftp_internal_error(xfer);
-    }
+    RTStrPrintf(pathname, len, "%s/%s", tftpd.root, xfer->filename);
+/** @todo fix RTStrPrintf because this does not currently work:
+ *   status = RTStrPrintf(pathname, len, "%s/%s", tftpd.root, xfer->filename);
+ *   if (status < 0) {
+ *       return tftp_internal_error(xfer);
+ *   }
+ */
 
     DPRINTF(("%s: full pathname: %s\n", __func__, pathname));
@@ -821 +825 @@
     int sz;
 
-    sz = RTStrPrintf(*ps, *plen, "%s", optname);
-    if (sz < 0 || (size_t)sz >= *plen) {
+/** @todo Fix RTStrPrintf because this doesn't really work.
+ *   sz = RTStrPrintf(*ps, *plen, "%s", optname);
+ *   if (sz < 0 || (size_t)sz >= *plen) {
+ *       return -1;
+ *   } */
+    sz = (int)RTStrPrintf(*ps, *plen, "%s", optname);
+    if (/*sz < 0 ||*/ (size_t)sz >= *plen) {
         return -1;
     }