diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Src/hist.c | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 1bcf38611..3c7b1dfe6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-02-08 Peter Stephenson <pws@csr.com> + + * : Timothy Redaelli: 30187: Src/hist.c: file name manipulations + in history can return NULL if HAVE_CANONICALIZE_FILE_NAME. + 2012-02-07 Peter Stephenson <pws@csr.com> * Holger Macht via Ismail: 30185: Src/Zle/complete.mdd: add @@ -15918,5 +15923,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5574 $ +* $Revision: 1.5575 $ ***************************************************** diff --git a/Src/hist.c b/Src/hist.c index aeb6edda5..4d522dddb 100644 --- a/Src/hist.c +++ b/Src/hist.c @@ -1664,6 +1664,11 @@ chrealpath(char **junkptr) errno == ENAMETOOLONG || errno == ENOMEM) return 0; +#ifdef HAVE_CANONICALIZE_FILE_NAME + if (!real) + return 0; +#endif + if (nonreal == *junkptr) { *real = '\0'; break; |