brane 01/09/10 17:38:50
Modified: threadproc/win32 proc.c
Log:
(apr_proc_create): Sigh. Process attributes can remain
undefined. Don't dereference pointers without checking.
Revision Changes Path
1.50 +28 -14 apr/threadproc/win32/proc.c
Index: proc.c
===================================================================
RCS file: /home/cvs/apr/threadproc/win32/proc.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- proc.c 2001/09/10 19:45:05 1.49
+++ proc.c 2001/09/11 00:38:50 1.50
@@ -422,16 +422,23 @@
STARTUPINFOW si;
apr_wchar_t wprg[APR_PATH_MAX];
apr_size_t ncmd = strlen(cmdline) + 1, nwcmd = ncmd;
- apr_size_t ncwd = strlen(attr->currdir) + 1, nwcwd = ncwd;
- apr_wchar_t *wcmd = apr_palloc(cont, ncmd * 2);
- apr_wchar_t *wcwd = apr_palloc(cont, ncwd * 2);
+ apr_size_t ncwd = 0, nwcwd = 0;
+ apr_wchar_t *wcmd = apr_palloc(cont, ncmd * sizeof(wcmd[0]));
+ apr_wchar_t *wcwd = NULL;
+ if (attr->currdir)
+ {
+ ncwd = nwcwd = strlen(attr->currdir) + 1;
+ wcwd = apr_palloc(cont, ncwd * sizeof(wcwd[0]));
+ }
+
if (((rv = utf8_to_unicode_path(wprg, sizeof(wprg)/sizeof(wprg[0]),
progname))
!= APR_SUCCESS)
|| ((rv = conv_utf8_to_ucs2(cmdline, &ncmd, wcmd, &nwcmd))
!= APR_SUCCESS)
- || ((rv = conv_utf8_to_ucs2(attr->currdir, &ncwd, wcwd, &nwcwd))
+ || (attr->currdir &&
+ (rv = conv_utf8_to_ucs2(attr->currdir, &ncwd, wcwd, &nwcwd))
!= APR_SUCCESS)) {
return rv;
}
@@ -442,13 +449,17 @@
si.dwFlags |= STARTF_USESHOWWINDOW;
si.wShowWindow = SW_HIDE;
}
- if (attr->child_in->filehand || attr->child_out->filehand
- || attr->child_err->filehand) {
+ if (attr->child_in || attr->child_out || attr->child_err)
+ {
si.dwFlags |= STARTF_USESTDHANDLES;
- si.hStdInput = attr->child_in->filehand;
- si.hStdOutput = attr->child_out->filehand;
- si.hStdError = attr->child_err->filehand;
+ if (attr->child_in)
+ si.hStdInput = attr->child_in->filehand;
+ if (attr->child_out)
+ si.hStdOutput = attr->child_out->filehand;
+ if (attr->child_err)
+ si.hStdError = attr->child_err->filehand;
}
+
rv = CreateProcessW(wprg, wcmd, /* Command line */
NULL, NULL, /* Proc & thread security
attributes */
TRUE, /* Inherit handles */
@@ -466,12 +477,15 @@
si.dwFlags |= STARTF_USESHOWWINDOW;
si.wShowWindow = SW_HIDE;
}
- if (attr->child_in->filehand || attr->child_out->filehand
- || attr->child_err->filehand) {
+ if (attr->child_in || attr->child_out || attr->child_err)
+ {
si.dwFlags |= STARTF_USESTDHANDLES;
- si.hStdInput = attr->child_in->filehand;
- si.hStdOutput = attr->child_out->filehand;
- si.hStdError = attr->child_err->filehand;
+ if (attr->child_in)
+ si.hStdInput = attr->child_in->filehand;
+ if (attr->child_out)
+ si.hStdOutput = attr->child_out->filehand;
+ if (attr->child_err)
+ si.hStdError = attr->child_err->filehand;
}
rv = CreateProcessA(progname, cmdline, /* Command line */
