From 607b26c426a89c843727a146ee66514efba3c99f Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Fri, 7 Aug 2020 10:42:52 +0000 Subject: [PATCH] www: avoid warnings on YYYYMMDD-only t= query parameter While we always generate YYYYMMDDhhmmss query parameters ourselves, the regexps in paginate_recent allow YYYYMMDD-only (no hhmmss) timestamps, so don't trigger Time::Local::timegm warnings about empty numeric comparisons on empty strings when a client starts making up their own URLs. --- lib/PublicInbox/View.pm | 2 +- t/psgi_v2.t | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm index 4cb72bea..f23bfcc9 100644 --- a/lib/PublicInbox/View.pm +++ b/lib/PublicInbox/View.pm @@ -1147,7 +1147,7 @@ sub ts2str ($) { strftime('%Y%m%d%H%M%S', gmtime($_[0])) }; sub str2ts ($) { my ($yyyy, $mon, $dd, $hh, $mm, $ss) = unpack('A4A2A2A2A2A2', $_[0]); - timegm($ss, $mm, $hh, $dd, $mon - 1, $yyyy); + timegm($ss || 0, $mm || 0, $hh || 0, $dd, $mon - 1, $yyyy); } sub pagination_footer ($$) { diff --git a/t/psgi_v2.t b/t/psgi_v2.t index 4ab9601c..11aef5b3 100644 --- a/t/psgi_v2.t +++ b/t/psgi_v2.t @@ -296,6 +296,9 @@ my $client3 = sub { } $res = $cb->(GET('/v2test/?t=1970'.'01'.'01'.'000000')); is($res->code, 404, '404 for out-of-range t= param'); + @warn = (); + $res = $cb->(GET('/v2test/?t=1970'.'01'.'01')); + is_deeply(\@warn, [], 'no warnings on YYYYMMDD only'); }; test_psgi(sub { $www->call(@_) }, $client3); $run_httpd->($client3, 4); -- 2.44.0