From patchwork Wed Jul 4 20:30:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 141087 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1182735ljj; Wed, 4 Jul 2018 13:31:27 -0700 (PDT) X-Google-Smtp-Source: AAOMgpeV2+X4tBibIZHDm+OBlBzojMniZzZ2ao7WOSffWxnnCEAA5E2F+cJMDdMsaNkNVt2JtOnW X-Received: by 2002:a62:5290:: with SMTP id g138-v6mr3618815pfb.46.1530736287462; Wed, 04 Jul 2018 13:31:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530736287; cv=none; d=google.com; s=arc-20160816; b=licADAY26nx9KLc2eSDjyX6ktq+NWyAu7ZGMbhuDzFXwA4SmVYCpOwHBZIVBLykfJg lGdMIutJb2VQWdTey3QKa7/CtlpZNi4MJSI52OtuvP6y59Wq3xW0iae9KJl7zFyWH/yo w6dO1FzX3LqFHg8b0vX3e+JWcvc6WvRMfZrC5TqBOno0f6l/jq2Hr9UeNS9U2JjcGsXL j/MqfeukViP+GQfAftkvO8GBv1TLysAte5sPBsv2rbYQosidxVgpzOPXGZg+GE6WUQdw ugoKIF+Z8qzVezwYnFqglGMlkvftXOQyrKP37VkpibDSdC3++my64vdWkK80+0yVCbF+ qCVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:dkim-signature:delivered-to:sender:list-help:list-post :list-archive:list-subscribe:list-unsubscribe:list-id:precedence :mailing-list:dkim-signature:domainkey-signature :arc-authentication-results; bh=1kdkTSWcAK8p6f/J90kaq4L0r5PbJAZ5n5Dg/BU/FE8=; b=L0YylvP5bqrNafYmXp8XReIzQ4GYbIRrGfb7bCRP+JXJw2MajirOS0/fKCFruR9/HT msi9xjG3Z9fs5YcTVdPxok3dkHWK+vQbsO7aT/ok0FAOTC062nAanre9iM8QcStlvXdI UxGwh7zUDvJSAMwMI+wGPsph5MRdQKuAxGY1+JljmQUeYoJOWCVeV2aMumtID31g+Aep xGgtNftHBvEaDT6BRTudbMhoZ4eH0zTRju0b3S6yr2ohouzdT8WGzzy58duQY1dypq2s 1GH7Sk4l8ZUh1ZFfcJXCzEb3uv62bh3m6WtYLj2dmhGpEM59MthdVr2mcKv6PtV+8OYj +5fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=xzs2lpgB; dkim=pass header.i=@linaro.org header.s=google header.b=JvUS2mF1; spf=pass (google.com: domain of libc-alpha-return-93976-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-93976-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id h89-v6si4277753pld.378.2018.07.04.13.31.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Jul 2018 13:31:27 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-93976-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=xzs2lpgB; dkim=pass header.i=@linaro.org header.s=google header.b=JvUS2mF1; spf=pass (google.com: domain of libc-alpha-return-93976-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-93976-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; q=dns; s=default; b=t0K GLPzGEsqRGDI5ZoV7BM9W8Y5jWdzjck8KzATdyuqOHxAqb6B0iwesYGfxujN+riP fR0VUKD62Hj8wMOZ2Tt/2OPxVXB2SN4+HcofjsUTGojFD/Ww0MbBj8BDeHfk21VQ LgK7Kikr7WKK2so5ZWw8bcKlNqDXojxj9UX5o2q4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id:mime-version :content-type:content-transfer-encoding; s=default; bh=BrkGP7Qv6 +ket97pfmwIWP04lt0=; b=xzs2lpgBSQJQ9lLW0Y+5twHWFbJJkm0R27D33irIT ySb0smiSLRc0XV9zCE6cHzFRSfKhCiGXI/3Z5yV4yNRpGmpGSDkifKv68KjT+4ML XL6KdGwVT8bUpJCbZySEIX8oaJTAo8Yh70OnyDEXPMAPkroRe2ZAeXKRrSWIC25Q s0= Received: (qmail 32583 invoked by alias); 4 Jul 2018 20:31:18 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 32470 invoked by uid 89); 4 Jul 2018 20:31:03 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=398, HContent-Transfer-Encoding:8bit X-HELO: mail-qk0-f182.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=1kdkTSWcAK8p6f/J90kaq4L0r5PbJAZ5n5Dg/BU/FE8=; b=JvUS2mF1MaqfLuw/pXVnbepn63+4/arH85BbJJpnDy5hc2P+/Z2AZpAB6PJGGVev8g TEoqa6tLJl8wYGHMKFfjn07Qlk+1qTy4yLdiJw//tF6PrZ29aBZvUPNrennYW9bqDCXM ccXfjcv87G2E00RIdEIvEtssmSLyJ1nhs/P7A= Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [COMMITTED] posix: Fix bug-regex33 after regex sync Date: Wed, 4 Jul 2018 17:30:42 -0300 Message-Id: <1530736242-15891-1-git-send-email-adhemerval.zanella@linaro.org> MIME-Version: 1.0 On some platforms the inclusion of regex-internal.h in bug-regex33 testcase show a MAX redefinition if test-skeleton.c is include later. This patch fixes by removing regex-internal.h inclusion and using SBC_MAX value directly. Checked on aarch64-linux-gnu. * posix/bug-regex33.c: Fix build after regex sync. --- ChangeLog | 4 ++++ posix/bug-regex33.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/posix/bug-regex33.c b/posix/bug-regex33.c index 0313cb4..015b73c 100644 --- a/posix/bug-regex33.c +++ b/posix/bug-regex33.c @@ -23,7 +23,6 @@ #include #include #include -#include "regex_internal.h" static int do_test (void) @@ -39,8 +38,9 @@ do_test (void) memset (&r, 0, sizeof (r)); memset (&s, 0, sizeof (s)); - /* The bug cannot be reproduced without initialized fastmap. */ - r.fastmap = malloc (SBC_MAX); + /* The bug cannot be reproduced without initialized fastmap (it is SBC_MAX + value from regex_internal.h). */ + r.fastmap = malloc (UCHAR_MAX + 1); /* 圭 */ re_compile_pattern ("\xb7\xbd", 2, &r);