D31292.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D31292.diff
View Options

	diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc
	--- a/lib/libc/stdlib/Makefile.inc
	+++ b/lib/libc/stdlib/Makefile.inc
	@@ -18,6 +18,8 @@
	strtol.c strtold.c strtoll.c strtoq.c strtoul.c strtonum.c strtoull.c \
	strtoumax.c strtouq.c system.c tdelete.c tfind.c tsearch.c twalk.c

	+CFLAGS.qsort.c+= -Wsign-compare
	+
	# Work around an issue on case-insensitive file systems.
	# libc has both _Exit.c and _exit.s and they both yield
	# _exit.o (case insensitively speaking).
	diff --git a/lib/libc/stdlib/qsort.c b/lib/libc/stdlib/qsort.c
	--- a/lib/libc/stdlib/qsort.c
	+++ b/lib/libc/stdlib/qsort.c
	@@ -171,7 +171,12 @@
	pn = (char )a + n es;
	d1 = MIN(pa - (char *)a, pb - pa);
	vecswap(a, pb - d1, d1);
	- d1 = MIN(pd - pc, pn - pd - es);
	+ /*
	+ * Cast es to preserve signedness of right-hand side of MIN()
	+ * expression, to avoid sign ambiguity in the implied comparison. es
	+ * is safely within [0, SSIZE_MAX].
	+ */
	+ d1 = MIN(pd - pc, pn - pd - (ssize_t)es);
	vecswap(pb, pn - d1, d1);

	d1 = pb - pa;