Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-01-23 23:28:31 +00:00
Code Issues Projects Releases Wiki Activity

Prevent fzf crashing on malformed remote action

Browse Source
This commit is contained in:
Junegunn Choi 2023-01-07 15:35:29 +09:00
parent 23d8b78ce1
commit bf641faafa
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
1 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/options.go
View File

@ -551,8 +551,13 @@ func parseBorder(str string, optional bool) tui.BorderShape {
} }
func parseKeyChords(str string, message string) map[tui.Event]string { func parseKeyChords(str string, message string) map[tui.Event]string {
return parseKeyChordsImpl(str, message, errorExit)
}
func parseKeyChordsImpl(str string, message string, exit func(string)) map[tui.Event]string {
if len(str) == 0 { if len(str) == 0 {
errorExit(message) exit(message)
return nil
} }
str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string([]rune{escapedComma})) str = regexp.MustCompile("(?i)(alt-),").ReplaceAllString(str, "$1"+string([]rune{escapedComma}))
@ -686,7 +691,8 @@ func parseKeyChords(str string, message string) map[tui.Event]string {
} else if len(runes) == 1 { } else if len(runes) == 1 {
chords[tui.Key(runes[0])] = key chords[tui.Key(runes[0])] = key
} else { } else {
errorExit("unsupported key: " + key) exit("unsupported key: " + key)
return nil
} }
} }
} }
@ -1151,8 +1157,15 @@ func parseActionList(masked string, original string, prevActions []*action, putA
actionArg = spec[offset+1 : len(spec)-1] actionArg = spec[offset+1 : len(spec)-1]
actions = append(actions, &action{t: t, a: actionArg}) actions = append(actions, &action{t: t, a: actionArg})
} }
if t == actUnbind || t == actRebind { switch t {
parseKeyChords(actionArg, spec[0:offset]+" target required") case actUnbind, actRebind:
parseKeyChordsImpl(actionArg, spec[0:offset]+" target required", exit)
case actChangePreviewWindow:
opts := previewOpts{}
for _, arg := range strings.Split(actionArg, "|") {
// Make sure that each expression is valid
parsePreviewWindowImpl(&opts, arg, exit)
}
} }
} }
} }
@ -1180,7 +1193,7 @@ func parseKeymap(keymap map[tui.Event][]*action, str string, exit func(string))
} else if len(pair[0]) == 1 && pair[0][0] == escapedPlus { } else if len(pair[0]) == 1 && pair[0][0] == escapedPlus {
key = tui.Key('+') key = tui.Key('+')
} else { } else {
keys := parseKeyChords(pair[0], "key name required") keys := parseKeyChordsImpl(pair[0], "key name required", exit)
key = firstKey(keys) key = firstKey(keys)
} }
putAllowed := key.Type == tui.Rune && unicode.IsGraphic(key.Char) putAllowed := key.Type == tui.Rune && unicode.IsGraphic(key.Char)
@ -1311,6 +1324,10 @@ func parseInfoStyle(str string) infoStyle {
} }
func parsePreviewWindow(opts *previewOpts, input string) { func parsePreviewWindow(opts *previewOpts, input string) {
parsePreviewWindowImpl(opts, input, errorExit)
}
func parsePreviewWindowImpl(opts *previewOpts, input string, exit func(string)) {
tokenRegex := regexp.MustCompile(`[:,]*(<([1-9][0-9]*)\(([^)<]+)\)|[^,:]+)`) tokenRegex := regexp.MustCompile(`[:,]*(<([1-9][0-9]*)\(([^)<]+)\)|[^,:]+)`)
sizeRegex := regexp.MustCompile("^[0-9]+%?$") sizeRegex := regexp.MustCompile("^[0-9]+%?$")
offsetRegex := regexp.MustCompile(`^(\+{-?[0-9]+})?([+-][0-9]+)*(-?/[1-9][0-9]*)?$`) offsetRegex := regexp.MustCompile(`^(\+{-?[0-9]+})?([+-][0-9]+)*(-?/[1-9][0-9]*)?$`)
@ -1382,7 +1399,8 @@ func parsePreviewWindow(opts *previewOpts, input string) {
} else if offsetRegex.MatchString(token) { } else if offsetRegex.MatchString(token) {
opts.scroll = token opts.scroll = token
} else { } else {
errorExit("invalid preview window option: " + token) exit("invalid preview window option: " + token)
return
} }
} }
} }
@ -1391,7 +1409,7 @@ func parsePreviewWindow(opts *previewOpts, input string) {
opts.alternative = &alternativeOpts opts.alternative = &alternativeOpts
opts.alternative.hidden = false opts.alternative.hidden = false
opts.alternative.alternative = nil opts.alternative.alternative = nil
parsePreviewWindow(opts.alternative, alternative) parsePreviewWindowImpl(opts.alternative, alternative, exit)
} }
} }
@ -1887,7 +1905,6 @@ func postProcessOptions(opts *Options) {
} }
// Extend the default key map // Extend the default key map
previewEnabled := len(opts.Preview.command) > 0 || hasPreviewAction(opts)
keymap := defaultKeymap() keymap := defaultKeymap()
for key, actions := range opts.Keymap { for key, actions := range opts.Keymap {
var lastChangePreviewWindow *action var lastChangePreviewWindow *action
@ -1898,15 +1915,6 @@ func postProcessOptions(opts *Options) {
opts.ToggleSort = true opts.ToggleSort = true
case actChangePreviewWindow: case actChangePreviewWindow:
lastChangePreviewWindow = act lastChangePreviewWindow = act
if !previewEnabled {
// Doesn't matter
continue
}
opts := previewOpts{}
for _, arg := range strings.Split(act.a, "|") {
// Make sure that each expression is valid
parsePreviewWindow(&opts, arg)
}
} }
} }