fix(_get_comp_words_by_ref): protect against custom IFS

akinomyoga · akinomyoga · commit 7ba4b4a27cdc · 2023-04-17T05:20:05.000+09:00
diff --git a/bash_completion b/bash_completion
@@ -655,19 +655,19 @@ _comp_get_words()
 
     [[ $vcur ]] && {
         upvars+=("$vcur")
-        upargs+=(-v $vcur "$cur")
+        upargs+=(-v "$vcur" "$cur")
     }
     [[ $vcword ]] && {
         upvars+=("$vcword")
-        upargs+=(-v $vcword "$cword")
+        upargs+=(-v "$vcword" "$cword")
     }
     [[ $vprev && $cword -ge 1 ]] && {
         upvars+=("$vprev")
-        upargs+=(-v $vprev "${words[cword - 1]}")
+        upargs+=(-v "$vprev" "${words[cword - 1]}")
     }
     [[ $vwords ]] && {
         upvars+=("$vwords")
-        upargs+=(-a${#words[@]} $vwords ${words+"${words[@]}"})
+        upargs+=(-a"${#words[@]}" "$vwords" ${words+"${words[@]}"})
     }
 
     ((${#upvars[@]})) && local "${upvars[@]}" && _comp_upvars "${upargs[@]}"

Original file line number	Diff line number	Diff line change
`@@ -655,19 +655,19 @@ _comp_get_words()`
`655`	`655`
`656`	`656`	`[[ $vcur ]] && {`
`657`	`657`	`upvars+=("$vcur")`
`658`		`- upargs+=(-v $vcur "$cur")`
	`658`	`+ upargs+=(-v "$vcur" "$cur")`
`659`	`659`	`}`
`660`	`660`	`[[ $vcword ]] && {`
`661`	`661`	`upvars+=("$vcword")`
`662`		`- upargs+=(-v $vcword "$cword")`
	`662`	`+ upargs+=(-v "$vcword" "$cword")`
`663`	`663`	`}`
`664`	`664`	`[[ $vprev && $cword -ge 1 ]] && {`
`665`	`665`	`upvars+=("$vprev")`
`666`		`- upargs+=(-v $vprev "${words[cword - 1]}")`
	`666`	`+ upargs+=(-v "$vprev" "${words[cword - 1]}")`
`667`	`667`	`}`
`668`	`668`	`[[ $vwords ]] && {`
`669`	`669`	`upvars+=("$vwords")`
`670`		`- upargs+=(-a${#words[@]} $vwords ${words+"${words[@]}"})`
	`670`	`+ upargs+=(-a"${#words[@]}" "$vwords" ${words+"${words[@]}"})`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`((${#upvars[@]})) && local "${upvars[@]}" && _comp_upvars "${upargs[@]}"`