com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/spl/spl _directory.c
| From: | Nikita Popov | Date: | Mon, 18 Mar 2019 10:07:27 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/spl/spl _directory.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105206@lists.php.net to get a copy of this message | ||
Commit: 82fbaab53c4ea6fb8417cbad8254b8475e50b4cd
Author: Nikita Popov <nikita.ppv@gmail.com> Mon, 18 Mar 2019 11:07:27 +0100
Parents: da7add3525d78181f15dcabc4025d5a972e23b57 4f034016289f5a52073bfd012899dd3e202742b5
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=82fbaab53c4ea6fb8417cbad8254b8475e50b4cd
Log:
Merge branch 'PHP-7.2' into PHP-7.3
Changed paths:
MM ext/spl/spl_directory.c
Diff:
diff --cc ext/spl/spl_directory.c
index 946e1cd,47b3521..7f14ae9
--- a/ext/spl/spl_directory.c
+++ b/ext/spl/spl_directory.c
@@@ -95,10 -97,9 +95,11 @@@ static void spl_filesystem_object_destr
} else {
php_stream_pclose(intern->u.file.stream);
}
+ intern->u.file..stream = NULL;
}
break;
+ default:
+ break;
}
} /* }}} */