182549 2018-02-06 13:41:37 -0800 put_to_scope/get_from_scope should not cache lexical scopes when expecting a global object 2018-03-25 22:35:50 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=184001 InRadar P2 Normal --- 1 keith_miller keith_miller ews-watchlist jfbastien mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1396922 0 keith_miller 2018-02-06 13:41:37 -0800 put_to_scope/get_from_scope should not cache lexical scopes when expecting a global object 1396930 1 333214 keith_miller 2018-02-06 13:54:02 -0800 Created attachment 333214 Patch 1396934 2 333214 saam 2018-02-06 14:03:43 -0800 Comment on attachment 333214 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333214&action=review > Source/JavaScriptCore/jit/JITPropertyAccess.cpp:861 > + emitLoadWithStructureCheck(scope, structureSlot); // Structure check covers var injection since we don't cache structures for anything but the GlobalObject. Also: this should say that resolve_scope does the check for var injection firing. 1396935 3 mark.lam 2018-02-06 14:04:06 -0800 <rdar://problem/36189995> 1396936 4 333214 saam 2018-02-06 14:05:38 -0800 Comment on attachment 333214 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333214&action=review > Source/JavaScriptCore/ChangeLog:12 > + in the DFG, does not follow this same assumption so we could no comma needed > Source/JavaScriptCore/ChangeLog:17 > + GlobalPropertyWithVarInjectionChecks. or GlobalProperty 1396947 5 333214 keith_miller 2018-02-06 14:14:50 -0800 Comment on attachment 333214 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333214&action=review >> Source/JavaScriptCore/ChangeLog:12 >> + in the DFG, does not follow this same assumption so we could > > no comma needed Fixed. >> Source/JavaScriptCore/ChangeLog:17 >> + GlobalPropertyWithVarInjectionChecks. > > or GlobalProperty I don't think that was possible before? I can update the sentence though. >> Source/JavaScriptCore/jit/JITPropertyAccess.cpp:861 >> + emitLoadWithStructureCheck(scope, structureSlot); // Structure check covers var injection since we don't cache structures for anything but the GlobalObject. > > Also: this should say that resolve_scope does the check for var injection firing. Fixed. 1396953 6 keith_miller 2018-02-06 14:42:31 -0800 Committed r228193: <https://trac.webkit.org/changeset/228193> 1401842 7 333214 jfbastien 2018-02-23 16:59:43 -0800 Comment on attachment 333214 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333214&action=review > Source/JavaScriptCore/runtime/Options.h:253 > + v(bool, enableJITDebugAssetions, !ASSERT_DISABLED, Normal, nullptr) \ Typo enableJITDebugAssetions 1409241 8 saam 2018-03-25 22:35:47 -0700 (In reply to JF Bastien from comment #7) > Comment on attachment 333214 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=333214&action=review > > > Source/JavaScriptCore/runtime/Options.h:253 > > + v(bool, enableJITDebugAssetions, !ASSERT_DISABLED, Normal, nullptr) \ > > Typo enableJITDebugAssetions https://bugs.webkit.org/show_bug.cgi?id=184001 333214 2018-02-06 13:54:02 -0800 2018-02-06 14:03:43 -0800 Patch bug-182549-20180206135401.patch text/plain 10213 keith_miller U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3OTk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAw ZGFhZmRkYmM5YWM3MjA1ZDljNDg5NmJmOWFjYWU0OWEwZGExNjE3Li5kMDJmMjhlNjAyYzcyNDc1 Mzc5YTRmNjU1Y2NhYzJhMDIyZWQ4NDNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMiBAQAorMjAxOC0wMi0wNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFwcGxl LmNvbT4KKworICAgICAgICBwdXRfdG9fc2NvcGUvZ2V0X2Zyb21fc2NvcGUgc2hvdWxkIG5vdCBj YWNoZSBsZXhpY2FsIHNjb3BlcyB3aGVuIGV4cGVjdGluZyBhIGdsb2JhbCBvYmplY3QKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU0OQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vMzYxODk5OTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUHJldmlvdXNseSwgdGhlIGxsaW50L2Jhc2VsaW5lIGNhY2hp bmcgZm9yIHB1dF90b19zY29wZSBhbmQKKyAgICAgICAgZ2V0X2Zyb21fc2NvcGUgd291bGQgY2Fj aGUgbGV4aWNhbCBlbnZpcm9ubWVudHMgd2hlbiB0aGUKKyAgICAgICAgdmFySW5qZWN0aW9uV2F0 Y2hwb2ludCBoYWQgYmVlbiBmaXJlZCBmb3IgZ2xvYmFsIHByb3BlcnRpZXMuIENvZGUKKyAgICAg ICAgaW4gdGhlIERGRywgZG9lcyBub3QgZm9sbG93IHRoaXMgc2FtZSBhc3N1bXB0aW9uIHNvIHdl IGNvdWxkCisgICAgICAgIHBvdGVudGlhbGx5IHJldHVybiB0aGUgd3JvbmcgcmVzdWx0LiBBZGRp dGlvbmFsbHksIHRoZSBiYXNlbGluZQorICAgICAgICB3b3VsZCB3cml0ZSBiYXJyaWVyIHRoZSBn bG9iYWwgb2JqZWN0IHJhdGhlciB0aGFuIHRoZSBsZXhpY2FsCisgICAgICAgIGVudmlyb21lbnQg b2JqZWN0LiBUaGlzIHBhdGNoIG1ha2VzIGl0IHNvIHRoYXQgd2UgZG8gbm90IGNhY2hlCisgICAg ICAgIGFueXRoaW5nIG90aGVyIHRoYW4gdGhlIGdsb2JhbCBvYmplY3QgZm9yIHdoZW4gdGhlIHJl c29sdmUgdHlwZSBpcworICAgICAgICBHbG9iYWxQcm9wZXJ0eVdpdGhWYXJJbmplY3Rpb25DaGVj a3MuCisKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuY3BwOgorICAgICAgICAo SlNDOjpNYWNyb0Fzc2VtYmxlcjo6aml0QXNzZXJ0KToKKyAgICAgICAgKiBhc3NlbWJsZXIvTWFj cm9Bc3NlbWJsZXIuaDoKKyAgICAgICAgKiBqaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwOgorICAg ICAgICAoSlNDOjpKSVQ6OmVtaXRfb3BfZ2V0X2Zyb21fc2NvcGUpOgorICAgICAgICAoSlNDOjpK SVQ6OmVtaXRfb3BfcHV0X3RvX3Njb3BlKToKKyAgICAgICAgKiBydW50aW1lL0NvbW1vblNsb3dQ YXRocy5oOgorICAgICAgICAoSlNDOjpDb21tb25TbG93UGF0aHM6OnRyeUNhY2hlUHV0VG9TY29w ZUdsb2JhbCk6CisgICAgICAgIChKU0M6OkNvbW1vblNsb3dQYXRoczo6dHJ5Q2FjaGVHZXRGcm9t U2NvcGVHbG9iYWwpOgorICAgICAgICAqIHJ1bnRpbWUvT3B0aW9ucy5oOgorCiAyMDE4LTAyLTAx ICBLZWl0aCBNaWxsZXIgIDxrZWl0aF9taWxsZXJAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBj cmFzaGVzIGR1ZSB0byBtaXNoYW5kbGluZyBjdXN0b20gc2VjdGlvbnMuCmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNzZW1ibGVyLmNwcCBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuY3BwCmluZGV4IDgyYjI1 YzgxODEwOTM1MjVhMjRjYTY3MGU2YjhlZmEzYjg4NTljMTIuLjBkMTZkZjJjNGU4ZGUzZGQ3NGJi M2UzNjI4NzA0MGM5YWU2NDkyYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9h c3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuY3BwCkBAIC0yOCwxMyArMjgsMjQgQEAKIAogI2lmIEVO QUJMRShBU1NFTUJMRVIpCiAKKyNpbmNsdWRlICJPcHRpb25zLmgiCiAjaW5jbHVkZSAiUHJvYmVD b250ZXh0LmgiCiAjaW5jbHVkZSA8d3RmL1ByaW50U3RyZWFtLmg+CisjaW5jbHVkZSA8d3RmL1Nj b3BlZExhbWJkYS5oPgogCiBuYW1lc3BhY2UgSlNDIHsKIAogY29uc3QgZG91YmxlIE1hY3JvQXNz ZW1ibGVyOjp0d29Ub1RoZTMyID0gKGRvdWJsZSkweDEwMDAwMDAwMHVsbDsKIAordm9pZCBNYWNy b0Fzc2VtYmxlcjo6aml0QXNzZXJ0KGNvbnN0IFNjb3BlZExhbWJkYTxKdW1wKHZvaWQpPiYgZnVu Y3RvcikKK3sKKyAgICBpZiAoT3B0aW9uczo6ZW5hYmxlSklURGVidWdBc3NldGlvbnMoKSkgewor ICAgICAgICBKdW1wIHBhc3NlZCA9IGZ1bmN0b3IoKTsKKyAgICAgICAgYnJlYWtwb2ludCgpOwor ICAgICAgICBwYXNzZWQubGluayh0aGlzKTsKKyAgICB9Cit9CisKICNpZiBFTkFCTEUoTUFTTV9Q Uk9CRSkKIHN0YXRpYyB2b2lkIHN0ZEZ1bmN0aW9uQ2FsbGJhY2soUHJvYmU6OkNvbnRleHQmIGNv bnRleHQpCiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01h Y3JvQXNzZW1ibGVyLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvYXNzZW1ibGVyL01hY3JvQXNz ZW1ibGVyLmgKaW5kZXggYjk5YjZiM2ZlYjNjZmFmOWZmODU0MzFkMGEyN2MxNGMxZGNmOThhOS4u OTlkODA2NTc1ZjRjZmRkYjQwYTI5NmQyM2I1MjQzODAzZjI2MWY3MSAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2Fzc2VtYmxlci9NYWNyb0Fzc2VtYmxlci5oCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9hc3NlbWJsZXIvTWFjcm9Bc3NlbWJsZXIuaApAQCAtNjEsNiArNjEs MTMgQEAgbmFtZXNwYWNlIEpTQyB7IHR5cGVkZWYgTWFjcm9Bc3NlbWJsZXJYODZfNjQgTWFjcm9B c3NlbWJsZXJCYXNlOyB9OwogCiAjaW5jbHVkZSAiTWFjcm9Bc3NlbWJsZXJIZWxwZXJzLmgiCiAK K25hbWVzcGFjZSBXVEYgeworCit0ZW1wbGF0ZTx0eXBlbmFtZSBGdW5jdGlvblR5cGU+CitjbGFz cyBTY29wZWRMYW1iZGE7CisKK30gLy8gbmFtZXNwYWNlIFdURgorCiBuYW1lc3BhY2UgSlNDIHsK IAogI2lmIEVOQUJMRShNQVNNX1BST0JFKQpAQCAtMTg4NCw2ICsxODkxLDkgQEAgcHVibGljOgog ICAgICAgICB1cnNoaWZ0MzIoc3JjLCB0cnVzdGVkSW1tMzJGb3JTaGlmdChhbW91bnQpLCBkZXN0 KTsKICAgICB9CiAKKyAgICAvLyBJZiB0aGUgcmVzdWx0IGp1bXAgaXMgdGFrZW4gdGhhdCBtZWFu cyB0aGUgYXNzZXJ0IHBhc3NlZC4KKyAgICB2b2lkIGppdEFzc2VydChjb25zdCBXVEY6OlNjb3Bl ZExhbWJkYTxKdW1wKHZvaWQpPiYpOworCiAjaWYgRU5BQkxFKE1BU01fUFJPQkUpCiAgICAgLy8g VGhpcyBmdW5jdGlvbiBlbWl0cyBjb2RlIHRvIHByZXNlcnZlIHRoZSBDUFVTdGF0ZSAoZS5nLiBy ZWdpc3RlcnMpLAogICAgIC8vIGNhbGwgYSB1c2VyIHN1cHBsaWVkIHByb2JlIGZ1bmN0aW9uLCBh bmQgcmVzdG9yZSB0aGUgQ1BVU3RhdGUgYmVmb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVFByb3BlcnR5QWNjZXNzLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUUHJvcGVydHlBY2Nlc3MuY3BwCmluZGV4IDVhMDI1YzJkYmM1YzRlOTFhMTQyNTZh NGY3MThjMTJhNDE1OTI3MmMuLjU3ZDY1NmI3NzZkNjdiNWUzNjkzNzkxOTQ0OTYwMzM0ZGRlZjcy NzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nl c3MuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUUHJvcGVydHlBY2Nlc3Mu Y3BwCkBAIC00Myw2ICs0Myw3IEBACiAjaW5jbHVkZSAiU2NvcGVkQXJndW1lbnRzVGFibGUuaCIK ICNpbmNsdWRlICJTbG93UGF0aENhbGwuaCIKICNpbmNsdWRlICJTdHJ1Y3R1cmVTdHViSW5mby5o IgorI2luY2x1ZGUgPHd0Zi9TY29wZWRMYW1iZGEuaD4KICNpbmNsdWRlIDx3dGYvU3RyaW5nUHJp bnRTdHJlYW0uaD4KIAogCkBAIC04NTcsMTIgKzg1OCwxNiBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9n ZXRfZnJvbV9zY29wZShJbnN0cnVjdGlvbiogY3VycmVudEluc3RydWN0aW9uKQogICAgICAgICBz d2l0Y2ggKHJlc29sdmVUeXBlKSB7CiAgICAgICAgIGNhc2UgR2xvYmFsUHJvcGVydHk6CiAgICAg ICAgIGNhc2UgR2xvYmFsUHJvcGVydHlXaXRoVmFySW5qZWN0aW9uQ2hlY2tzOiB7Ci0gICAgICAg ICAgICBlbWl0TG9hZFdpdGhTdHJ1Y3R1cmVDaGVjayhzY29wZSwgc3RydWN0dXJlU2xvdCk7IC8v IFN0cnVjdHVyZSBjaGVjayBjb3ZlcnMgdmFyIGluamVjdGlvbi4KKyAgICAgICAgICAgIGVtaXRM b2FkV2l0aFN0cnVjdHVyZUNoZWNrKHNjb3BlLCBzdHJ1Y3R1cmVTbG90KTsgLy8gU3RydWN0dXJl IGNoZWNrIGNvdmVycyB2YXIgaW5qZWN0aW9uIHNpbmNlIHdlIGRvbid0IGNhY2hlIHN0cnVjdHVy ZXMgZm9yIGFueXRoaW5nIGJ1dCB0aGUgR2xvYmFsT2JqZWN0LgogICAgICAgICAgICAgR1BSUmVn IGJhc2UgPSByZWdUMDsKICAgICAgICAgICAgIEdQUlJlZyByZXN1bHQgPSByZWdUMDsKICAgICAg ICAgICAgIEdQUlJlZyBvZmZzZXQgPSByZWdUMTsKICAgICAgICAgICAgIEdQUlJlZyBzY3JhdGNo ID0gcmVnVDI7Ci0gICAgICAgICAgICAKKworICAgICAgICAgICAgaml0QXNzZXJ0KHNjb3BlZExh bWJkYTxKdW1wKHZvaWQpPihbJl0gKCkgLT4gSnVtcCB7CisgICAgICAgICAgICAgICAgcmV0dXJu IGJyYW5jaFB0cihFcXVhbCwgYmFzZSwgVHJ1c3RlZEltbVB0cihtX2NvZGVCbG9jay0+Z2xvYmFs T2JqZWN0KCkpKTsKKyAgICAgICAgICAgIH0pKTsKKwogICAgICAgICAgICAgbG9hZDMyKG9wZXJh bmRTbG90LCBvZmZzZXQpOwogICAgICAgICAgICAgaWYgKCFBU1NFUlRfRElTQUJMRUQpIHsKICAg ICAgICAgICAgICAgICBKdW1wIGlzT3V0T2ZMaW5lID0gYnJhbmNoMzIoR3JlYXRlclRoYW5PckVx dWFsLCBvZmZzZXQsIFRydXN0ZWRJbW0zMihmaXJzdE91dE9mTGluZU9mZnNldCkpOwpAQCAtOTg1 LDkgKzk5MCwxMyBAQCB2b2lkIEpJVDo6ZW1pdF9vcF9wdXRfdG9fc2NvcGUoSW5zdHJ1Y3Rpb24q IGN1cnJlbnRJbnN0cnVjdGlvbikKICAgICAgICAgc3dpdGNoIChyZXNvbHZlVHlwZSkgewogICAg ICAgICBjYXNlIEdsb2JhbFByb3BlcnR5OgogICAgICAgICBjYXNlIEdsb2JhbFByb3BlcnR5V2l0 aFZhckluamVjdGlvbkNoZWNrczogewotICAgICAgICAgICAgZW1pdExvYWRXaXRoU3RydWN0dXJl Q2hlY2soc2NvcGUsIHN0cnVjdHVyZVNsb3QpOyAvLyBTdHJ1Y3R1cmUgY2hlY2sgY292ZXJzIHZh ciBpbmplY3Rpb24uCisgICAgICAgICAgICBlbWl0TG9hZFdpdGhTdHJ1Y3R1cmVDaGVjayhzY29w ZSwgc3RydWN0dXJlU2xvdCk7IC8vIFN0cnVjdHVyZSBjaGVjayBjb3ZlcnMgdmFyIGluamVjdGlv biBzaW5jZSB3ZSBkb24ndCBjYWNoZSBzdHJ1Y3R1cmVzIGZvciBhbnl0aGluZyBidXQgdGhlIEds b2JhbE9iamVjdC4KICAgICAgICAgICAgIGVtaXRHZXRWaXJ0dWFsUmVnaXN0ZXIodmFsdWUsIHJl Z1QyKTsKLSAgICAgICAgICAgIAorCisgICAgICAgICAgICBqaXRBc3NlcnQoc2NvcGVkTGFtYmRh PEp1bXAodm9pZCk+KFsmXSAoKSAtPiBKdW1wIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gYnJh bmNoUHRyKEVxdWFsLCByZWdUMCwgVHJ1c3RlZEltbVB0cihtX2NvZGVCbG9jay0+Z2xvYmFsT2Jq ZWN0KCkpKTsKKyAgICAgICAgICAgIH0pKTsKKwogICAgICAgICAgICAgbG9hZFB0cihBZGRyZXNz KHJlZ1QwLCBKU09iamVjdDo6YnV0dGVyZmx5T2Zmc2V0KCkpLCByZWdUMCk7CiAgICAgICAgICAg ICBsb2FkUHRyKG9wZXJhbmRTbG90LCByZWdUMSk7CiAgICAgICAgICAgICBuZWdQdHIocmVnVDEp OwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvQ29tbW9uU2xvd1Bh dGhzLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuaApp bmRleCA3ODZmOWQyMzk4MGYwYTMyOWQ4ZDBkOGVlMWViYTNlODA5NzY1OWQyLi44ZjdjNDQ0Mjg1 N2U1YzFkMWE1MDA1MGRmYTkwNDVmODA2NjBiZDZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvcnVudGltZS9Db21tb25TbG93UGF0aHMuaApAQCAtMTM4LDggKzEzOCwxMSBAQCBpbmxp bmUgdm9pZCB0cnlDYWNoZVB1dFRvU2NvcGVHbG9iYWwoCiAgICAgfQogICAgIAogICAgIGlmIChy ZXNvbHZlVHlwZSA9PSBHbG9iYWxQcm9wZXJ0eSB8fCByZXNvbHZlVHlwZSA9PSBHbG9iYWxQcm9w ZXJ0eVdpdGhWYXJJbmplY3Rpb25DaGVja3MpIHsKKyAgICAgICAgSlNHbG9iYWxPYmplY3QqIGds b2JhbE9iamVjdCA9IGNvZGVCbG9jay0+Z2xvYmFsT2JqZWN0KCk7CisgICAgICAgIEFTU0VSVChn bG9iYWxPYmplY3QgPT0gc2NvcGUgfHwgZ2xvYmFsT2JqZWN0LT52YXJJbmplY3Rpb25XYXRjaHBv aW50KCktPmhhc0JlZW5JbnZhbGlkYXRlZCgpKTsKICAgICAgICAgaWYgKCFzbG90LmlzQ2FjaGVh YmxlUHV0KCkKICAgICAgICAgICAgIHx8IHNsb3QuYmFzZSgpICE9IHNjb3BlCisgICAgICAgICAg ICB8fCBzY29wZSAhPSBnbG9iYWxPYmplY3QKICAgICAgICAgICAgIHx8ICFzY29wZS0+c3RydWN0 dXJlKCktPnByb3BlcnR5QWNjZXNzZXNBcmVDYWNoZWFibGUoKSkKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgCkBAIC0xODMsOSArMTg2LDExIEBAIGlubGluZSB2b2lkIHRyeUNhY2hlR2V0 RnJvbVNjb3BlR2xvYmFsKAogICAgIH0KIAogICAgIC8vIENvdmVycyBpbXBsaWNpdCBnbG9iYWxz LiBTaW5jZSB0aGV5IGRvbid0IGV4aXN0IHVudGlsIHRoZXkgZmlyc3QgZXhlY3V0ZSwgd2UgZGlk bid0IGtub3cgaG93IHRvIGNhY2hlIHRoZW0gYXQgY29tcGlsZSB0aW1lLgotICAgIGlmIChzbG90 LmlzQ2FjaGVhYmxlVmFsdWUoKSAmJiBzbG90LnNsb3RCYXNlKCkgPT0gc2NvcGUgJiYgc2NvcGUt PnN0cnVjdHVyZSgpLT5wcm9wZXJ0eUFjY2Vzc2VzQXJlQ2FjaGVhYmxlKCkpIHsKLSAgICAgICAg aWYgKHJlc29sdmVUeXBlID09IEdsb2JhbFByb3BlcnR5IHx8IHJlc29sdmVUeXBlID09IEdsb2Jh bFByb3BlcnR5V2l0aFZhckluamVjdGlvbkNoZWNrcykgewotICAgICAgICAgICAgQ29kZUJsb2Nr KiBjb2RlQmxvY2sgPSBleGVjLT5jb2RlQmxvY2soKTsKKyAgICBpZiAocmVzb2x2ZVR5cGUgPT0g R2xvYmFsUHJvcGVydHkgfHwgcmVzb2x2ZVR5cGUgPT0gR2xvYmFsUHJvcGVydHlXaXRoVmFySW5q ZWN0aW9uQ2hlY2tzKSB7CisgICAgICAgIENvZGVCbG9jayogY29kZUJsb2NrID0gZXhlYy0+Y29k ZUJsb2NrKCk7CisgICAgICAgIEpTR2xvYmFsT2JqZWN0KiBnbG9iYWxPYmplY3QgPSBjb2RlQmxv Y2stPmdsb2JhbE9iamVjdCgpOworICAgICAgICBBU1NFUlQoc2NvcGUgPT0gZ2xvYmFsT2JqZWN0 IHx8IGdsb2JhbE9iamVjdC0+dmFySW5qZWN0aW9uV2F0Y2hwb2ludCgpLT5oYXNCZWVuSW52YWxp ZGF0ZWQoKSk7CisgICAgICAgIGlmIChzbG90LmlzQ2FjaGVhYmxlVmFsdWUoKSAmJiBzbG90LnNs b3RCYXNlKCkgPT0gc2NvcGUgJiYgc2NvcGUgPT0gZ2xvYmFsT2JqZWN0ICYmIHNjb3BlLT5zdHJ1 Y3R1cmUoKS0+cHJvcGVydHlBY2Nlc3Nlc0FyZUNhY2hlYWJsZSgpKSB7CiAgICAgICAgICAgICBT dHJ1Y3R1cmUqIHN0cnVjdHVyZSA9IHNjb3BlLT5zdHJ1Y3R1cmUodm0pOwogICAgICAgICAgICAg ewogICAgICAgICAgICAgICAgIENvbmN1cnJlbnRKU0xvY2tlciBsb2NrZXIoY29kZUJsb2NrLT5t X2xvY2spOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9u cy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvT3B0aW9ucy5oCmluZGV4IGYwYzhi OTY1MDBlYTA2ODY3NTMwYjVjZWJmNjJkMGQ5NGI2ODlkNmIuLjRmMGM2MzY0Mzc5NDk1N2I5ZGUy ZTYyOTUzZDllNTliOTI1OTk4NmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9y dW50aW1lL09wdGlvbnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9PcHRp b25zLmgKQEAgLTI1MCw2ICsyNTAsNyBAQCBjb25zdGV4cHIgYm9vbCBlbmFibGVBc3luY0l0ZXJh dGlvbiA9IGZhbHNlOwogICAgIHYoYm9vbCwgYjNBbHdheXNGYWlsc0JlZm9yZUxpbmssIGZhbHNl LCBOb3JtYWwsIG51bGxwdHIpIFwKICAgICB2KGJvb2wsIGZ0bENyYXNoZXMsIGZhbHNlLCBOb3Jt YWwsIG51bGxwdHIpIC8qIGZvb2wtcHJvb2Ygd2F5IG9mIGNoZWNraW5nIHRoYXQgeW91IGVuZGVk IHVwIGluIHRoZSBGVEwuIDstKSAqL1wKICAgICB2KGJvb2wsIGNsb2JiZXJBbGxSZWdzSW5GVExJ Q1Nsb3dQYXRoLCAhQVNTRVJUX0RJU0FCTEVELCBOb3JtYWwsIG51bGxwdHIpIFwKKyAgICB2KGJv b2wsIGVuYWJsZUpJVERlYnVnQXNzZXRpb25zLCAhQVNTRVJUX0RJU0FCTEVELCBOb3JtYWwsIG51 bGxwdHIpIFwKICAgICB2KGJvb2wsIHVzZUFjY2Vzc0lubGluaW5nLCB0cnVlLCBOb3JtYWwsIG51 bGxwdHIpIFwKICAgICB2KHVuc2lnbmVkLCBtYXhBY2Nlc3NWYXJpYW50TGlzdFNpemUsIDgsIE5v cm1hbCwgbnVsbHB0cikgXAogICAgIHYoYm9vbCwgdXNlUG9seXZhcmlhbnREZXZpcnR1YWxpemF0 aW9uLCB0cnVlLCBOb3JtYWwsIG51bGxwdHIpIFwKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdl TG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggNjliNDE5NjVmOWJjY2I1YTI3OWZhYWFiY2Vm MWM4YzgwMzllNTMwZS4uYWJiMjZkZDkxOTliZDc1OTNhMDk4ZmNjM2M5ODhiZjE2ZDk5MTA5ZSAx MDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxNSBAQAorMjAxOC0wMi0wNiAgS2VpdGggTWlsbGVyICA8a2VpdGhfbWlsbGVyQGFw cGxlLmNvbT4KKworICAgICAgICBwdXRfdG9fc2NvcGUvZ2V0X2Zyb21fc2NvcGUgc2hvdWxkIG5v dCBjYWNoZSBsZXhpY2FsIHNjb3BlcyB3aGVuIGV4cGVjdGluZyBhIGdsb2JhbCBvYmplY3QKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MjU0OQorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzYxODk5OTU+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3MvdmFyLWluamVjdGlvbi1jYWNoZS1pbnZh bGlkYXRpb24uanM6IEFkZGVkLgorICAgICAgICAoYWxsb2NhdGVMb3RzT2ZUaGluZ3MpOgorICAg ICAgICAodGVzdCk6CisKIDIwMTgtMDItMDEgIEtlaXRoIE1pbGxlciAgPGtlaXRoX21pbGxlckBh cHBsZS5jb20+CiAKICAgICAgICAgRml4IGNyYXNoZXMgZHVlIHRvIG1pc2hhbmRsaW5nIGN1c3Rv bSBzZWN0aW9ucy4KZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3Zhci1pbmplY3Rpb24tY2Fj aGUtaW52YWxpZGF0aW9uLmpzIGIvSlNUZXN0cy9zdHJlc3MvdmFyLWluamVjdGlvbi1jYWNoZS1p bnZhbGlkYXRpb24uanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjAwZjM4ZmM2NmUwZmYyNjI2YWVkM2Q3YmFiMDli MDkxOTRhNWZmNAotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3Zhci1pbmplY3Rp b24tY2FjaGUtaW52YWxpZGF0aW9uLmpzCkBAIC0wLDAgKzEsMTkgQEAKK2EgPSAwOworCitmdW5j dGlvbiBhbGxvY2F0ZUxvdHNPZlRoaW5ncyhhcnJheSkgeworICAgIGZvciAobGV0IGkgPSAwOyBp IDwgMWU0OyBpKyspCisgICAgICAgIGFycmF5W2ldID0geyBuZXh0OiBhcnJheVtNYXRoLmZsb29y KGkgLyAyKV0gfTsKK30KKworZnVuY3Rpb24gdGVzdCgpIHsKKyAgICBhID0gNTsKKyAgICBmb3Ig KHZhciBpID0gMDsgaSA8IDFlMzsgaSsrKSB7CisgICAgICAgIGFsbG9jYXRlTG90c09mVGhpbmdz KFtdKTsKKyAgICAgICAgZWRlbkdDKCk7CisgICAgICAgIGV2YWwoInZhciBhID0gbmV3IEludDMy QXJyYXkoMTAwKTsiKTsKKyAgICB9Cit9Citub0lubGluZSh0ZXN0KTsKK25vREZHKHRlc3QpOwor Cit0ZXN0KCk7Cg==