diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2012-06-18 09:05:01 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2012-06-18 09:05:01 +0000 |
| commit | c3fb9dbfa35043d4cb4c737032371df926ae6d3e (patch) | |
| tree | 29588bece3bf660231d7b3143953709fb55b4c94 | |
| parent | 38a4364db5ff298558fea28334a49c41f5921e7e (diff) | |
| download | zsh-c3fb9dbfa35043d4cb4c737032371df926ae6d3e.tar.gz zsh-c3fb9dbfa35043d4cb4c737032371df926ae6d3e.tar.xz zsh-c3fb9dbfa35043d4cb4c737032371df926ae6d3e.zip | |
Dima Kogan: 30515: fix globbing problem with large files:
failure owing to bad cast with large integers
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/glob.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 4e673df94..12baf69b6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-06-18 Peter Stephenson <pws@csr.com> + + * Dima Kogan: 30515: Src/glob.c: glob size test failed on very + large files owing to integer type error. + 2012-06-15 Phil Pennock <pdpennock@users.sourceforge.net> * 30513: zsh/regex metafy fixes for widechar; similar to 29838. @@ -16369,5 +16374,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5670 $ +* $Revision: 1.5671 $ ***************************************************** diff --git a/Src/glob.c b/Src/glob.c index d3ce73310..ca2ffaf51 100644 --- a/Src/glob.c +++ b/Src/glob.c @@ -997,7 +997,9 @@ gmatchcmp(Gmatch a, Gmatch b) break; } if (r) - return (int) ((s->tp & GS_DESC) ? -r : r); + return (s->tp & GS_DESC) ? + (r < 0L ? 1 : -1) : + (r > 0L ? 1 : -1); } return 0; } |