Fix proc_open resource destruction

nikic · nikic · commit b57d558d56ba · 2014-05-09T00:24:01.000+02:00
diff --git a/ext/standard/proc_open.c b/ext/standard/proc_open.c
@@ -222,7 +222,8 @@ static void proc_open_rsrc_dtor(zend_resource *rsrc TSRMLS_DC)
 	/* Close all handles to avoid a deadlock */
 	for (i = 0; i < proc->npipes; i++) {
 		if (proc->pipes[i] != 0) {
-			zend_list_delete(proc->pipes[i]);
+			GC_REFCOUNT(proc->pipes[i])--;
+			zend_list_close(proc->pipes[i]);
 			proc->pipes[i] = 0;
 		}
 	}
@@ -318,7 +319,7 @@ PHP_FUNCTION(proc_close)
 	ZEND_FETCH_RESOURCE(proc, struct php_process_handle *, zproc, -1, "process", le_proc_open);
 
 	FG(pclose_wait) = 1;
-	zend_list_delete(Z_RES_P(zproc));
+	zend_list_close(Z_RES_P(zproc));
 	FG(pclose_wait) = 0;
 	RETURN_LONG(FG(pclose_ret));
 }

Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,8 @@ static void proc_open_rsrc_dtor(zend_resource *rsrc TSRMLS_DC)`
`222`	`222`	`/* Close all handles to avoid a deadlock */`
`223`	`223`	`for (i = 0; i < proc->npipes; i++) {`
`224`	`224`	`if (proc->pipes[i] != 0) {`
`225`		`- zend_list_delete(proc->pipes[i]);`
	`225`	`+ GC_REFCOUNT(proc->pipes[i])--;`
	`226`	`+ zend_list_close(proc->pipes[i]);`
`226`	`227`	`proc->pipes[i] = 0;`
`227`	`228`	`}`
`228`	`229`	`}`
`@@ -318,7 +319,7 @@ PHP_FUNCTION(proc_close)`
`318`	`319`	`ZEND_FETCH_RESOURCE(proc, struct php_process_handle *, zproc, -1, "process", le_proc_open);`
`319`	`320`
`320`	`321`	`FG(pclose_wait) = 1;`
`321`		`- zend_list_delete(Z_RES_P(zproc));`
	`322`	`+ zend_list_close(Z_RES_P(zproc));`
`322`	`323`	`FG(pclose_wait) = 0;`
`323`	`324`	`RETURN_LONG(FG(pclose_ret));`
`324`	`325`	`}`