Skip to content

Fixed the vine_factory bug during command line submission #4235

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fixed the vine_factory bug during command line submission #4235

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
30d8349
Fixed the vine_factory bug during command line submission
LaxminarayanaV7416 Aug 27, 2025
adc4c58
made changes as per the btovar request
LaxminarayanaV7416 Sep 1, 2025
561ba1d
changed the string_escape_shell to string_escape_shell_vine_factory
LaxminarayanaV7416 Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 36 additions & 4 deletions batch_job/src/vine_factory.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,34 @@ int manager_workers_capacity(struct jx *j) {
return capacity;
}

char *string_escape_shell_vine_factory(const char *input) {
size_t len = strlen(input);

// Worst case: every char becomes 2 chars + quotes
char *output = malloc(len * 2 + 3);
Comment on lines +225 to +226
Copy link

Copilot AI Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The memory allocation calculation len * 2 + 3 may be insufficient for strings containing many special characters. Consider using a more conservative calculation or dynamic reallocation to prevent buffer overflows.

Suggested change
// Worst case: every char becomes 2 chars + quotes
char *output = malloc(len * 2 + 3);
// First pass: calculate required output size
size_t out_len = 2; // for opening and closing quotes
for (const char *src = input; *src; src++) {
switch (*src) {
case '"':
case '\\':
case '$':
case '`':
case '!':
case '\'':
out_len += 2; // escaped char: backslash + char
break;
default:
out_len += 1;
break;
}
}
out_len += 1; // for null terminator
char *output = malloc(out_len);

Copilot uses AI. Check for mistakes.
if (!output) return NULL;

char *dst = output;
*dst++ = '"'; // open double quote

for (const char *src = input; *src; src++) {
switch (*src) {
case '"': *dst++ = '\\'; *dst++ = '"'; break;
case '\\': *dst++ = '\\'; *dst++ = '\\'; break;
case '$': *dst++ = '\\'; *dst++ = '$'; break;
case '`': *dst++ = '\\'; *dst++ = '`'; break;
case '!': *dst++ = '\\'; *dst++ = '!'; break;
case '\'': *dst++ = '\\'; *dst++ = '\''; break; // escape single quote
default: *dst++ = *src; break;
}
}

*dst++ = '"'; // close double quote
*dst = '\0';

return output;
}

int manager_workers_needed_by_resource(struct jx *j) {
int tasks_total_cores = jx_lookup_integer(j, "tasks_total_cores");
int tasks_total_memory = jx_lookup_integer(j, "tasks_total_memory");
Expand Down Expand Up @@ -468,7 +496,7 @@ static int submit_worker( struct batch_queue *queue )
cmd = string_format(
"./%s --parent-death -M %s -t %d -C '%s' %s %s %s %s %s %s %s %s",
worker_command,
submission_regex,
string_escape_shell_vine_factory(submission_regex),
Copy link

Copilot AI Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Memory leak: The strings returned by string_escape_shell_vine_factory() are dynamically allocated but never freed. Store the returned pointers and call free() after string_format() to prevent memory leaks.

Copilot uses AI. Check for mistakes.
worker_timeout,
catalog_host,
debug_workers ? debug_worker_options : "",
Expand All @@ -484,7 +512,7 @@ static int submit_worker( struct batch_queue *queue )
cmd = string_format(
"./%s --parent-death %s %d -t %d -C '%s' %s %s %s %s %s %s %s",
worker_command,
manager_host,
string_escape_shell_vine_factory(manager_host),
Copy link

Copilot AI Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Memory leak: The strings returned by string_escape_shell_vine_factory() are dynamically allocated but never freed. Store the returned pointers and call free() after string_format() to prevent memory leaks.

Copilot uses AI. Check for mistakes.
manager_port,
worker_timeout,
catalog_host,
Expand Down Expand Up @@ -1686,7 +1714,9 @@ int main(int argc, char *argv[])

char* cmd;
if(worker_command != NULL){
cmd = string_format("cp '%s' '%s'",worker_command,scratch_dir);
cmd = string_format("cp %s %s",
string_escape_shell_vine_factory(worker_command),
Copy link

Copilot AI Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Memory leak: The strings returned by string_escape_shell_vine_factory() are dynamically allocated but never freed. Store the returned pointers and call free() after string_format() to prevent memory leaks.

Copilot uses AI. Check for mistakes.
string_escape_shell_vine_factory(scratch_dir));
if(system(cmd)){
fprintf(stderr,"vine_factory: Could not Access specified worker binary.\n");
exit(EXIT_FAILURE);
Expand All @@ -1703,7 +1733,9 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}

cmd = string_format("cp '%s' '%s'",tmp,scratch_dir);
cmd = string_format("cp %s %s",
string_escape_shell_vine_factory(tmp),
string_escape_shell_vine_factory(scratch_dir));
Comment on lines +1737 to +1738
Copy link

Copilot AI Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Memory leak: The strings returned by string_escape_shell_vine_factory() are dynamically allocated but never freed. Store the returned pointers and call free() after string_format() to prevent memory leaks.

Copilot uses AI. Check for mistakes.
if (system(cmd)) {
fprintf(stderr, "vine_factory: could not copy vine_worker to scratch directory.\n");
exit(EXIT_FAILURE);
Expand Down