git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "René Scharfe" <l.s.r@web.de>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>,
	Johannes Schindelin <johannes.schindelin@gmx.de>
Subject: [PATCH 2/3] add QSORT_S
Date: Thu, 1 Dec 2016 17:28:09 +0100	[thread overview]
Message-ID: <d7e9bf45-98ca-4245-7740-ef71f71610aa@web.de> (raw)
In-Reply-To: <3083fbf7-d67e-77e4-e05f-94a7e7e15eba@web.de>

Add the macro QSORT_S, a convenient wrapper for qsort_s() that infers
the size of the array elements and dies on error.

Basically all possible errors are programming mistakes (passing NULL as
base of a non-empty array, passing NULL as comparison function,
out-of-bounds accesses), so terminating the program should be acceptable
for most callers.

Signed-off-by: Rene Scharfe <l.s.r@web.de>
---
 git-compat-util.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/git-compat-util.h b/git-compat-util.h
index d25f0bd4c..b707dd880 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -994,6 +994,11 @@ int git_qsort_s(void *base, size_t nmemb, size_t size,
 #define qsort_s git_qsort_s
 #endif
 
+#define QSORT_S(base, n, compar, ctx) do {			\
+	if (qsort_s((base), (n), sizeof(*(base)), compar, ctx))	\
+		die("BUG: qsort_s() failed");			\
+} while (0)
+
 #ifndef REG_STARTEND
 #error "Git requires REG_STARTEND support. Compile with NO_REGEX=NeedsStartEnd"
 #endif
-- 
2.11.0


  parent reply	other threads:[~2016-12-01 16:28 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-12-01 16:24 [PATCH 0/3] string-list: make string_list_sort() reentrant René Scharfe
2016-12-01 16:26 ` [PATCH 1/3] compat: add qsort_s() René Scharfe
2016-12-01 16:31   ` René Scharfe
2016-12-01 19:35   ` Jeff King
2016-12-01 20:14     ` Junio C Hamano
2016-12-01 20:19       ` Jeff King
2016-12-01 20:25         ` Junio C Hamano
2016-12-01 22:30         ` René Scharfe
2016-12-01 23:37           ` Junio C Hamano
2016-12-01 20:22       ` Junio C Hamano
2016-12-01 20:26         ` Jeff King
2016-12-12 19:51         ` René Scharfe
2016-12-12 19:57           ` Jeff King
2016-12-21  9:36             ` René Scharfe
2016-12-01 16:28 ` René Scharfe [this message]
2016-12-01 16:29 ` [PATCH 3/3] string-list: use QSORT_S in string_list_sort() René Scharfe

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d7e9bf45-98ca-4245-7740-ef71f71610aa@web.de \
    --to=l.s.r@web.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=johannes.schindelin@gmx.de \
    /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://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).