From 148f4dc1052c2f0f629395a18c59b62970cc1f44 Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Thu, 30 Jul 2009 12:06:40 +0000 Subject: [PATCH] - Fixed bug #49108 (2nd scan_dir produces seg fault) --- ext/standard/dir.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/standard/dir.c b/ext/standard/dir.c index c858fec82c..ce45ace899 100644 --- 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; } -- 2.40.0