[PHP-CVS] cvs: php-src(PHP_5_3) /ext/phar phar.phar util.c

[Greg Beaver]

cellog          Sun Aug 31 07:15:26 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   phar.phar util.c 
  Log:
  use safer strlcpy, patch by Tony Dovgal
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar.phar?r1=1.7.2.42&r2=1.7.2.43&diff_format=u
Index: php-src/ext/phar/phar.phar
diff -u php-src/ext/phar/phar.phar:1.7.2.42 php-src/ext/phar/phar.phar:1.7.2.43
--- php-src/ext/phar/phar.phar:1.7.2.42 Sun Aug 31 06:58:04 2008
+++ php-src/ext/phar/phar.phar  Sun Aug 31 07:15:25 2008
@@ -1171,8 +1171,8 @@
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?>
-6
-+6
+ 
ž¶Â²Ø䂱÷¡ˆJÉþžs±æêÔ*,8ƒW——?°!~ý븅ˆY…åBós„.coîd!¨`w¡ŽóLæȹBÀ’í.å[ža‘äÙs\í¹
 gߜ×
 „ób„náNŸ@@ -1229,4 +1229,4 @@
 ùU™NøÖ        [EMAIL PROTECTED]"[EMAIL PROTECTED]     
¬ËaYšº
[Ã⎬mòvOë<ý]¸¹)×soS…jßZæ/]ûô‚Þv¿Ç½T%æ:ýÚ)cÚv]¶Ebô«ŒÐӛ*€Çê=KÕO)ò)‘«Ë-ԍ]µLí‹·¡7µ¾Í¨.î
Ÿšzÿ.jß?8Tù®,˜:«Äa·éï¤Á»hg•
 ±µÉH¨#[T5$ÜßÞ¶LÐâ¯z4ʃ¼è)ÿLuÒñxï;ñ©Æø³;TMe,¯¿{}4b,[EMAIL PROTECTED]
íÑ藵ïtúÎþ®øÚ÷Eí»ú¡ÃÏà›Ÿ‚ÇGx‰îӟ᧾óãæ]Ž¢Õ~f–I|øðP› 
j„7l1ØÛPšH†üéÅiGH¬5´¯’$ß/rªýëІ~ѐ›úgìªz²¢ÎÛ¦pu€Šùäûù;â9³™䂯;[EMAIL 
PROTECTED]
-Pàø3C°\ No newline at end of file
+Pàø3C°\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.30&r2=1.55.2.31&diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.30 php-src/ext/phar/util.c:1.55.2.31
--- php-src/ext/phar/util.c:1.55.2.30   Sun Aug 31 02:14:03 2008
+++ php-src/ext/phar/util.c     Sun Aug 31 07:15:25 2008
@@ -18,7 +18,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: util.c,v 1.55.2.30 2008/08/31 02:14:03 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.31 2008/08/31 07:15:25 cellog Exp $ */
 
 #include "phar_internal.h"
 
@@ -475,7 +475,7 @@
 
                        wrapper = php_stream_locate_url_wrapper(trypath, 
&actual, STREAM_OPEN_FOR_INCLUDE TSRMLS_CC);
                        if (wrapper == &php_plain_files_wrapper) {
-                               strncpy(trypath, actual, MAXPATHLEN);
+                               strlcpy(trypath, actual, sizeof(trypath));
                        } else if (!wrapper) {
                                /* if wrapper is NULL, there was a mal-formed 
include_path stream wrapper, so skip this ptr */
                                continue;
@@ -542,7 +542,7 @@
 
                                if (wrapper == &php_plain_files_wrapper) {
                                        /* this should never technically 
happen, but we'll leave it here for completeness */
-                                       strncpy(trypath, actual, MAXPATHLEN);
+                                       strlcpy(trypath, actual, 
sizeof(trypath));
                                } else if (!wrapper) {
                                        /* if wrapper is NULL, there was a 
malformed include_path stream wrapper
                                           this also should be impossible */



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