popen4 can yield while child has already died.

2 files changed, 26 insertions, 2 deletions

diff --git a/lib/chef/provider/cron.rb b/lib/chef/provider/cron.rb
index 19fe9a64af..4430e3e18f 100644
--- a/lib/chef/provider/cron.rb
+++ b/lib/chef/provider/cron.rb
@@ -196,10 +196,17 @@ class Chef
       end
 
       def write_crontab(crontab)
+        write_exception = false
         status = popen4("crontab -u #{@new_resource.user} -", :waitlast => true) do |pid, stdin, stdout, stderr|
-          stdin.write crontab
+          begin
+            stdin.write crontab
+          rescue Errno::EPIPE => e
+            # popen4 could yield while child has already died.
+            write_exception = true
+            Chef::Log.debug("#{e.message}")
+          end
         end
-        if status.exitstatus > 0
+        if status.exitstatus > 0 || write_exception
           raise Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: #{status.exitstatus}"
         end
       end
diff --git a/spec/unit/provider/cron_spec.rb b/spec/unit/provider/cron_spec.rb
index 56d51cd23f..f0d800741d 100644
--- a/spec/unit/provider/cron_spec.rb
+++ b/spec/unit/provider/cron_spec.rb
@@ -809,5 +809,22 @@ MAILTO=foo@example.com
         @provider.send(:write_crontab, "Foo")
       end.should raise_error(Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: 1")
     end
+
+    it "should raise an exception if the command die's and parent tries to write" do
+      class WriteErrPipe
+        def write(str)
+          raise Errno::EPIPE, "Test"
+        end
+      end
+      @status.stub!(:exitstatus).and_return(1)
+      @provider.stub!(:popen4).and_yield(1234, WriteErrPipe.new, StringIO.new, StringIO.new).and_return(@status)
+
+      Chef::Log.should_receive(:debug).with("Broken pipe - Test")
+
+      lambda do
+        @provider.send(:write_crontab, "Foo")
+      end.should raise_error(Chef::Exceptions::Cron, "Error updating state of #{@new_resource.name}, exit: 1")
+    end
+
   end
 end