summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMikael Magnusson <mikachu@gmail.com>2022-03-19 01:20:57 +0100
committerMikael Magnusson <mikachu@gmail.com>2022-03-30 08:07:39 +0200
commit3bf95b91f0cd378c1a4e9c611a51cb9fe0e2ffcd (patch)
treeb4719cea1999f39d6bab12772c0e4e7c8b518e92
parent49915: Efficient dedup for unsorted completions (diff)
downloadzsh-3bf95b91f0cd378c1a4e9c611a51cb9fe0e2ffcd.tar
zsh-3bf95b91f0cd378c1a4e9c611a51cb9fe0e2ffcd.tar.gz
zsh-3bf95b91f0cd378c1a4e9c611a51cb9fe0e2ffcd.tar.bz2
zsh-3bf95b91f0cd378c1a4e9c611a51cb9fe0e2ffcd.tar.lz
zsh-3bf95b91f0cd378c1a4e9c611a51cb9fe0e2ffcd.tar.xz
zsh-3bf95b91f0cd378c1a4e9c611a51cb9fe0e2ffcd.tar.zst
zsh-3bf95b91f0cd378c1a4e9c611a51cb9fe0e2ffcd.zip
49870: Fix NULL reference in match code more
This reverts "49658: Fix NULL reference in match code." and adds a check inside the block, as well as a failsafe check at the end. The above commit (49658) causes a crash due to ll being calculated as 0 which leads to rr being an invalid pointer. Only adding a check for when ll is 0 just leads to bck-i-search pattern not working at all (the final hunk). Restoring the condition and adding an explicit NULL check for replstr seems to make matters work as intended.
-rw-r--r--ChangeLog2
-rw-r--r--Src/glob.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b02f3bc8..3b7cc4921 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@
* 49915: Src/Zle/comp.h, Src/Zle/compcore.c: Efficient dedup
for unsorted completions
+ * 49870: Src/glob.c: Fix NULL reference in match code more
+