儲存庫 vbox 的更動 67622

時間撮記:

2017-6-26 下午09:16:24 (7 年 以前)

作者:

vboxsync

訊息:

VBoxProxyStub.c: off-by-two

檔案:

• trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c (修改) (3 筆差異)

trunk/src/VBox/Main/src-all/win/VBoxProxyStub.c

@@ -2327 +2327 @@
     moduleLen = RTUtf16Len(wszServiceModule);
 
-    if (dirLen + moduleLen >= MAX_PATH + QUOTES_SPACE ||
-        !RT_SUCCESS(RTUtf16Copy(szFilePath + 1, MAX_PATH + QUOTES_SPACE - 1, wszVBoxDir)) ||
-        !RT_SUCCESS(RTUtf16Copy(szFilePath + dirLen + 1, MAX_PATH + QUOTES_SPACE - dirLen - 1, wszServiceModule)))
+    if (   dirLen + moduleLen + 2 >= MAX_PATH + QUOTES_SPACE
+        || !RT_SUCCESS(RTUtf16Copy(szFilePath + 1, MAX_PATH + QUOTES_SPACE - 1, wszVBoxDir)) 
+        || !RT_SUCCESS(RTUtf16Copy(szFilePath + dirLen + 1, MAX_PATH + QUOTES_SPACE - dirLen - 1, wszServiceModule)))
     {
         LogWarnFunc(("Error: The path to a windows service module is too long\n"));
@@ -2348 +2348 @@
     }
 
-    hService = CreateService(
-        hSCM, wszServiceName, wszServiceDisplayName,
-        SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
-        SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL,
-        szFilePath, NULL, NULL, L"RPCSS\0", NULL, NULL);
-
+    hService = CreateService(hSCM, wszServiceName, wszServiceDisplayName,
+                             SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS,
+                             SERVICE_DEMAND_START, SERVICE_ERROR_NORMAL,
+                             szFilePath, NULL, NULL, L"RPCSS\0", NULL, NULL);
     if (hService == NULL)
     {
@@ -2366 +2364 @@
     {
         LogWarnFunc(("Error: could not set service description. code: %x\n",
-            GetLastError()));
+                    GetLastError()));
         Assert(0);
     }