Improve shm_attach()

Fix Unknown default value & promote a warning to exception

Author: kocsismate

ext/sysvshm/sysvshm.c

@@ -137,15 +137,20 @@ PHP_FUNCTION(shm_attach)
 	sysvshm_shm *shm_list_ptr;
 	char *shm_ptr;
 	sysvshm_chunk_head *chunk_ptr;
-	zend_long shm_key, shm_id, shm_size = php_sysvshm.init_mem, shm_flag = 0666;
+	zend_long shm_key, shm_id, shm_size, shm_flag = 0666;
+	zend_bool shm_size_is_null = 1;
 
-	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "l|ll", &shm_key, &shm_size, &shm_flag)) {
+	if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS(), "l|l!l", &shm_key, &shm_size, &shm_size_is_null, &shm_flag)) {
 		RETURN_THROWS();
 	}
 
+	if (shm_size_is_null) {
+		shm_size = php_sysvshm.init_mem;
+	}
+
 	if (shm_size < 1) {
-		php_error_docref(NULL, E_WARNING, "Segment size must be greater than zero");
-		RETURN_FALSE;
+		zend_argument_value_error(2, "must be greater than 0");
+		RETURN_THROWS();
   	}
 
 	/* get the id from a specified key or create new shared memory */

ext/sysvshm/sysvshm.stub.php

@@ -6,7 +6,7 @@ final class SysvSharedMemory
 {
 }
 
-function shm_attach(int $key, int $memsize = UNKNOWN, int $perm = 0666): SysvSharedMemory|false {}
+function shm_attach(int $key, ?int $memsize = null, int $perm = 0666): SysvSharedMemory|false {}
 
 function shm_detach(SysvSharedMemory $shm): bool {}
 

ext/sysvshm/sysvshm_arginfo.h

@@ -2,7 +2,7 @@
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_shm_attach, 0, 1, SysvSharedMemory, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, key, IS_LONG, 0)
-	ZEND_ARG_TYPE_INFO(0, memsize, IS_LONG, 0)
+	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, memsize, IS_LONG, 1, "null")
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, perm, IS_LONG, 0, "0666")
 ZEND_END_ARG_INFO()
 

ext/sysvshm/tests/002.phpt

@@ -10,11 +10,35 @@ if (!function_exists('ftok')){ print 'skip'; }
 
 $key = ftok(__FILE__, 't');
 
-var_dump(shm_attach(-1, 0));
-var_dump(shm_attach(0, -1));
-var_dump(shm_attach(123, -1));
-var_dump(shm_attach($key, -1));
-var_dump(shm_attach($key, 0));
+try {
+    shm_attach(-1, 0);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    shm_attach(0, -1);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    shm_attach(123, -1);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    shm_attach($key, -1);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
+
+try {
+    shm_attach($key, 0);
+} catch (ValueError $exception) {
+    echo $exception->getMessage() . "\n";
+}
 
 var_dump($s = shm_attach($key, 1024));
 shm_remove($s);
@@ -31,28 +55,19 @@ shm_remove($s);
 echo "Done\n";
 ?>
 --EXPECTF--
-Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
-bool(false)
-
-Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
-bool(false)
-
-Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
-bool(false)
-
-Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
-bool(false)
-
-Warning: shm_attach(): Segment size must be greater than zero in %s on line %d
-bool(false)
-object(SysvSharedMemory)#1 (0) {
+shm_attach(): Argument #2 ($memsize) must be greater than 0
+shm_attach(): Argument #2 ($memsize) must be greater than 0
+shm_attach(): Argument #2 ($memsize) must be greater than 0
+shm_attach(): Argument #2 ($memsize) must be greater than 0
+shm_attach(): Argument #2 ($memsize) must be greater than 0
+object(SysvSharedMemory)#%d (0) {
 }
-object(SysvSharedMemory)#2 (0) {
+object(SysvSharedMemory)#%d (0) {
 }
-object(SysvSharedMemory)#1 (0) {
+object(SysvSharedMemory)#%d (0) {
 }
-object(SysvSharedMemory)#2 (0) {
+object(SysvSharedMemory)#%d (0) {
 }
-object(SysvSharedMemory)#1 (0) {
+object(SysvSharedMemory)#%d (0) {
 }
 Done