From: Fabien Potencier Date: Sat, 17 Dec 2011 07:58:24 +0000 (+0100) Subject: merged branch arnaud-lb/ext-crash2 (PR #560) X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=b9908680126b3e5aa640de298c9382ea752b3be5;p=web%2Fkonrad%2Ftwig.git merged branch arnaud-lb/ext-crash2 (PR #560) Commits ------- 9e6f285 fixed crash in twig_template_get_attributes when input is not an array or object Discussion ---------- Fix crash in twig_template_get_attributes when input is not an array or object This fixes a crash when the input of twig_template_get_attributes() is not an array or object, and strict mode is enabled. --------------------------------------------------------------------------- by nikic at 2011/12/16 12:03:21 -0800 Could you maybe place the exception tests in a different method? --------------------------------------------------------------------------- by arnaud-lb at 2011/12/16 12:13:35 -0800 This method already expects many of its inputs to cause an exception to be thrown (it tests getAttribute() in strict mode, and in many cases the attribute isn't defined). I don't see a real benefit from moving these tests in a separate method in this case. --- b9908680126b3e5aa640de298c9382ea752b3be5