From 4bfa5cd4215a9994b3c6da291d8b52f2c0f6553d Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Sun, 13 May 2007 20:22:01 +0000 Subject: 23435: Nikloai Weibull: bug testing end of string for sorting when ignoring backslashes --- ChangeLog | 5 ++++- Src/sort.c | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b3d92d4c3..8f806927e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,9 @@ 2007-05-13 Peter Stephenson - * Phil Pennoc: unposted: Doc/Zsh/cond.yo: should document + * 23435: Nikolai Weibull: Src/sort.c: bug testing for end + of sort string when ignoring backslashes. + + * Phil Pennock: unposted: Doc/Zsh/cond.yo: should document POSIX regular expressions as extended, not basic. * 23436: Src/params.c: handle empty strings for locale diff --git a/Src/sort.c b/Src/sort.c index 4f091deb8..7f539a248 100644 --- a/Src/sort.c +++ b/Src/sort.c @@ -338,8 +338,9 @@ strmetasort(char **array, int sortwhat, int *unmetalenp) src = dst; } if (sortwhat & SORTIT_IGNORING_BACKSLASHES) { + char *end = src + len + 1; /* copy null byte, so increment length */ - for (s = src, t = dst; s - src != len+1; ) { + for (s = src, t = dst; s < end; ) { if (*s == '\\') { s++; len--; -- cgit 1.4.1