use safer strlcpy, patch by Tony Dovgal

ext/phar/phar.phar

@@ -1171,8 +1171,8 @@ spl_autoload_register('command_autoload');
 new PharCommand($argc, $argv);
 
 __HALT_COMPILER(); ?>
-6

pharcommandclicommand.incü!„@ºH%
-Çší¶directorygraphiterator.incò„@ºHu
.XM¶directorytreeiterator.inc„@ºHXe#Q¶invertedregexiterator.incÕ
„@ºHÕj©Q¶pharcommand.inc4š„@ºH#…¿Z^¶phar.inc„@ºH+
CbcD¶µksÚHò3üŠ1Å­¤°±·j÷L`/—»­Úªd/åd?Š’Åt7#a»²þï×ÝóÐ	ìÍí¥Ê fzú=ýR^ÿ´ÛìºÝ‹W¯Øßâ$å,J“(ßnÃl5J²¨Ë`=ÉÖ"/wìÃ&´p'd(%{ûî—·
+6

pharcommandclicommand.incü!€DºH%
+Çší¶directorygraphiterator.incò€DºHu
.XM¶directorytreeiterator.inc€DºHXe#Q¶invertedregexiterator.incÕ
€DºHÕj©Q¶pharcommand.inc4š€DºH#…¿Z^¶phar.inc€DºH+
CbcD¶µksÚHò3üŠ1Å­¤°±·j÷L`/—»­Úªd/åd?Š’Åt7#a»²þï×ÝóÐ	ìÍí¥Ê fzú=ýR^ÿ´ÛìºÝ‹W¯Øßâ$å,J“(ßnÃl5J²¨Ë`=ÉÖ"/wìÃ&´p'd(%{ûî—·
 ž¶Â²Ø䂱÷¡ˆJÉþžs±æêÔ*,8ƒW——?°!~ý븅ˆY…åBós„.coîd!¨`w¡ŽóLæȹBÀ’í.å[ža‘äÙs\í¹�ÆÆ£K"Ü
ñ¾v;;‘<*øŠõC±Ž&‡+ûúJ´]I6e¡á£4 �î�»Ú^·—Y„Ò°åÅ-D>ñ0P`Š|Ðí—�~±Iäp†Û€Æ°ê,ïõòÞYÖÌJžÆ77k^h±¥Oû�©Ù³�oÄú,Y@€Lb¦Øc¯ÙUÀ�©Ž‚çBäÂïýš[{­“=Ï,ÚðèëE¶æ—‹'¶áéîsÖ#ÊOŒ§’#Ö³DJ^øÓs’d>^,æž(3o´ü-û’å÷™¥êiJãÅ“÷"â
 gßœ×
 „ób„náNŸîà@Å]e
Tf¦é²”\,ÑÔ¾2=�ØilB–Ž±zÜpu`!�oZ¼ßàÝöÏÏ
ðµò͆5Õ~ÞO ;›N™7ôÌ6íƒÃ¥<«Àºbß}Çjò¢,ó
@@ -1229,4 +1229,4 @@ t
 ùU™NøÖ	þ­î_ê!@Îå°"¦ÚÚ�FóõOÿ¨ÊLG3@§=DM¡b�P½5ùâ	¬ËaYšº
[Ã⎬mòv
O�ë<ý]¸¹)×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,­°„í]@¿úÁëÀu8á3nã\WÊíÑè—µïtúÎþ®øÚ÷Eí»ú¡ÃÏà›Ÿ‚ÇGx‰îÓŸ᧾óãæ]Ž¢Õ~f–I|øðP›|·sºH@N*E¯èWÐzønSVµ:C§^©_^“B¯"�jÀïp t?Õy‘`Š»r©BÓÐõŠÿ+Æc�BÅ—^—ƒ­–RM°ê°:+©Äí„O*€ÄYxm66:´¿72r¿ƒÌRºl@>kÂ1ÊU�³_4	�…;%žXçð¡Ñ€¸ï%ùˆ��lüìA­ÁµÔßE�c‘�Õ,§½à³á_fŸ}†ÇAyÞžÀôð,.ö÷öúbW¿9 ï6n=};³8Q‰œ°tŸ3¿ˆ­µiÅsjºhp‹¾¬1j®ëC¨Íâ°5;ÿû梯oñ�S}oä¿–²ÀoÛÜ�ß°v¨�ƒZzkÅX–c­½¬By´	¨w®æÑxNâ@—ZaƒExÝÓc& ¼À/®°vÄÅDò›¡è'ùj4–½@ $ÄxäWì·?¼š1©úoãß]ò¯™û]¼4Àïìå)Bº9ztw+Ç.£<M:£‹/Ê4�…Bw®É‘šçãˆÏ�S7qåÚ™Ñð欫æÿPž\�|PWxÌ7ϪïÕŒrΊ�~{ª9N翲yfÐóQ0Ä@ì5§ùš†í7ò2¯ &‡ýÛðÑp_l«“fTì}òßo�&†Î'v/ŠBжÁkÐ4ôCkxÙÆt|úÂÁÄ>Ì¢\RñùžÒŸ8‡¨
 j„7l1ØÛPšH†üéÅiGH¬5´¯’$ß/rªýëІ~Ñ�›úgìªz²¢ÎÛ¦pu€Š�ùäûù;â9³™䂯;pUµ–T°¬\ÍÏà騫éóÀ¨Ð}º{këáCz·«t8Ç›6
¬ò“.ÑZ^ÂøIw®N$_ÿ¸@P…Ê•¡ðÙÎö¯ØïÇBˆÏ
-Pàø3�C°쬡Í?ÞSžÝû�’AOƒ@…Ï쯘£6±T/šØXk/zhÒØ`¦0ÀÆe!³»¨!þwª©mH[.dÞ÷æí[ÂtVµRñh¤`�™6u�<Ö6éms®B
+{aÚ2H:·1ø¢b€%r<UÄ9mQŠž@ž›É䮺×�èê¶aQ•%ÚTæXÅ1´mû/èÓ“Mex^½Í9)tC]{Þ[»éXWØzuY*Ézôº²§j7ÄNlp=žôÝŽ—Ú…;x¥$ÈnC/ž}ŪUQlÒ9ùµÎ-úÀtq©"a“L24ŽîUô­öýs£Ñ�ãeúÐ6ýuî‘�Nω�ê,·Êx§¯!ÙÊçÒt‹B›Tâμç�ý0mIågÂ!,Û'ðÚ‡ÍrHàìáØ'ƒ‚ó6ôÄ0Q_€†œW›²/GBMB
+Pàø3�C°쬡Í?ÞSžÝû�’AOƒ@…Ï쯘£6±T/šØXk/zhÒØ`¦0ÀÆe!³»¨!þwª©mH[.dÞ÷æí[ÂtVµRñh¤`�™6u�<Ö6éms®B
+{aÚ2H:·1ø¢b€%r<UÄ9mQŠž@ž›É䮺×�èê¶aQ•%ÚTæXÅ1´mû/èÓ“Mex^½Í9)tC]{Þ[»éXWØzuY*Ézôº²§j7ÄNlp=žôÝŽ—Ú…;x¥$ÈnC/ž}ŪUQlÒ9ùµÎ-úÀtq©"a“L24ŽîUô­öýs£Ñ�ãeúÐ6ýuî‘�Nω�ê,·Êx§¯!ÙÊçÒt‹B›Tâμç�ý0mIågÂ!,Û'ðÚ‡ÍrHàìá/�O+¡,�[]ØiÚ*÷¥Ú(#
GBMB

ext/phar/util.c

@@ -475,7 +475,7 @@ not_stream:
 
 			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 @@ not_stream:
 
 				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 */