]> Sergey Matveev's repositories - public-inbox.git/commitdiff
www: gzip_filter: avoid errors after ->write failure
authorEric Wong <e@80x24.org>
Thu, 4 Aug 2022 20:08:21 +0000 (20:08 +0000)
committerEric Wong <e@80x24.org>
Thu, 4 Aug 2022 20:09:53 +0000 (20:09 +0000)
->zflush must return a string to its caller, not undef.
Additionally, {http_out} may be deleted on ->write if ->close
recurses.

This should fix the following errors:
  Use of uninitialized value $_[1] in string eq at PublicInbox/HTTP.pm line 211.
  E: Can't call method "close" on an undefined value at GzipFilter.pm line 167.

Fixes: a6d50dc1098c01a1 (www: gzip_filter: gracefully handle socket ->write failures, 2022-08-03)
lib/PublicInbox/GzipFilter.pm

index d41748c4de0878d2be4c392726ee1fab2beff239..bdd313f5a799c5f003adb61ea205219d85b60281 100644 (file)
@@ -154,7 +154,7 @@ sub zflush ($;$) {
                $err = $gz->deflate($_[1], $zbuf);
                die "gzip->deflate: $err" if $err != Z_OK;
        }
-       $gz // return; # not a bug, recursing on DS->write failure
+       $gz // return ''; # not a bug, recursing on DS->write failure
        $err = $gz->flush($zbuf);
        die "gzip->flush: $err" if $err != Z_OK;
        $zbuf;
@@ -164,7 +164,7 @@ sub close {
        my ($self) = @_;
        my $http_out = http_out($self) // return;
        $http_out->write(zflush($self));
-       delete($self->{http_out})->close;
+       (delete($self->{http_out}) // return)->close;
 }
 
 sub bail  {