fileinfo: Remove options field from finfo_object

This was only required to restore the original options when options are given
for `finfo_file()` or `finfo_buffer()`. This can more reliably be achieved
using `magic_getflags()` and is therefore redundant.

Author: TimWolla

ext/fileinfo/fileinfo.c

@@ -40,7 +40,6 @@ static zend_object_handlers finfo_object_handlers;
 zend_class_entry *finfo_class_entry;
 
 typedef struct _finfo_object {
-	zend_long options;
 	struct magic_set *magic;
 	zend_object zo;
 } finfo_object;
@@ -203,12 +202,10 @@ PHP_FUNCTION(finfo_open)
 		zend_restore_error_handling(&zeh);
 		finfo_object *obj = Z_FINFO_P(object);
 		obj->magic = magic;
-		obj->options = options;
 	} else {
 		zend_object *zobj = finfo_objects_new(finfo_class_entry);
 		finfo_object *obj = php_finfo_fetch_object(zobj);
 		obj->magic = magic;
-		obj->options = options;
 		RETURN_OBJ(zobj);
 	}
 }
@@ -240,7 +237,6 @@ PHP_FUNCTION(finfo_set_flags)
 	/* We do not check the return value as it can only ever fail if options contains MAGIC_PRESERVE_ATIME
 	 * and the system neither has utime(3) nor utimes(2). Something incredibly unlikely. */
 	magic_setflags(Z_FINFO_P(self)->magic, options);
-	Z_FINFO_P(self)->options = options;
 
 	RETURN_TRUE;
 }
@@ -317,16 +313,19 @@ PHP_FUNCTION(finfo_file)
 	}
 
 	/* Set options for the current file/buffer. */
+	int old_options;
 	if (options) {
+		old_options = magic_getflags(magic);
 		/* We do not check the return value as it can only ever fail if options contains MAGIC_PRESERVE_ATIME
 		 * and the system neither has utime(3) nor utimes(2). Something incredibly unlikely. */
 		magic_setflags(magic, options);
 	}
 
 	const char *ret_val = php_fileinfo_from_path(magic, path, context);
+
 	/* Restore options */
 	if (options) {
-		magic_setflags(magic, Z_FINFO_P(self)->options);
+		magic_setflags(magic, old_options);
 	}
 
 	if (UNEXPECTED(ret_val == NULL)) {
@@ -351,15 +350,19 @@ PHP_FUNCTION(finfo_buffer)
 	struct magic_set *magic = Z_FINFO_P(self)->magic;
 
 	/* Set options for the current file/buffer. */
+	int old_options;
 	if (options) {
+		old_options = magic_getflags(magic);
+		/* We do not check the return value as it can only ever fail if options contains MAGIC_PRESERVE_ATIME
+		 * and the system neither has utime(3) nor utimes(2). Something incredibly unlikely. */
 		magic_setflags(magic, options);
 	}
 
 	const char *ret_val = magic_buffer(magic, ZSTR_VAL(buffer), ZSTR_LEN(buffer));
 
 	/* Restore options */
 	if (options) {
-		magic_setflags(magic, Z_FINFO_P(self)->options);
+		magic_setflags(magic, old_options);
 	}
 
 	if (UNEXPECTED(ret_val == NULL)) {