| Message ID | 20230312000810.51652-1-alx@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | time: Fix strftime(3) API regarding nullability | expand |
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.
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(-)