Use fact that if checking that a stream can be cast the return pointer is NULL

Author: Girgias

main/streams/cast.c

@@ -187,11 +187,6 @@ void php_stream_mode_sanitize_fdopen_fopencookie(php_stream *stream, char *resul
 }
 /* }}} */
 
-static inline bool is_stream_user_stream(const php_stream *stream)
-{
-	return stream->ops == &php_stream_userspace_ops;
-}
-
 /* {{{ php_stream_cast */
 PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show_err)
 {
@@ -201,10 +196,6 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
 	/* synchronize our buffer (if possible) */
 	if (ret && castas != PHP_STREAM_AS_FD_FOR_SELECT) {
 		php_stream_flush(stream);
-		/* Do special handling for user streams as they may not implement the cast method */
-		if (!show_err && is_stream_user_stream(stream)) {
-			castas |= PHP_STREAM_FLAG_SUPPRESS_ERRORS;
-		}
 		if (stream->ops->seek && (stream->flags & PHP_STREAM_FLAG_NO_SEEK) == 0) {
 			zend_off_t dummy;
 
@@ -223,11 +214,6 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
 			goto exit_success;
 		}
 
-		/* Do special handling for user streams as they may not implement the cast method */
-		if (!show_err && is_stream_user_stream(stream)) {
-			castas |= PHP_STREAM_FLAG_SUPPRESS_ERRORS;
-		}
-
 		/* if the stream is a stdio stream let's give it a chance to respond
 		 * first, to avoid doubling up the layers of stdio with an fopencookie */
 		if (php_stream_is(stream, PHP_STREAM_IS_STDIO) &&
@@ -282,7 +268,7 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
 		} else if (flags & PHP_STREAM_CAST_TRY_HARD) {
 			php_stream *newstream;
 
-			newstream = php_stream_fopen_tmpfile_ex(/* emit errors */ false);
+			newstream = php_stream_fopen_tmpfile();
 			if (newstream) {
 				int retcopy = php_stream_copy_to_stream_ex(stream, newstream, PHP_STREAM_COPY_ALL, NULL);
 
@@ -314,10 +300,6 @@ PHPAPI int _php_stream_cast(php_stream *stream, int castas, void **ret, int show
 		}
 		return FAILURE;
 	} else if (stream->ops->cast) {
-		/* Do special handling for user streams as they may not implement the cast method */
-		if (!show_err && is_stream_user_stream(stream)) {
-			castas |= PHP_STREAM_FLAG_SUPPRESS_ERRORS;
-		}
 		if (stream->ops->cast(stream, castas, ret) == SUCCESS) {
 			goto exit_success;
 		}

main/streams/userspace.c

@@ -1373,8 +1373,6 @@ static int php_userstreamop_rewinddir(php_stream *stream, zend_off_t offset, int
 
 }
 
-/* The user stream overloads the castas parameter by accepting PHP_STREAM_FLAG_SUPPRESS_ERRORS as a bitmask
- * If present the call is silent, otherwise it will report errors  */
 static int php_userstreamop_cast(php_stream *stream, int castas, void **retptr)
 {
 	php_userstream_data_t *us = (php_userstream_data_t *)stream->abstract;
@@ -1384,8 +1382,8 @@ static int php_userstreamop_cast(php_stream *stream, int castas, void **retptr)
 	php_stream * intstream = NULL;
 	int call_result;
 	int ret = FAILURE;
-	bool report_errors = !(castas & PHP_STREAM_FLAG_SUPPRESS_ERRORS);
-	castas &= ~PHP_STREAM_FLAG_SUPPRESS_ERRORS;
+	/* If we a checking if the stream can cast, no return pointer is provided, so do not emit errors */
+	bool report_errors = retptr;
 
 	ZVAL_STRINGL(&func_name, USERSTREAM_CAST, sizeof(USERSTREAM_CAST)-1);