Message ID | 20230312000810.51652-1-alx@kernel.org |
---|---|
State | Committed |
Commit | 09b382122288e706c5fa2c0412910f71c78b7d63 |
Headers |
Return-Path: <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org> 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 730A53858C39 for <patchwork@sourceware.org>; Sun, 12 Mar 2023 00:08:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 730A53858C39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1678579720; bh=D1NvcKHssmt/Co5LH12IsLDlkE7CN5Y2n4/8z9sy+L4=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=OXtXMNRCHPqOt32OpxwGRNbrn/k2a3uMJ3l6C5r7J/bU43haMRBfp3tpyYVQSXyiL EL6WhkrthH2sneGE7+Fr+Wbgh0irX6Qt2cctqRlNtR+FN/HB8+bMqc2YmJW6QOWTdF IrfCgSTJYo5YZ8BQ6Gxag6fYZd1jilQbeWQnHFP0= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id C655A3858D1E for <libc-alpha@sourceware.org>; Sun, 12 Mar 2023 00:08:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C655A3858D1E Received: by mail-wr1-x42e.google.com with SMTP id q16so8257507wrw.2 for <libc-alpha@sourceware.org>; Sat, 11 Mar 2023 16:08:15 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678579694; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=D1NvcKHssmt/Co5LH12IsLDlkE7CN5Y2n4/8z9sy+L4=; b=Rj6GnZK/YBjm5YytfUqKISZiiSFXQiMNAggeB+95UoGCnB18sIJBpoBI/CGW5efRjG xthdOlpKvFphZTuD4/bjaKodnFz91+5qYA1t7AxBzR+1pfpplhS9aY7CXhbmh1Fw9zCA UEjOOnkfXerTgYf2+gpgK/pm9sB1jD5De+/GfRNeyexHd2dhBdXSHFtjedTUYtTGwblu MEvIj/1C0ochw1CN2S1udrumQI++88N6I05n7+ormZlCcfWAPpfEQPzZYguM1KbX/FGg ytT5Bj8fdx0a4I9ga/UfogrBKnsNEYzG0rS382KzMcslrPTKU0/fE0tyQYKdLlK5dHfc wXWg== X-Gm-Message-State: AO0yUKXrLK40dZR1AULU81ytsbuAEfARnV5YgJEE8FA+aACFSjTrztv2 nev3JUtwz38GYP2vVF9L4n5BkFFh9ZI= X-Google-Smtp-Source: AK7set9KgIw3161pWFa/U9LaRKt05BYmlvb7Tr94D2YOzqDPcyp4LgSnDrXVDD/OSVl6uVx5Py9zhw== X-Received: by 2002:adf:dcc5:0:b0:2cc:4d09:c971 with SMTP id x5-20020adfdcc5000000b002cc4d09c971mr21417650wrm.68.1678579694524; Sat, 11 Mar 2023 16:08:14 -0800 (PST) Received: from asus5775.alejandro-colomar.es ([170.253.51.134]) by smtp.googlemail.com with ESMTPSA id z9-20020adfdf89000000b002ceac2ccc4asm70932wrl.23.2023.03.11.16.08.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 16:08:14 -0800 (PST) X-Google-Original-From: Alejandro Colomar <alx@kernel.org> To: libc-alpha@sourceware.org Cc: Alejandro Colomar <alx@kernel.org>, Paul Eggert <eggert@cs.ucla.edu> Subject: [PATCH] time: Fix strftime(3) API regarding nullability Date: Sun, 12 Mar 2023 01:08:10 +0100 Message-Id: <20230312000810.51652-1-alx@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=843; i=alx@kernel.org; h=from:subject; bh=YYpGJtro33D+C2ft+ZioACOo9vP2XMip+MZhicRmxNE=; b=owEBbQKS/ZANAwAKAZ6MGvu+/9syAcsmYgBkDRfd4KwFxP2CSN6GlJiAEPJEtLJezf5OcYjZp se7OxgTaFSJAjMEAAEKAB0WIQTqOofwpOugMORd8kCejBr7vv/bMgUCZA0X3QAKCRCejBr7vv/b MnjuD/43vhBIb/oPXSK1DzXighka4gi4qqmeF+XSW6XHVl48iY8kffxQLl86RkMM1m17s/7y76Z iDDs5ge0NWW58YKN+TVyn6hL298IGQUkwNW8+lZc+BxjmczSs0B9M0Ain2s5KmnrRqLCIIKHdNs N95JbPYeJRTKW+T1SGA8YhIC4S0l26J23DlJqK7LNPMECNiFX29FFtr7zJP1pesurJE0p9sEPd+ a7LUFy4CEee7fOQ6OyyvmkTw9UqMLV04TTq/YLsRniQ+1Zxt3C/ParyRFYMBWqJmE3j1kB9dIGP xN0JmCCYK/6FqfjHhKTLN543qJVBgX9AyLVOwKz9Wk0rhmwBTfN3B7k3LuYL9TNkXxXWuRJ44iS Pc/yIR3J9SiN+4aunGdp2AMj0rP3h3lYxWuFAJyZmbvb+7fy9hf/klU2OVEs9La/HuSrHeEDsfS SjwtyFNoGfR4SCehbfJTajl8oRRVnhPRa5Vta9pHYzf2ezb6LCdF7S33nwJ4x2GaYHoAX1wpwHx ywUaS2Qdr7CBmxPXI3MxIwXdSDTpr/rLThAVcqRzAJM0tX341ksinLY+UkyiudSF3D1IIqXIKe8 WKLAG3WKdgv3vUgO1SZDFKkgbaixlQ3mGVDAoJ39th9fEYKOkbx516rBrI33yBMS0S/jSYsDvOk 3GkDKEt4Pd1nUtA== X-Developer-Key: i=alx@kernel.org; a=openpgp; fpr=A9348594CE31283A826FBDD8D57633D441E25BB5 Content-Transfer-Encoding: 8bit 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.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org> List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe> List-Archive: <https://sourceware.org/pipermail/libc-alpha/> List-Post: <mailto:libc-alpha@sourceware.org> List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help> List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>, <mailto:libc-alpha-request@sourceware.org?subject=subscribe> From: Alejandro Colomar via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Alejandro Colomar <alx.manpages@gmail.com> Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces+patchwork=sourceware.org@sourceware.org> |
Series |
time: Fix strftime(3) API regarding nullability
|
|
Checks
Context | Check | Description |
---|---|---|
dj/TryBot-apply_patch | success | Patch applied to master at the time it was sent |
dj/TryBot-32bit | success | Build for i686 |
Commit Message
Alejandro Colomar
March 12, 2023, 12:08 a.m. UTC
strftime(3) doesn't accept null pointers in any of the parameters.
Cc: Paul Eggert <eggert@cs.ucla.edu>
Signed-off-by: Alejandro Colomar <alx@kernel.org>
---
time/time.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Comments
On 11/03/23 21:08, Alejandro Colomar via Libc-alpha wrote: > strftime(3) doesn't accept null pointers in any of the parameters. > > Cc: Paul Eggert <eggert@cs.ucla.edu> > Signed-off-by: Alejandro Colomar <alx@kernel.org> LGTM, thanks. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > --- > time/time.h | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/time/time.h b/time/time.h > index d18089116e..28fb075b19 100644 > --- a/time/time.h > +++ b/time/time.h > @@ -99,7 +99,8 @@ extern time_t __REDIRECT_NTH (mktime, (struct tm *__tp), __mktime64); > of characters written, or 0 if it would exceed MAXSIZE. */ > extern size_t strftime (char *__restrict __s, size_t __maxsize, > const char *__restrict __format, > - const struct tm *__restrict __tp) __THROW; > + const struct tm *__restrict __tp) > + __THROW __nonnull((1, 3, 4)); > > #ifdef __USE_XOPEN > /* Parse S according to FORMAT and store binary time information in TP.
Ping :) On 3/13/23 18:10, Adhemerval Zanella Netto wrote: > > > On 11/03/23 21:08, Alejandro Colomar via Libc-alpha wrote: >> strftime(3) doesn't accept null pointers in any of the parameters. >> >> Cc: Paul Eggert <eggert@cs.ucla.edu> >> Signed-off-by: Alejandro Colomar <alx@kernel.org> > > LGTM, thanks. > > Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> > >> --- >> time/time.h | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/time/time.h b/time/time.h >> index d18089116e..28fb075b19 100644 >> --- a/time/time.h >> +++ b/time/time.h >> @@ -99,7 +99,8 @@ extern time_t __REDIRECT_NTH (mktime, (struct tm *__tp), __mktime64); >> of characters written, or 0 if it would exceed MAXSIZE. */ >> extern size_t strftime (char *__restrict __s, size_t __maxsize, >> const char *__restrict __format, >> - const struct tm *__restrict __tp) __THROW; >> + const struct tm *__restrict __tp) >> + __THROW __nonnull((1, 3, 4)); >> >> #ifdef __USE_XOPEN >> /* Parse S according to FORMAT and store binary time information in TP.
Committed, thanks. On 30/03/23 20:43, Alejandro Colomar wrote: > Ping :) > > On 3/13/23 18:10, Adhemerval Zanella Netto wrote: >> >> >> On 11/03/23 21:08, Alejandro Colomar via Libc-alpha wrote: >>> strftime(3) doesn't accept null pointers in any of the parameters. >>> >>> Cc: Paul Eggert <eggert@cs.ucla.edu> >>> Signed-off-by: Alejandro Colomar <alx@kernel.org> >> >> LGTM, thanks. >> >> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> >> >>> --- >>> time/time.h | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/time/time.h b/time/time.h >>> index d18089116e..28fb075b19 100644 >>> --- a/time/time.h >>> +++ b/time/time.h >>> @@ -99,7 +99,8 @@ extern time_t __REDIRECT_NTH (mktime, (struct tm *__tp), __mktime64); >>> of characters written, or 0 if it would exceed MAXSIZE. */ >>> extern size_t strftime (char *__restrict __s, size_t __maxsize, >>> const char *__restrict __format, >>> - const struct tm *__restrict __tp) __THROW; >>> + const struct tm *__restrict __tp) >>> + __THROW __nonnull((1, 3, 4)); >>> >>> #ifdef __USE_XOPEN >>> /* Parse S according to FORMAT and store binary time information in TP. >
Alejandro Colomar via Libc-alpha <libc-alpha@sourceware.org> writes: > [[PGP Signed Part:Undecided]] > Ping :) > > On 3/13/23 18:10, Adhemerval Zanella Netto wrote: >> >> >> On 11/03/23 21:08, Alejandro Colomar via Libc-alpha wrote: >>> strftime(3) doesn't accept null pointers in any of the parameters. >>> >>> Cc: Paul Eggert <eggert@cs.ucla.edu> >>> Signed-off-by: Alejandro Colomar <alx@kernel.org> >> >> LGTM, thanks. >> >> Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org> >> >>> --- >>> time/time.h | 3 ++- >>> 1 file changed, 2 insertions(+), 1 deletion(-) >>> >>> diff --git a/time/time.h b/time/time.h >>> index d18089116e..28fb075b19 100644 >>> --- a/time/time.h >>> +++ b/time/time.h >>> @@ -99,7 +99,8 @@ extern time_t __REDIRECT_NTH (mktime, (struct tm *__tp), __mktime64); >>> of characters written, or 0 if it would exceed MAXSIZE. */ >>> extern size_t strftime (char *__restrict __s, size_t __maxsize, >>> const char *__restrict __format, >>> - const struct tm *__restrict __tp) __THROW; >>> + const struct tm *__restrict __tp) >>> + __THROW __nonnull((1, 3, 4)); >>> >>> #ifdef __USE_XOPEN >>> /* Parse S according to FORMAT and store binary time information in TP. Nice spot. I suspect there's a few more of these we need to fix too.
diff --git a/time/time.h b/time/time.h index d18089116e..28fb075b19 100644 --- a/time/time.h +++ b/time/time.h @@ -99,7 +99,8 @@ extern time_t __REDIRECT_NTH (mktime, (struct tm *__tp), __mktime64); of characters written, or 0 if it would exceed MAXSIZE. */ extern size_t strftime (char *__restrict __s, size_t __maxsize, const char *__restrict __format, - const struct tm *__restrict __tp) __THROW; + const struct tm *__restrict __tp) + __THROW __nonnull((1, 3, 4)); #ifdef __USE_XOPEN /* Parse S according to FORMAT and store binary time information in TP.