]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3' into PHP-7.4
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 20 Dec 2019 10:02:57 +0000 (11:02 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 20 Dec 2019 10:02:57 +0000 (11:02 +0100)
* PHP-7.3:
  Fix #78402: pcntl_signal() misleading error message

1  2 
ext/pcntl/pcntl.c

index cd85080c9b7bec6d0902af067c49e765e0a1d48f,11f6164eb8fb808effffa63154931ddee8d6d758..1bb67af6c541c289f5bbdc7f692ef8732e51e1fd
@@@ -1057,9 -1005,9 +1057,10 @@@ PHP_FUNCTION(pcntl_signal
        zval *handle;
        zend_long signo;
        zend_bool restart_syscalls = 1;
 +      zend_bool restart_syscalls_is_null = 1;
+       char *error = NULL;
  
 -      if (zend_parse_parameters(ZEND_NUM_ARGS(), "lz|b", &signo, &handle, &restart_syscalls) == FAILURE) {
 +      if (zend_parse_parameters(ZEND_NUM_ARGS(), "lz|b!", &signo, &handle, &restart_syscalls, &restart_syscalls_is_null) == FAILURE) {
                return;
        }