From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 66ED01384AE for ; Sun, 20 Sep 2015 08:15:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4759021C0C0; Sun, 20 Sep 2015 08:15:32 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B59421C045 for ; Sun, 20 Sep 2015 08:15:31 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B973934089A for ; Sun, 20 Sep 2015 08:15:30 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C69F0207 for ; Sun, 20 Sep 2015 08:15:27 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1442730925.7e7a7a025dd2d43daf0b8ca14135e14bcaf871ce.vapier@gentoo> Subject: [gentoo-commits] proj/sandbox:master commit in: libsbutil/ X-VCS-Repository: proj/sandbox X-VCS-Files: libsbutil/sb_memory.c X-VCS-Directories: libsbutil/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 7e7a7a025dd2d43daf0b8ca14135e14bcaf871ce X-VCS-Branch: master Date: Sun, 20 Sep 2015 08:15:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5d3de347-42e2-499c-8816-234ab31515dc X-Archives-Hash: 0f21e75665867655901ff6b674855978 commit: 7e7a7a025dd2d43daf0b8ca14135e14bcaf871ce Author: Mike Frysinger gentoo org> AuthorDate: Sun Sep 20 06:35:25 2015 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Sun Sep 20 06:35:25 2015 +0000 URL: https://gitweb.gentoo.org/proj/sandbox.git/commit/?id=7e7a7a02 libsbutil: undef memory redirect calls Sometimes the C library will redirect a call to strdup to __strdup which breaks when we're using the libsandbox memory allocator. This was fixed in libsandbox in commit d7801453aced46a6f31d8455877edeb31a5211cc, but we didn't notice in libsbutil as no calls to strdup happened to come up. Signed-off-by: Mike Frysinger gentoo.org> libsbutil/sb_memory.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libsbutil/sb_memory.c b/libsbutil/sb_memory.c index bdc054f..ebc1c8e 100644 --- a/libsbutil/sb_memory.c +++ b/libsbutil/sb_memory.c @@ -11,6 +11,12 @@ #include "headers.h" #include "sbutil.h" +/* Make sure the C library doesn't rewrite calls to funcs libsandbox provides. */ +#undef calloc +#undef malloc +#undef realloc +#undef strdup + void * __xcalloc(size_t nmemb, size_t size, const char *file, const char *func, size_t line) {