Merge branch 'PHP-7.4' into PHP-8.0

* PHP-7.4:
  Fix php_pgsql_fd_cast() wrt. php_stream_can_cast()

Author: cmb69

NEWS

@@ -6,6 +6,9 @@ PHP                                                                        NEWS
   . Fixed bug #80960 (opendir() warning wrong info when failed on Windows).
     (cmb)
 
+- pgsql:
+  . Fixed php_pgsql_fd_cast() wrt. php_stream_can_cast(). (cmb)
+
 - SPL:
   . Fixed bug #80933 (SplFileObject::DROP_NEW_LINE is broken for NUL and CR).
     (cmb, Nikita)

ext/pgsql/pgsql.c

@@ -4142,16 +4142,17 @@ static int php_pgsql_fd_cast(php_stream *stream, int cast_as, void **ret) /* {{{
 	switch (cast_as)	{
 		case PHP_STREAM_AS_FD_FOR_SELECT:
 		case PHP_STREAM_AS_FD:
-		case PHP_STREAM_AS_SOCKETD:
-			if (ret) {
+		case PHP_STREAM_AS_SOCKETD: {
 				int fd_number = PQsocket(pgsql);
 				if (fd_number == -1) {
 					return FAILURE;
 				}
 
-				*(php_socket_t *)ret = fd_number;
-				return SUCCESS;
+				if (ret) {
+					*(php_socket_t *)ret = fd_number;
+				}
 			}
+			return SUCCESS;
 		default:
 			return FAILURE;
 	}