cvs: php-src /ext/standard file.c

From: Date: Fri, 09 Jan 2009 22:50:45 +0000
Subject: cvs: php-src /ext/standard file.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-55508@lists.php.net to get a copy of this message
tony2001 Fri Jan 9 22:50:45 2009 UTC Modified files: /php-src/ext/standard file.c Log: use temp var instead of wrong typecast http://cvs.php.net/viewvc.cgi/php-src/ext/standard/file.c?r1=1.536&r2=1.537&diff_format=u Index: php-src/ext/standard/file.c diff -u php-src/ext/standard/file.c:1.536 php-src/ext/standard/file.c:1.537 --- php-src/ext/standard/file.c:1.536 Fri Jan 9 18:23:45 2009 +++ php-src/ext/standard/file.c Fri Jan 9 22:50:45 2009 @@ -21,7 +21,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: file.c,v 1.536 2009/01/09 18:23:45 tony2001 Exp $ */ +/* $Id: file.c,v 1.537 2009/01/09 22:50:45 tony2001 Exp $ */ /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */ @@ -911,7 +911,7 @@ { zval **ppdir, **ppprefix; char *dir, *prefix; - int dir_len; + int dir_len, tmp_prefix_len; char *opened_path; char *p; int fd; @@ -922,7 +922,7 @@ } if (php_stream_path_param_encode(ppdir, &dir, &dir_len, REPORT_ERRORS, FG(default_context)) == FAILURE || - php_stream_path_param_encode(ppprefix, &prefix, (int *)&prefix_len, REPORT_ERRORS, FG(default_context)) == FAILURE) { + php_stream_path_param_encode(ppprefix, &prefix, &tmp_prefix_len, REPORT_ERRORS, FG(default_context)) == FAILURE) { RETURN_FALSE; } @@ -930,6 +930,7 @@ RETURN_FALSE; } + prefix_len = tmp_prefix_len; php_basename(prefix, prefix_len, NULL, 0, &p, &p_len TSRMLS_CC); if (p_len > 64) { p[63] = '\0';

« previous php.cvs (#55508) next »