pajoye                                   Thu, 20 Jan 2011 06:32:59 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307611

Log:
- no need of assert here

Changed paths:
    U   php/php-src/branches/PHP_5_3/main/streams/cast.c
    U   php/php-src/trunk/main/streams/cast.c

Modified: php/php-src/branches/PHP_5_3/main/streams/cast.c
===================================================================
--- php/php-src/branches/PHP_5_3/main/streams/cast.c    2011-01-20 06:23:35 UTC 
(rev 307610)
+++ php/php-src/branches/PHP_5_3/main/streams/cast.c    2011-01-20 06:32:59 UTC 
(rev 307611)
@@ -366,8 +366,9 @@
 /* {{{ php_stream_make_seekable */
 PHPAPI int _php_stream_make_seekable(php_stream *origstream, php_stream 
**newstream, int flags STREAMS_DC TSRMLS_DC)
 {
-       assert(newstream != NULL);
-
+       if (newstream == NULL) {
+               return PHP_STREAM_FAILED;
+       }
        *newstream = NULL;

        if (((flags & PHP_STREAM_FORCE_CONVERSION) == 0) && 
origstream->ops->seek != NULL) {

Modified: php/php-src/trunk/main/streams/cast.c
===================================================================
--- php/php-src/trunk/main/streams/cast.c       2011-01-20 06:23:35 UTC (rev 
307610)
+++ php/php-src/trunk/main/streams/cast.c       2011-01-20 06:32:59 UTC (rev 
307611)
@@ -366,8 +366,9 @@
 /* {{{ php_stream_make_seekable */
 PHPAPI int _php_stream_make_seekable(php_stream *origstream, php_stream 
**newstream, int flags STREAMS_DC TSRMLS_DC)
 {
-       assert(newstream != NULL);
-
+       if (newstream == NULL) {
+               return PHP_STREAM_FAILED;
+       }
        *newstream = NULL;

        if (((flags & PHP_STREAM_FORCE_CONVERSION) == 0) && 
origstream->ops->seek != NULL) {

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to