Code review fixes

Author: kocsismate

ext/sysvshm/sysvshm.c

@@ -148,25 +148,20 @@ PHP_FUNCTION(shm_attach)
 		RETURN_FALSE;
   	}
 
-	object_init_ex(return_value, sysvshm_ce);
-
 	/* get the id from a specified key or create new shared memory */
 	if ((shm_id = shmget(shm_key, 0, 0)) < 0) {
 		if (shm_size < (zend_long)sizeof(sysvshm_chunk_head)) {
 			php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": memorysize too small", shm_key);
-			zval_ptr_dtor(return_value);
 			RETURN_FALSE;
 		}
 		if ((shm_id = shmget(shm_key, shm_size, shm_flag | IPC_CREAT | IPC_EXCL)) < 0) {
 			php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": %s", shm_key, strerror(errno));
-			zval_ptr_dtor(return_value);
 			RETURN_FALSE;
 		}
 	}
 
 	if ((shm_ptr = shmat(shm_id, NULL, 0)) == (void *) -1) {
 		php_error_docref(NULL, E_WARNING, "Failed for key 0x" ZEND_XLONG_FMT ": %s", shm_key, strerror(errno));
-		zval_ptr_dtor(return_value);
 		RETURN_FALSE;
 	}
 
@@ -180,6 +175,8 @@ PHP_FUNCTION(shm_attach)
 		chunk_ptr->free = shm_size-chunk_ptr->end;
 	}
 
+	object_init_ex(return_value, sysvshm_ce);
+
 	shm_list_ptr = Z_SYSVSHM_P(return_value);
 
 	shm_list_ptr->key = shm_key;
@@ -220,6 +217,9 @@ PHP_FUNCTION(shm_remove)
 		RETURN_FALSE;
 	}
 
+	shmdt((void *) shm_list_ptr->ptr);
+	shm_list_ptr->ptr = NULL;
+
 	RETURN_TRUE;
 }
 /* }}} */

ext/sysvshm/sysvshm.stub.php

@@ -9,15 +9,15 @@ final class Sysvshm
 /** @return Sysvshm|false */
 function shm_attach(int $key, int $memsize = UNKNOWN, int $perm = 0666): Sysvshm|false {}
 
-function shm_detach(Sysvshm $shm_identifier): bool {}
+function shm_detach(Sysvshm $shm): bool {}
 
-function shm_has_var(Sysvshm $id, int $variable_key): bool {}
+function shm_has_var(Sysvshm $shm, int $variable_key): bool {}
 
-function shm_remove(Sysvshm $shm_identifier): bool {}
+function shm_remove(Sysvshm $shm): bool {}
 
-function shm_put_var(Sysvshm $shm_identifier, int $variable_key, $variable): bool {}
+function shm_put_var(Sysvshm $shm, int $variable_key, $variable): bool {}
 
 /** @return mixed */
-function shm_get_var(Sysvshm $id, int $variable_key) {}
+function shm_get_var(Sysvshm $shm, int $variable_key) {}
 
-function shm_remove_var(Sysvshm $id, int $variable_key): bool {}
+function shm_remove_var(Sysvshm $shm, int $variable_key): bool {}

ext/sysvshm/sysvshm_arginfo.h

@@ -7,24 +7,24 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shm_attach, 0, 1, Sysvshm, M
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_detach, 0, 1, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, shm_identifier, Sysvshm, 0)
+	ZEND_ARG_OBJ_INFO(0, shm, Sysvshm, 0)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_has_var, 0, 2, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, id, Sysvshm, 0)
+	ZEND_ARG_OBJ_INFO(0, shm, Sysvshm, 0)
 	ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
 #define arginfo_shm_remove arginfo_shm_detach
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_shm_put_var, 0, 3, _IS_BOOL, 0)
-	ZEND_ARG_OBJ_INFO(0, shm_identifier, Sysvshm, 0)
+	ZEND_ARG_OBJ_INFO(0, shm, Sysvshm, 0)
 	ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
 	ZEND_ARG_INFO(0, variable)
 ZEND_END_ARG_INFO()
 
 ZEND_BEGIN_ARG_INFO_EX(arginfo_shm_get_var, 0, 0, 2)
-	ZEND_ARG_OBJ_INFO(0, id, Sysvshm, 0)
+	ZEND_ARG_OBJ_INFO(0, shm, Sysvshm, 0)
 	ZEND_ARG_TYPE_INFO(0, variable_key, IS_LONG, 0)
 ZEND_END_ARG_INFO()