- Similar to the previous commit, pass ONE character less into
ompi_info_get, to not stand the chance to overwrite any of the buffers (on the stack). This commit was SVN r21155.
Этот коммит содержится в:
родитель
250c3d0ddd
Коммит
9bcc47b05c
@ -610,19 +610,19 @@ static int spawn(int count, char **array_of_commands,
|
|||||||
if ( array_of_info != NULL && array_of_info[i] != MPI_INFO_NULL ) {
|
if ( array_of_info != NULL && array_of_info[i] != MPI_INFO_NULL ) {
|
||||||
|
|
||||||
/* check for 'host' */
|
/* check for 'host' */
|
||||||
ompi_info_get (array_of_info[i], "host", sizeof(host), host, &flag);
|
ompi_info_get (array_of_info[i], "host", sizeof(host) - 1, host, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
opal_argv_append_nosize(&app->dash_host, host);
|
opal_argv_append_nosize(&app->dash_host, host);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check for 'hostfile' */
|
/* check for 'hostfile' */
|
||||||
ompi_info_get (array_of_info[i], "hostfile", sizeof(host), host, &flag);
|
ompi_info_get (array_of_info[i], "hostfile", sizeof(host) - 1, host, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
app->hostfile = strdup(host);
|
app->hostfile = strdup(host);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check for 'add-hostfile' */
|
/* check for 'add-hostfile' */
|
||||||
ompi_info_get (array_of_info[i], "add-hostfile", sizeof(host), host, &flag);
|
ompi_info_get (array_of_info[i], "add-hostfile", sizeof(host) - 1, host, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
app->add_hostfile = strdup(host);
|
app->add_hostfile = strdup(host);
|
||||||
}
|
}
|
||||||
@ -632,13 +632,13 @@ static int spawn(int count, char **array_of_commands,
|
|||||||
/* check for 'ompi_prefix' (OMPI-specific -- to effect the same
|
/* check for 'ompi_prefix' (OMPI-specific -- to effect the same
|
||||||
* behavior as --prefix option to orterun)
|
* behavior as --prefix option to orterun)
|
||||||
*/
|
*/
|
||||||
ompi_info_get (array_of_info[i], "ompi_prefix", sizeof(prefix), prefix, &flag);
|
ompi_info_get (array_of_info[i], "ompi_prefix", sizeof(prefix) - 1, prefix, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
app->prefix_dir = strdup(prefix);
|
app->prefix_dir = strdup(prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check for 'wdir' */
|
/* check for 'wdir' */
|
||||||
ompi_info_get (array_of_info[i], "wdir", valuelen, cwd, &flag);
|
ompi_info_get (array_of_info[i], "wdir", sizeof(cwd) - 1, cwd, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
app->cwd = strdup(cwd);
|
app->cwd = strdup(cwd);
|
||||||
have_wdir = 1;
|
have_wdir = 1;
|
||||||
@ -660,19 +660,19 @@ static int spawn(int count, char **array_of_commands,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* check for 'preload_files' */
|
/* check for 'preload_files' */
|
||||||
ompi_info_get (array_of_info[i], "ompi_preload_files", valuelen, cwd, &flag);
|
ompi_info_get (array_of_info[i], "ompi_preload_files", sizeof(cwd) - 1, cwd, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
app->preload_files = strdup(cwd);
|
app->preload_files = strdup(cwd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check for 'preload_files_dest_dir' */
|
/* check for 'preload_files_dest_dir' */
|
||||||
ompi_info_get (array_of_info[i], "ompi_preload_files_dest_dir", valuelen, cwd, &flag);
|
ompi_info_get (array_of_info[i], "ompi_preload_files_dest_dir", sizeof(cwd) - 1, cwd, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
app->preload_files_dest_dir = strdup(cwd);
|
app->preload_files_dest_dir = strdup(cwd);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* check for 'preload_files_src_dir' */
|
/* check for 'preload_files_src_dir' */
|
||||||
ompi_info_get (array_of_info[i], "ompi_preload_files_src_dir", valuelen, cwd, &flag);
|
ompi_info_get (array_of_info[i], "ompi_preload_files_src_dir", sizeof(cwd) - 1, cwd, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
app->preload_files_src_dir = strdup(cwd);
|
app->preload_files_src_dir = strdup(cwd);
|
||||||
}
|
}
|
||||||
@ -686,7 +686,7 @@ static int spawn(int count, char **array_of_commands,
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* see if this is an MCA param that the user wants applied to the child job */
|
/* see if this is an MCA param that the user wants applied to the child job */
|
||||||
ompi_info_get (array_of_info[i], "ompi_param", valuelen, params, &flag);
|
ompi_info_get (array_of_info[i], "ompi_param", sizeof(params) - 1, params, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
opal_argv_append_unique_nosize(&app->env, params, true);
|
opal_argv_append_unique_nosize(&app->env, params, true);
|
||||||
}
|
}
|
||||||
@ -694,7 +694,7 @@ static int spawn(int count, char **array_of_commands,
|
|||||||
/* see if user specified what to do with stdin - defaults to
|
/* see if user specified what to do with stdin - defaults to
|
||||||
* not forwarding stdin to child processes
|
* not forwarding stdin to child processes
|
||||||
*/
|
*/
|
||||||
ompi_info_get (array_of_info[i], "ompi_stdin_target", valuelen, stdin_target, &flag);
|
ompi_info_get (array_of_info[i], "ompi_stdin_target", sizeof(stdin_target) - 1, stdin_target, &flag);
|
||||||
if ( flag ) {
|
if ( flag ) {
|
||||||
if (0 == strcmp(stdin_target, "all")) {
|
if (0 == strcmp(stdin_target, "all")) {
|
||||||
jdata->stdin_target = ORTE_VPID_WILDCARD;
|
jdata->stdin_target = ORTE_VPID_WILDCARD;
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user