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ßœ×
@@ -1229,4 +1229,4 @@ t
 …Z}…=ŸY5ÏôVRÓÔ.6d^qBÌ *�õ
 ÷k\–Ãn‹†¯Zs‡”J̈’*Ú”f¾	žn:v­z¾à©WìtSüb5¶Ê¡fË¢&ÒÉ[áŠ/ª9(†¥:‰ÌÀ×(�ÉÅ0bµë&Â|rÜ&ÄZ9+1F²ðSÏ`«ij%Áß'áˆÃï8+<E
¢*
 M¸µ(jt$¢bLö÷äz,9B¼-Û–Iõö|±¤®p
-¬Þ ;1„ö;G़ÂðÙLöúðè�µ 6_
Ë<ö-šFx¿G–ì?›KØh•–Ó‹n‰ÆûVá¥@œâITª$¸$SÜ]Ú©pa…ýäú€þý£’G¼
+¬Þ ;1„ö;G़ÂðÙLöúðè�µ 6_
Ë<ö-šFx¿G–ì?›KØh•–Ó‹n‰ÆûVá¥@œâITª$¸$SÜ]Ú©pa…ýäú€þý£’G¼

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 */