[PHP-CVS] cvs: php-src /ext/standard file.c

[Felipe Pena]

felipe          Mon Feb  4 19:48:14 2008 UTC

  Modified files:              
    /php-src/ext/standard       file.c 
  Log:
  Fixed wrong fix
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.505&r2=1.506&diff_format=u
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.505 php-src/ext/standard/file.c:1.506
--- php-src/ext/standard/file.c:1.505   Mon Feb  4 18:45:40 2008
+++ php-src/ext/standard/file.c Mon Feb  4 19:48:14 2008
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: file.c,v 1.505 2008/02/04 18:45:40 felipe Exp $ */
+/* $Id: file.c,v 1.506 2008/02/04 19:48:14 felipe Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -1359,22 +1359,22 @@
                RETURN_NULL();
        }
 
-       if (write_len <= 0) {
+       php_stream_from_zval(stream, &zstream);
+       
+       if (argc > 2 && write_len <= 0) {
                RETURN_LONG(0);
        }
 
-       php_stream_from_zval(stream, &zstream);
-
        if (Z_TYPE_P(zstring) == IS_UNICODE) {
+               if (write_len < 0 || write_len > Z_USTRLEN_P(zstring)) {
+                       write_len = Z_USTRLEN_P(zstring);
+               }
                /* Convert code units to data points */
                int32_t write_uchars = 0;
 
                U16_FWD_N(Z_USTRVAL_P(zstring), write_uchars, 
Z_USTRLEN_P(zstring), write_len);
                write_len = write_uchars;
 
-               if (write_len > Z_USTRLEN_P(zstring)) {
-                       write_len = Z_USTRLEN_P(zstring);
-               }
                ret = php_stream_write_unicode(stream, Z_USTRVAL_P(zstring), 
write_len);
 
                /* Convert data points back to code units */
@@ -1383,7 +1383,7 @@
                }
        } else {
                convert_to_string(zstring);
-               if (write_len > Z_STRLEN_P(zstring)) {
+               if (write_len < 0 || write_len > Z_STRLEN_P(zstring)) {
                        write_len = Z_STRLEN_P(zstring);
                }
 

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