about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorSzabolcs Nagy <nsz@port70.net>2019-10-13 14:54:31 +0000
committerRich Felker <dalias@aerifal.cx>2019-10-13 17:46:58 -0400
commite858063070eedb7fe78c37eba5177d8c5cfccfa6 (patch)
tree096107b70bf29ed69cdb761894a91c230b885fa7 /src
parent716745e00e304a650a8eef57c15fbd326168096e (diff)
downloadmusl-e858063070eedb7fe78c37eba5177d8c5cfccfa6.tar.gz
musl-e858063070eedb7fe78c37eba5177d8c5cfccfa6.tar.xz
musl-e858063070eedb7fe78c37eba5177d8c5cfccfa6.zip
math: fix signed int left shift ub in sqrt
Both sqrt and sqrtf shifted the signed exponent as signed int to adjust
the bit representation of the result. There are signed right shifts too
in the code but those are implementation defined and are expected to
compile to arithmetic shift on supported compilers and targets.
Diffstat (limited to 'src')
-rw-r--r--src/math/sqrt.c3
-rw-r--r--src/math/sqrtf.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/math/sqrt.c b/src/math/sqrt.c
index b2775673..f1f6d76c 100644
--- a/src/math/sqrt.c
+++ b/src/math/sqrt.c
@@ -179,7 +179,6 @@ double sqrt(double x)
 	ix1 = q1>>1;
 	if (q&1)
 		ix1 |= sign;
-	ix0 += m << 20;
-	INSERT_WORDS(z, ix0, ix1);
+	INSERT_WORDS(z, ix0 + ((uint32_t)m << 20), ix1);
 	return z;
 }
diff --git a/src/math/sqrtf.c b/src/math/sqrtf.c
index 28cb4ad3..d6ace38a 100644
--- a/src/math/sqrtf.c
+++ b/src/math/sqrtf.c
@@ -78,7 +78,6 @@ float sqrtf(float x)
 		}
 	}
 	ix = (q>>1) + 0x3f000000;
-	ix += m << 23;
-	SET_FLOAT_WORD(z, ix);
+	SET_FLOAT_WORD(z, ix + ((uint32_t)m << 23));
 	return z;
 }