Module Name: src
Committed By: christos
Date: Sat May 26 21:47:05 UTC 2012
Modified Files:
src/lib/libc/stdlib: qsort.c
Log Message:
don't trigger diagassert for a null array with 0 elements or 0 elementsize.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/stdlib/qsort.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/qsort.c
diff -u src/lib/libc/stdlib/qsort.c:1.21 src/lib/libc/stdlib/qsort.c:1.22
--- src/lib/libc/stdlib/qsort.c:1.21 Wed May 18 15:36:36 2011
+++ src/lib/libc/stdlib/qsort.c Sat May 26 17:47:05 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: qsort.c,v 1.21 2011/05/18 19:36:36 dsl Exp $ */
+/* $NetBSD: qsort.c,v 1.22 2012/05/26 21:47:05 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)qsort.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: qsort.c,v 1.21 2011/05/18 19:36:36 dsl Exp $");
+__RCSID("$NetBSD: qsort.c,v 1.22 2012/05/26 21:47:05 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -105,7 +105,7 @@ qsort(void *a, size_t n, size_t es,
size_t d, r;
int swaptype, cmp_result;
- _DIAGASSERT(a != NULL);
+ _DIAGASSERT(a != NULL || n == 0 || es == 0);
_DIAGASSERT(cmp != NULL);
loop: SWAPINIT(a, es);
