Merge pull request #963 from kebby/master

Fix Process.CancelErrorRead

diff --combined mcs/class/System/System.Diagnostics/Process.cs
index 7a63ce0377c62529dbf33b5f8c9718d401f74ff9,515903d3fe01c610e607cc0d12e3fab7167d6d8b..af427037b285cfc9ae8e1b4e7aa7183d1fddc04b
--- 1/mcs/class/System/System.Diagnostics/Process.cs
--- 2/mcs/class/System/System.Diagnostics/Process.cs
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@@ -918,7 -918,8 +918,7 @@@ namespace System.Diagnostics 
                                                                  IntPtr stderr,
                                                                  ref ProcInfo proc_info);
  
 -              private static bool Start_shell (ProcessStartInfo startInfo,
 -                                               Process process)
 +              private static bool Start_shell (ProcessStartInfo startInfo, Process process)
                {
                        ProcInfo proc_info=new ProcInfo();
                        bool ret;
@@@ -947,7 -948,9 +947,7 @@@
  
                        process.process_handle = proc_info.process_handle;
                        process.pid = proc_info.pid;
 -
                        process.StartExitCallbackIfNeeded ();
 -
                        return(ret);
                }
  
@@@ -1179,9 -1182,9 +1179,9 @@@
                        if (startInfo == null)
                                throw new ArgumentNullException ("startInfo");
  
 -                      Process process=new Process();
 +                      Process process = new Process();
                        process.StartInfo = startInfo;
 -                      if (Start_common(startInfo, process))
 +                      if (Start_common(startInfo, process) && process.process_handle != IntPtr.Zero)
                                return process;
                        return null;
                }
@@@ -1514,8 -1517,8 +1514,8 @@@
                [ComVisibleAttribute(false)] 
                public void CancelErrorRead ()
                {
-                       if (process_handle == IntPtr.Zero || output_stream == null || StartInfo.RedirectStandardOutput == false)
-                               throw new InvalidOperationException ("Standard output has not been redirected or process has not been started.");
+                       if (process_handle == IntPtr.Zero || error_stream == null || StartInfo.RedirectStandardError == false)
+                               throw new InvalidOperationException ("Standard error has not been redirected or process has not been started.");
  
                        if ((async_mode & AsyncModes.SyncOutput) != 0)
                                throw new InvalidOperationException ("OutputStream is not enabled for asynchronous read operations.");
@@@ -1563,21 -1566,6 +1563,21 @@@
                                                        async_output.Close ();
                                                if (async_error != null)
                                                        async_error.Close ();
 +
 +                                              if (input_stream != null) {
 +                                                      input_stream.Close();
 +                                                      input_stream = null;
 +                                              }
 +
 +                                              if (output_stream != null) {
 +                                                      output_stream.Close();
 +                                                      output_stream = null;
 +                                              }
 +
 +                                              if (error_stream != null) {
 +                                                      error_stream.Close();
 +                                                      error_stream = null;
 +                                              }
                                        }
                                }
                                
@@@ -1588,6 -1576,21 +1588,6 @@@
                                                Process_free_internal(process_handle);
                                                process_handle=IntPtr.Zero;
                                        }
 -
 -                                      if (input_stream != null) {
 -                                              input_stream.Close();
 -                                              input_stream = null;
 -                                      }
 -
 -                                      if (output_stream != null) {
 -                                              output_stream.Close();
 -                                              output_stream = null;
 -                                      }
 -
 -                                      if (error_stream != null) {
 -                                              error_stream.Close();
 -                                              error_stream = null;
 -                                      }
                                }
                        }
                        base.Dispose (disposing);