cvs: php-src /main/streams streams.c

helly Sat Mar 3 18:59:53 2007 UTC Modified files: /php-src/main/streams streams.c Log: -A stream wrapper might only allow directory access http://cvs.php.net/viewvc.cgi/php-src/main/streams/streams.c?r1=1.148&r2=1.149&diff_format=u Index: php-src/main/streams/streams.c diff -u php-src/main/streams/streams.c:1.148 php-src/main/streams/streams.c:1.149 --- php-src/main/streams/streams.c:1.148 Wed Feb 21 21:56:45 2007 +++ php-src/main/streams/streams.c Sat Mar 3 18:59:53 2007 @@ -19,7 +19,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: streams.c,v 1.148 2007/02/21 21:56:45 tony2001 Exp $ */ +/* $Id: streams.c,v 1.149 2007/03/03 18:59:53 helly Exp $ */ #define _GNU_SOURCE #include "php.h" @@ -2388,10 +2388,14 @@ } if (wrapper) { - - stream = wrapper->wops->stream_opener(wrapper, + if (!wrapper->wops->stream_opener) { + php_stream_wrapper_log_error(wrapper, options ^ REPORT_ERRORS TSRMLS_CC, + "wrapper does not support stream open"); + } else { + stream = wrapper->wops->stream_opener(wrapper, path_to_open, implicit_mode, options ^ REPORT_ERRORS, opened_path, context STREAMS_REL_CC TSRMLS_CC); + } /* if the caller asked for a persistent stream but the wrapper did not * return one, force an error here */