tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 00:04:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #616 from ago-shi/test

Browse Source 
Fix not to assign null to strstr function
This commit is contained in:
Vivian Thiebaut 2022-11-08 15:47:09 -05:00 committed by GitHub
commit f2ee7ea5fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/win32/win32compat/w32-doexec.c
View File

@ -469,12 +469,15 @@ int do_exec_windows(struct ssh *ssh, Session *s, const char *command, int pty) {
} }
//Passing the PRIVSEP_LOG_FD (STDERR_FILENO + 2) to sftp-server for logging //Passing the PRIVSEP_LOG_FD (STDERR_FILENO + 2) to sftp-server for logging
if(strstr(exec_command, "sftp-server.exe")) if (exec_command) {
if (strstr(exec_command, "sftp-server.exe")) {
if (posix_spawn_file_actions_adddup2(&actions, STDERR_FILENO + 2, SFTP_SERVER_LOG_FD) != 0) { if (posix_spawn_file_actions_adddup2(&actions, STDERR_FILENO + 2, SFTP_SERVER_LOG_FD) != 0) {
errno = EOTHER; errno = EOTHER;
error("posix_spawn initialization failed"); error("posix_spawn initialization failed");
goto cleanup; goto cleanup;
} }
}
}
if (posix_spawn(&pid, spawn_argv[0], &actions, NULL, spawn_argv, NULL) != 0) { if (posix_spawn(&pid, spawn_argv[0], &actions, NULL, spawn_argv, NULL) != 0) {
errno = EOTHER; errno = EOTHER;