Commit da4a0e4d authored by Robert Longson's avatar Robert Longson
Browse files

Bug 601131 - Hang with feTurbulence with huge numOctaves. r=roc

parent 528eb19b

content/svg/content/src/SVGFETurbulenceElement.cpp

+3 −1
Original line number Diff line number Diff line
@@ -23,6 +23,8 @@ static const unsigned short SVG_STITCHTYPE_UNKNOWN = 0; 
static const unsigned short SVG_STITCHTYPE_STITCH = 1;

static const unsigned short SVG_STITCHTYPE_NOSTITCH = 2;



static const int32_t MAX_OCTAVES = 10;



JSObject*

SVGFETurbulenceElement::WrapNode(JSContext* aCx, JS::Handle<JSObject*> aScope)

{
@@ -137,7 +139,7 @@ SVGFETurbulenceElement::Filter(nsSVGFilterInstance* instance, 
  float fX = mNumberPairAttributes[BASE_FREQ].GetAnimValue(nsSVGNumberPair::eFirst);

  float fY = mNumberPairAttributes[BASE_FREQ].GetAnimValue(nsSVGNumberPair::eSecond);

  float seed = mNumberAttributes[OCTAVES].GetAnimValue();

  int32_t octaves = mIntegerAttributes[OCTAVES].GetAnimValue();

  int32_t octaves = std::min(mIntegerAttributes[OCTAVES].GetAnimValue(), MAX_OCTAVES);

  uint16_t type = mEnumAttributes[TYPE].GetAnimValue();

  uint16_t stitch = mEnumAttributes[STITCHTILES].GetAnimValue();