sshd server to avoid closing child handle if already closed

quamrulmina · quamrulmina · commit 5b34ab66d86f · 2015-11-16T18:20:36.000-06:00
was causing exception in debugger otherwise.
diff --git a/serverloop.c b/serverloop.c
@@ -885,11 +885,12 @@ collect_children(void)
 			char *inittermseq = "\033[20l\033[?7h\0" ; // no LFtoCRLF no AUTOWRAPON
 			Channel *c=channel_by_id ( s->chanid );
 			buffer_append(&c->input, inittermseq, strlen(inittermseq));
-			channel_output_poll();
+			packet_write_poll();
 		}
         session_close_by_pid(s->pid, status);
         
-        CloseHandle(process);
+        if (s->pid)
+			CloseHandle(process);
 		int WSHELPDelChildToWatch (HANDLE processtowatch);
 		WSHELPDelChildToWatch (process); // take the process off from watch list in select mux
       }

Original file line number	Diff line number	Diff line change
`@@ -885,11 +885,12 @@ collect_children(void)`
`885`	`885`	`char *inittermseq = "\033[20l\033[?7h\0" ; // no LFtoCRLF no AUTOWRAPON`
`886`	`886`	`Channel *c=channel_by_id ( s->chanid );`
`887`	`887`	`buffer_append(&c->input, inittermseq, strlen(inittermseq));`
`888`		`- channel_output_poll();`
	`888`	`+ packet_write_poll();`
`889`	`889`	`}`
`890`	`890`	`session_close_by_pid(s->pid, status);`
`891`	`891`
`892`		`- CloseHandle(process);`
	`892`	`+ if (s->pid)`
	`893`	`+ CloseHandle(process);`
`893`	`894`	`int WSHELPDelChildToWatch (HANDLE processtowatch);`
`894`	`895`	`WSHELPDelChildToWatch (process); // take the process off from watch list in select mux`
`895`	`896`	`}`