From e8fcd7477c029f1bad4cb4f1e08d7be674b0d825 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Mon, 23 Jul 2007 13:27:59 +0000 Subject: [PATCH] MFH: Fixed str_pad() when passed huge negative pad length. --- ext/standard/string.c | 2 +- ext/standard/tests/strings/str_pad.phpt | Bin 9091 -> 10196 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/standard/string.c b/ext/standard/string.c index cb8fa70ca3..4436b5a7aa 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -4746,7 +4746,7 @@ PHP_FUNCTION(str_pad) /* If resulting string turns out to be shorter than input string, we simply copy the input and return. */ - if (num_pad_chars < 0) { + if (Z_LVAL_PP(pad_length) < 0 || num_pad_chars < 0) { RETURN_ZVAL(*input, 1, 0); } diff --git a/ext/standard/tests/strings/str_pad.phpt b/ext/standard/tests/strings/str_pad.phpt index 6eaff1514bd4bc1545f17efc87f97e97c1893088..886743a8b707a3c0f810055d2cf579a850adc712 100644 GIT binary patch delta 707 zcmZp6zv924gGD94BOu<>FC^aAF+xW{L0?}XqclBLAulyOu_UuBRiP{~r!;kPGt2$S zYOLy;J6LyeO!nu^n;gl3*+Sb{3=i^w3%7pALHf&g7!>6VlU(5YSEs_=S3}m zm~S(?m=M$C4dULLB_#})Houo_V455!BZ!PQ$H~~Udg^E7=cejsCFW)77Z)Y#7i1LZ zn(7(pr&g5c7ndaFr6d-m=$E7xmlOlJMVWc&U^>1aF+~rkR3Sf4Aty60Rl&@VYjTdF zp$C;rGn)KTQI}dyGX*=%i%L#2<>H#m$t^dzNy&m*zO|Ult1LHpzLGSx473Cq7#B<( T51Sit`GxxUaJl5?rE&oP=D7D+ delta 202 zcmccO-|W7jgJtqYmRpkpSk)%63T!^ax{_n_O};~no4*SDW87>a3?^zAC%+f#*?dr3 zh-tH&lmXM`6*6i}o0aADSou_o74q{Gax(K$6;xBWCM&2I@}dY$7FN|ItcXc10!`Z@ ZHA^%RW%W1-6r;KPLVbL=T=Mf$xd0