mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 18:04:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

- fix #44683, popen crashes when an invalid mode is passed (works on 2k8/vista/win7)

Browse Source
This commit is contained in:
Pierre Joye 2009-08-26 19:57:01 +00:00
parent 48d031aa6e
commit bae3df7505
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
TSRM/tsrm_win32.c
View File

@ -305,7 +305,7 @@ TSRM_API FILE *popen(const char *command, const char *type)
TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env) TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd, char *env)
{ {
FILE *stream = NULL; FILE *stream = NULL;
int fno, str_len = strlen(type), read, mode; int fno, type_len = strlen(type), read, mode;
STARTUPINFO startup; STARTUPINFO startup;
PROCESS_INFORMATION process; PROCESS_INFORMATION process;
SECURITY_ATTRIBUTES security; SECURITY_ATTRIBUTES security;
@ -313,13 +313,32 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
DWORD dwCreateFlags = 0; DWORD dwCreateFlags = 0;
process_pair *proc; process_pair *proc;
char *cmd; char *cmd;
int i;
char *ptype = (char *)type;
TSRMLS_FETCH(); TSRMLS_FETCH();
if (!type) {
return NULL;
}
/*The following two checks can be removed once we drop XP support */
type_len = strlen(type);
if (type_len <1 || type_len > 2) {
return NULL;
}
for (i=0; i < type_len; i++) {
if (!(*ptype == 'r' || *ptype == 'w' || *ptype == 'b' || *ptype == 't')) {
return NULL;
}
ptype++;
}
security.nLength = sizeof(SECURITY_ATTRIBUTES); security.nLength = sizeof(SECURITY_ATTRIBUTES);
security.bInheritHandle = TRUE; security.bInheritHandle = TRUE;
security.lpSecurityDescriptor = NULL; security.lpSecurityDescriptor = NULL;
if (!str_len || !CreatePipe(&in, &out, &security, 2048L)) { if (!type_len || !CreatePipe(&in, &out, &security, 2048L)) {
return NULL; return NULL;
} }
@ -331,7 +350,7 @@ TSRM_API FILE *popen_ex(const char *command, const char *type, const char *cwd,
startup.hStdError = GetStdHandle(STD_ERROR_HANDLE); startup.hStdError = GetStdHandle(STD_ERROR_HANDLE);
read = (type[0] == 'r') ? TRUE : FALSE; read = (type[0] == 'r') ? TRUE : FALSE;
mode = ((str_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT; mode = ((type_len == 2) && (type[1] == 'b')) ? O_BINARY : O_TEXT;
if (read) { if (read) {
in = dupHandle(in, FALSE); in = dupHandle(in, FALSE);