diff options
| author | Gerald Combs <gerald@wireshark.org> | 2011-08-17 16:54:24 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2011-08-17 16:54:24 +0000 |
| commit | 5520a452b5a8d521011e8673e2462a0d08dda523 (patch) | |
| tree | 12dfa085210356b0dadb228ae79492204f4512ba /packaging/u3 | |
| parent | 78d49fadf5839e956fd14b5348747c15acf1fbec (diff) | |
| download | wireshark-5520a452b5a8d521011e8673e2462a0d08dda523.tar.gz wireshark-5520a452b5a8d521011e8673e2462a0d08dda523.tar.bz2 wireshark-5520a452b5a8d521011e8673e2462a0d08dda523.zip | |
The MSDN page for ZeroMemory recommends using SecureZeroMemory instead,
so do so. Add ZeroMemory to checkAPIs.pl.
svn path=/trunk/; revision=38584
Diffstat (limited to 'packaging/u3')
| -rw-r--r-- | packaging/u3/win32/u3util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/packaging/u3/win32/u3util.c b/packaging/u3/win32/u3util.c index 5f1645325d..bb007833cb 100644 --- a/packaging/u3/win32/u3util.c +++ b/packaging/u3/win32/u3util.c @@ -308,9 +308,9 @@ void ExecuteAndWait(char *buffer) STARTUPINFO si; PROCESS_INFORMATION pi; - ZeroMemory(&si, sizeof(si)); + SecureZeroMemory(&si, sizeof(si)); si.cb = sizeof(si); - ZeroMemory(&pi, sizeof(pi)); + SecureZeroMemory(&pi, sizeof(pi)); if(CreateProcess(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi)) { /* wait for the uninstall to finish */ @@ -378,7 +378,7 @@ void uninstall(char *regkey, char *u3installed, char *uninstall) buffer, "Uninstall", MB_YESNO|MB_TOPMOST|MB_ICONQUESTION); -#endif +#endif /* we have an uninstall string */ ExecuteAndWait(buffer); @@ -394,7 +394,7 @@ void winpcap_auto_start() char buffer[BUFSIZ+1]; int buflen = 0; DWORD startVal = NPF_START_VAL; - + if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, WINDOWS_VERSION_KEY, 0, (KEY_READ), &key) == ERROR_SUCCESS) { if(RegQueryValueEx(key, WINDOWS_VERSION, NULL, NULL, buffer, &buflen) == ERROR_SUCCESS) { @@ -405,7 +405,7 @@ void winpcap_auto_start() if(RegOpenKeyEx(HKEY_LOCAL_MACHINE, NPF_KEY, 0, (KEY_READ | KEY_WRITE), &npfKey) == ERROR_SUCCESS) { (void)RegSetValueEx(npfKey, NPF_START, 0, REG_DWORD, (BYTE*)&startVal, sizeof(DWORD)); - + RegCloseKey(npfKey); } @@ -768,7 +768,7 @@ void host_configure(void) RegCloseKey(key); - } + } if(!hasRedist) { @@ -868,10 +868,10 @@ main(int argc, char *argv[]) { DWORD time_out = 0; char *u3_is_device_available; -#if 0 +#if 0 char **envptr; char *envval; -# endif +# endif u3_is_device_available = getenv("U3_IS_DEVICE_AVAILABLE"); if(u3_is_device_available && !strncmp(u3_is_device_available, "true", 4)) |