171339 2017-04-26 13:19:57 -0700 Make user script injection more robust 2017-04-28 00:27:26 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen buildbot cdumez commit-queue dbates ggaren japhet oldest_to_newest 1301744 0 achristensen 2017-04-26 13:19:57 -0700 Make user script injection more robust 1301751 1 308280 achristensen 2017-04-26 13:33:42 -0700 Created attachment 308280 Patch 1301756 2 308280 ggaren 2017-04-26 13:37:37 -0700 Comment on attachment 308280 Patch r=me 1301766 3 308280 achristensen 2017-04-26 14:11:12 -0700 Comment on attachment 308280 Patch I'm not sure this will fix anything because m_script can never be null and forEachUserScript does everything synchronously. 1301770 4 308280 commit-queue 2017-04-26 14:40:52 -0700 Comment on attachment 308280 Patch Clearing flags on attachment: 308280 Committed r215831: <http://trac.webkit.org/changeset/215831> 1301771 5 commit-queue 2017-04-26 14:40:54 -0700 All reviewed patches have been landed. Closing bug. 1302513 6 ddkilzer 2017-04-28 00:27:26 -0700 <rdar://problem/30643691> 308280 2017-04-26 13:33:42 -0700 2017-04-26 14:40:52 -0700 Patch bug-171339-20170426133341.patch text/plain 11763 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIxNTgwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIxIEBACisyMDE3LTA0LTI2ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSB1c2Vy IHNjcmlwdCBpbmplY3Rpb24gbW9yZSByb2J1c3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3MTMzOQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzA2 NDM2OTE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBsb2FkZXIvRW1wdHlDbGllbnRzLmNwcDoKKyAgICAgICAgKiBwYWdlL0ZyYW1lLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkZyYW1lOjppbmplY3RVc2VyU2NyaXB0cyk6CisgICAgICAgICogcGFn ZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6VXNlckNvbnRl bnRDb250cm9sbGVyOjpmb3JFYWNoVXNlclNjcmlwdCk6CisgICAgICAgIChXZWJDb3JlOjpVc2Vy Q29udGVudENvbnRyb2xsZXI6OmZvckVhY2hVc2VyU3R5bGVTaGVldCk6CisgICAgICAgIChXZWJD b3JlOjpVc2VyQ29udGVudENvbnRyb2xsZXI6OmZvckVhY2hVc2VyTWVzc2FnZUhhbmRsZXIpOgor ICAgICAgICAqIHBhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmg6CisgICAgICAgICogcGFnZS9V c2VyQ29udGVudFByb3ZpZGVyLmg6CisKIDIwMTctMDQtMjUgIEFsZXggQ2hyaXN0ZW5zZW4gIDxh Y2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBFbmNvZGVkIGZpbGVuYW1lIHNob3Vs ZCBiZSBkZWNvZGVkIGZvciBXS0NvbnRlbnRFeHRlbnNpb24uaWRlbnRpZmllcgpJbmRleDogU291 cmNlL1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvbG9hZGVyL0VtcHR5Q2xpZW50cy5jcHAJKHJldmlzaW9uIDIxNTc5MSkKKysrIFNv dXJjZS9XZWJDb3JlL2xvYWRlci9FbXB0eUNsaWVudHMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 NjgsMTAgKzU2OCwxMCBAQCBjbGFzcyBFbXB0eVN0b3JhZ2VOYW1lc3BhY2VQcm92aWRlciBmaW5h CiB9OwogCiBjbGFzcyBFbXB0eVVzZXJDb250ZW50UHJvdmlkZXIgZmluYWwgOiBwdWJsaWMgVXNl ckNvbnRlbnRQcm92aWRlciB7Ci0gICAgdm9pZCBmb3JFYWNoVXNlclNjcmlwdChjb25zdCBzdGQ6 OmZ1bmN0aW9uPHZvaWQoRE9NV3JhcHBlcldvcmxkJiwgY29uc3QgVXNlclNjcmlwdCYpPiYpIGNv bnN0IGZpbmFsIHsgfQotICAgIHZvaWQgZm9yRWFjaFVzZXJTdHlsZVNoZWV0KGNvbnN0IHN0ZDo6 ZnVuY3Rpb248dm9pZChjb25zdCBVc2VyU3R5bGVTaGVldCYpPiYpIGNvbnN0IGZpbmFsIHsgfQor ICAgIHZvaWQgZm9yRWFjaFVzZXJTY3JpcHQoRnVuY3Rpb248dm9pZChET01XcmFwcGVyV29ybGQm LCBjb25zdCBVc2VyU2NyaXB0Jik+JiYpIGNvbnN0IGZpbmFsIHsgfQorICAgIHZvaWQgZm9yRWFj aFVzZXJTdHlsZVNoZWV0KEZ1bmN0aW9uPHZvaWQoY29uc3QgVXNlclN0eWxlU2hlZXQmKT4mJikg Y29uc3QgZmluYWwgeyB9CiAjaWYgRU5BQkxFKFVTRVJfTUVTU0FHRV9IQU5ETEVSUykKLSAgICB2 b2lkIGZvckVhY2hVc2VyTWVzc2FnZUhhbmRsZXIoY29uc3Qgc3RkOjpmdW5jdGlvbjx2b2lkKGNv bnN0IFVzZXJNZXNzYWdlSGFuZGxlckRlc2NyaXB0b3ImKT4mKSBjb25zdCBmaW5hbCB7IH0KKyAg ICB2b2lkIGZvckVhY2hVc2VyTWVzc2FnZUhhbmRsZXIoRnVuY3Rpb248dm9pZChjb25zdCBVc2Vy TWVzc2FnZUhhbmRsZXJEZXNjcmlwdG9yJik+JiYpIGNvbnN0IGZpbmFsIHsgfQogI2VuZGlmCiAj aWYgRU5BQkxFKENPTlRFTlRfRVhURU5TSU9OUykKICAgICBDb250ZW50RXh0ZW5zaW9uczo6Q29u dGVudEV4dGVuc2lvbnNCYWNrZW5kJiB1c2VyQ29udGVudEV4dGVuc2lvbkJhY2tlbmQoKSBmaW5h bCB7IHN0YXRpYyBOZXZlckRlc3Ryb3llZDxDb250ZW50RXh0ZW5zaW9uczo6Q29udGVudEV4dGVu c2lvbnNCYWNrZW5kPiBiYWNrZW5kOyByZXR1cm4gYmFja2VuZC5nZXQoKTsgfTsKSW5kZXg6IFNv dXJjZS9XZWJDb3JlL3BhZ2UvRnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWUuY3BwCShyZXZpc2lvbiAyMTU3OTEpCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzA0LDE3ICs3MDQsMTggQEAgdm9pZCBGcmFt ZTo6aW5qZWN0VXNlclNjcmlwdHMoVXNlclNjcmlwdAogICAgIGlmIChsb2FkZXIoKS5zdGF0ZU1h Y2hpbmUoKS5jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50KCkgJiYgIXNldHRpbmdzKCkuc2hv dWxkSW5qZWN0VXNlclNjcmlwdHNJbkluaXRpYWxFbXB0eURvY3VtZW50KCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHRoaXMtPmRvY3VtZW50KCk7Ci0gICAg aWYgKCFkb2N1bWVudCkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgbV9wYWdlLT51c2VyQ29udGVu dFByb3ZpZGVyKCkuZm9yRWFjaFVzZXJTY3JpcHQoWyZdKERPTVdyYXBwZXJXb3JsZCYgd29ybGQs IGNvbnN0IFVzZXJTY3JpcHQmIHNjcmlwdCkgeworICAgIG1fcGFnZS0+dXNlckNvbnRlbnRQcm92 aWRlcigpLmZvckVhY2hVc2VyU2NyaXB0KFt0aGlzLCBwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigq dGhpcyksIGluamVjdGlvblRpbWVdKERPTVdyYXBwZXJXb3JsZCYgd29ybGQsIGNvbnN0IFVzZXJT Y3JpcHQmIHNjcmlwdCkgeworICAgICAgICBhdXRvKiBkb2N1bWVudCA9IHRoaXMtPmRvY3VtZW50 KCk7CisgICAgICAgIGlmICghZG9jdW1lbnQpCisgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IGlmIChzY3JpcHQuaW5qZWN0ZWRGcmFtZXMoKSA9PSBJbmplY3RJblRvcEZyYW1lT25seSAmJiBv d25lckVsZW1lbnQoKSkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICBpZiAoc2NyaXB0 LmluamVjdGlvblRpbWUoKSA9PSBpbmplY3Rpb25UaW1lICYmIFVzZXJDb250ZW50VVJMUGF0dGVy bjo6bWF0Y2hlc1BhdHRlcm5zKGRvY3VtZW50LT51cmwoKSwgc2NyaXB0LndoaXRlbGlzdCgpLCBz Y3JpcHQuYmxhY2tsaXN0KCkpKSB7Ci0gICAgICAgICAgICBtX3BhZ2UtPnNldEFzUnVubmluZ1Vz ZXJTY3JpcHRzKCk7Ci0gICAgICAgICAgICBtX3NjcmlwdC0+ZXZhbHVhdGVJbldvcmxkKFNjcmlw dFNvdXJjZUNvZGUoc2NyaXB0LnNvdXJjZSgpLCBzY3JpcHQudXJsKCkpLCB3b3JsZCk7CisgICAg ICAgICAgICBpZiAobV9wYWdlKQorICAgICAgICAgICAgICAgIG1fcGFnZS0+c2V0QXNSdW5uaW5n VXNlclNjcmlwdHMoKTsKKyAgICAgICAgICAgIGlmIChtX3NjcmlwdCkKKyAgICAgICAgICAgICAg ICBtX3NjcmlwdC0+ZXZhbHVhdGVJbldvcmxkKFNjcmlwdFNvdXJjZUNvZGUoc2NyaXB0LnNvdXJj ZSgpLCBzY3JpcHQudXJsKCkpLCB3b3JsZCk7CiAgICAgICAgIH0KICAgICB9KTsKIH0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVyLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5jcHAJKHJldmlz aW9uIDIxNTc5MSkKKysrIFNvdXJjZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRDb250cm9sbGVy LmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsNyArNTIsNyBAQCBVc2VyQ29udGVudENvbnRyb2xs ZXI6On5Vc2VyQ29udGVudENvbnRyCiB7CiB9CiAKLXZvaWQgVXNlckNvbnRlbnRDb250cm9sbGVy Ojpmb3JFYWNoVXNlclNjcmlwdChjb25zdCBzdGQ6OmZ1bmN0aW9uPHZvaWQoRE9NV3JhcHBlcldv cmxkJiwgY29uc3QgVXNlclNjcmlwdCYpPiYgZnVuY3RvcikgY29uc3QKK3ZvaWQgVXNlckNvbnRl bnRDb250cm9sbGVyOjpmb3JFYWNoVXNlclNjcmlwdChGdW5jdGlvbjx2b2lkKERPTVdyYXBwZXJX b3JsZCYsIGNvbnN0IFVzZXJTY3JpcHQmKT4mJiBmdW5jdG9yKSBjb25zdAogewogICAgIGZvciAo Y29uc3QgYXV0byYgd29ybGRBbmRVc2VyU2NyaXB0VmVjdG9yIDogbV91c2VyU2NyaXB0cykgewog ICAgICAgICBhdXRvJiB3b3JsZCA9ICp3b3JsZEFuZFVzZXJTY3JpcHRWZWN0b3Iua2V5LmdldCgp OwpAQCAtNjEsNyArNjEsNyBAQCB2b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6Zm9yRWFjaFVz ZXJTCiAgICAgfQogfQogCi12b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6Zm9yRWFjaFVzZXJT dHlsZVNoZWV0KGNvbnN0IHN0ZDo6ZnVuY3Rpb248dm9pZChjb25zdCBVc2VyU3R5bGVTaGVldCYp PiYgZnVuY3RvcikgY29uc3QKK3ZvaWQgVXNlckNvbnRlbnRDb250cm9sbGVyOjpmb3JFYWNoVXNl clN0eWxlU2hlZXQoRnVuY3Rpb248dm9pZChjb25zdCBVc2VyU3R5bGVTaGVldCYpPiYmIGZ1bmN0 b3IpIGNvbnN0CiB7CiAgICAgZm9yIChhdXRvJiBzdHlsZVNoZWV0VmVjdG9yIDogbV91c2VyU3R5 bGVTaGVldHMudmFsdWVzKCkpIHsKICAgICAgICAgZm9yIChjb25zdCBhdXRvJiBzdHlsZVNoZWV0 IDogKnN0eWxlU2hlZXRWZWN0b3IpCkBAIC03MCw3ICs3MCw3IEBAIHZvaWQgVXNlckNvbnRlbnRD b250cm9sbGVyOjpmb3JFYWNoVXNlclMKIH0KIAogI2lmIEVOQUJMRShVU0VSX01FU1NBR0VfSEFO RExFUlMpCi12b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6Zm9yRWFjaFVzZXJNZXNzYWdlSGFu ZGxlcihjb25zdCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29uc3QgVXNlck1lc3NhZ2VIYW5kbGVyRGVz Y3JpcHRvciYpPiYpIGNvbnN0Cit2b2lkIFVzZXJDb250ZW50Q29udHJvbGxlcjo6Zm9yRWFjaFVz ZXJNZXNzYWdlSGFuZGxlcihGdW5jdGlvbjx2b2lkKGNvbnN0IFVzZXJNZXNzYWdlSGFuZGxlckRl c2NyaXB0b3ImKT4mJikgY29uc3QKIHsKIH0KICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUv cGFnZS9Vc2VyQ29udGVudENvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oCShyZXZpc2lvbiAyMTU3OTEpCisrKyBTb3Vy Y2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBA IC00OCwxMCArNDgsMTAgQEAgcHJpdmF0ZToKICAgICBVc2VyQ29udGVudENvbnRyb2xsZXIoKTsK IAogICAgIC8vIFVzZXJDb250ZW50UHJvdmlkZXIKLSAgICB2b2lkIGZvckVhY2hVc2VyU2NyaXB0 KGNvbnN0IHN0ZDo6ZnVuY3Rpb248dm9pZChET01XcmFwcGVyV29ybGQmLCBjb25zdCBVc2VyU2Ny aXB0Jik+JikgY29uc3Qgb3ZlcnJpZGU7Ci0gICAgdm9pZCBmb3JFYWNoVXNlclN0eWxlU2hlZXQo Y29uc3Qgc3RkOjpmdW5jdGlvbjx2b2lkKGNvbnN0IFVzZXJTdHlsZVNoZWV0Jik+JikgY29uc3Qg b3ZlcnJpZGU7CisgICAgdm9pZCBmb3JFYWNoVXNlclNjcmlwdChGdW5jdGlvbjx2b2lkKERPTVdy YXBwZXJXb3JsZCYsIGNvbnN0IFVzZXJTY3JpcHQmKT4mJikgY29uc3QgZmluYWw7CisgICAgdm9p ZCBmb3JFYWNoVXNlclN0eWxlU2hlZXQoRnVuY3Rpb248dm9pZChjb25zdCBVc2VyU3R5bGVTaGVl dCYpPiYmKSBjb25zdCBmaW5hbDsKICNpZiBFTkFCTEUoVVNFUl9NRVNTQUdFX0hBTkRMRVJTKQot ICAgIHZvaWQgZm9yRWFjaFVzZXJNZXNzYWdlSGFuZGxlcihjb25zdCBzdGQ6OmZ1bmN0aW9uPHZv aWQoY29uc3QgVXNlck1lc3NhZ2VIYW5kbGVyRGVzY3JpcHRvciYpPiYpIGNvbnN0IG92ZXJyaWRl OworICAgIHZvaWQgZm9yRWFjaFVzZXJNZXNzYWdlSGFuZGxlcihGdW5jdGlvbjx2b2lkKGNvbnN0 IFVzZXJNZXNzYWdlSGFuZGxlckRlc2NyaXB0b3ImKT4mJikgY29uc3QgZmluYWw7CiAjZW5kaWYK ICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQogICAgIENvbnRlbnRFeHRlbnNpb25zOjpD b250ZW50RXh0ZW5zaW9uc0JhY2tlbmQmIHVzZXJDb250ZW50RXh0ZW5zaW9uQmFja2VuZCgpIG92 ZXJyaWRlIHsgcmV0dXJuIG1fY29udGVudEV4dGVuc2lvbkJhY2tlbmQ7IH0KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BhZ2UvVXNlckNvbnRlbnRQcm92aWRlci5oCShyZXZpc2lvbiAyMTU3OTEpCisr KyBTb3VyY2UvV2ViQ29yZS9wYWdlL1VzZXJDb250ZW50UHJvdmlkZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIlVzZXJTdHlsZVNoZWV0VHlwZXMuaCIKICNp bmNsdWRlIDxmdW5jdGlvbmFsPgogI2luY2x1ZGUgPHd0Zi9Gb3J3YXJkLmg+CisjaW5jbHVkZSA8 d3RmL0Z1bmN0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYv UmVmQ291bnRlZC5oPgogCkBAIC03MywxMCArNzQsMTAgQEAgcHVibGljOgogICAgIFdFQkNPUkVf RVhQT1JUIFVzZXJDb250ZW50UHJvdmlkZXIoKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2aXJ0dWFs IH5Vc2VyQ29udGVudFByb3ZpZGVyKCk7CiAKLSAgICB2aXJ0dWFsIHZvaWQgZm9yRWFjaFVzZXJT Y3JpcHQoY29uc3Qgc3RkOjpmdW5jdGlvbjx2b2lkKERPTVdyYXBwZXJXb3JsZCYsIGNvbnN0IFVz ZXJTY3JpcHQmKT4mKSBjb25zdCA9IDA7Ci0gICAgdmlydHVhbCB2b2lkIGZvckVhY2hVc2VyU3R5 bGVTaGVldChjb25zdCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29uc3QgVXNlclN0eWxlU2hlZXQmKT4m KSBjb25zdCA9IDA7CisgICAgdmlydHVhbCB2b2lkIGZvckVhY2hVc2VyU2NyaXB0KEZ1bmN0aW9u PHZvaWQoRE9NV3JhcHBlcldvcmxkJiwgY29uc3QgVXNlclNjcmlwdCYpPiYmKSBjb25zdCA9IDA7 CisgICAgdmlydHVhbCB2b2lkIGZvckVhY2hVc2VyU3R5bGVTaGVldChGdW5jdGlvbjx2b2lkKGNv bnN0IFVzZXJTdHlsZVNoZWV0Jik+JiYpIGNvbnN0ID0gMDsKICNpZiBFTkFCTEUoVVNFUl9NRVNT QUdFX0hBTkRMRVJTKQotICAgIHZpcnR1YWwgdm9pZCBmb3JFYWNoVXNlck1lc3NhZ2VIYW5kbGVy KGNvbnN0IHN0ZDo6ZnVuY3Rpb248dm9pZChjb25zdCBVc2VyTWVzc2FnZUhhbmRsZXJEZXNjcmlw dG9yJik+JikgY29uc3QgPSAwOworICAgIHZpcnR1YWwgdm9pZCBmb3JFYWNoVXNlck1lc3NhZ2VI YW5kbGVyKEZ1bmN0aW9uPHZvaWQoY29uc3QgVXNlck1lc3NhZ2VIYW5kbGVyRGVzY3JpcHRvciYp PiYmKSBjb25zdCA9IDA7CiAjZW5kaWYKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQog ICAgIHZpcnR1YWwgQ29udGVudEV4dGVuc2lvbnM6OkNvbnRlbnRFeHRlbnNpb25zQmFja2VuZCYg dXNlckNvbnRlbnRFeHRlbnNpb25CYWNrZW5kKCkgPSAwOwpJbmRleDogU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkocmV2aXNp b24gMjE1ODIzKQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTctMDQtMjYgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5z ZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBNYWtlIHVzZXIgc2NyaXB0IGluamVjdGlvbiBtb3Jl IHJvYnVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTcxMzM5CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zMDY0MzY5MT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvVXNlckNvbnRl bnQvV2ViVXNlckNvbnRlbnRDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViVXNl ckNvbnRlbnRDb250cm9sbGVyOjpmb3JFYWNoVXNlclNjcmlwdCk6CisgICAgICAgIChXZWJLaXQ6 OldlYlVzZXJDb250ZW50Q29udHJvbGxlcjo6Zm9yRWFjaFVzZXJTdHlsZVNoZWV0KToKKyAgICAg ICAgKFdlYktpdDo6V2ViVXNlckNvbnRlbnRDb250cm9sbGVyOjpmb3JFYWNoVXNlck1lc3NhZ2VI YW5kbGVyKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1VzZXJDb250ZW50L1dlYlVzZXJDb250ZW50 Q29udHJvbGxlci5oOgorCiAyMDE3LTA0LTI2ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxl LmNvbT4KIAogICAgICAgICBFbmFibGUgZXhwaXJlZC1vbmx5IHJlbG9hZCBwb2xpY3kgb24gTWFj IGFuZCBpT1MKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvVXNlckNvbnRlbnQvV2Vi VXNlckNvbnRlbnRDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1VzZXJDb250ZW50L1dlYlVzZXJDb250ZW50Q29udHJvbGxlci5jcHAJKHJldmlz aW9uIDIxNTc5MSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvVXNlckNvbnRlbnQvV2Vi VXNlckNvbnRlbnRDb250cm9sbGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDg4LDcgKzQ4OCw3 IEBAIHZvaWQgV2ViVXNlckNvbnRlbnRDb250cm9sbGVyOjpyZW1vdmVBbGwKICAgICB9CiB9CiAK LXZvaWQgV2ViVXNlckNvbnRlbnRDb250cm9sbGVyOjpmb3JFYWNoVXNlclNjcmlwdChjb25zdCBz dGQ6OmZ1bmN0aW9uPHZvaWQoV2ViQ29yZTo6RE9NV3JhcHBlcldvcmxkJiwgY29uc3QgV2ViQ29y ZTo6VXNlclNjcmlwdCYpPiYgZnVuY3RvcikgY29uc3QKK3ZvaWQgV2ViVXNlckNvbnRlbnRDb250 cm9sbGVyOjpmb3JFYWNoVXNlclNjcmlwdChGdW5jdGlvbjx2b2lkKFdlYkNvcmU6OkRPTVdyYXBw ZXJXb3JsZCYsIGNvbnN0IFdlYkNvcmU6OlVzZXJTY3JpcHQmKT4mJiBmdW5jdG9yKSBjb25zdAog ewogICAgIGZvciAoY29uc3QgYXV0byYgd29ybGRBbmRVc2VyU2NyaXB0VmVjdG9yIDogbV91c2Vy U2NyaXB0cykgewogICAgICAgICBhdXRvJiB3b3JsZCA9IHdvcmxkQW5kVXNlclNjcmlwdFZlY3Rv ci5rZXktPmNvcmVXb3JsZCgpOwpAQCAtNDk3LDcgKzQ5Nyw3IEBAIHZvaWQgV2ViVXNlckNvbnRl bnRDb250cm9sbGVyOjpmb3JFYWNoVXMKICAgICB9CiB9CiAKLXZvaWQgV2ViVXNlckNvbnRlbnRD b250cm9sbGVyOjpmb3JFYWNoVXNlclN0eWxlU2hlZXQoY29uc3Qgc3RkOjpmdW5jdGlvbjx2b2lk KGNvbnN0IFdlYkNvcmU6OlVzZXJTdHlsZVNoZWV0Jik+JiBmdW5jdG9yKSBjb25zdAordm9pZCBX ZWJVc2VyQ29udGVudENvbnRyb2xsZXI6OmZvckVhY2hVc2VyU3R5bGVTaGVldChGdW5jdGlvbjx2 b2lkKGNvbnN0IFdlYkNvcmU6OlVzZXJTdHlsZVNoZWV0Jik+JiYgZnVuY3RvcikgY29uc3QKIHsK ICAgICBmb3IgKGF1dG8mIHN0eWxlU2hlZXRWZWN0b3IgOiBtX3VzZXJTdHlsZVNoZWV0cy52YWx1 ZXMoKSkgewogICAgICAgICBmb3IgKGNvbnN0IGF1dG8mIGlkZW50aWZpZXJVc2VyU3R5bGVTaGVl dFBhaXIgOiBzdHlsZVNoZWV0VmVjdG9yKQpAQCAtNTA2LDcgKzUwNiw3IEBAIHZvaWQgV2ViVXNl ckNvbnRlbnRDb250cm9sbGVyOjpmb3JFYWNoVXMKIH0KIAogI2lmIEVOQUJMRShVU0VSX01FU1NB R0VfSEFORExFUlMpCi12b2lkIFdlYlVzZXJDb250ZW50Q29udHJvbGxlcjo6Zm9yRWFjaFVzZXJN ZXNzYWdlSGFuZGxlcihjb25zdCBzdGQ6OmZ1bmN0aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6VXNl ck1lc3NhZ2VIYW5kbGVyRGVzY3JpcHRvciYpPiYgZnVuY3RvcikgY29uc3QKK3ZvaWQgV2ViVXNl ckNvbnRlbnRDb250cm9sbGVyOjpmb3JFYWNoVXNlck1lc3NhZ2VIYW5kbGVyKEZ1bmN0aW9uPHZv aWQoY29uc3QgV2ViQ29yZTo6VXNlck1lc3NhZ2VIYW5kbGVyRGVzY3JpcHRvciYpPiYmIGZ1bmN0 b3IpIGNvbnN0CiB7CiAgICAgZm9yIChjb25zdCBhdXRvJiB1c2VyTWVzc2FnZUhhbmRsZXJWZWN0 b3IgOiBtX3VzZXJNZXNzYWdlSGFuZGxlcnMudmFsdWVzKCkpIHsKICAgICAgICAgZm9yIChjb25z dCBhdXRvJiB1c2VyTWVzc2FnZUhhbmRsZXIgOiB1c2VyTWVzc2FnZUhhbmRsZXJWZWN0b3IpCklu ZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1VzZXJDb250ZW50L1dlYlVzZXJDb250ZW50 Q29udHJvbGxlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvVXNl ckNvbnRlbnQvV2ViVXNlckNvbnRlbnRDb250cm9sbGVyLmgJKHJldmlzaW9uIDIxNTc5MSkKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvVXNlckNvbnRlbnQvV2ViVXNlckNvbnRlbnRDb250 cm9sbGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTc0LDEwICs3NCwxMCBAQCBwcml2YXRlOgogICAg IGV4cGxpY2l0IFdlYlVzZXJDb250ZW50Q29udHJvbGxlcih1aW50NjRfdCBpZGVudGlmaWVyKTsK IAogICAgIC8vIFdlYkNvcmU6OlVzZXJDb250ZW50UHJvdmlkZXIKLSAgICB2b2lkIGZvckVhY2hV c2VyU2NyaXB0KGNvbnN0IHN0ZDo6ZnVuY3Rpb248dm9pZChXZWJDb3JlOjpET01XcmFwcGVyV29y bGQmLCBjb25zdCBXZWJDb3JlOjpVc2VyU2NyaXB0Jik+JikgY29uc3Qgb3ZlcnJpZGU7Ci0gICAg dm9pZCBmb3JFYWNoVXNlclN0eWxlU2hlZXQoY29uc3Qgc3RkOjpmdW5jdGlvbjx2b2lkKGNvbnN0 IFdlYkNvcmU6OlVzZXJTdHlsZVNoZWV0Jik+JikgY29uc3Qgb3ZlcnJpZGU7CisgICAgdm9pZCBm b3JFYWNoVXNlclNjcmlwdChGdW5jdGlvbjx2b2lkKFdlYkNvcmU6OkRPTVdyYXBwZXJXb3JsZCYs IGNvbnN0IFdlYkNvcmU6OlVzZXJTY3JpcHQmKT4mJikgY29uc3QgZmluYWw7CisgICAgdm9pZCBm b3JFYWNoVXNlclN0eWxlU2hlZXQoRnVuY3Rpb248dm9pZChjb25zdCBXZWJDb3JlOjpVc2VyU3R5 bGVTaGVldCYpPiYmKSBjb25zdCBmaW5hbDsKICNpZiBFTkFCTEUoVVNFUl9NRVNTQUdFX0hBTkRM RVJTKQotICAgIHZvaWQgZm9yRWFjaFVzZXJNZXNzYWdlSGFuZGxlcihjb25zdCBzdGQ6OmZ1bmN0 aW9uPHZvaWQoY29uc3QgV2ViQ29yZTo6VXNlck1lc3NhZ2VIYW5kbGVyRGVzY3JpcHRvciYpPiYp IGNvbnN0IG92ZXJyaWRlOworICAgIHZvaWQgZm9yRWFjaFVzZXJNZXNzYWdlSGFuZGxlcihGdW5j dGlvbjx2b2lkKGNvbnN0IFdlYkNvcmU6OlVzZXJNZXNzYWdlSGFuZGxlckRlc2NyaXB0b3ImKT4m JikgY29uc3QgZmluYWw7CiAjZW5kaWYKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQog ICAgIFdlYkNvcmU6OkNvbnRlbnRFeHRlbnNpb25zOjpDb250ZW50RXh0ZW5zaW9uc0JhY2tlbmQm IHVzZXJDb250ZW50RXh0ZW5zaW9uQmFja2VuZCgpIG92ZXJyaWRlIHsgcmV0dXJuIG1fY29udGVu dEV4dGVuc2lvbkJhY2tlbmQ7IH0K