- Fixed bug #49108 (2nd scan_dir produces seg fault)

diff --git a/ext/standard/dir.c b/ext/standard/dir.c
index c858fec82c34033695cd2e8259f665fc807a88fe..ce45ace899cb1c01d872d70c06c47b023dc541da 100644 (file)
--- a/ext/standard/dir.c
+++ b/ext/standard/dir.c
@@ -586,7 +586,10 @@ PHP_FUNCTION(scandir)
                return;
        }
 
-       context = php_stream_context_from_zval(zcontext, 0);
+       if (zcontext) {
+               context = php_stream_context_from_zval(zcontext, 0);
+       }
+
        if (FAILURE == php_stream_path_param_encode(ppdirn, &dirn, &dirn_len, REPORT_ERRORS, context)) {
                RETURN_FALSE;
        }