115431 2013-04-30 11:07:01 -0700 Cap max CALayer tree depth to avoid crashes 2013-04-30 22:03:27 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser bdakin simon.fraser thorton oldest_to_newest 883165 0 simon.fraser 2013-04-30 11:07:01 -0700 Cap max CALayer tree depth to avoid crashes 883177 1 200136 simon.fraser 2013-04-30 11:25:56 -0700 Created attachment 200136 Patch 883181 2 200136 thorton 2013-04-30 11:33:21 -0700 Comment on attachment 200136 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=200136&action=review > Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp:64 > +static const int cMaxLayerTreeDepth = 250; I think the 'c' is unusual but you're just following this file. 883383 3 simon.fraser 2013-04-30 22:03:27 -0700 http://trac.webkit.org/changeset/149388 200136 2013-04-30 11:25:56 -0700 2013-04-30 11:33:21 -0700 Patch bug-115431-20130430112513.patch text/plain 12767 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5MzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzJkZGIwZmJmODAyNjJi YTE3YjY3NjMyODI5ZTJmYmQ0NTQ3Yjg5My4uNWU4MjhlOTNhMjY4NjBiYjA3YjBkMmNmYTA4MWQx ODdmODY5NmIwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA0LTMwICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIENhcCBtYXggQ0FM YXllciB0cmVlIGRlcHRoIHRvIGF2b2lkIGNyYXNoZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTQzMQorICAgICAgICA8cmRhcjovL3Byb2JsZW0v MTM0MDE4NjE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisgICAgICAg IAorICAgICAgICBDb3JlIEFuaW1hdGlvbiBjYW4gY3Jhc2ggaWYgZmVkIGRlZXBseSBuZXN0ZWQg bGF5ZXIgdHJlZXMuCisgICAgICAgIEF2b2lkIHRoaXMgYnkgY2FwcGluZyBDQUxheWVyIHRyZWUg ZGVwdGggYXQgc29tZSBlbXBpcmljYWxseS1kZXRlcm1pbmVkCisgICAgICAgIGxldmVsLgorCisg ICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL2xheWVyLWNyZWF0aW9uL2RlZXAtdHJlZS5odG1sCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuaDoKKyAgICAg ICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Q29tbWl0U3RhdGU6OkNvbW1pdFN0YXRlKTog QWRkIHRyZWVEZXB0aCB0byB0aGUgQ29tbWl0U3RhdGUuCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcDogU2V0IGNNYXhMYXllclRyZWVEZXB0aCB0byAy NTAKKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Zmx1c2hDb21wb3NpdGluZ1N0 YXRlRm9yVGhpc0xheWVyT25seSk6IFdlIG5lZWQgYSBkdW1teSBDb21taXRTdGF0ZQorICAgICAg ICBoZXJlLiBJdCBpcyBub3QgZXhwZWN0ZWQgdGhhdCBmbHVzaENvbXBvc2l0aW5nU3RhdGVGb3JU aGlzTGF5ZXJPbmx5KCkgd2lsbCBiZSBjYWxsZWQgZm9yCisgICAgICAgIGEgbGF5ZXIgaW4gdGhl IG1pZGRsZSBvZiB0aGUgaGllcmFyY2h5LCBvbmx5IGZvciBjdXN0b20tbWFuYWdlZCBsZWFmIGxh eWVycywgc28gd2UgZG9uJ3QgdHJ5CisgICAgICAgIHRvIGNvbXB1dGUgdGhlIGNvcnJlY3QgdHJl ZSBkZXB0aC4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6cmVjdXJzaXZlQ29t bWl0Q2hhbmdlcyk6IFBhc3MgaW4gdGhlIGNvbW1pdFN0YXRlLiBTaW5jZSB0aGlzIGlzCisgICAg ICAgIGNvcGllZCBmb3IgZWFjaCBmcmFtZSwgbm8gbmVlZCB0byBkZWNyZW1lbnQgY29tbWl0U3Rh dGUudHJlZURlcHRoLgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNBOjpjb21taXRM YXllckNoYW5nZXNCZWZvcmVTdWJsYXllcnMpOiBJbmNyZW1lbnQgdHJlZURlcHRoIG9uY2Ugb3IK KyAgICAgICAgdHdpY2UuIElmIHdlJ3ZlIHJlYWNoZWQgbWF4LCBiZSBzdXJlIHRvIHNldCB0aGUg Q2hpbGRyZW5DaGFuZ2VkIGZsYWcuIFdlIGRlbGF5IHRyZWUgdHJ1bmNhdGlvbgorICAgICAgICB1 bnRpbCBjb21taXRMYXllckNoYW5nZXNBZnRlclN1YmxheWVycygpIHNpbmNlIENoaWxkcmVuQ2hh bmdlZCBjYW4gYmUgc2V0IGFnYWluIHdoZW4gY2hpbGRyZW4KKyAgICAgICAgYXJlIGJlaW5nIHBy b2Nlc3NlZC4KKyAgICAgICAgKFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXJDQTo6Y29tbWl0TGF5ZXJD aGFuZ2VzQWZ0ZXJTdWJsYXllcnMpOgorICAgICAgICAoV2ViQ29yZTo6R3JhcGhpY3NMYXllckNB Ojp1cGRhdGVTdWJsYXllckxpc3QpOiBJZiB3ZSd2ZSBoaXQgbWF4IGRlcHRoLCBqdXN0IHNldAor ICAgICAgICBlbXB0eSBzdWJsYXllcnMuCisKIDIwMTMtMDQtMjkgIEFuZGVycyBDYXJsc3NvbiAg PGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggYnVpbGQuCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcApp bmRleCBmNDZmZGQ1NDBlZDY3YjU0MjcwZGVkYzkyYTY2ZDdjZjc1MzhjMWE5Li5lMDIyZmUyN2Iw YzM0YzhiMDE3N2M5ZGFiYzc1YWI5ZmI3YzZjZjI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAKQEAgLTYwLDYg KzYwLDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogLy8gdGV4dHVyZSBzaXplIGxpbWl0IG9uIGFs bCBzdXBwb3J0ZWQgaGFyZHdhcmUuCiBzdGF0aWMgY29uc3QgaW50IGNNYXhQaXhlbERpbWVuc2lv biA9IDIwMDA7CiAKKy8vIERlcml2ZWQgZW1waXJpY2FsbHk6IDxyZGFyOi8vcHJvYmxlbS8xMzQw MTg2MT4KK3N0YXRpYyBjb25zdCBpbnQgY01heExheWVyVHJlZURlcHRoID0gMjUwOworCiAvLyBJ ZiB3ZSBzZW5kIGEgZHVyYXRpb24gb2YgMCB0byBDQSwgdGhlbiBpdCB3aWxsIHVzZSB0aGUgZGVm YXVsdCBkdXJhdGlvbgogLy8gb2YgMjUwbXMuIFNvIHNlbmQgYSB2ZXJ5IHNtYWxsIHZhbHVlIGlu c3RlYWQuCiBzdGF0aWMgY29uc3QgZmxvYXQgY0FuaW1hdGlvbkFsbW9zdFplcm9EdXJhdGlvbiA9 IDFlLTNmOwpAQCAtODk4LDEwICs5MDEsMTIgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OmZsdXNo Q29tcG9zaXRpbmdTdGF0ZUZvclRoaXNMYXllck9ubHkoKQogewogICAgIGZsb2F0IHBhZ2VTY2Fs ZUZhY3RvcjsKICAgICBib29sIGhhZENoYW5nZXMgPSBtX3VuY29tbWl0dGVkQ2hhbmdlczsKKyAg ICAKKyAgICBDb21taXRTdGF0ZSBjb21taXRTdGF0ZTsKIAogICAgIEZsb2F0UG9pbnQgb2Zmc2V0 ID0gY29tcHV0ZVBvc2l0aW9uUmVsYXRpdmVUb0Jhc2UocGFnZVNjYWxlRmFjdG9yKTsKLSAgICBj b21taXRMYXllckNoYW5nZXNCZWZvcmVTdWJsYXllcnMocGFnZVNjYWxlRmFjdG9yLCBvZmZzZXQs IG1fdmlzaWJsZVJlY3QpOwotICAgIGNvbW1pdExheWVyQ2hhbmdlc0FmdGVyU3VibGF5ZXJzKCk7 CisgICAgY29tbWl0TGF5ZXJDaGFuZ2VzQmVmb3JlU3VibGF5ZXJzKGNvbW1pdFN0YXRlLCBwYWdl U2NhbGVGYWN0b3IsIG9mZnNldCwgbV92aXNpYmxlUmVjdCk7CisgICAgY29tbWl0TGF5ZXJDaGFu Z2VzQWZ0ZXJTdWJsYXllcnMoY29tbWl0U3RhdGUpOwogCiAgICAgaWYgKGhhZENoYW5nZXMgJiYg Y2xpZW50KCkpCiAgICAgICAgIGNsaWVudCgpLT5kaWRDb21taXRDaGFuZ2VzRm9yTGF5ZXIodGhp cyk7CkBAIC0xMDU5LDcgKzEwNjQsNyBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6cmVjdXJzaXZl Q29tbWl0Q2hhbmdlcyhjb25zdCBDb21taXRTdGF0ZSYgY29tbWl0U3RhdGUsIGNvbgogICAgIGlm IChhZmZlY3RlZEJ5UGFnZVNjYWxlKQogICAgICAgICBiYXNlUmVsYXRpdmVQb3NpdGlvbiArPSBt X3Bvc2l0aW9uOwogICAgIAotICAgIGNvbW1pdExheWVyQ2hhbmdlc0JlZm9yZVN1YmxheWVycyhw YWdlU2NhbGVGYWN0b3IsIGJhc2VSZWxhdGl2ZVBvc2l0aW9uLCBvbGRWaXNpYmxlUmVjdCk7Cisg ICAgY29tbWl0TGF5ZXJDaGFuZ2VzQmVmb3JlU3VibGF5ZXJzKGNoaWxkQ29tbWl0U3RhdGUsIHBh Z2VTY2FsZUZhY3RvciwgYmFzZVJlbGF0aXZlUG9zaXRpb24sIG9sZFZpc2libGVSZWN0KTsKIAog ICAgIGlmIChpc1J1bm5pbmdUcmFuc2Zvcm1BbmltYXRpb24oKSkgewogICAgICAgICBjaGlsZENv bW1pdFN0YXRlLmFuY2VzdG9ySGFzVHJhbnNmb3JtQW5pbWF0aW9uID0gdHJ1ZTsKQEAgLTEwNjgs NyArMTA3Myw3IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpyZWN1cnNpdmVDb21taXRDaGFuZ2Vz KGNvbnN0IENvbW1pdFN0YXRlJiBjb21taXRTdGF0ZSwgY29uCiAKICAgICBpZiAobV9tYXNrTGF5 ZXIpIHsKICAgICAgICAgR3JhcGhpY3NMYXllckNBKiBtYXNrTGF5ZXJDQSA9IHN0YXRpY19jYXN0 PEdyYXBoaWNzTGF5ZXJDQSo+KG1fbWFza0xheWVyKTsKLSAgICAgICAgbWFza0xheWVyQ0EtPmNv bW1pdExheWVyQ2hhbmdlc0JlZm9yZVN1YmxheWVycyhwYWdlU2NhbGVGYWN0b3IsIGJhc2VSZWxh dGl2ZVBvc2l0aW9uLCBtYXNrTGF5ZXJDQS0+dmlzaWJsZVJlY3QoKSk7CisgICAgICAgIG1hc2tM YXllckNBLT5jb21taXRMYXllckNoYW5nZXNCZWZvcmVTdWJsYXllcnMoY2hpbGRDb21taXRTdGF0 ZSwgcGFnZVNjYWxlRmFjdG9yLCBiYXNlUmVsYXRpdmVQb3NpdGlvbiwgbWFza0xheWVyQ0EtPnZp c2libGVSZWN0KCkpOwogICAgIH0KIAogICAgIGNvbnN0IFZlY3RvcjxHcmFwaGljc0xheWVyKj4m IGNoaWxkTGF5ZXJzID0gY2hpbGRyZW4oKTsKQEAgLTEwODMsOSArMTA4OCw5IEBAIHZvaWQgR3Jh cGhpY3NMYXllckNBOjpyZWN1cnNpdmVDb21taXRDaGFuZ2VzKGNvbnN0IENvbW1pdFN0YXRlJiBj b21taXRTdGF0ZSwgY29uCiAgICAgICAgIHN0YXRpY19jYXN0PEdyYXBoaWNzTGF5ZXJDQSo+KG1f cmVwbGljYUxheWVyKS0+cmVjdXJzaXZlQ29tbWl0Q2hhbmdlcyhjaGlsZENvbW1pdFN0YXRlLCBs b2NhbFN0YXRlLCBwYWdlU2NhbGVGYWN0b3IsIGJhc2VSZWxhdGl2ZVBvc2l0aW9uLCBhZmZlY3Rl ZEJ5UGFnZVNjYWxlKTsKIAogICAgIGlmIChtX21hc2tMYXllcikKLSAgICAgICAgc3RhdGljX2Nh c3Q8R3JhcGhpY3NMYXllckNBKj4obV9tYXNrTGF5ZXIpLT5jb21taXRMYXllckNoYW5nZXNBZnRl clN1YmxheWVycygpOworICAgICAgICBzdGF0aWNfY2FzdDxHcmFwaGljc0xheWVyQ0EqPihtX21h c2tMYXllciktPmNvbW1pdExheWVyQ2hhbmdlc0FmdGVyU3VibGF5ZXJzKGNoaWxkQ29tbWl0U3Rh dGUpOwogCi0gICAgY29tbWl0TGF5ZXJDaGFuZ2VzQWZ0ZXJTdWJsYXllcnMoKTsKKyAgICBjb21t aXRMYXllckNoYW5nZXNBZnRlclN1YmxheWVycyhjaGlsZENvbW1pdFN0YXRlKTsKIAogICAgIGlm IChhZmZlY3RlZEJ5VHJhbnNmb3JtQW5pbWF0aW9uICYmIGNsaWVudCgpICYmIG1fbGF5ZXItPmxh eWVyVHlwZSgpID09IFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlVGlsZWRCYWNraW5nTGF5ZXIp CiAgICAgICAgIGNsaWVudCgpLT5ub3RpZnlGbHVzaEJlZm9yZURpc3BsYXlSZWZyZXNoKHRoaXMp OwpAQCAtMTEyNCwxMCArMTEyOSwxOCBAQCBmbG9hdCBHcmFwaGljc0xheWVyQ0E6OnBsYXRmb3Jt Q0FMYXllckRldmljZVNjYWxlRmFjdG9yKCkKICAgICByZXR1cm4gZGV2aWNlU2NhbGVGYWN0b3Io KTsKIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQ0E6OmNvbW1pdExheWVyQ2hhbmdlc0JlZm9yZVN1 YmxheWVycyhmbG9hdCBwYWdlU2NhbGVGYWN0b3IsIGNvbnN0IEZsb2F0UG9pbnQmIHBvc2l0aW9u UmVsYXRpdmVUb0Jhc2UsIGNvbnN0IEZsb2F0UmVjdCYgb2xkVmlzaWJsZVJlY3QpCit2b2lkIEdy YXBoaWNzTGF5ZXJDQTo6Y29tbWl0TGF5ZXJDaGFuZ2VzQmVmb3JlU3VibGF5ZXJzKENvbW1pdFN0 YXRlJiBjb21taXRTdGF0ZSwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yLCBjb25zdCBGbG9hdFBvaW50 JiBwb3NpdGlvblJlbGF0aXZlVG9CYXNlLCBjb25zdCBGbG9hdFJlY3QmIG9sZFZpc2libGVSZWN0 KQogewotICAgIGlmICghbV91bmNvbW1pdHRlZENoYW5nZXMpCisgICAgKytjb21taXRTdGF0ZS50 cmVlRGVwdGg7CisgICAgaWYgKG1fc3RydWN0dXJhbExheWVyKQorICAgICAgICArK2NvbW1pdFN0 YXRlLnRyZWVEZXB0aDsKKworICAgIGlmICghbV91bmNvbW1pdHRlZENoYW5nZXMpIHsKKyAgICAg ICAgLy8gRW5zdXJlIHRoYXQgd2UgY2FwIGxheWVyIGRlcHRoIGluIGNvbW1pdExheWVyQ2hhbmdl c0FmdGVyU3VibGF5ZXJzKCkuCisgICAgICAgIGlmIChjb21taXRTdGF0ZS50cmVlRGVwdGggPiBj TWF4TGF5ZXJUcmVlRGVwdGgpCisgICAgICAgICAgICBtX3VuY29tbWl0dGVkQ2hhbmdlcyB8PSBD aGlsZHJlbkNoYW5nZWQ7CiAgICAgICAgIHJldHVybjsKKyAgICB9CiAKICAgICBib29sIG5lZWRU aWxlZExheWVyID0gcmVxdWlyZXNUaWxlZExheWVyKHBhZ2VTY2FsZUZhY3Rvcik7CiAgICAgaWYg KG5lZWRUaWxlZExheWVyICE9IG1fdXNpbmdUaWxlZEJhY2tpbmcpCkBAIC0xMjIxLDE1ICsxMjM0 LDE5IEBAIHZvaWQgR3JhcGhpY3NMYXllckNBOjpjb21taXRMYXllckNoYW5nZXNCZWZvcmVTdWJs YXllcnMoZmxvYXQgcGFnZVNjYWxlRmFjdG9yLCBjCiAgICAgICAgIC8vIFN1YmxheWVycyBtYXkg c2V0IHRoaXMgZmxhZyBhZ2Fpbiwgc28gY2xlYXIgaXQgdG8gYXZvaWQgYWx3YXlzIHVwZGF0aW5n IHN1YmxheWVycyBpbiBjb21taXRMYXllckNoYW5nZXNBZnRlclN1YmxheWVycygpLgogICAgICAg ICBtX3VuY29tbWl0dGVkQ2hhbmdlcyAmPSB+Q2hpbGRyZW5DaGFuZ2VkOwogICAgIH0KKworICAg IC8vIEVuc3VyZSB0aGF0IHdlIGNhcCBsYXllciBkZXB0aCBpbiBjb21taXRMYXllckNoYW5nZXNB ZnRlclN1YmxheWVycygpLgorICAgIGlmIChjb21taXRTdGF0ZS50cmVlRGVwdGggPiBjTWF4TGF5 ZXJUcmVlRGVwdGgpCisgICAgICAgIG1fdW5jb21taXR0ZWRDaGFuZ2VzIHw9IENoaWxkcmVuQ2hh bmdlZDsKIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQ0E6OmNvbW1pdExheWVyQ2hhbmdlc0FmdGVy U3VibGF5ZXJzKCkKK3ZvaWQgR3JhcGhpY3NMYXllckNBOjpjb21taXRMYXllckNoYW5nZXNBZnRl clN1YmxheWVycyhDb21taXRTdGF0ZSYgY29tbWl0U3RhdGUpCiB7CiAgICAgaWYgKCFtX3VuY29t bWl0dGVkQ2hhbmdlcykKICAgICAgICAgcmV0dXJuOwogCiAgICAgaWYgKG1fdW5jb21taXR0ZWRD aGFuZ2VzICYgQ2hpbGRyZW5DaGFuZ2VkKQotICAgICAgICB1cGRhdGVTdWJsYXllckxpc3QoKTsK KyAgICAgICAgdXBkYXRlU3VibGF5ZXJMaXN0KGNvbW1pdFN0YXRlLnRyZWVEZXB0aCA+IGNNYXhM YXllclRyZWVEZXB0aCk7CiAKICAgICBpZiAobV91bmNvbW1pdHRlZENoYW5nZXMgJiBSZXBsaWNh dGVkTGF5ZXJDaGFuZ2VkKQogICAgICAgICB1cGRhdGVSZXBsaWNhdGVkTGF5ZXJzKCk7CkBAIC0x MjUyLDggKzEyNjksMTMgQEAgdm9pZCBHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZUxheWVyTmFtZXMo KQogICAgIG1fbGF5ZXItPnNldE5hbWUobmFtZSgpKTsKIH0KIAotdm9pZCBHcmFwaGljc0xheWVy Q0E6OnVwZGF0ZVN1YmxheWVyTGlzdCgpCit2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlU3Vi bGF5ZXJMaXN0KGJvb2wgbWF4TGF5ZXJEZXB0aFJlYWNoZWQpCiB7CisgICAgaWYgKG1heExheWVy RGVwdGhSZWFjaGVkKSB7CisgICAgICAgIG1fbGF5ZXItPnNldFN1YmxheWVycyhQbGF0Zm9ybUNB TGF5ZXJMaXN0KCkpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAogICAgIGNvbnN0IFBs YXRmb3JtQ0FMYXllckxpc3QqIGN1c3RvbVN1YmxheWVycyA9IG1fbGF5ZXItPmN1c3RvbVN1Ymxh eWVycygpOwogCiAgICAgUGxhdGZvcm1DQUxheWVyTGlzdCBzdHJ1Y3R1cmFsTGF5ZXJDaGlsZHJl bjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBo aWNzTGF5ZXJDQS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhp Y3NMYXllckNBLmgKaW5kZXggMDc5MjhmYzUwNDExNTFlZGMxNmZjMWRkMDUwZTdiYWViNWFkODRm OC4uMDJjMDIyN2U5OGM2YzUyZTg5NDNhZGFiZGQ4ZTBjOTRhNjE0YTUyMCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgK QEAgLTEzMyw4ICsxMzMsMTAgQEAgcHVibGljOgogCiAgICAgc3RydWN0IENvbW1pdFN0YXRlIHsK ICAgICAgICAgYm9vbCBhbmNlc3Rvckhhc1RyYW5zZm9ybUFuaW1hdGlvbjsKKyAgICAgICAgaW50 IHRyZWVEZXB0aDsKICAgICAgICAgQ29tbWl0U3RhdGUoKQogICAgICAgICAgICAgOiBhbmNlc3Rv ckhhc1RyYW5zZm9ybUFuaW1hdGlvbihmYWxzZSkKKyAgICAgICAgICAgICwgdHJlZURlcHRoKDAp CiAgICAgICAgIHsgfQogICAgIH07CiAgICAgdm9pZCByZWN1cnNpdmVDb21taXRDaGFuZ2VzKGNv bnN0IENvbW1pdFN0YXRlJiwgY29uc3QgVHJhbnNmb3JtU3RhdGUmLCBmbG9hdCBwYWdlU2NhbGVG YWN0b3IgPSAxLCBjb25zdCBGbG9hdFBvaW50JiBwb3NpdGlvblJlbGF0aXZlVG9CYXNlID0gRmxv YXRQb2ludCgpLCBib29sIGFmZmVjdGVkQnlQYWdlU2NhbGUgPSBmYWxzZSk7CkBAIC0yMjMsOCAr MjI1LDggQEAgcHJpdmF0ZToKICAgICAgICAgcmV0dXJuIG1fcnVubmluZ0FuaW1hdGlvbnMuZmlu ZChhbmltYXRpb25OYW1lKSAhPSBtX3J1bm5pbmdBbmltYXRpb25zLmVuZCgpOwogICAgIH0KIAot ICAgIHZvaWQgY29tbWl0TGF5ZXJDaGFuZ2VzQmVmb3JlU3VibGF5ZXJzKGZsb2F0IHBhZ2VTY2Fs ZUZhY3RvciwgY29uc3QgRmxvYXRQb2ludCYgcG9zaXRpb25SZWxhdGl2ZVRvQmFzZSwgY29uc3Qg RmxvYXRSZWN0JiBvbGRWaXNpYmxlUmVjdCk7Ci0gICAgdm9pZCBjb21taXRMYXllckNoYW5nZXNB ZnRlclN1YmxheWVycygpOworICAgIHZvaWQgY29tbWl0TGF5ZXJDaGFuZ2VzQmVmb3JlU3VibGF5 ZXJzKENvbW1pdFN0YXRlJiwgZmxvYXQgcGFnZVNjYWxlRmFjdG9yLCBjb25zdCBGbG9hdFBvaW50 JiBwb3NpdGlvblJlbGF0aXZlVG9CYXNlLCBjb25zdCBGbG9hdFJlY3QmIG9sZFZpc2libGVSZWN0 KTsKKyAgICB2b2lkIGNvbW1pdExheWVyQ2hhbmdlc0FmdGVyU3VibGF5ZXJzKENvbW1pdFN0YXRl Jik7CiAKICAgICBGbG9hdFBvaW50IGNvbXB1dGVQb3NpdGlvblJlbGF0aXZlVG9CYXNlKGZsb2F0 JiBwYWdlU2NhbGUpIGNvbnN0OwogCkBAIC0zMjAsNyArMzIyLDcgQEAgcHJpdmF0ZToKICAgICAK ICAgICAvLyBBbGwgdGhlc2UgInVwZGF0ZSIgbWV0aG9kcyB3aWxsIGJlIGNhbGxlZCBpbnNpZGUg YSBCRUdJTl9CTE9DS19PQkpDX0VYQ0VQVElPTlMvRU5EX0JMT0NLX09CSkNfRVhDRVBUSU9OUyBi bG9jay4KICAgICB2b2lkIHVwZGF0ZUxheWVyTmFtZXMoKTsKLSAgICB2b2lkIHVwZGF0ZVN1Ymxh eWVyTGlzdCgpOworICAgIHZvaWQgdXBkYXRlU3VibGF5ZXJMaXN0KGJvb2wgbWF4TGF5ZXJEZXB0 aFJlYWNoZWQgPSBmYWxzZSk7CiAgICAgdm9pZCB1cGRhdGVHZW9tZXRyeShmbG9hdCBwaXhlbEFs aWdubWVudFNjYWxlLCBjb25zdCBGbG9hdFBvaW50JiBwb3NpdGlvblJlbGF0aXZlVG9CYXNlKTsK ICAgICB2b2lkIHVwZGF0ZVRyYW5zZm9ybSgpOwogICAgIHZvaWQgdXBkYXRlQ2hpbGRyZW5UcmFu c2Zvcm0oKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwppbmRleCA2ZTJhZDhiZDUzZjZlZDMwODYwZTE1ZTZmODBhNmZkZmVhNDc2ODIx Li40OGIzYThlNTQ2NDAwZGFiNmUzNzU5MGMyN2FjMGI2ZmNlNTRjZjAyIDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTcgQEAKKzIwMTMtMDQtMzAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5j b20+CisKKyAgICAgICAgQ2FwIG1heCBDQUxheWVyIHRyZWUgZGVwdGggdG8gYXZvaWQgY3Jhc2hl cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTE1NDMx CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzQwMTg2MT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIFRlc3QgdGhhdCBtYWtlcyBhIHZl cnkgZGVlcCB0cmVlLiBTaG91bGQgbm90ZSBjcmFzaCwgYW5kIHNob3VsZCBtYXRjaAorICAgICAg ICB0aGUgcmVmZXJlbmNlLgorCisgICAgICAgICogY29tcG9zaXRpbmcvbGF5ZXItY3JlYXRpb24v ZGVlcC10cmVlLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAgICAqIGNvbXBvc2l0aW5nL2xh eWVyLWNyZWF0aW9uL2RlZXAtdHJlZS5odG1sOiBBZGRlZC4KKwogMjAxMy0wNC0yOSAgSmFtZXMg Q3JhaWcgIDxqYW1lc0Bjb29raWVjcm9vay5jb20+CiAKICAgICAgICAgU2V0dGluZ3MuaW4gc2Vs ZWN0aW9uSW5jbHVkZXNBbHRJbWFnZVRleHQgc2hvdWxkIGRlZmF1bHQgdG8gdHJ1ZSwgZHVlIHRv IHVwZGF0ZSBpbiBIVE1MIHNwZWMuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGlu Zy9sYXllci1jcmVhdGlvbi9kZWVwLXRyZWUtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Nv bXBvc2l0aW5nL2xheWVyLWNyZWF0aW9uL2RlZXAtdHJlZS1leHBlY3RlZC5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjBiNzBjZGYyMmYzNTYzODE5ZDkyODY3ODkxMWIxMDg2MjQzZGZiZDkKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9kZWVwLXRyZWUt ZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgaHRtbD4KKworPGh0bWw+ Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgIC5ib3ggeworICAgICAgICAgICAgaGVpZ2h0 OiAxMDBweDsKKyAgICAgICAgICAgIHdpZHRoOiAxMDBweDsKKyAgICAgICAgICAgIG1hcmdpbjog MTBweCAwOworICAgICAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKKyAgICAgICAgICAg IC13ZWJraXQtdHJhbnNmb3JtOiB0cmFuc2xhdGVaKDApOworICAgICAgICB9CisgICAgICAgIAor ICAgICAgICAubGVhZiB7CisgICAgICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAg ICAgICAgfQorICAgIDwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPSJiZWZv cmUiIGNsYXNzPSJsZWFmIGJveCI+PC9kaXY+CisgICAgPGRpdiBpZD0iZGVlcCIgY2xhc3M9ImJv eCI+PC9kaXY+CisgICAgPGRpdiBpZD0iYWZ0ZXIiIGNsYXNzPSJsZWFmIGJveCI+PC9kaXY+Cis8 L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXll ci1jcmVhdGlvbi9kZWVwLXRyZWUuaHRtbCBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2xheWVy LWNyZWF0aW9uL2RlZXAtdHJlZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjRkN2JjYTMxZjZhMzJmNDIwZWQ0 MGUwYmRiNDgwYmM0YmE4YjhmYmMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21w b3NpdGluZy9sYXllci1jcmVhdGlvbi9kZWVwLXRyZWUuaHRtbApAQCAtMCwwICsxLDQ3IEBACis8 IURPQ1RZUEUgaHRtbD4KKworPGh0bWw+Cis8aGVhZD4KKyAgICA8c3R5bGU+CisgICAgICAgIC5i b3ggeworICAgICAgICAgICAgaGVpZ2h0OiAxMDBweDsKKyAgICAgICAgICAgIHdpZHRoOiAxMDBw eDsKKyAgICAgICAgICAgIG1hcmdpbjogMTBweCAwOworICAgICAgICAgICAgYmFja2dyb3VuZC1j b2xvcjogYmx1ZTsKKyAgICAgICAgICAgIC13ZWJraXQtdHJhbnNmb3JtOiB0cmFuc2xhdGVaKDAp OworICAgICAgICB9CisgICAgICAgIAorICAgICAgICAubGVhZiB7CisgICAgICAgICAgICBiYWNr Z3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICAgICAgfQorICAgIDwvc3R5bGU+CisgICAgPHNjcmlw dCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIGNoYXJzZXQ9InV0Zi04Ij4KKyAgICAgICAgCisgICAg ICAgIGZ1bmN0aW9uIG1ha2VEZWVwVHJlZShkZXB0aCwgaG9zdCkKKyAgICAgICAgeworICAgICAg ICAgICAgdmFyIHBhcmVudCA9IGhvc3Q7CisgICAgICAgICAgICB2YXIgaW5uZXJFbGVtZW50Owor ICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBkZXB0aDsgaSsrKSB7CisgICAgICAgICAg ICAgICAgdmFyIGN1cnJFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7Cisg ICAgICAgICAgICAgICAgY3VyckVsZW1lbnQuY2xhc3NOYW1lID0gJ2JveCc7CisgICAgICAgICAg ICAgICAgcGFyZW50LmFwcGVuZENoaWxkKGN1cnJFbGVtZW50KTsKKyAgICAgICAgICAgICAgICBw YXJlbnQgPSBjdXJyRWxlbWVudDsKKyAgICAgICAgICAgICAgICBpbm5lckVsZW1lbnQgPSBjdXJy RWxlbWVudDsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlubmVyRWxlbWVudC5jbGFzc0xp c3QuYWRkKCdsZWFmJyk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIGZ1bmN0aW9uIGRv VGVzdCgpCisgICAgICAgIHsKKyAgICAgICAgICAgIG1ha2VEZWVwVHJlZSg1MDAsIGRvY3VtZW50 LmdldEVsZW1lbnRCeUlkKCdkZWVwJykpOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICB3 aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGRvVGVzdCwgZmFsc2UpOworICAgIDwvc2Ny aXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBpZD0iYmVmb3JlIiBjbGFzcz0ibGVhZiBi b3giPjwvZGl2PgorICAgIDxkaXYgaWQ9ImRlZXAiIGNsYXNzPSJib3giPjwvZGl2PgorICAgIDxk aXYgaWQ9ImFmdGVyIiBjbGFzcz0ibGVhZiBib3giPjwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo=