Fix issue #36, Fix issue #56, uv_poll no longer allows plainfiles or php related streams resolving a SIGABRT as epoll doesn't support those stream types

Author: steverhoades

php_uv.c

@@ -110,6 +110,18 @@ zend_fcall_info empty_fcall_info = { 0, NULL, NULL, NULL, NULL, 0, NULL, NULL, 0
 	lock->type = lock_type; \
 	lock->locked = 0; \
 
+#define PHP_UV_ZVAL_TO_VALID_POLL_FD(fd, zstream) \
+{ \
+	fd = php_uv_zval_to_valid_poll_fd(zstream TSRMLS_CC); \
+	if (fd < 0) { \
+		php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid variable passed. can't convert to fd."); \
+		RETURN_FALSE; \
+	} \
+	if (uv->fs_fd == NULL) { \
+		uv->fs_fd = zstream;\
+		Z_ADDREF_P(zstream);\
+	}\
+}
 
 #define PHP_UV_ZVAL_TO_FD(fd, zstream) \
 { \
@@ -318,6 +330,51 @@ static char *php_uv_map_resource_name(enum php_uv_resource_type type)
 		RETURN_FALSE; \
 	} \
 
+#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)
+static php_socket_t php_uv_zval_to_valid_poll_fd(zval *ptr TSRMLS_DC)
+{
+	php_socket_t fd = -1;
+	php_stream *stream;
+	php_uv_t *uv;
+
+    /* Validate Checks */
+    const char check_php[] = "PHP";
+    const char check_file[] = "plainfile";
+
+#ifndef PHP_WIN32
+	php_socket *socket;
+#endif
+	/* TODO: is this correct on windows platform? */
+	if (Z_TYPE_P(ptr) == IS_RESOURCE) {
+		if (ZEND_FETCH_RESOURCE_NO_RETURN(stream, php_stream *, &ptr, -1, NULL, php_file_le_stream())) {
+            /* make sure only valid resource streams are passed - plainfiles and php streams are invalid */
+            if (stream->wrapper) {
+                if ( (strcmp((char *)stream->wrapper->wops->label, check_file) == 0) || (strcmp((char *)stream->wrapper->wops->label, check_php) == 0) ) {
+                    php_error_docref(NULL TSRMLS_CC, E_ERROR, "invalid resource passed, this resource is not supported");
+                    return -1;
+                }
+            } 
+            
+            if (php_stream_cast(stream, PHP_STREAM_AS_FD | PHP_STREAM_CAST_INTERNAL, (void*)&fd, 1) != SUCCESS || fd < 0) {
+				fd = -1;
+			}
+		} else if (ZEND_FETCH_RESOURCE_NO_RETURN(uv, php_uv_t*, &ptr, -1, NULL, uv_resource_handle)) {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "uv resource does not support yet");
+			fd = -1;
+#ifndef PHP_WIN32
+		} else if (ZEND_FETCH_RESOURCE_NO_RETURN(socket, php_socket *, &ptr, -1, NULL, php_sockets_le_socket())) {
+			/* TODO: is this correct on windows platform? */
+			fd = socket->bsd_socket;
+#endif
+		} else {
+			php_error_docref(NULL TSRMLS_CC, E_WARNING, "unhandled resource type detected.");
+			fd = -1;
+		}
+	} 
+	
+	return fd;
+}
+#endif
 
 #if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3)
 static php_socket_t php_uv_zval_to_fd(zval *ptr TSRMLS_DC)
@@ -351,6 +408,14 @@ static php_socket_t php_uv_zval_to_fd(zval *ptr TSRMLS_DC)
 		if (fd < 0) {
 			fd = -1;
 		}
+      
+        /* make sure that a valid resource handle was passed - issue #36 */
+        int err; 
+        err = uv_guess_handle((uv_file) fd);
+        if(err == UV_UNKNOWN_HANDLE) {
+            php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid resource type detected");
+            fd = -1;
+        }
 	}
 
 	return fd;
@@ -6210,7 +6275,7 @@ PHP_FUNCTION(uv_poll_init)
 
 	PHP_UV_INIT_UV(uv, IS_UV_POLL);
 	PHP_UV_FETCH_UV_DEFAULT_LOOP(loop, zloop);
-	PHP_UV_ZVAL_TO_FD(fd, zstream);
+	PHP_UV_ZVAL_TO_VALID_POLL_FD(fd, zstream);
 
 	error = uv_poll_init(loop, &uv->uv.poll, fd);
 	if (error) {

tests/300-fs_close.phpt

@@ -15,5 +15,5 @@ uv_fs_open(uv_default_loop(),FIXTURE_PATH, UV::O_RDONLY, 0, function($r){
 });
 
 uv_run();
---EXPECT--
-OK
+--EXPECTF--
+Warning: uv_fs_close(): invalid resource type detected in %s on line %d

tests/330-poll-fd.phpt

@@ -16,5 +16,5 @@ uv_run($loop);
 
 fwrite($fd, 'hello');
 
---EXPECT--
-OK
+--EXPECTF--
+Fatal error: uv_poll_init(): invalid resource passed, this resource is not supported in %s on line %d

tests/330-poll-pipe.phpt

@@ -0,0 +1,20 @@
+--TEST--
+Check poll of a pipe works
+--FILE--
+<?php
+$fd = popen(PHP_BINARY . " ". __DIR__ . "/fixtures/proc.php", "w");
+stream_set_blocking($fd, 0);
+fwrite($fd, 'test');
+
+$loop = uv_loop_new();
+$poll = uv_poll_init($loop, $fd);
+
+uv_poll_start($poll, UV::READABLE, function($poll, $stat, $ev, $fd) {
+    echo "OK";
+    uv_poll_stop($poll);
+    pclose($fd);
+});
+uv_run($loop);
+
+--EXPECT--
+OK

tests/fixtures/proc.php

@@ -0,0 +1,3 @@
+<?php
+
+echo $argv[1];