From patchwork Tue Nov 2 23:31:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stafford Horne X-Patchwork-Id: 46973 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DBC9385800A for ; Tue, 2 Nov 2021 23:32:28 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DBC9385800A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1635895948; bh=olD9T2of99Zy5npxmO5WDkM49F9YmZ8WUJp6YXfJhgY=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=xQUr/l6/RCdrchhgyLA9bKdluMp8KNIDFgf/VZofDFfuVmPl6y4+zpuKHTMmSfHm/ qKXSDia1a9IEsh8FX20dH7RMKU8dhyOEO2WPWzcA1wGYEAju+uU6EHRHpqGn2iOc56 Qd1VNfxQACk+3DQBtSczKs0ehvUZjeMOlqHo/T6E= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by sourceware.org (Postfix) with ESMTPS id 429723858415 for ; Tue, 2 Nov 2021 23:32:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 429723858415 Received: by mail-pg1-x531.google.com with SMTP id e65so743927pgc.5 for ; Tue, 02 Nov 2021 16:32:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=olD9T2of99Zy5npxmO5WDkM49F9YmZ8WUJp6YXfJhgY=; b=ViaoQazYVFjpvQr3XRCz5/MHZRsZ3xc6bCJ/4jrf0UhPz0wW3XAPDoIXAZoo3pkrBP uzDtxYD8BHZSYd5kRy7u9BAafnXCjxJacYTg6K9lUQAWPWdYNPz7JMvhXchsDDNYLEmT +VS5mgDU3SCcAu1K9lkXIy94JEoo0HUmayOblhWZIjDuJ/C928RWk4LC8IOKYjXVJO6p 6EmbQqLyAeZTzzgCsu4f2x9MBdjkNowG1bb3HrSQ96kNePTkxtRuwtXkXef0d6qI47S2 3NOUNOCuvY7VUTTQcc0YuYoAOEIzBSbmY0A3ButJs1RjpklJOnQ0/PslN2QlsK9o1pux rWuA== X-Gm-Message-State: AOAM530+jcfuasP+D9/JW2crGUbIZWGckqIebljIXjzJOChHuCAjE/WQ aDQB+3qXPNwD7Kkb15I09XDN1bNZHyY= X-Google-Smtp-Source: ABdhPJz4ezNdzSugpjJkda+3SaHl5OeqnFRCWc3MZTVO0v6eXiJwh1lE4GDVz6Ewoj0uZf6L8mrFyA== X-Received: by 2002:a05:6a00:1781:b0:44d:faef:f2c0 with SMTP id s1-20020a056a00178100b0044dfaeff2c0mr39521227pfg.68.1635895925215; Tue, 02 Nov 2021 16:32:05 -0700 (PDT) Received: from localhost ([2409:10:24a0:4700:e8ad:216a:2a9d:6d0c]) by smtp.gmail.com with ESMTPSA id o4sm3392465pjq.23.2021.11.02.16.32.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Nov 2021 16:32:04 -0700 (PDT) To: GLIBC patches Subject: [PATCH v2] tst-tzset: output reason when creating 4GiB file fails Date: Wed, 3 Nov 2021 08:31:59 +0900 Message-Id: <20211102233159.4094554-1-shorne@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-10.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Stafford Horne via Libc-alpha From: Stafford Horne Reply-To: Stafford Horne Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" Currently, if the temporary file creation fails the create_tz_file function returns NULL. The NULL pointer is then passed to setenv which causes a SIGSEGV. Rather than failing with a SIGSEGV print a warning and exit. Cc: Adhemerval Zanella Reviewed-by: Adhemerval Zanella --- Changes since v1: - Use PRId64 printf formatting, suggested by Adhemerval timezone/tst-tzset.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/timezone/tst-tzset.c b/timezone/tst-tzset.c index d6da2932bb..3dad42e041 100644 --- a/timezone/tst-tzset.c +++ b/timezone/tst-tzset.c @@ -25,6 +25,7 @@ #include #include #include +#include static int do_test (void); #define TEST_FUNCTION do_test () @@ -103,6 +104,13 @@ static void test_tz_file (off64_t size) { char *path = create_tz_file (size); + if (path == NULL) + { + printf ("creating timezone file of size: %" PRId64 "MiB failed.\n", + size / (1024 * 1024)); + exit (1); + } + if (setenv ("TZ", path, 1) < 0) { printf ("setenv failed: %m\n");