Attachment 826574 Details for Bug 1032550 – Proposed patch -- use quotes for arguments in the bash script

[patch] Proposed patch -- use quotes for arguments in the bash script

scl-args.patch (text/plain), 1.01 KB, created by Honza Horak on 2013-11-20 11:51:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Honza Horak

Created: 2013-11-20 11:51:41 UTC

Size: 1.01 KB

patch

obsolete

>diff -up scl-utils-20131017/scl.c.args scl-utils-20131017/scl.c
>--- scl-utils-20131017/scl.c.args	2013-11-20 12:46:18.430367787 +0100
>+++ scl-utils-20131017/scl.c	2013-11-20 12:49:09.661420197 +0100
>@@ -319,10 +319,10 @@ int main(int argc, char **argv) {
> 	} else if (command == NULL) {
> 		int len = 0;
> 		for (i = separator_pos+1; i < argc; i++) {
>-			len += strlen(argv[i])+1; /* +1 for additional space */
>+			len += strlen(argv[i])+3; /* +1 for additional space, +2 for additional quotes */
> 		}
> 
>-		command = malloc(len*sizeof(char));
>+		command = malloc((len+1)*sizeof(char));
> 		if (command == NULL) {
> 			fprintf(stderr, "Can't allocate memory.\n");
> 			exit(EXIT_FAILURE);
>@@ -330,11 +330,13 @@ int main(int argc, char **argv) {
> 
> 		len = 0;
> 		for (i = separator_pos+1; i < argc; i++) {
>+			command[len++] = '"';
> 			strcpy(command+len, argv[i]);
> 			len += strlen(argv[i]);
>-			command[len] = ' ';
>-			len++;
>+			command[len++] = '"';
>+			command[len++] = ' ';
> 		}
>+		command[len] = '\0';
> 	}
> 
> 	tfd = mkstemp(tmp);

Actions: View | Diff

Attachments on bug 1032550: 826574