From: "Jérémie Roquet" <arkanosis@gmail.com>
To: zsh-workers@zsh.org
Subject: PATCH: prevent SIGFPE on systems where LONG_MIN < -LONG_MAX
Date: Mon, 3 Sep 2012 16:32:46 +0200 [thread overview]
Message-ID: <CAFOazAPwkJ25FDNL--AtCFLFK2CWKHiOCyCJudx3qgK7LKcDGg@mail.gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
Hello,
$ echo $[ - 2**63 / -1 ]
zsh: floating point exception ./Src/zsh
$ echo $[ - 2**63 % -1 ]
zsh: floating point exception ./Src/zsh
The attached patch fixes this.
Best regards,
--
Jérémie
[-- Attachment #2: zsh_fix_sigfpe.patch --]
[-- Type: application/octet-stream, Size: 1072 bytes --]
diff --git a/Src/math.c b/Src/math.c
index cca5210..5e0a509 100644
--- a/Src/math.c
+++ b/Src/math.c
@@ -32,6 +32,7 @@ struct mathvalue;
#include "zsh.mdh"
#include "math.pro"
+#include <limits.h>
#include <math.h>
/* nonzero means we are not evaluating, just parsing */
@@ -962,6 +963,19 @@ notzero(mnumber a)
return 1;
}
+/**/
+static int
+representable(mnumber a, mnumber b)
+{
+#if LONG_MIN < -LONG_MAX
+ if (a.u.l - 1 > a.u.l && b.u.l == -1) {
+ zerr("non representable result");
+ return 0;
+ }
+#endif
+ return 1;
+}
+
/* macro to pop three values off the value stack */
/**/
@@ -1053,13 +1067,18 @@ op(int what)
return;
if (c.type == MN_FLOAT)
c.u.d = a.u.d / b.u.d;
- else
+ else {
+ if (!representable(a, b))
+ return;
c.u.l = a.u.l / b.u.l;
+ }
break;
case MOD:
case MODEQ:
if (!notzero(b))
return;
+ if (!representable(a, b))
+ return;
c.u.l = a.u.l % b.u.l;
break;
case PLUS:
next reply other threads:[~2012-09-03 14:33 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-03 14:32 Jérémie Roquet [this message]
2012-09-03 14:40 ` Mikael Magnusson
2012-09-03 14:57 ` Peter Stephenson
2012-09-03 15:08 ` Jérémie Roquet
2012-09-03 16:26 ` Vincent Lefevre
2012-09-04 18:26 ` Peter Stephenson
2012-09-04 23:50 ` Vincent Lefevre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAFOazAPwkJ25FDNL--AtCFLFK2CWKHiOCyCJudx3qgK7LKcDGg@mail.gmail.com \
--to=arkanosis@gmail.com \
--cc=zsh-workers@zsh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).