diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2017-05-30 20:56:09 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2017-05-30 20:56:09 -0700 |
| commit | 399a23806fc39e13a31bb4138f8589cae0706f1d (patch) | |
| tree | 8aacc7937c3aa0ce891c42fbf7b4ac8b4b67ce88 /Src/hashtable.c | |
| parent | e4c33c6b1493ddeb91a91d0fa339c38bccd64f03 (diff) | |
| parent | 151a4660e289c66d13b65d68ad2f10d93743d2d4 (diff) | |
| download | zsh-399a23806fc39e13a31bb4138f8589cae0706f1d.tar.gz zsh-399a23806fc39e13a31bb4138f8589cae0706f1d.tar.xz zsh-399a23806fc39e13a31bb4138f8589cae0706f1d.zip | |
Merge branch 'master' into schaefer/badarrays
Diffstat (limited to 'Src/hashtable.c')
| -rw-r--r-- | Src/hashtable.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Src/hashtable.c b/Src/hashtable.c index c34744cd8..6ec2ed220 100644 --- a/Src/hashtable.c +++ b/Src/hashtable.c @@ -1445,10 +1445,12 @@ freehistdata(Histent he, int unlink) if (!he) return; + if (he == &curline) + return; + if (!(he->node.flags & (HIST_DUP | HIST_TMPSTORE))) removehashnode(histtab, he->node.nam); - DPUTS(he->node.nam == chline, "Attempt to free chline in history data"); zsfree(he->node.nam); if (he->nwords) zfree(he->words, he->nwords*2*sizeof(short)); |