Pass spl_filesystem_object pointer to CHECK_SPL_FILE_OBJECT_IS_INITIALIZED() macro

Author: Girgias

ext/spl/spl_directory.c

@@ -53,8 +53,8 @@ PHPAPI zend_class_entry *spl_ce_SplFileObject;
 PHPAPI zend_class_entry *spl_ce_SplTempFileObject;
 
 // TODO Use standard Error
-#define CHECK_SPL_FILE_OBJECT_IS_INITIALIZED() \
-	if (!intern->u.file.stream) { \
+#define CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(spl_filesystem_object_pointer) \
+	if (!(spl_filesystem_object_pointer)->u.file.stream) { \
 		zend_throw_exception_ex(spl_ce_RuntimeException, 0, "Object not initialized"); \
 		RETURN_THROWS(); \
 	}
@@ -2147,7 +2147,7 @@ PHP_METHOD(SplFileObject, eof)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	RETURN_BOOL(php_stream_eof(intern->u.file.stream));
 } /* }}} */
@@ -2180,7 +2180,7 @@ PHP_METHOD(SplFileObject, fgets)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	if (spl_filesystem_file_read(intern, 0) == FAILURE) {
 		RETURN_FALSE;
@@ -2197,7 +2197,7 @@ PHP_METHOD(SplFileObject, current)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	if (!intern->u.file.current_line && Z_ISUNDEF(intern->u.file.current_zval)) {
 		spl_filesystem_file_read_line(ZEND_THIS, intern, 1);
@@ -2328,7 +2328,7 @@ PHP_METHOD(SplFileObject, fgetcsv)
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS(), "|sss", &delim, &d_len, &enclo, &e_len, &esc, &esc_len) == SUCCESS) {
 
-		CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+		CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 		switch(ZEND_NUM_ARGS())
 		{
@@ -2508,7 +2508,7 @@ PHP_METHOD(SplFileObject, flock)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	act = operation & PHP_LOCK_UN;
 	// TODO doesn't this fail if operation is a bitmask with LOCK_NB?
@@ -2539,7 +2539,7 @@ PHP_METHOD(SplFileObject, fflush)
 {
 	spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS);
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	RETURN_BOOL(!php_stream_flush(intern->u.file.stream));
 } /* }}} */
@@ -2550,7 +2550,7 @@ PHP_METHOD(SplFileObject, ftell)
 	spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS);
 	zend_long ret;
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	ret = php_stream_tell(intern->u.file.stream);
 
@@ -2571,7 +2571,7 @@ PHP_METHOD(SplFileObject, fseek)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	spl_filesystem_file_free_line(intern);
 	RETURN_LONG(php_stream_seek(intern->u.file.stream, pos, (int)whence));
@@ -2584,7 +2584,7 @@ PHP_METHOD(SplFileObject, fgetc)
 	char buf[2];
 	int result;
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	spl_filesystem_file_free_line(intern);
 
@@ -2608,7 +2608,7 @@ PHP_METHOD(SplFileObject, fpassthru)
 {
 	spl_filesystem_object *intern = Z_SPLFILESYSTEM_P(ZEND_THIS);
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	RETURN_LONG(php_stream_passthru(intern->u.file.stream));
 } /* }}} */
@@ -2625,7 +2625,7 @@ PHP_METHOD(SplFileObject, fscanf)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	/* Get next line */
 	if (spl_filesystem_file_read(intern, 0) == FAILURE) {
@@ -2653,7 +2653,7 @@ PHP_METHOD(SplFileObject, fwrite)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	if (ZEND_NUM_ARGS() > 1) {
 		if (length >= 0) {
@@ -2684,7 +2684,7 @@ PHP_METHOD(SplFileObject, fread)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	if (length <= 0) {
 		php_error_docref(NULL, E_WARNING, "Length parameter must be greater than 0");
@@ -2707,7 +2707,7 @@ PHP_METHOD(SplFileObject, fstat)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	php_fstat(intern->u.file.stream, return_value);
 }
@@ -2723,7 +2723,7 @@ PHP_METHOD(SplFileObject, ftruncate)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	if (!php_stream_truncate_supported(intern->u.file.stream)) {
 		zend_throw_exception_ex(spl_ce_LogicException, 0, "Can't truncate file %s", intern->file_name);
@@ -2743,7 +2743,7 @@ PHP_METHOD(SplFileObject, seek)
 		RETURN_THROWS();
 	}
 
-	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED();
+	CHECK_SPL_FILE_OBJECT_IS_INITIALIZED(intern);
 
 	if (line_pos < 0) {
 		zend_throw_exception_ex(spl_ce_LogicException, 0, "Can't seek file %s to negative line " ZEND_LONG_FMT, intern->file_name, line_pos);