Changeset 35709 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 25, 2011 1:03:11 PM (14 years ago)

Author:

vboxsync

Message:

Check for string buffer lengths.

File:

• trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp (modified) (6 diffs)

trunk/src/VBox/Additions/WINNT/Installer/VBoxDrvInst.cpp

@@ -98 +98 @@
     if (::FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwLastError, 0, pszMsg, dwBufSize / sizeof(TCHAR), NULL) == 0)
     {
-        _stprintf(pszMsg, _T("Unknown error!\n"), dwLastError);
+        _sntprintf(pszMsg, dwBufSize / sizeof(TCHAR), _T("Unknown error!\n"), dwLastError);
         return false;
     }
@@ -104 +104 @@
     {
         _TCHAR *p = _tcschr(pszMsg, _T('\r'));
-
         if (p != NULL)
             *p = _T('\0');
@@ -1048 +1047 @@
                 else
                 {
-                    _stprintf(szINF, _T("%ws"), argv[3]);
+                    _sntprintf(szINF, sizeof(szINF) / sizeof(TCHAR), _T("%ws"), argv[3]);
 
                     _TCHAR szLogFile[_MAX_PATH] = { 0 };
                     if (argc > 4)
-                        _stprintf(szLogFile, _T("%ws"), argv[4]);
+                        _sntprintf(szLogFile, sizeof(szLogFile) / sizeof(TCHAR), _T("%ws"), argv[4]);
                     rc = VBoxInstallDriver(!_tcsicmp(argv[2], _T("install")) ? TRUE : FALSE, szINF,
                                            FALSE /* Not silent */, szLogFile[0] != NULL ? szLogFile : NULL);
@@ -1060 +1059 @@
                      && argc == 4)
             {
-                _stprintf(szINF, _T("%ws"), argv[3]);
+                _sntprintf(szINF, sizeof(szINF) / sizeof(TCHAR), _T("%ws"), argv[3]);
                 rc = ExecuteInfFile(_T("DefaultInstall"), 132, szINF);
             }
@@ -1074 +1073 @@
                 if (argc > 4)
                     iOrder = _ttoi(argv[4]);
-                _stprintf(szProvider, _T("%ws"), argv[3]);
+                _sntprintf(szProvider, sizeof(szProvider) / sizeof(TCHAR), _T("%ws"), argv[3]);
                 rc = AddNetworkProvider(szProvider, iOrder);
             }
@@ -1080 +1079 @@
                 && argc >= 4)
             {
-                _stprintf(szProvider, _T("%ws"), argv[3]);
+                _sntprintf(szProvider, sizeof(szProvider) / sizeof(TCHAR), _T("%ws"), argv[3]);
                 rc = RemoveNetworkProvider(szProvider);
             }