185530 2018-05-10 14:27:48 -0700 DFG CFA should pick the right time to inject OSR entry data 2018-05-10 15:24:18 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo fpizlo ews-watchlist keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1422873 0 fpizlo 2018-05-10 14:27:48 -0700 Patch forthcoming. 1422876 1 340131 fpizlo 2018-05-10 14:30:39 -0700 Created attachment 340131 the patch 1422880 2 340131 saam 2018-05-10 14:36:02 -0700 Comment on attachment 340131 the patch r=me 1422905 3 fpizlo 2018-05-10 15:23:40 -0700 Landed in https://trac.webkit.org/changeset/231665/webkit 1422906 4 webkit-bug-importer 2018-05-10 15:24:18 -0700 <rdar://problem/40144150> 340131 2018-05-10 14:30:39 -0700 2018-05-10 14:36:02 -0700 the patch blah.patch text/plain 9237 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjMxNjU5KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBA CisyMDE4LTA1LTEwICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg REZHIENGQSBzaG91bGQgcGljayB0aGUgcmlnaHQgdGltZSB0byBpbmplY3QgT1NSIGVudHJ5IGRh dGEKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTUz MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAg ICAgUHJldmlvdXNseSwgd2Ugd291bGQgZG8gYSBib251cyBydW4gb2YgQ0ZBIHRvIGluamVjdCBP U1IgZW50cnkgZGF0YS4gVGhpcyBwYXRjaCBtYWtlcyB1cyBpbmplY3QKKyAgICAgICAgT1NSIGVu dHJ5IGRhdGEgYXMgcGFydCBvZiB0aGUgbm9ybWFsIGZsb3cgb2YgQ0ZBLCB3aGljaCByZWR1Y2Vz IHRoZSB0b3RhbCBudW1iZXIgb2YgQ0ZBCisgICAgICAgIHJlZXhlY3V0aW9ucyB3aGlsZSBtaW5p bWl6aW5nIHRoZSBsaWtlbGlob29kIHRoYXQgd2UgaGF2ZSBDRkEgZXhlY3V0ZSBjb25zdGFudHMg aW4gcGF0aHMgdGhhdAorICAgICAgICB3b3VsZCBldmVudHVhbGx5IExVQiB0byBub24tY29uc3Rh bnQuCisgICAgICAgIAorICAgICAgICBUaGlzIGxvb2tzIGxpa2UgYWxtb3N0IGEgMSUgc3BlZWQt dXAgb24gU3VuU3BpZGVyLUNvbXBpbGVUaW1lLgorCisgICAgICAgICogZGZnL0RGR0Jsb2NrU2V0 Lmg6CisgICAgICAgIChKU0M6OkRGRzo6QmxvY2tTZXQ6OnJlbW92ZSk6CisgICAgICAgICogZGZn L0RGR0NGQVBoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpDRkFQaGFzZTo6cnVuKToKKyAg ICAgICAgKEpTQzo6REZHOjpDRkFQaGFzZTo6aW5qZWN0T1NSKToKKyAgICAgICAgKEpTQzo6REZH OjpDRkFQaGFzZTo6cGVyZm9ybUJsb2NrQ0ZBKToKKwogMjAxOC0wNS0wOSAgQ2FpbyBMaW1hICA8 dGljYWlvbGltYUBnbWFpbC5jb20+CiAKICAgICAgICAgW0VTTmV4dF1bQmlnSW50XSBJbXBsZW1l bnQgc3VwcG9ydCBmb3IgIj09IiBvcGVyYXRpb24KSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHQmxvY2tTZXQuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUv ZGZnL0RGR0Jsb2NrU2V0LmgJKHJldmlzaW9uIDIzMTYwNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0 Q29yZS9kZmcvREZHQmxvY2tTZXQuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8q Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor ICogQ29weXJpZ2h0IChDKSAyMDE0LTIwMTggQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9y bXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3Zp ZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC00NCw2ICs0NCwxMiBAQCBwdWJs aWM6CiAgICAgICAgIHJldHVybiAhbV9zZXQuc2V0KGJsb2NrLT5pbmRleCk7CiAgICAgfQogICAg IAorICAgIC8vIFJldHVybiB0cnVlIGlmIHRoZSBibG9jayB3YXMgcmVtb3ZlZCwgZmFsc2UgaWYg aXQgd2FzIGFscmVhZHkgYWJzZW50LgorICAgIGJvb2wgcmVtb3ZlKEJhc2ljQmxvY2sqIGJsb2Nr KQorICAgIHsKKyAgICAgICAgcmV0dXJuIG1fc2V0LmNsZWFyKGJsb2NrLT5pbmRleCk7CisgICAg fQorICAgIAogICAgIGJvb2wgY29udGFpbnMoQmFzaWNCbG9jayogYmxvY2spIGNvbnN0CiAgICAg ewogICAgICAgICBpZiAoIWJsb2NrKQpJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdDRkFQaGFzZS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdDRkFQaGFzZS5jcHAJKHJldmlzaW9uIDIzMTYwNykKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHQ0ZBUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsyOSw3IEBACiAj aWYgRU5BQkxFKERGR19KSVQpCiAKICNpbmNsdWRlICJERkdBYnN0cmFjdEludGVycHJldGVySW5s aW5lcy5oIgorI2luY2x1ZGUgIkRGR0Jsb2NrU2V0LmgiCiAjaW5jbHVkZSAiREZHQ2xvYmJlclNl dC5oIgogI2luY2x1ZGUgIkRGR0dyYXBoLmgiCiAjaW5jbHVkZSAiREZHSW5QbGFjZUFic3RyYWN0 U3RhdGUuaCIKQEAgLTc1LDE3ICs3NiwxMCBAQCBwdWJsaWM6CiAgICAgICAgIAogICAgICAgICBt X3N0YXRlLmluaXRpYWxpemUoKTsKICAgICAgICAgCi0gICAgICAgIGRvIHsKLSAgICAgICAgICAg IG1fY2hhbmdlZCA9IGZhbHNlOwotICAgICAgICAgICAgcGVyZm9ybUZvcndhcmRDRkEoKTsKLSAg ICAgICAgfSB3aGlsZSAobV9jaGFuZ2VkKTsKLSAgICAgICAgCiAgICAgICAgIGlmIChtX2dyYXBo Lm1fZm9ybSAhPSBTU0EpIHsKICAgICAgICAgICAgIGlmIChtX3ZlcmJvc2UpCiAgICAgICAgICAg ICAgICAgZGF0YUxvZygiICAgV2lkZW5pbmcgc3RhdGUgYXQgT1NSIGVudHJ5IGJsb2NrLlxuIik7 CiAgICAgICAgICAgICAKLSAgICAgICAgICAgIEFTU0VSVCghbV9jaGFuZ2VkKTsKLSAgICAgICAg ICAgIAogICAgICAgICAgICAgLy8gV2lkZW4gdGhlIGFic3RyYWN0IHZhbHVlcyBhdCB0aGUgYmxv Y2sgdGhhdCBzZXJ2ZXMgYXMgdGhlIG11c3QtaGFuZGxlIE9TUiBlbnRyeS4KICAgICAgICAgICAg IGZvciAoQmxvY2tJbmRleCBibG9ja0luZGV4ID0gbV9ncmFwaC5udW1CbG9ja3MoKTsgYmxvY2tJ bmRleC0tOykgewogICAgICAgICAgICAgICAgIEJhc2ljQmxvY2sqIGJsb2NrID0gbV9ncmFwaC5i bG9jayhibG9ja0luZGV4KTsKQEAgLTk3LDQxICs5MSw0OCBAQCBwdWJsaWM6CiAgICAgICAgICAg ICAgICAgaWYgKGJsb2NrLT5ieXRlY29kZUJlZ2luICE9IG1fZ3JhcGgubV9wbGFuLm9zckVudHJ5 Qnl0ZWNvZGVJbmRleCkKICAgICAgICAgICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgICAg ICAgICAgCi0gICAgICAgICAgICAgICAgaWYgKG1fdmVyYm9zZSkKLSAgICAgICAgICAgICAgICAg ICAgZGF0YUxvZygiICAgRm91bmQgbXVzdC1oYW5kbGUgYmxvY2s6ICIsICpibG9jaywgIlxuIik7 Ci0gICAgICAgICAgICAgICAgCi0gICAgICAgICAgICAgICAgYm9vbCBjaGFuZ2VkID0gZmFsc2U7 Ci0gICAgICAgICAgICAgICAgZm9yIChzaXplX3QgaSA9IG1fZ3JhcGgubV9wbGFuLm11c3RIYW5k bGVWYWx1ZXMuc2l6ZSgpOyBpLS07KSB7Ci0gICAgICAgICAgICAgICAgICAgIGludCBvcGVyYW5k ID0gbV9ncmFwaC5tX3BsYW4ubXVzdEhhbmRsZVZhbHVlcy5vcGVyYW5kRm9ySW5kZXgoaSk7Ci0g ICAgICAgICAgICAgICAgICAgIEpTVmFsdWUgdmFsdWUgPSBtX2dyYXBoLm1fcGxhbi5tdXN0SGFu ZGxlVmFsdWVzW2ldOwotICAgICAgICAgICAgICAgICAgICBOb2RlKiBub2RlID0gYmxvY2stPnZh cmlhYmxlc0F0SGVhZC5vcGVyYW5kKG9wZXJhbmQpOwotICAgICAgICAgICAgICAgICAgICBpZiAo IW5vZGUpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIGlmIChtX3ZlcmJvc2UpCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgZGF0YUxvZygiICAgTm90IGxpdmU6ICIsIFZpcnR1YWxSZWdp c3RlcihvcGVyYW5kKSwgIlxuIik7Ci0gICAgICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgICAgICAKLSAgICAgICAgICAg ICAgICAgICAgaWYgKG1fdmVyYm9zZSkKLSAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFMb2co IiAgIFdpZGVuaW5nICIsIFZpcnR1YWxSZWdpc3RlcihvcGVyYW5kKSwgIiB3aXRoICIsIHZhbHVl LCAiXG4iKTsKLQotICAgICAgICAgICAgICAgICAgICBBYnN0cmFjdFZhbHVlJiB0YXJnZXQgPSBi bG9jay0+dmFsdWVzQXRIZWFkLm9wZXJhbmQob3BlcmFuZCk7Ci0gICAgICAgICAgICAgICAgICAg IGNoYW5nZWQgfD0gdGFyZ2V0Lm1lcmdlT1NSRW50cnlWYWx1ZShtX2dyYXBoLCB2YWx1ZSk7Ci0g ICAgICAgICAgICAgICAgICAgIHRhcmdldC5maXhUeXBlRm9yUmVwcmVzZW50YXRpb24oCi0gICAg ICAgICAgICAgICAgICAgICAgICBtX2dyYXBoLCByZXN1bHRGb3Iobm9kZS0+dmFyaWFibGVBY2Nl c3NEYXRhKCktPmZsdXNoRm9ybWF0KCkpKTsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAg ICAgICAgCi0gICAgICAgICAgICAgICAgaWYgKGNoYW5nZWQgfHwgIWJsb2NrLT5jZmFIYXNWaXNp dGVkKSB7Ci0gICAgICAgICAgICAgICAgICAgIG1fY2hhbmdlZCA9IHRydWU7Ci0gICAgICAgICAg ICAgICAgICAgIGJsb2NrLT5jZmFTaG91bGRSZXZpc2l0ID0gdHJ1ZTsKLSAgICAgICAgICAgICAg ICB9CisgICAgICAgICAgICAgICAgLy8gV2UgcmVjb3JkIHRoYXQgdGhlIGJsb2NrIG5lZWRzIHNv bWUgT1NSIHN0dWZmLCBidXQgd2UgZG9uJ3QgZG8gdGhhdCB5ZXQuIFdlIHdhbnQgdG8KKyAgICAg ICAgICAgICAgICAvLyBoYW5kbGUgT1NSIGVudHJ5IGRhdGEgYXQgdGhlIHJpZ2h0IHRpbWUgaW4g b3JkZXIgdG8gZ2V0IHRoZSBiZXN0IGNvbXBpbGUgdGltZXMuIElmIHdlCisgICAgICAgICAgICAg ICAgLy8gc2ltcGx5IGluamVjdGVkIE9TUiBkYXRhIHJpZ2h0IG5vdywgdGhlbiB3ZSdkIHBvdGVu dGlhbGx5IGNhdXNlIGEgbG9vcCBib2R5IHRvIGJlCisgICAgICAgICAgICAgICAgLy8gaW50ZXJw cmV0ZWQgd2l0aCBqdXN0IHRoZSBjb25zdGFudHMgd2UgZmVlZCBpdCwgd2hpY2ggaXMgbW9yZSBl eHBlbnNpdmUgdGhhbiBpZiB3ZQorICAgICAgICAgICAgICAgIC8vIGludGVycHJldGVkIGl0IHdp dGggbm9uLWNvbnN0YW50IHZhbHVlcy4gSWYgd2UgYWx3YXlzIGluamVjdGVkIHRoaXMgZGF0YSBh ZnRlciB0aGUKKyAgICAgICAgICAgICAgICAvLyBtYWluIHBhc3Mgb2YgQ0ZBIHJhbiwgdGhlbiB3 ZSB3b3VsZCBwb3RlbnRpYWxseSBzcGVuZCBhIGJ1bmNoIG9mIHRpbWUgcmVydW5uaW5nIENGQQor ICAgICAgICAgICAgICAgIC8vIGFmdGVyIGNvbnZlcmdlbmNlLiBTbywgd2UgdHJ5IHZlcnkgaGFy ZCB0byBpbmplY3QgT1NSIGRhdGEgZm9yIGEgYmxvY2sgd2hlbiB3ZSBmaXJzdAorICAgICAgICAg ICAgICAgIC8vIG5hdHVyYWxseSBjb21lIHRvIHNlZSBpdCAtIHNlZSB0aGUgbV9ibG9ja3NXaXRo T1NSIGNoZWNrIGluIHBlcmZvcm1CbG9ja0NGQSgpLiBUaGlzCisgICAgICAgICAgICAgICAgLy8g d2F5LCB3ZToKKyAgICAgICAgICAgICAgICAvLworICAgICAgICAgICAgICAgIC8vIC0gUmVkdWNl IHRoZSBsaWtlbGlob29kIG9mIGludGVycHJldGluZyB0aGUgYmxvY2sgd2l0aCBjb25zdGFudHMs IHNpbmNlIHdlIHdpbGwgaW5qZWN0CisgICAgICAgICAgICAgICAgLy8gICB0aGUgT1NSIGVudHJ5 IGNvbnN0YW50cyBvbiB0b3Agb2Ygd2hhdGV2ZXIgYWJzdHJhY3QgdmFsdWVzIHdlIGdvdCBmb3Ig dGhhdCBibG9jayBvbgorICAgICAgICAgICAgICAgIC8vICAgdGhlIGZpcnN0IHBhc3MuIFRoZSBt aXggb2YgdGhvc2UgdHdvIHRoaW5ncyBpcyBsaWtlbHkgdG8gbm90IGJlIGNvbnN0YW50LgorICAg ICAgICAgICAgICAgIC8vCisgICAgICAgICAgICAgICAgLy8gLSBSZWR1Y2UgdGhlIHRvdGFsIG51 bWJlciBvZiBDRkEgcmVleGVjdXRpb25zIHNpbmNlIHdlIGluamVjdCB0aGUgT1NSIGRhdGEgYXMg cGFydCBvZgorICAgICAgICAgICAgICAgIC8vICAgdGhlIG5vcm1hbCBmbG93IG9mIENGQSBpbnN0 ZWFkIG9mIGhhdmluZyB0byBkbyBhIHNlY29uZCBmaXhwb2ludC4gV2UgbWF5IHN0aWxsIGhhdmUK KyAgICAgICAgICAgICAgICAvLyAgIHRvIGRvIGEgc2Vjb25kIGZpeHBvaW50IGlmIHdlIGRvbid0 IGV2ZW4gcmVhY2ggdGhlIE9TUiBlbnRyeSBibG9jayBkdXJpbmcgdGhlIG1haW4KKyAgICAgICAg ICAgICAgICAvLyAgIHJ1biBvZiBDRkEsIGJ1dCBpbiB0aGF0IGNhc2UgYXQgbGVhc3Qgd2UncmUg bm90IGJlaW5nIHJlZHVuZGFudC4KKyAgICAgICAgICAgICAgICBtX2Jsb2Nrc1dpdGhPU1IuYWRk KGJsb2NrKTsKICAgICAgICAgICAgIH0KKyAgICAgICAgfQogCi0gICAgICAgICAgICAvLyBQcm9w YWdhdGUgYW55IG9mIHRoZSBjaGFuZ2VzIHdlIGp1c3QgaW50cm9kdWNlZC4KKyAgICAgICAgZG8g eworICAgICAgICAgICAgbV9jaGFuZ2VkID0gZmFsc2U7CisgICAgICAgICAgICBwZXJmb3JtRm9y d2FyZENGQSgpOworICAgICAgICB9IHdoaWxlIChtX2NoYW5nZWQpOworICAgICAgICAKKyAgICAg ICAgaWYgKG1fZ3JhcGgubV9mb3JtICE9IFNTQSkgeworICAgICAgICAgICAgZm9yIChCbG9ja0lu ZGV4IGJsb2NrSW5kZXggPSBtX2dyYXBoLm51bUJsb2NrcygpOyBibG9ja0luZGV4LS07KSB7Cisg ICAgICAgICAgICAgICAgQmFzaWNCbG9jayogYmxvY2sgPSBtX2dyYXBoLmJsb2NrKGJsb2NrSW5k ZXgpOworICAgICAgICAgICAgICAgIGlmICghYmxvY2spCisgICAgICAgICAgICAgICAgICAgIGNv bnRpbnVlOworICAgICAgICAgICAgICAgIAorICAgICAgICAgICAgICAgIGlmIChtX2Jsb2Nrc1dp dGhPU1IucmVtb3ZlKGJsb2NrKSkKKyAgICAgICAgICAgICAgICAgICAgbV9jaGFuZ2VkIHw9IGlu amVjdE9TUihibG9jayk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICAKICAgICAgICAgICAg IHdoaWxlIChtX2NoYW5nZWQpIHsKICAgICAgICAgICAgICAgICBtX2NoYW5nZWQgPSBmYWxzZTsK ICAgICAgICAgICAgICAgICBwZXJmb3JtRm9yd2FyZENGQSgpOwogICAgICAgICAgICAgfQotICAg ICAgICAgICAgCisgICAgICAgIAogICAgICAgICAgICAgLy8gTWFrZSBzdXJlIHdlIHJlY29yZCB0 aGUgaW50ZXJzZWN0aW9uIG9mIGFsbCBwcm9vZnMgdGhhdCB3ZSBldmVyIGFsbG93ZWQgdGhlCiAg ICAgICAgICAgICAvLyBjb21waWxlciB0byByZWx5IHVwb24uCiAgICAgICAgICAgICBmb3IgKEJs b2NrSW5kZXggYmxvY2tJbmRleCA9IG1fZ3JhcGgubnVtQmxvY2tzKCk7IGJsb2NrSW5kZXgtLTsp IHsKQEAgLTE0OSw2ICsxNTAsMzkgQEAgcHVibGljOgogICAgIH0KICAgICAKIHByaXZhdGU6Cisg ICAgYm9vbCBpbmplY3RPU1IoQmFzaWNCbG9jayogYmxvY2spCisgICAgeworICAgICAgICBpZiAo bV92ZXJib3NlKQorICAgICAgICAgICAgZGF0YUxvZygiICAgRm91bmQgbXVzdC1oYW5kbGUgYmxv Y2s6ICIsICpibG9jaywgIlxuIik7CisgICAgICAgIAorICAgICAgICBib29sIGNoYW5nZWQgPSBm YWxzZTsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IG1fZ3JhcGgubV9wbGFuLm11c3RIYW5kbGVW YWx1ZXMuc2l6ZSgpOyBpLS07KSB7CisgICAgICAgICAgICBpbnQgb3BlcmFuZCA9IG1fZ3JhcGgu bV9wbGFuLm11c3RIYW5kbGVWYWx1ZXMub3BlcmFuZEZvckluZGV4KGkpOworICAgICAgICAgICAg SlNWYWx1ZSB2YWx1ZSA9IG1fZ3JhcGgubV9wbGFuLm11c3RIYW5kbGVWYWx1ZXNbaV07CisgICAg ICAgICAgICBOb2RlKiBub2RlID0gYmxvY2stPnZhcmlhYmxlc0F0SGVhZC5vcGVyYW5kKG9wZXJh bmQpOworICAgICAgICAgICAgaWYgKCFub2RlKSB7CisgICAgICAgICAgICAgICAgaWYgKG1fdmVy Ym9zZSkKKyAgICAgICAgICAgICAgICAgICAgZGF0YUxvZygiICAgTm90IGxpdmU6ICIsIFZpcnR1 YWxSZWdpc3RlcihvcGVyYW5kKSwgIlxuIik7CisgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICB9CisgICAgICAgICAgICAKKyAgICAgICAgICAgIGlmIChtX3ZlcmJvc2UpCisg ICAgICAgICAgICAgICAgZGF0YUxvZygiICAgV2lkZW5pbmcgIiwgVmlydHVhbFJlZ2lzdGVyKG9w ZXJhbmQpLCAiIHdpdGggIiwgdmFsdWUsICJcbiIpOworICAgICAgICAgICAgCisgICAgICAgICAg ICBBYnN0cmFjdFZhbHVlJiB0YXJnZXQgPSBibG9jay0+dmFsdWVzQXRIZWFkLm9wZXJhbmQob3Bl cmFuZCk7CisgICAgICAgICAgICBjaGFuZ2VkIHw9IHRhcmdldC5tZXJnZU9TUkVudHJ5VmFsdWUo bV9ncmFwaCwgdmFsdWUpOworICAgICAgICAgICAgdGFyZ2V0LmZpeFR5cGVGb3JSZXByZXNlbnRh dGlvbigKKyAgICAgICAgICAgICAgICBtX2dyYXBoLCByZXN1bHRGb3Iobm9kZS0+dmFyaWFibGVB Y2Nlc3NEYXRhKCktPmZsdXNoRm9ybWF0KCkpKTsKKyAgICAgICAgfQorICAgICAgICAKKyAgICAg ICAgaWYgKGNoYW5nZWQgfHwgIWJsb2NrLT5jZmFIYXNWaXNpdGVkKSB7CisgICAgICAgICAgICBi bG9jay0+Y2ZhU2hvdWxkUmV2aXNpdCA9IHRydWU7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsK KyAgICAgICAgfQorICAgICAgICAKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICAK ICAgICB2b2lkIHBlcmZvcm1CbG9ja0NGQShCYXNpY0Jsb2NrKiBibG9jaykKICAgICB7CiAgICAg ICAgIGlmICghYmxvY2spCkBAIC0xNTcsNiArMTkxLDEwIEBAIHByaXZhdGU6CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIGlmIChtX3ZlcmJvc2UpCiAgICAgICAgICAgICBkYXRhTG9nKCIg ICBCbG9jayAiLCAqYmxvY2ssICI6XG4iKTsKKyAgICAgICAgCisgICAgICAgIGlmIChtX2Jsb2Nr c1dpdGhPU1IucmVtb3ZlKGJsb2NrKSkKKyAgICAgICAgICAgIGluamVjdE9TUihibG9jayk7Cisg ICAgICAgIAogICAgICAgICBtX3N0YXRlLmJlZ2luQmFzaWNCbG9jayhibG9jayk7CiAgICAgICAg IGlmIChtX3ZlcmJvc2UpIHsKICAgICAgICAgICAgIGRhdGFMb2coIiAgICAgIGhlYWQgdmFyczog IiwgYmxvY2stPnZhbHVlc0F0SGVhZCwgIlxuIik7CkBAIC0yMTIsNiArMjUwLDcgQEAgcHJpdmF0 ZToKIHByaXZhdGU6CiAgICAgSW5QbGFjZUFic3RyYWN0U3RhdGUgbV9zdGF0ZTsKICAgICBBYnN0 cmFjdEludGVycHJldGVyPEluUGxhY2VBYnN0cmFjdFN0YXRlPiBtX2ludGVycHJldGVyOworICAg IEJsb2NrU2V0IG1fYmxvY2tzV2l0aE9TUjsKICAgICAKICAgICBib29sIG1fdmVyYm9zZTsKICAg ICAK