about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Kiddle <opk@zsh.org>2021-11-30 18:27:53 +0100
committerOliver Kiddle <opk@zsh.org>2021-11-30 18:27:53 +0100
commitb3519a9603e8f7f1c9830e14f918e87daf8fea13 (patch)
tree9f166214fa090e99a8b44c8d68e345dc5645c7d7
parent07c77dad5025a3c1a1cef8c707fa1f1ae43d0f1c (diff)
downloadzsh-b3519a9603e8f7f1c9830e14f918e87daf8fea13.tar.gz
zsh-b3519a9603e8f7f1c9830e14f918e87daf8fea13.tar.xz
zsh-b3519a9603e8f7f1c9830e14f918e87daf8fea13.zip
49611 based on 49590 (Martijn Dekker): disable Inf and NaN in math expressions for sh emulation
-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')) {