From 75f853f2e309bd2ed98209eb64b47ca2bdcf46fb Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Wed, 6 Jul 2005 10:01:19 +0000 Subject: 21402: Fix crash with case-insensitive matching. --- ChangeLog | 7 +++++++ Src/Zle/compmatch.c | 20 ++++++++++++++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 115ce11eb..4df3d3403 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-07-06 Peter Stephenson + + * 21402: Src/Zle/compmatch.c: Fix crash completing the set + of files AIWebKitMessageViewController.m, + AIWebKitMessageViewPlugin.m, AIWebkitMessageViewStyle.m + with case-insensitive matching. + 2005-07-03 Doug Kearns * unposted: Completion/Unix/Command/_w3m: add missing compset -S calls diff --git a/Src/Zle/compmatch.c b/Src/Zle/compmatch.c index 90823c9f7..7054feb6d 100644 --- a/Src/Zle/compmatch.c +++ b/Src/Zle/compmatch.c @@ -803,14 +803,26 @@ match_str(char *l, char *w, Brinfo *bpp, int bc, int *rwlp, /* Probably add the matched strings. */ if (!test) { if (sfx) - add_match_str(NULL, NULL, w, ow - w, sfx); + { + if (ow >= w) + add_match_str(NULL, NULL, w, ow - w, sfx); + } else - add_match_str(NULL, NULL, ow, w - ow, sfx); + { + if (w >= ow) + add_match_str(NULL, NULL, ow, w - ow, sfx); + } add_match_str(mp, tl, tw, mp->wlen, sfx); if (sfx) - add_match_sub(NULL, NULL, 0, w, ow - w); + { + if (ow >= w) + add_match_sub(NULL, NULL, 0, w, ow - w); + } else - add_match_sub(NULL, NULL, 0, ow, w - ow); + { + if (w >= ow) + add_match_sub(NULL, NULL, 0, ow, w - ow); + } add_match_sub(mp, tl, mp->llen, tw, mp->wlen); } if (sfx) { -- cgit 1.4.1