Changeset 82617 in vbox

Timestamp:

Dec 18, 2019 2:05:56 PM (5 years ago)

Author:

vboxsync

Message:

Windows Additions/tstWinAdditionsInstallHelper: Also check if something has been returned on the stack to detect NSIS API failures.

File:

• trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/testcase/tstWinAdditionsInstallHelper.cpp (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Installer/InstallHelper/testcase/tstWinAdditionsInstallHelper.cpp

@@ -152 +152 @@
 
                 char *pszStack = tstStackPopString(&pStack);
-                RTTestIPrintf(RTTESTLVL_ALWAYS, "Arch: %s\n", pszStack);
+                if (pszStack)
+                    RTTestIPrintf(RTTESTLVL_ALWAYS, "Arch: %s\n", pszStack);
+                else
+                    RTTestIFailed("Getting file arch failed (NSIS API changed?)\n");
                 RTStrFree(pszStack);
                 tstStackDestroy(pStack);
@@ -167 +170 @@
                 pfnFileGetVendor(NULL /* hWnd */, NSIS_MAX_STRLEN, szVars, &pStack, NULL /* extra */);
                 char *pszStack = tstStackPopString(&pStack);
-                RTTestIPrintf(RTTESTLVL_ALWAYS, "Vendor: %s\n", pszStack);
+                if (pszStack)
+                    RTTestIPrintf(RTTESTLVL_ALWAYS, "Vendor: %s\n", pszStack);
+                else
+                    RTTestIFailed("Getting file vendor failed (NSIS API changed?)\n");
                 RTStrFree(pszStack);
                 tstStackDestroy(pStack);