Merge pull request #317 from dscho/helper-selector-quoting

dscho · web-flow · commit 6ba872cb4cb0 · 2020-10-22T22:35:00.000+02:00
helper-selector: fix quoting of trailing backslashes
diff --git a/git-extra/git-credential-helper-selector.c b/git-extra/git-credential-helper-selector.c
@@ -291,7 +291,8 @@ static LPWSTR quote(LPWSTR string)
 			while (end[1] == L'\\')
 				end++;
 			len += end - p;
-			if (end[1] == L'"')
+			if (end[1] == L'"' ||
+			    (needs_quotes && end[1] == L'\0'))
 				len += end - p + 1;
 			p = end;
 		}
@@ -313,7 +314,7 @@ static LPWSTR quote(LPWSTR string)
 				memcpy(q, p, (end - p) * sizeof(WCHAR));
 				q += end - p;
 			}
-			if (end[1] == L'"') {
+			if (end[1] == L'"' || end[1] == L'\0') {
 				memcpy(q, p, (end - p + 1) * sizeof(WCHAR));
 				q += end - p + 1;
 			}

Original file line number	Diff line number	Diff line change
`@@ -291,7 +291,8 @@ static LPWSTR quote(LPWSTR string)`
`291`	`291`	`while (end[1] == L'\\')`
`292`	`292`	`end++;`
`293`	`293`	`len += end - p;`
`294`		`- if (end[1] == L'"')`
	`294`	`+ if (end[1] == L'"' \|\|`
	`295`	`+ (needs_quotes && end[1] == L'\0'))`
`295`	`296`	`len += end - p + 1;`
`296`	`297`	`p = end;`
`297`	`298`	`}`
`@@ -313,7 +314,7 @@ static LPWSTR quote(LPWSTR string)`
`313`	`314`	`memcpy(q, p, (end - p) * sizeof(WCHAR));`
`314`	`315`	`q += end - p;`
`315`	`316`	`}`
`316`		`- if (end[1] == L'"') {`
	`317`	`+ if (end[1] == L'"' \|\| end[1] == L'\0') {`
`317`	`318`	`memcpy(q, p, (end - p + 1) * sizeof(WCHAR));`
`318`	`319`	`q += end - p + 1;`
`319`	`320`	`}`