Report errors from stream write operations

Fixes bug #73535 and related.

Author: nikic

ext/bz2/bz2.c

@@ -160,20 +160,21 @@ static size_t php_bz2iop_read(php_stream *stream, char *buf, size_t count)
 	return ret;
 }
 
-static size_t php_bz2iop_write(php_stream *stream, const char *buf, size_t count)
+static ssize_t php_bz2iop_write(php_stream *stream, const char *buf, size_t count)
 {
-	size_t wrote = 0;
+	ssize_t wrote = 0;
 	struct php_bz2_stream_data_t *self = (struct php_bz2_stream_data_t *)stream->abstract;
 
-
 	do {
 		int just_wrote;
 		size_t remain = count - wrote;
 		int to_write = (int)(remain <= INT_MAX ? remain : INT_MAX);
 
 		just_wrote = BZ2_bzwrite(self->bz_file, (char*)buf, to_write);
-
-		if (just_wrote < 1) {
+		if (just_wrote < 0) {
+			return just_wrote;
+		}
+		if (just_wrote == 0) {
 			break;
 		}
 

ext/openssl/xp_ssl.c

@@ -2085,7 +2085,7 @@ static size_t php_openssl_sockop_read(php_stream *stream, char *buf, size_t coun
 }
 /* }}} */
 
-static size_t php_openssl_sockop_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
+static ssize_t php_openssl_sockop_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
 {
 	return php_openssl_sockop_io( 0, stream, (char*)buf, count );
 }

ext/pdo_oci/oci_statement.c

@@ -634,7 +634,7 @@ struct oci_lob_self {
 	ub4 offset;
 };
 
-static size_t oci_blob_write(php_stream *stream, const char *buf, size_t count)
+static ssize_t oci_blob_write(php_stream *stream, const char *buf, size_t count)
 {
 	struct oci_lob_self *self = (struct oci_lob_self*)stream->abstract;
 	ub4 amt;
@@ -647,7 +647,7 @@ static size_t oci_blob_write(php_stream *stream, const char *buf, size_t count)
 		NULL, NULL, 0, SQLCS_IMPLICIT);
 
 	if (r != OCI_SUCCESS) {
-		return (size_t)-1;
+		return (ssize_t)-1;
 	}
 
 	self->offset += amt;

ext/pdo_pgsql/pgsql_driver.c

@@ -124,7 +124,7 @@ static int pdo_pgsql_fetch_error_func(pdo_dbh_t *dbh, pdo_stmt_t *stmt, zval *in
 /* }}} */
 
 /* {{{ pdo_pgsql_create_lob_stream */
-static size_t pgsql_lob_write(php_stream *stream, const char *buf, size_t count)
+static ssize_t pgsql_lob_write(php_stream *stream, const char *buf, size_t count)
 {
 	struct pdo_pgsql_lob_self *self = (struct pdo_pgsql_lob_self*)stream->abstract;
 	return lo_write(self->conn, self->lfd, (char*)buf, count);

ext/pgsql/pgsql.c

@@ -5372,9 +5372,9 @@ PHP_FUNCTION(pg_get_pid)
 }
 /* }}} */
 
-static size_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
+static ssize_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
 {
-	return 0;
+	return -1;
 }
 /* }}} */
 

ext/pgsql/php_pgsql.h

@@ -225,7 +225,7 @@ static void php_pgsql_get_field_info(INTERNAL_FUNCTION_PARAMETERS, int entry_typ
 static void php_pgsql_data_info(INTERNAL_FUNCTION_PARAMETERS, int entry_type);
 static void php_pgsql_do_async(INTERNAL_FUNCTION_PARAMETERS,int entry_type);
 
-static size_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count);
+static ssize_t php_pgsql_fd_write(php_stream *stream, const char *buf, size_t count);
 static size_t php_pgsql_fd_read(php_stream *stream, char *buf, size_t count);
 static int php_pgsql_fd_close(php_stream *stream, int close_handle);
 static int php_pgsql_fd_flush(php_stream *stream);

ext/phar/dirstream.c

@@ -118,9 +118,9 @@ static size_t phar_dir_read(php_stream *stream, char *buf, size_t count) /* {{{
 /**
  * Dummy: Used for writing to a phar directory (i.e. not used)
  */
-static size_t phar_dir_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
+static ssize_t phar_dir_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
 {
-	return 0;
+	return -1;
 }
 /* }}} */
 

ext/phar/dirstream.h

@@ -25,7 +25,7 @@ int phar_wrapper_rmdir(php_stream_wrapper *wrapper, const char *url, int options
 php_url* phar_parse_url(php_stream_wrapper *wrapper, const char *filename, const char *mode, int options);
 
 /* directory handlers */
-static size_t phar_dir_write(php_stream *stream, const char *buf, size_t count);
+static ssize_t phar_dir_write(php_stream *stream, const char *buf, size_t count);
 static size_t phar_dir_read( php_stream *stream, char *buf, size_t count);
 static int    phar_dir_close(php_stream *stream, int close_handle);
 static int    phar_dir_flush(php_stream *stream);

ext/phar/stream.c

@@ -436,14 +436,14 @@ static int phar_stream_seek(php_stream *stream, zend_off_t offset, int whence, z
 /**
  * Used for writing to a phar file
  */
-static size_t phar_stream_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
+static ssize_t phar_stream_write(php_stream *stream, const char *buf, size_t count) /* {{{ */
 {
 	phar_entry_data *data = (phar_entry_data *) stream->abstract;
 
 	php_stream_seek(data->fp, data->position, SEEK_SET);
 	if (count != php_stream_write(data->fp, buf, count)) {
 		php_stream_wrapper_log_error(stream->wrapper, stream->flags, "phar error: Could not write %d characters to \"%s\" in phar \"%s\"", (int) count, data->internal_file->filename, data->phar->fname);
-		return 0;
+		return -1;
 	}
 	data->position = php_stream_tell(data->fp);
 	if (data->position > (zend_off_t)data->internal_file->uncompressed_filesize) {

ext/phar/stream.h

@@ -28,7 +28,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, const char *url, int
 static int phar_wrapper_stat(php_stream_wrapper *wrapper, const char *url, int flags, php_stream_statbuf *ssb, php_stream_context *context);
 
 /* file/stream handlers */
-static size_t phar_stream_write(php_stream *stream, const char *buf, size_t count);
+static ssize_t phar_stream_write(php_stream *stream, const char *buf, size_t count);
 static size_t phar_stream_read( php_stream *stream, char *buf, size_t count);
 static int    phar_stream_close(php_stream *stream, int close_handle);
 static int    phar_stream_flush(php_stream *stream);