Blame SOURCES/zsh-5.0.2-CVE-2018-7549.patch
|
 |
f686d7 |
From 8aa649ab39c6113072f93d8065d846477ab297f1 Mon Sep 17 00:00:00 2001
|
|
|
f686d7 |
From: Stephane Chazelas <stephane.chazelas@gmail.com>
|
|
|
f686d7 |
Date: Fri, 22 Dec 2017 22:17:09 +0000
|
|
|
f686d7 |
Subject: [PATCH] Avoid crash copying empty hash table.
|
|
|
f686d7 |
|
|
|
f686d7 |
Visible with typeset -p.
|
|
|
f686d7 |
|
|
|
f686d7 |
Upstream-commit: c2cc8b0fbefc9868fa83537f5b6d90fc1ec438dd
|
|
|
f686d7 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
f686d7 |
---
|
|
|
f686d7 |
Src/params.c | 11 +++++++----
|
|
|
f686d7 |
1 file changed, 7 insertions(+), 4 deletions(-)
|
|
|
f686d7 |
|
|
|
f686d7 |
diff --git a/Src/params.c b/Src/params.c
|
|
|
f686d7 |
index be8394b..25f34e8 100644
|
|
|
f686d7 |
--- a/Src/params.c
|
|
|
f686d7 |
+++ b/Src/params.c
|
|
|
f686d7 |
@@ -492,10 +492,13 @@ scancopyparams(HashNode hn, UNUSED(int flags))
|
|
|
f686d7 |
HashTable
|
|
|
f686d7 |
copyparamtable(HashTable ht, char *name)
|
|
|
f686d7 |
{
|
|
|
f686d7 |
- HashTable nht = newparamtable(ht->hsize, name);
|
|
|
f686d7 |
- outtable = nht;
|
|
|
f686d7 |
- scanhashtable(ht, 0, 0, 0, scancopyparams, 0);
|
|
|
f686d7 |
- outtable = NULL;
|
|
|
f686d7 |
+ HashTable nht = 0;
|
|
|
f686d7 |
+ if (ht) {
|
|
|
f686d7 |
+ nht = newparamtable(ht->hsize, name);
|
|
|
f686d7 |
+ outtable = nht;
|
|
|
f686d7 |
+ scanhashtable(ht, 0, 0, 0, scancopyparams, 0);
|
|
|
f686d7 |
+ outtable = NULL;
|
|
|
f686d7 |
+ }
|
|
|
f686d7 |
return nht;
|
|
|
f686d7 |
}
|
|
|
f686d7 |
|
|
|
f686d7 |
--
|
|
|
f686d7 |
2.14.3
|
|
|
f686d7 |
|