From: Rich Felker <dalias@libc.org>
To: "sysysongyue@gmail.com" <sysysongyue@gmail.com>
Cc: musl@lists.openwall.com
Subject: Re: [musl] [BUG] catanf: overflow when the parameter is valid
Date: Wed, 5 Feb 2020 09:23:38 -0500 [thread overview]
Message-ID: <20200205142338.GB1663@brightrain.aerifal.cx> (raw)
In-Reply-To: <20200205133226.GA1663@brightrain.aerifal.cx>
[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]
On Wed, Feb 05, 2020 at 08:32:26AM -0500, Rich Felker wrote:
> On Wed, Feb 05, 2020 at 04:33:43PM +0800, sysysongyue@gmail.com wrote:
> > Hi!
> > I wrote some testcases for catanf(), and found that catanf(1+0*I) return
> > 99999996802856924650656260769173209088+99999996802856924650656260769173209088*I,
> > which should return pi/4 in expected. catanl, catanhf, and catanhl have
> > the same problem. Is this a bug? Any patches existed?
> > Thank you in advance!
>
> Looks like the equivalent of commit
> 10e4bd3780050e75b72aac5d85c31816419bb17d for catan was not applied to
> catanf. It should be an easy fix. I'll look at it.
>
> BTW your mail contained an empty plaintext part and the actual message
> was buried in the html version. I was able to dig it out to reply, but
> try to send text-only or at least with a matching text part since many
> readers probably can't see your email and the archive probably missed
> the body.
Proposed patch attached. It should be identical to the changes in
10e4bd3780050e75b72aac5d85c31816419bb17d except that it's applied to
catanf and catanl.
Rich
[-- Attachment #2: catanfl.diff --]
[-- Type: text/plain, Size: 1358 bytes --]
diff --git a/src/complex/catanf.c b/src/complex/catanf.c
index e10d9c09..ef3907a5 100644
--- a/src/complex/catanf.c
+++ b/src/complex/catanf.c
@@ -87,29 +87,17 @@ float complex catanf(float complex z)
x = crealf(z);
y = cimagf(z);
- if ((x == 0.0f) && (y > 1.0f))
- goto ovrf;
-
x2 = x * x;
a = 1.0f - x2 - (y * y);
- if (a == 0.0f)
- goto ovrf;
t = 0.5f * atan2f(2.0f * x, a);
w = _redupif(t);
t = y - 1.0f;
a = x2 + (t * t);
- if (a == 0.0f)
- goto ovrf;
t = y + 1.0f;
a = (x2 + (t * t))/a;
- w = w + (0.25f * logf (a)) * I;
- return w;
-
-ovrf:
- // FIXME
- w = MAXNUMF + MAXNUMF * I;
+ w = CMPLXF(w, 0.25f * logf(a));
return w;
}
diff --git a/src/complex/catanl.c b/src/complex/catanl.c
index a9fc02db..e62526c0 100644
--- a/src/complex/catanl.c
+++ b/src/complex/catanl.c
@@ -97,30 +97,18 @@ long double complex catanl(long double complex z)
x = creall(z);
y = cimagl(z);
- if ((x == 0.0L) && (y > 1.0L))
- goto ovrf;
-
x2 = x * x;
a = 1.0L - x2 - (y * y);
- if (a == 0.0L)
- goto ovrf;
t = atan2l(2.0L * x, a) * 0.5L;
w = redupil(t);
t = y - 1.0L;
a = x2 + (t * t);
- if (a == 0.0L)
- goto ovrf;
t = y + 1.0L;
a = (x2 + (t * t)) / a;
- w = w + (0.25L * logl(a)) * I;
- return w;
-
-ovrf:
- // FIXME
- w = LDBL_MAX + LDBL_MAX * I;
+ w = CMPLXF(w, 0.25L * logl(a));
return w;
}
#endif
prev parent reply other threads:[~2020-02-05 14:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-05 8:33 sysysongyue
2020-02-05 13:32 ` Rich Felker
2020-02-05 14:23 ` Rich Felker [this message]
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=20200205142338.GB1663@brightrain.aerifal.cx \
--to=dalias@libc.org \
--cc=musl@lists.openwall.com \
--cc=sysysongyue@gmail.com \
/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/musl/
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).