65761 2011-08-05 02:24:18 -0700 Web Inspector: constrain maximum depth for returnByValue objects 2011-08-05 02:38:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 447129 0 yurys 2011-08-05 02:24:18 -0700 Result of evaluation may well be self referencing structure, we need to fail gracefully in that case if the evaluation was requested with returnByValue flag. 447131 1 103054 yurys 2011-08-05 02:27:48 -0700 Created attachment 103054 Patch 447132 2 103054 pfeldman 2011-08-05 02:32:01 -0700 Comment on attachment 103054 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=103054&action=review > Source/WebCore/inspector/InspectorValues.h:51 > + static const int maxDepth = 20; 1000? 447133 3 yurys 2011-08-05 02:35:19 -0700 (In reply to comment #2) > (From update of attachment 103054 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=103054&action=review > > > Source/WebCore/inspector/InspectorValues.h:51 > > + static const int maxDepth = 20; > > 1000? Done. 447135 4 yurys 2011-08-05 02:38:36 -0700 Committed r92471: <http://trac.webkit.org/changeset/92471> 103054 2011-08-05 02:27:48 -0700 2011-08-05 02:32:01 -0700 Patch bug-65761-20110805132746.patch text/plain 13119 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogOTI0NTAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBjNjUxNDAwM2M4Y2JjNWFmOGI3ZDU1 MzhhNjk3ODZiYTA5Njc2M2UzLi5lYmUxYjNhMmYzNTAxNzUxYzU3YWM3NGZhZGRhYmE3OGVjZmNm ZWUzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDgtMDUgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogY29uc3RyYWlu IG1heGltdW0gZGVwdGggZm9yIHJldHVybkJ5VmFsdWUgb2JqZWN0cworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU3NjEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9wcm90b2NvbC9ydW50 aW1lLWFnZW50LWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvcHJvdG9jb2wvcnVu dGltZS1hZ2VudC5odG1sOgorCiAyMDExLTA4LTA0ICBTY290dCBHcmFoYW0gIDxzY290dG1nQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBCYWQgaW50ZXJhY3Rpb24gYmV0d2VlbiBkb2N1bWVudCBk ZXN0cnVjdGlvbiBhbmQgdW5sb2FkIGV2ZW50cwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL3Byb3RvY29sL3J1bnRpbWUtYWdlbnQtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3Byb3RvY29sL3J1bnRpbWUtYWdlbnQtZXhwZWN0ZWQudHh0CmluZGV4IDhlNzZm MjQ5OThjNGNiN2ZhMjJlZmNmYjJiODQ4NDAwY2E1Y2NjMWMuLmQ1Y2M5YTViYWIzZDlkNWQwOTI1 NDMyMGQ1MzIwYTczM2Q3ODA1ODQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9w cm90b2NvbC9ydW50aW1lLWFnZW50LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvcHJvdG9jb2wvcnVudGltZS1hZ2VudC1leHBlY3RlZC50eHQKQEAgLTc4LDYgKzc4LDg4 IEBAIHJlc3BvbnNlOgogfQogCiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorUnVudGltZUFnZW50LmV2YWx1YXRlKCJ2YXIgbyA9IHtu OjIwMTEsIGI6dHJ1ZSwgczpcImEgc3RyaW5nXCIsIG86e246MjAxMX19OyBvIiwidGVzdCIsZmFs c2UsdHJ1ZSxudWxsLHRydWUpCisKK3JlcXVlc3Q6Cit7CisgICAgbWV0aG9kIDogIlJ1bnRpbWUu ZXZhbHVhdGUiCisgICAgcGFyYW1zIDogeworICAgICAgICBleHByZXNzaW9uIDogInZhciBvID0g e246MjAxMSwgYjp0cnVlLCBzOiJhIHN0cmluZyIsIG86e246MjAxMX19OyBvIgorICAgICAgICBv YmplY3RHcm91cCA6ICJ0ZXN0IgorICAgICAgICBpbmNsdWRlQ29tbWFuZExpbmVBUEkgOiBmYWxz ZQorICAgICAgICBkb05vdFBhdXNlT25FeGNlcHRpb25zIDogdHJ1ZQorICAgICAgICByZXR1cm5C eVZhbHVlIDogdHJ1ZQorICAgIH0KKyAgICBpZCA6IDxudW1iZXI+Cit9CisKK3Jlc3BvbnNlOgor eworICAgIHJlc3VsdCA6IHsKKyAgICAgICAgcmVzdWx0IDogeworICAgICAgICAgICAgdHlwZSA6 ICJvYmplY3QiCisgICAgICAgICAgICB2YWx1ZSA6IHsKKyAgICAgICAgICAgICAgICBuIDogMjAx MQorICAgICAgICAgICAgICAgIGIgOiB0cnVlCisgICAgICAgICAgICAgICAgcyA6ICJhIHN0cmlu ZyIKKyAgICAgICAgICAgICAgICBvIDogeworICAgICAgICAgICAgICAgICAgICBuIDogMjAxMQor ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorICAgIH0KKyAgICBp ZCA6IDxudW1iZXI+Cit9CisKKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tCitSdW50aW1lQWdlbnQuZXZhbHVhdGUoInZhciB4ID0ge307 IHguc2VsZiA9IHg7IHgiLCJ0ZXN0IixmYWxzZSx0cnVlLG51bGwsdHJ1ZSkKKworcmVxdWVzdDoK K3sKKyAgICBtZXRob2QgOiAiUnVudGltZS5ldmFsdWF0ZSIKKyAgICBwYXJhbXMgOiB7CisgICAg ICAgIGV4cHJlc3Npb24gOiAidmFyIHggPSB7fTsgeC5zZWxmID0geDsgeCIKKyAgICAgICAgb2Jq ZWN0R3JvdXAgOiAidGVzdCIKKyAgICAgICAgaW5jbHVkZUNvbW1hbmRMaW5lQVBJIDogZmFsc2UK KyAgICAgICAgZG9Ob3RQYXVzZU9uRXhjZXB0aW9ucyA6IHRydWUKKyAgICAgICAgcmV0dXJuQnlW YWx1ZSA6IHRydWUKKyAgICB9CisgICAgaWQgOiA8bnVtYmVyPgorfQorCityZXNwb25zZToKK3sK KyAgICBlcnJvciA6IHsKKyAgICAgICAgY29kZSA6IC0zMjAwMAorICAgICAgICBtZXNzYWdlIDog Ik9iamVjdCBoYXMgdG9vIGxvbmcgcmVmZXJlbmNlIGNoYWluKG11c3Qgbm90IGJlIGxvbmdlciB0 aGFuIDIwKSIKKyAgICB9CisgICAgaWQgOiA8bnVtYmVyPgorfQorCistLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQorUnVudGltZUFnZW50 LmNhbGxGdW5jdGlvbk9uKDxzdHJpbmc+LCJmdW5jdGlvbigpIHsgdGhpcy5zZWxmID0gdGhpczsg cmV0dXJuIHRoaXM7IH0iLG51bGwsdHJ1ZSkKKworcmVxdWVzdDoKK3sKKyAgICBtZXRob2QgOiAi UnVudGltZS5jYWxsRnVuY3Rpb25PbiIKKyAgICBwYXJhbXMgOiB7CisgICAgICAgIG9iamVjdElk IDogPHN0cmluZz4KKyAgICAgICAgZnVuY3Rpb25EZWNsYXJhdGlvbiA6ICJmdW5jdGlvbigpIHsg dGhpcy5zZWxmID0gdGhpczsgcmV0dXJuIHRoaXM7IH0iCisgICAgICAgIHJldHVybkJ5VmFsdWUg OiB0cnVlCisgICAgfQorICAgIGlkIDogPG51bWJlcj4KK30KKworcmVzcG9uc2U6Cit7CisgICAg ZXJyb3IgOiB7CisgICAgICAgIGNvZGUgOiAtMzIwMDAKKyAgICAgICAgbWVzc2FnZSA6ICJPYmpl Y3QgaGFzIHRvbyBsb25nIHJlZmVyZW5jZSBjaGFpbihtdXN0IG5vdCBiZSBsb25nZXIgdGhhbiAy MCkiCisgICAgfQorICAgIGlkIDogPG51bWJlcj4KK30KKworLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIFJ1bnRpbWVBZ2VudC5nZXRQ cm9wZXJ0aWVzKDxzdHJpbmc+LGZhbHNlKQogCiByZXF1ZXN0OgpAQCAtMTAyLDYgKzE4NCwxNSBA QCByZXNwb25zZToKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICB9CiAgICAgICAgICAg ICB7CisgICAgICAgICAgICAgICAgbmFtZSA6ICJzZWxmIgorICAgICAgICAgICAgICAgIHZhbHVl IDogeworICAgICAgICAgICAgICAgICAgICB0eXBlIDogIm9iamVjdCIKKyAgICAgICAgICAgICAg ICAgICAgb2JqZWN0SWQgOiA8c3RyaW5nPgorICAgICAgICAgICAgICAgICAgICBjbGFzc05hbWUg OiA8c3RyaW5nPgorICAgICAgICAgICAgICAgICAgICBkZXNjcmlwdGlvbiA6ICJUZXN0T2JqZWN0 IgorICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHsKICAgICAg ICAgICAgICAgICBuYW1lIDogIl9fcHJvdG9fXyIKICAgICAgICAgICAgICAgICB2YWx1ZSA6IHsK ICAgICAgICAgICAgICAgICAgICAgdHlwZSA6ICJvYmplY3QiCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wvcnVudGltZS1hZ2VudC5odG1sIGIvTGF5b3V0VGVzdHMv aW5zcGVjdG9yL3Byb3RvY29sL3J1bnRpbWUtYWdlbnQuaHRtbAppbmRleCA5YjA2MDBjMDk2MmJj MmZkNjFhOTNiYTZlOWI1MTM4NWJkODNjN2Y0Li5mZDAxZWM3MzU4MTU1OTRmYTg0NmY5NWVlYzhj OGNlN2UyY2UwYzM1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvcHJvdG9jb2wv cnVudGltZS1hZ2VudC5odG1sCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9wcm90b2NvbC9y dW50aW1lLWFnZW50Lmh0bWwKQEAgLTIwLDYgKzIwLDEyIEBAIGZ1bmN0aW9uIHRlc3QoKQogICAg ICAgICAgICAgWyJSdW50aW1lQWdlbnQiLCAiZXZhbHVhdGUiLCAndGVzdE9iamVjdCcsICd0ZXN0 JywgZmFsc2VdLAogICAgICAgICAgICAgWyJSdW50aW1lQWdlbnQiLCAiZXZhbHVhdGUiLCAndGVz dE9iamVjdCcsICd0ZXN0J10sCiAgICAgICAgICAgICBbIlJ1bnRpbWVBZ2VudCIsICJjYWxsRnVu Y3Rpb25PbiIsIHJlc3VsdC5vYmplY3RJZCwgJ2Z1bmN0aW9uKCkgeyB0aGlzLmFzc2lnbmVkQnlD YWxsRnVuY3Rpb25PbiA9ICJjYWxsRnVuY3Rpb25PbiBmdW5jdGlvbiB3b3JrcyBmaW5lIjsgcmV0 dXJuIHRoaXMuYXNzaWduZWRCeUNhbGxGdW5jdGlvbk9uOyB9J10sCisKKyAgICAgICAgICAgIC8v IHRlc3QgcmV0dXJuQnlWYWx1ZToKKyAgICAgICAgICAgIFsiUnVudGltZUFnZW50IiwgImV2YWx1 YXRlIiwgJ3ZhciBvID0ge246MjAxMSwgYjp0cnVlLCBzOiJhIHN0cmluZyIsIG86e246MjAxMX19 OyBvJywgJ3Rlc3QnLCBmYWxzZSwgdHJ1ZSwgdW5kZWZpbmVkLCB0cnVlXSwKKyAgICAgICAgICAg IFsiUnVudGltZUFnZW50IiwgImV2YWx1YXRlIiwgJ3ZhciB4ID0ge307IHguc2VsZiA9IHg7IHgn LCAndGVzdCcsIGZhbHNlLCB0cnVlLCB1bmRlZmluZWQsIHRydWVdLAorICAgICAgICAgICAgWyJS dW50aW1lQWdlbnQiLCAiY2FsbEZ1bmN0aW9uT24iLCByZXN1bHQub2JqZWN0SWQsICdmdW5jdGlv bigpIHsgdGhpcy5zZWxmID0gdGhpczsgcmV0dXJuIHRoaXM7IH0nLCB1bmRlZmluZWQsIHRydWVd LAorCiAgICAgICAgICAgICBbIlJ1bnRpbWVBZ2VudCIsICJnZXRQcm9wZXJ0aWVzIiwgcmVzdWx0 Lm9iamVjdElkLCBmYWxzZV0sCiAgICAgICAgICAgICBbIlJ1bnRpbWVBZ2VudCIsICJyZWxlYXNl T2JqZWN0IiwgcmVzdWx0Lm9iamVjdElkXSwKICAgICAgICAgICAgIFsiUnVudGltZUFnZW50Iiwg InJlbGVhc2VPYmplY3RHcm91cCIsICd0ZXN0J11dOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDQ3ODRlNTE1ZjUw NjQ2MDU2NWEwYmFjMzkyZjVkNDdiOGJiMDMxMTEuLjk2Y2E4MjY5ZDIwMzc1OTdjOTNlNTI0NmRi YTY2MTkwYjNiMTI5OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysg Yi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMiBAQAorMjAxMS0wOC0wNSAg WXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBjb25zdHJhaW4gbWF4aW11bSBkZXB0aCBmb3IgcmV0dXJuQnlWYWx1ZSBvYmplY3Rz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTc2MQor CisgICAgICAgIFNldCBtYXhpbXVtIGRlcHRoIHRvIDIwIGZvciBvYmplY3RzIHJldHVybmVkIGJ5 IHZhbHVlIGFzIGEgcmVzdWx0IG9mIGV2YWx1YXRpb25zLgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYmluZGluZ3MvanMvU2NyaXB0VmFsdWUuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6anNUb0luc3BlY3RvclZhbHVlKToKKyAgICAgICAgKFdlYkNv cmU6OlNjcmlwdFZhbHVlOjp0b0luc3BlY3RvclZhbHVlKToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9TY3JpcHRWYWx1ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjp2OFRvSW5zcGVjdG9yVmFsdWUp OgorICAgICAgICAoV2ViQ29yZTo6U2NyaXB0VmFsdWU6OnRvSW5zcGVjdG9yVmFsdWUpOgorICAg ICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJ bmplY3RlZFNjcmlwdDo6bWFrZUNhbGwpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JW YWx1ZXMuaDoKKwogMjAxMS0wOC0wNCAgSGF5YXRvIEl0byAgPGhheWF0b0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgTWFrZSBTY29wZWRFdmVudFF1ZXVlIGVucXVldWUgYW4gRXZlbnREaXNwYXRj aE1lZGlhdG9yLCBpbnN0ZWFkIG9mIGFuIEV2ZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3MvanMvU2NyaXB0VmFsdWUuY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv anMvU2NyaXB0VmFsdWUuY3BwCmluZGV4IDRmNTFkZGJjZTEzMDI2NGQwODgxMGJmYTExZGIxYjU4 MTBhNTkxNGMuLjQ5NjZhZTAxMDdkN2I0MjYxNmE2NTFlZDAzNDY0NjI5NjRkZWEwZDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL2pzL1NjcmlwdFZhbHVlLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9TY3JpcHRWYWx1ZS5jcHAKQEAgLTExMSwxMiArMTEx LDE3IEBAIFNjcmlwdFZhbHVlIFNjcmlwdFZhbHVlOjpkZXNlcmlhbGl6ZShTY3JpcHRTdGF0ZSog c2NyaXB0U3RhdGUsIFNlcmlhbGl6ZWRTY3JpcHRWCiB9CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9S KQotc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGpzVG9JbnNwZWN0b3JWYWx1ZShT Y3JpcHRTdGF0ZSogc2NyaXB0U3RhdGUsIEpTVmFsdWUgdmFsdWUpCitzdGF0aWMgUGFzc1JlZlB0 cjxJbnNwZWN0b3JWYWx1ZT4ganNUb0luc3BlY3RvclZhbHVlKFNjcmlwdFN0YXRlKiBzY3JpcHRT dGF0ZSwgSlNWYWx1ZSB2YWx1ZSwgaW50IG1heERlcHRoKQogewogICAgIGlmICghdmFsdWUpIHsK ICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVybiAwOwogICAgIH0K KworICAgIGlmICghbWF4RGVwdGgpCisgICAgICAgIHJldHVybiAwOworICAgIG1heERlcHRoLS07 CisKICAgICBpZiAodmFsdWUuaXNOdWxsKCkgfHwgdmFsdWUuaXNVbmRlZmluZWQoKSkKICAgICAg ICAgcmV0dXJuIEluc3BlY3RvclZhbHVlOjpudWxsKCk7CiAgICAgaWYgKHZhbHVlLmlzQm9vbGVh bigpKQpAQCAtMTM0LDExICsxMzksOSBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1 ZT4ganNUb0luc3BlY3RvclZhbHVlKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgSgogICAgICAg ICAgICAgdW5zaWduZWQgbGVuZ3RoID0gYXJyYXktPmxlbmd0aCgpOwogICAgICAgICAgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSA8IGxlbmd0aDsgaSsrKSB7CiAgICAgICAgICAgICAgICAgSlNW YWx1ZSBlbGVtZW50ID0gYXJyYXktPmdldEluZGV4KGkpOwotICAgICAgICAgICAgICAgIFJlZlB0 cjxJbnNwZWN0b3JWYWx1ZT4gZWxlbWVudFZhbHVlID0ganNUb0luc3BlY3RvclZhbHVlKHNjcmlw dFN0YXRlLCBlbGVtZW50KTsKLSAgICAgICAgICAgICAgICBpZiAoIWVsZW1lbnRWYWx1ZSkgewot ICAgICAgICAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgICAg ICAgICAgZWxlbWVudFZhbHVlID0gSW5zcGVjdG9yVmFsdWU6Om51bGwoKTsKLSAgICAgICAgICAg ICAgICB9CisgICAgICAgICAgICAgICAgUmVmUHRyPEluc3BlY3RvclZhbHVlPiBlbGVtZW50VmFs dWUgPSBqc1RvSW5zcGVjdG9yVmFsdWUoc2NyaXB0U3RhdGUsIGVsZW1lbnQsIG1heERlcHRoKTsK KyAgICAgICAgICAgICAgICBpZiAoIWVsZW1lbnRWYWx1ZSkKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuIDA7CiAgICAgICAgICAgICAgICAgaW5zcGVjdG9yQXJyYXktPnB1c2hWYWx1ZShlbGVt ZW50VmFsdWUpOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgcmV0dXJuIGluc3BlY3RvckFy cmF5OwpAQCAtMTUwLDExICsxNTMsOSBAQCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1 ZT4ganNUb0luc3BlY3RvclZhbHVlKFNjcmlwdFN0YXRlKiBzY3JpcHRTdGF0ZSwgSgogICAgICAg ICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IHByb3BlcnR5TmFtZXMuc2l6ZSgpOyBpKyspIHsKICAg ICAgICAgICAgIGNvbnN0IElkZW50aWZpZXImIG5hbWUgPSAgcHJvcGVydHlOYW1lc1tpXTsKICAg ICAgICAgICAgIEpTVmFsdWUgcHJvcGVydHlWYWx1ZSA9IG9iamVjdC0+Z2V0KHNjcmlwdFN0YXRl LCBuYW1lKTsKLSAgICAgICAgICAgIFJlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gaW5zcGVjdG9yVmFs dWUgPSBqc1RvSW5zcGVjdG9yVmFsdWUoc2NyaXB0U3RhdGUsIHByb3BlcnR5VmFsdWUpOwotICAg ICAgICAgICAgaWYgKCFpbnNwZWN0b3JWYWx1ZSkgewotICAgICAgICAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgICAgIGluc3BlY3RvclZhbHVlID0gSW5zcGVjdG9y VmFsdWU6Om51bGwoKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIFJlZlB0cjxJbnNwZWN0 b3JWYWx1ZT4gaW5zcGVjdG9yVmFsdWUgPSBqc1RvSW5zcGVjdG9yVmFsdWUoc2NyaXB0U3RhdGUs IHByb3BlcnR5VmFsdWUsIG1heERlcHRoKTsKKyAgICAgICAgICAgIGlmICghaW5zcGVjdG9yVmFs dWUpCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICBpbnNwZWN0b3JPYmpl Y3QtPnNldFZhbHVlKFN0cmluZyhuYW1lLmNoYXJhY3RlcnMoKSwgbmFtZS5sZW5ndGgoKSksIGlu c3BlY3RvclZhbHVlKTsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gaW5zcGVjdG9yT2JqZWN0 OwpAQCAtMTY1LDcgKzE2Niw3IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3RvclZhbHVlPiBq c1RvSW5zcGVjdG9yVmFsdWUoU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXRlLCBKCiAKIFBhc3NSZWZQ dHI8SW5zcGVjdG9yVmFsdWU+IFNjcmlwdFZhbHVlOjp0b0luc3BlY3RvclZhbHVlKFNjcmlwdFN0 YXRlKiBzY3JpcHRTdGF0ZSkgY29uc3QKIHsKLSAgICByZXR1cm4ganNUb0luc3BlY3RvclZhbHVl KHNjcmlwdFN0YXRlLCBtX3ZhbHVlLmdldCgpKTsKKyAgICByZXR1cm4ganNUb0luc3BlY3RvclZh bHVlKHNjcmlwdFN0YXRlLCBtX3ZhbHVlLmdldCgpLCBJbnNwZWN0b3JWYWx1ZTo6bWF4RGVwdGgp OwogfQogI2VuZGlmIC8vIEVOQUJMRShJTlNQRUNUT1IpCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L1NjcmlwdFZhbHVlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3Y4L1NjcmlwdFZhbHVlLmNwcAppbmRleCAzNDg3ZDM5YjllM2NhNjZkODE5MjA0MmVhODkz N2NmZDM2MGY1YzU1Li5lY2MzNjczNjJhODM4YjdmOTg5MjhlZDA1OTlkNjM3NjlmMDk3Y2I3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9TY3JpcHRWYWx1ZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvU2NyaXB0VmFsdWUuY3BwCkBAIC03MywxMiAr NzMsMTcgQEAgU3RyaW5nIFNjcmlwdFZhbHVlOjp0b1N0cmluZyhTY3JpcHRTdGF0ZSopIGNvbnN0 CiB9CiAKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9y VmFsdWU+IHY4VG9JbnNwZWN0b3JWYWx1ZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCitz dGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gdjhUb0luc3BlY3RvclZhbHVlKHY4OjpI YW5kbGU8djg6OlZhbHVlPiB2YWx1ZSwgaW50IG1heERlcHRoKQogewogICAgIGlmICh2YWx1ZS5J c0VtcHR5KCkpIHsKICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIHJldHVy biAwOwogICAgIH0KKworICAgIGlmICghbWF4RGVwdGgpCisgICAgICAgIHJldHVybiAwOworICAg IG1heERlcHRoLS07CisKICAgICBpZiAodmFsdWUtPklzTnVsbCgpIHx8IHZhbHVlLT5Jc1VuZGVm aW5lZCgpKQogICAgICAgICByZXR1cm4gSW5zcGVjdG9yVmFsdWU6Om51bGwoKTsKICAgICBpZiAo dmFsdWUtPklzQm9vbGVhbigpKQpAQCAtOTMsMTEgKzk4LDkgQEAgc3RhdGljIFBhc3NSZWZQdHI8 SW5zcGVjdG9yVmFsdWU+IHY4VG9JbnNwZWN0b3JWYWx1ZSh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g dmFsdWUKICAgICAgICAgdWludDMyX3QgbGVuZ3RoID0gYXJyYXktPkxlbmd0aCgpOwogICAgICAg ICBmb3IgKHVpbnQzMl90IGkgPSAwOyBpIDwgbGVuZ3RoOyBpKyspIHsKICAgICAgICAgICAgIHY4 OjpMb2NhbDx2ODo6VmFsdWU+IHZhbHVlID0gYXJyYXktPkdldCh2ODo6SW50MzI6Ok5ldyhpKSk7 Ci0gICAgICAgICAgICBSZWZQdHI8SW5zcGVjdG9yVmFsdWU+IGVsZW1lbnQgPSB2OFRvSW5zcGVj dG9yVmFsdWUodmFsdWUpOwotICAgICAgICAgICAgaWYgKCFlbGVtZW50KSB7Ci0gICAgICAgICAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICAgICAgZWxlbWVudCA9IElu c3BlY3RvclZhbHVlOjpudWxsKCk7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICBSZWZQdHI8 SW5zcGVjdG9yVmFsdWU+IGVsZW1lbnQgPSB2OFRvSW5zcGVjdG9yVmFsdWUodmFsdWUsIG1heERl cHRoKTsKKyAgICAgICAgICAgIGlmICghZWxlbWVudCkKKyAgICAgICAgICAgICAgICByZXR1cm4g MDsKICAgICAgICAgICAgIGluc3BlY3RvckFycmF5LT5wdXNoVmFsdWUoZWxlbWVudCk7CiAgICAg ICAgIH0KICAgICAgICAgcmV0dXJuIGluc3BlY3RvckFycmF5OwpAQCAtMTEyLDExICsxMTUsOSBA QCBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gdjhUb0luc3BlY3RvclZhbHVlKHY4 OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZQogICAgICAgICAgICAgLy8gRklYTUUoeXVyeXMpOiB2 ODo6T2JqZWN0IHNob3VsZCBzdXBwb3J0IEdldE93blByb3BlcnR5TmFtZXMKICAgICAgICAgICAg IGlmIChuYW1lLT5Jc1N0cmluZygpICYmICFvYmplY3QtPkhhc1JlYWxOYW1lZFByb3BlcnR5KHY4 OjpIYW5kbGU8djg6OlN0cmluZz46OkNhc3QobmFtZSkpKQogICAgICAgICAgICAgICAgIGNvbnRp bnVlOwotICAgICAgICAgICAgUmVmUHRyPEluc3BlY3RvclZhbHVlPiBwcm9wZXJ0eVZhbHVlID0g djhUb0luc3BlY3RvclZhbHVlKG9iamVjdC0+R2V0KG5hbWUpKTsKLSAgICAgICAgICAgIGlmICgh cHJvcGVydHlWYWx1ZSkgewotICAgICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwot ICAgICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgfQorICAgICAgICAgICAgUmVm UHRyPEluc3BlY3RvclZhbHVlPiBwcm9wZXJ0eVZhbHVlID0gdjhUb0luc3BlY3RvclZhbHVlKG9i amVjdC0+R2V0KG5hbWUpLCBtYXhEZXB0aCk7CisgICAgICAgICAgICBpZiAoIXByb3BlcnR5VmFs dWUpCisgICAgICAgICAgICAgICAgcmV0dXJuIDA7CiAgICAgICAgICAgICBpbnNwZWN0b3JPYmpl Y3QtPnNldFZhbHVlKHRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2sobmFtZSksIHByb3BlcnR5 VmFsdWUpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybiBpbnNwZWN0b3JPYmplY3Q7CkBAIC0x MzAsNyArMTMxLDcgQEAgUGFzc1JlZlB0cjxJbnNwZWN0b3JWYWx1ZT4gU2NyaXB0VmFsdWU6OnRv SW5zcGVjdG9yVmFsdWUoU2NyaXB0U3RhdGUqIHNjcmlwdFN0YXQKICAgICB2ODo6SGFuZGxlU2Nv cGUgaGFuZGxlU2NvcGU7CiAgICAgLy8gdjg6Ok9iamVjdDo6R2V0UHJvcGVydHlOYW1lcygpIGV4 cGVjdHMgY3VycmVudCBjb250ZXh0IHRvIGJlIG5vdCBudWxsLgogICAgIHY4OjpDb250ZXh0OjpT Y29wZSBjb250ZXh0U2NvcGUoc2NyaXB0U3RhdGUtPmNvbnRleHQoKSk7Ci0gICAgcmV0dXJuIHY4 VG9JbnNwZWN0b3JWYWx1ZShtX3ZhbHVlKTsKKyAgICByZXR1cm4gdjhUb0luc3BlY3RvclZhbHVl KG1fdmFsdWUsIEluc3BlY3RvclZhbHVlOjptYXhEZXB0aCk7CiB9CiAjZW5kaWYKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdC5jcHAKaW5kZXggYzllOGNlZDZhYWY0 MDhhYTg5NzNkYmIwZjUyYzkyMmFjNmM5MTdiNC4uZWNlNjlhNzg4MTI4ZGY1YjRhZTk3YTFkMWYw ODAzMWNkMTY1NDUxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luamVj dGVkU2NyaXB0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3Jp cHQuY3BwCkBAIC0xOTIsOSArMTkyLDExIEBAIHZvaWQgSW5qZWN0ZWRTY3JpcHQ6Om1ha2VDYWxs KFNjcmlwdEZ1bmN0aW9uQ2FsbCYgZnVuY3Rpb24sIFJlZlB0cjxJbnNwZWN0b3JWYWx1CiAgICAg U2NyaXB0VmFsdWUgcmVzdWx0VmFsdWUgPSBmdW5jdGlvbi5jYWxsKGhhZEV4Y2VwdGlvbik7CiAK ICAgICBBU1NFUlQoIWhhZEV4Y2VwdGlvbik7Ci0gICAgaWYgKCFoYWRFeGNlcHRpb24pCisgICAg aWYgKCFoYWRFeGNlcHRpb24pIHsKICAgICAgICAgKnJlc3VsdCA9IHJlc3VsdFZhbHVlLnRvSW5z cGVjdG9yVmFsdWUobV9pbmplY3RlZFNjcmlwdE9iamVjdC5zY3JpcHRTdGF0ZSgpKTsKLSAgICBl bHNlCisgICAgICAgIGlmICghKnJlc3VsdCkKKyAgICAgICAgICAgICpyZXN1bHQgPSBJbnNwZWN0 b3JTdHJpbmc6OmNyZWF0ZShTdHJpbmc6OmZvcm1hdCgiT2JqZWN0IGhhcyB0b28gbG9uZyByZWZl cmVuY2UgY2hhaW4obXVzdCBub3QgYmUgbG9uZ2VyIHRoYW4gJWQpIiwgSW5zcGVjdG9yVmFsdWU6 Om1heERlcHRoKSk7CisgICAgfSBlbHNlCiAgICAgICAgICpyZXN1bHQgPSBJbnNwZWN0b3JTdHJp bmc6OmNyZWF0ZSgiRXhjZXB0aW9uIHdoaWxlIG1ha2luZyBhIGNhbGwuIik7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JWYWx1ZXMuaCBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JWYWx1ZXMuaAppbmRleCA4MzVjOTgyYmQ2YTM4 NGZhY2RlNjc3YmQ4ZTJlODc3YmM4MmIxYzQ4Li5lMGE1ZTU2ZmU4ZmZlMzIyOGU4NzQ1NTZmOTYw NzhiMWNlNmJkNGUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yVmFsdWVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclZhbHVl cy5oCkBAIC00OCw2ICs0OCw4IEBAIGNsYXNzIEluc3BlY3Rvck9iamVjdDsKIAogY2xhc3MgSW5z cGVjdG9yVmFsdWUgOiBwdWJsaWMgUmVmQ291bnRlZDxJbnNwZWN0b3JWYWx1ZT4gewogcHVibGlj OgorICAgIHN0YXRpYyBjb25zdCBpbnQgbWF4RGVwdGggPSAyMDsKKwogICAgIEluc3BlY3RvclZh bHVlKCkgOiBtX3R5cGUoVHlwZU51bGwpIHsgfQogICAgIHZpcnR1YWwgfkluc3BlY3RvclZhbHVl KCkgeyB9CiAK