fix bugs in Mojo::Util and Mojo::Asset::File where incomplete writes …

…would not be recognized as errors (closes #1020)
mojolicious · Nov 29, 2016 · 903feb8 · 903feb8
1 parent 02049dd
commit 903feb8
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/Changes b/Changes
@@ -5,8 +5,10 @@
     to the start method.
   - Improved log attribute in Mojolicious making it easier to override default
     settings. (jberger)
-  - Fixed a bug in Mojo::Server::Prefork where workers would accept keep-alive
+  - Fixed bug in Mojo::Server::Prefork where workers would accept keep-alive
     requests after a graceful shutdown had already been initiated.
+  - Fixed bugs in Mojo::Util and Mojo::Asset::File where incomplete writes would
+    not be recognized as errors. (bobkare, sri)
 
 7.10  2016-11-01
   - Added getopt function to Mojo::Util.

diff --git a/lib/Mojo/Asset/File.pm b/lib/Mojo/Asset/File.pm
@@ -46,7 +46,8 @@ sub DESTROY {
 
 sub add_chunk {
   my ($self, $chunk) = @_;
-  defined $self->handle->syswrite($chunk) or croak "Can't write to asset: $!";
+  ($self->handle->syswrite($chunk) // -1) == length $chunk
+    or croak "Can't write to asset: $!";
   return $self;
 }
 

diff --git a/lib/Mojo/Util.pm b/lib/Mojo/Util.pm
@@ -269,7 +269,7 @@ sub split_header        { _header(shift, 0) }
 sub spurt {
   my ($content, $path) = @_;
   open my $file, '>', $path or croak qq{Can't open file "$path": $!};
-  defined $file->syswrite($content)
+  ($file->syswrite($content) // -1) == length $content
     or croak qq{Can't write to file "$path": $!};
   return $content;
 }

diff --git a/t/mojo/asset.t b/t/mojo/asset.t
@@ -238,6 +238,14 @@ ok -e $path, 'file exists';
 unlink $path;
 ok !-e $path, 'file has been cleaned up';
 
+# Incomplete write
+{
+  no warnings 'redefine';
+  local *IO::Handle::syswrite = sub { $! = 0; 2 };
+  eval { Mojo::Asset::File->new->add_chunk('test') };
+  like $@, qr/Can't write to asset: .*/, 'right error';
+}
+
 # Abstract methods
 eval { Mojo::Asset->add_chunk };
 like $@, qr/Method "add_chunk" not implemented by subclass/, 'right error';

diff --git a/t/mojo/util.t b/t/mojo/util.t
@@ -422,6 +422,14 @@ my $file = catfile $dir, 'test.txt';
 spurt "just\nworks!", $file;
 is slurp($file), "just\nworks!", 'successful roundtrip';
 
+# spurt (incomplete write)
+{
+  no warnings 'redefine';
+  local *IO::Handle::syswrite = sub { $! = 0; 5 };
+  eval { spurt "just\nworks!", $file };
+  like $@, qr/Can't write to file ".*/, 'right error';
+}
+
 # files
 is_deeply [files 'does_not_exist'], [], 'no files';
 is_deeply [files __FILE__],         [], 'no files';