Escape file name commas in startup command #67
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
mborgerson
reviewed
Nov 5, 2020
softmmu/vl.c
Outdated
| @@ -2921,7 +2945,7 @@ void qemu_init(int argc, char **argv, char **envp) | |||
| xemu_settings_get_bool(XEMU_SETTINGS_SYSTEM_SHORTANIM, &short_animation); | |||
|
|
|||
| fake_argv[fake_argc++] = g_strdup_printf("xbox%s%s%s", | |||
| strlen(bootrom_path) > 0 ? g_strdup_printf(",bootrom=%s", bootrom_path) : "", // Leak | |||
| strlen(bootrom_path) > 0 ? g_strdup_printf(",bootrom=%s", strdup_double_commas(bootrom_path)) : "", // Leak | |||
There was a problem hiding this comment.
Let's free the escaped paths after using g_strdup_printf
mborgerson
reviewed
Nov 5, 2020
softmmu/vl.c
Outdated
| // Duplicate commas to escape them | ||
| static char *strdup_double_commas(const char *input) { | ||
| size_t length = 0; | ||
| for(const char *i = input; *i; i++) { |
There was a problem hiding this comment.
nits: Please have a space after for and while, if below as well
mborgerson
reviewed
Nov 5, 2020
softmmu/vl.c
Outdated
| char *output = malloc(length + 1); | ||
| char *out = output; | ||
| const char *in = input; | ||
| while(*in) { |
There was a problem hiding this comment.
Suggest a slightly more succinct version:
const char *in = input;
char *out = output;
while (*in) {
if (*in == ',') {
*(out++) = ',';
}
*(out++) = *(in++);
}
|
Looks good, just some minor changes requested. Thanks for looking into it! |
|
Thanks! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes #65