summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/math.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f9ae6a3bb..20bb88d88 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2021-11-30 Oliver Kiddle <opk@zsh.org>
+
+ * 49611 based on 49590 (Martijn Dekker): Src/math.c: disable Inf
+ and NaN in math expressions for sh emulation
+
2021-11-28 Oliver Kiddle <opk@zsh.org>
* 49606: Src/hashnameddir.c, Src/utils.c, configure.ac: remove old
diff --git a/Src/math.c b/Src/math.c
index 4f24361a4..777ad9c31 100644
--- a/Src/math.c
+++ b/Src/math.c
@@ -863,7 +863,7 @@ zzlex(void)
p = ptr;
ptr = ie;
- if (ie - p == 3) {
+ if (ie - p == 3 && !EMULATION(EMULATE_SH)) {
if ((p[0] == 'N' || p[0] == 'n') &&
(p[1] == 'A' || p[1] == 'a') &&
(p[2] == 'N' || p[2] == 'n')) {