194577 2019-02-12 17:58:22 -0800 JSScript needs to retain its cache path NSURL* 2019-02-12 22:35:24 -0800 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov guijemont keith_miller mark.lam msaboff rmorisset thorton ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1505549 0 saam 2019-02-12 17:58:22 -0800 ... 1505555 1 361882 saam 2019-02-12 18:09:57 -0800 Created attachment 361882 patch 1505560 2 361882 keith_miller 2019-02-12 18:12:27 -0800 Comment on attachment 361882 patch View in context: https://bugs.webkit.org/attachment.cgi?id=361882&action=review > Source/JavaScriptCore/API/JSScript.mm:109 > + result->m_cachePath = [cachePath retain]; Can we make m_cachePath be a retainPtr? 1505561 3 361884 saam 2019-02-12 18:13:46 -0800 Created attachment 361884 patch 1505562 4 361884 thorton 2019-02-12 18:14:27 -0800 Comment on attachment 361884 patch View in context: https://bugs.webkit.org/attachment.cgi?id=361884&action=review > Source/JavaScriptCore/API/JSScript.mm:132 > + int fd = open(m_cachePath.get().path.UTF8String, O_RDONLY); In WK2 we usually would just [m_cachePath path].UTF8String but it's up to you. 1505564 5 361885 saam 2019-02-12 18:16:49 -0800 Created attachment 361885 patch for landing 1505565 6 361884 saam 2019-02-12 18:17:03 -0800 Comment on attachment 361884 patch View in context: https://bugs.webkit.org/attachment.cgi?id=361884&action=review >> Source/JavaScriptCore/API/JSScript.mm:132 >> + int fd = open(m_cachePath.get().path.UTF8String, O_RDONLY); > > In WK2 we usually would just [m_cachePath path].UTF8String but it's up to you. Sounds good. Fixed. 1505566 7 361886 saam 2019-02-12 18:17:44 -0800 Created attachment 361886 patch for landing 1505617 8 361886 commit-queue 2019-02-12 22:34:49 -0800 Comment on attachment 361886 patch for landing Clearing flags on attachment: 361886 Committed r241340: <https://trac.webkit.org/changeset/241340> 1505618 9 commit-queue 2019-02-12 22:34:51 -0800 All reviewed patches have been landed. Closing bug. 1505619 10 webkit-bug-importer 2019-02-12 22:35:24 -0800 <rdar://problem/48028610> 361882 2019-02-12 18:09:57 -0800 2019-02-12 18:13:46 -0800 patch a-backup.diff text/plain 1575 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQxMzM0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE5LTAyLTEyICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEpTU2NyaXB0IG5lZWRzIHRvIHJldGFpbiBpdHMgY2FjaGUgcGF0aCBOU1VSTCoKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDU3NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQVBJL0pTU2NyaXB0Lm1t OgorICAgICAgICAoK1tKU1NjcmlwdCBzY3JpcHRGcm9tQVNDSUlGaWxlOmluVmlydHVhbE1hY2hp bmU6d2l0aENvZGVTaWduaW5nOmFuZEJ5dGVjb2RlQ2FjaGU6XSk6CisgICAgICAgICgtW0pTU2Ny aXB0IGRlYWxsb2NdKToKKwogMjAxOS0wMi0xMiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56 YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IC1XaW1wbGljaXQtZmFs bHRocm91Z2ggd2FybmluZyBhZnRlciByMjQxMTQwCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvQVBJL0pTU2NyaXB0Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9B UEkvSlNTY3JpcHQubW0JKHJldmlzaW9uIDI0MTMzNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9BUEkvSlNTY3JpcHQubW0JKHdvcmtpbmcgY29weSkKQEAgLTEwNiw3ICsxMDYsNyBAQCArIChp bnN0YW5jZXR5cGUpc2NyaXB0RnJvbUFTQ0lJRmlsZTooTlNVCiAgICAgSlNTY3JpcHQgKnJlc3Vs dCA9IFtbW0pTU2NyaXB0IGFsbG9jXSBpbml0XSBhdXRvcmVsZWFzZV07CiAgICAgcmVzdWx0LT5t X3ZpcnR1YWxNYWNoaW5lID0gdm07CiAgICAgcmVzdWx0LT5tX3NvdXJjZSA9IFN0cmluZzo6ZnJv bVVURjhXaXRoTGF0aW4xRmFsbGJhY2soYnVmZmVyLmRhdGEoKSwgYnVmZmVyLnNpemUoKSk7Ci0g ICAgcmVzdWx0LT5tX2NhY2hlUGF0aCA9IGNhY2hlUGF0aDsKKyAgICByZXN1bHQtPm1fY2FjaGVQ YXRoID0gW2NhY2hlUGF0aCByZXRhaW5dOwogICAgIFtyZXN1bHQgcmVhZENhY2hlXTsKICAgICBy ZXR1cm4gcmVzdWx0OwogfQpAQCAtMTIwLDYgKzEyMCw5IEBAIC0gKHZvaWQpZGVhbGxvYwogewog ICAgIGlmIChtX2NhY2hlZEJ5dGVjb2RlLnNpemUoKSAmJiAhbV9jYWNoZWRCeXRlY29kZS5vd25l ZCgpKQogICAgICAgICBtdW5tYXAoY29uc3RfY2FzdDx2b2lkKj4obV9jYWNoZWRCeXRlY29kZS5k YXRhKCkpLCBtX2NhY2hlZEJ5dGVjb2RlLnNpemUoKSk7CisKKyAgICBbbV9jYWNoZVBhdGggcmVs ZWFzZV07CisKICAgICBbc3VwZXIgZGVhbGxvY107CiB9CiAK 361884 2019-02-12 18:13:46 -0800 2019-02-12 18:16:49 -0800 patch a-backup.diff text/plain 2141 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQxMzM0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE5LTAyLTEyICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEpTU2NyaXB0IG5lZWRzIHRvIHJldGFpbiBpdHMgY2FjaGUgcGF0aCBOU1VSTCoKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDU3NworCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogQVBJL0pTU2NyaXB0Lm1t OgorICAgICAgICAoK1tKU1NjcmlwdCBzY3JpcHRGcm9tQVNDSUlGaWxlOmluVmlydHVhbE1hY2hp bmU6d2l0aENvZGVTaWduaW5nOmFuZEJ5dGVjb2RlQ2FjaGU6XSk6CisgICAgICAgICgtW0pTU2Ny aXB0IGRlYWxsb2NdKToKKwogMjAxOS0wMi0xMiAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56 YXJvQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgZml4IC1XaW1wbGljaXQtZmFs bHRocm91Z2ggd2FybmluZyBhZnRlciByMjQxMTQwCkluZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENv cmUvQVBJL0pTU2NyaXB0Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9B UEkvSlNTY3JpcHQubW0JKHJldmlzaW9uIDI0MTMzNCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9BUEkvSlNTY3JpcHQubW0JKHdvcmtpbmcgY29weSkKQEAgLTQyLDcgKzQyLDcgQEAKIEBpbXBs ZW1lbnRhdGlvbiBKU1NjcmlwdCB7CiAgICAgX193ZWFrIEpTVmlydHVhbE1hY2hpbmUqIG1fdmly dHVhbE1hY2hpbmU7CiAgICAgU3RyaW5nIG1fc291cmNlOwotICAgIE5TVVJMKiBtX2NhY2hlUGF0 aDsKKyAgICBSZXRhaW5QdHI8TlNVUkw+IG1fY2FjaGVQYXRoOwogICAgIEpTQzo6Q2FjaGVkQnl0 ZWNvZGUgbV9jYWNoZWRCeXRlY29kZTsKICAgICBKU0M6OlN0cm9uZzxKU0M6OkpTU291cmNlQ29k ZT4gbV9qc1NvdXJjZUNvZGU7CiAgICAgVW5pcXVlZFN0cmluZ0ltcGwqIG1fbW9kdWxlS2V5OwpA QCAtMTIwLDYgKzEyMCw3IEBAIC0gKHZvaWQpZGVhbGxvYwogewogICAgIGlmIChtX2NhY2hlZEJ5 dGVjb2RlLnNpemUoKSAmJiAhbV9jYWNoZWRCeXRlY29kZS5vd25lZCgpKQogICAgICAgICBtdW5t YXAoY29uc3RfY2FzdDx2b2lkKj4obV9jYWNoZWRCeXRlY29kZS5kYXRhKCkpLCBtX2NhY2hlZEJ5 dGVjb2RlLnNpemUoKSk7CisKICAgICBbc3VwZXIgZGVhbGxvY107CiB9CiAKQEAgLTEyOCw3ICsx MjksNyBAQCAtICh2b2lkKXJlYWRDYWNoZQogICAgIGlmICghbV9jYWNoZVBhdGgpCiAgICAgICAg IHJldHVybjsKIAotICAgIGludCBmZCA9IG9wZW4obV9jYWNoZVBhdGgucGF0aC5VVEY4U3RyaW5n LCBPX1JET05MWSk7CisgICAgaW50IGZkID0gb3BlbihtX2NhY2hlUGF0aC5nZXQoKS5wYXRoLlVU RjhTdHJpbmcsIE9fUkRPTkxZKTsKICAgICBpZiAoZmQgPT0gLTEpCiAgICAgICAgIHJldHVybjsK IApAQCAtMTYxLDcgKzE2Miw3IEBAIC0gKHZvaWQpd3JpdGVDYWNoZQogICAgIG1fY2FjaGVkQnl0 ZWNvZGUgPSBKU0M6OmdlbmVyYXRlTW9kdWxlQnl0ZWNvZGUobV92aXJ0dWFsTWFjaGluZS52bSwg bV9qc1NvdXJjZUNvZGUtPnNvdXJjZUNvZGUoKSwgZXJyb3IpOwogICAgIGlmIChlcnJvci5pc1Zh bGlkKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBpbnQgZmQgPSBvcGVuKG1fY2FjaGVQYXRoLnBh dGguVVRGOFN0cmluZywgT19DUkVBVCB8IE9fV1JPTkxZLCAwNjY2KTsKKyAgICBpbnQgZmQgPSBv cGVuKG1fY2FjaGVQYXRoLmdldCgpLnBhdGguVVRGOFN0cmluZywgT19DUkVBVCB8IE9fV1JPTkxZ LCAwNjY2KTsKICAgICBpZiAoZmQgPT0gLTEpCiAgICAgICAgIHJldHVybjsKICAgICBpbnQgcmMg PSBmbG9jayhmZCwgTE9DS19FWCB8IExPQ0tfTkIpOwo= 361885 2019-02-12 18:16:49 -0800 2019-02-12 18:17:44 -0800 patch for landing a-backup.diff text/plain 2129 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQxMzM0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE5LTAyLTEyICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEpTU2NyaXB0IG5lZWRzIHRvIHJldGFpbiBpdHMgY2FjaGUgcGF0aCBOU1VSTCoKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDU3NworCisgICAgICAg IFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgKiBBUEkvSlNTY3JpcHQubW06Cisg ICAgICAgICgrW0pTU2NyaXB0IHNjcmlwdEZyb21BU0NJSUZpbGU6aW5WaXJ0dWFsTWFjaGluZTp3 aXRoQ29kZVNpZ25pbmc6YW5kQnl0ZWNvZGVDYWNoZTpdKToKKyAgICAgICAgKC1bSlNTY3JpcHQg ZGVhbGxvY10pOgorCiAyMDE5LTAyLTEyICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9A aWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggLVdpbXBsaWNpdC1mYWxsdGhy b3VnaCB3YXJuaW5nIGFmdGVyIHIyNDExNDAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9B UEkvSlNTY3JpcHQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9K U1NjcmlwdC5tbQkocmV2aXNpb24gMjQxMzM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9KU1NjcmlwdC5tbQkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNyBAQAogQGltcGxlbWVu dGF0aW9uIEpTU2NyaXB0IHsKICAgICBfX3dlYWsgSlNWaXJ0dWFsTWFjaGluZSogbV92aXJ0dWFs TWFjaGluZTsKICAgICBTdHJpbmcgbV9zb3VyY2U7Ci0gICAgTlNVUkwqIG1fY2FjaGVQYXRoOwor ICAgIFJldGFpblB0cjxOU1VSTD4gbV9jYWNoZVBhdGg7CiAgICAgSlNDOjpDYWNoZWRCeXRlY29k ZSBtX2NhY2hlZEJ5dGVjb2RlOwogICAgIEpTQzo6U3Ryb25nPEpTQzo6SlNTb3VyY2VDb2RlPiBt X2pzU291cmNlQ29kZTsKICAgICBVbmlxdWVkU3RyaW5nSW1wbCogbV9tb2R1bGVLZXk7CkBAIC0x MjAsNiArMTIwLDcgQEAgLSAodm9pZClkZWFsbG9jCiB7CiAgICAgaWYgKG1fY2FjaGVkQnl0ZWNv ZGUuc2l6ZSgpICYmICFtX2NhY2hlZEJ5dGVjb2RlLm93bmVkKCkpCiAgICAgICAgIG11bm1hcChj b25zdF9jYXN0PHZvaWQqPihtX2NhY2hlZEJ5dGVjb2RlLmRhdGEoKSksIG1fY2FjaGVkQnl0ZWNv ZGUuc2l6ZSgpKTsKKwogICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KIApAQCAtMTI4LDcgKzEyOSw3 IEBAIC0gKHZvaWQpcmVhZENhY2hlCiAgICAgaWYgKCFtX2NhY2hlUGF0aCkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgaW50IGZkID0gb3BlbihtX2NhY2hlUGF0aC5wYXRoLlVURjhTdHJpbmcsIE9f UkRPTkxZKTsKKyAgICBpbnQgZmQgPSBvcGVuKFttX2NhY2hlUGF0aCBwYXRoXS5VVEY4U3RyaW5n LCBPX1JET05MWSk7CiAgICAgaWYgKGZkID09IC0xKQogICAgICAgICByZXR1cm47CiAKQEAgLTE2 MSw3ICsxNjIsNyBAQCAtICh2b2lkKXdyaXRlQ2FjaGUKICAgICBtX2NhY2hlZEJ5dGVjb2RlID0g SlNDOjpnZW5lcmF0ZU1vZHVsZUJ5dGVjb2RlKG1fdmlydHVhbE1hY2hpbmUudm0sIG1fanNTb3Vy Y2VDb2RlLT5zb3VyY2VDb2RlKCksIGVycm9yKTsKICAgICBpZiAoZXJyb3IuaXNWYWxpZCgpKQog ICAgICAgICByZXR1cm47Ci0gICAgaW50IGZkID0gb3BlbihtX2NhY2hlUGF0aC5wYXRoLlVURjhT dHJpbmcsIE9fQ1JFQVQgfCBPX1dST05MWSwgMDY2Nik7CisgICAgaW50IGZkID0gb3BlbihbbV9j YWNoZVBhdGggcGF0aF0uVVRGOFN0cmluZywgT19DUkVBVCB8IE9fV1JPTkxZLCAwNjY2KTsKICAg ICBpZiAoZmQgPT0gLTEpCiAgICAgICAgIHJldHVybjsKICAgICBpbnQgcmMgPSBmbG9jayhmZCwg TE9DS19FWCB8IExPQ0tfTkIpOwo= 361886 2019-02-12 18:17:44 -0800 2019-02-12 22:34:49 -0800 patch for landing a-backup.diff text/plain 1912 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjQxMzM0KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBA CisyMDE5LTAyLTEyICBTYWFtIGJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IEpTU2NyaXB0IG5lZWRzIHRvIHJldGFpbiBpdHMgY2FjaGUgcGF0aCBOU1VSTCoKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDU3NworCisgICAgICAg IFJldmlld2VkIGJ5IFRpbSBIb3J0b24uCisKKyAgICAgICAgKiBBUEkvSlNTY3JpcHQubW06Cisg ICAgICAgICgrW0pTU2NyaXB0IHNjcmlwdEZyb21BU0NJSUZpbGU6aW5WaXJ0dWFsTWFjaGluZTp3 aXRoQ29kZVNpZ25pbmc6YW5kQnl0ZWNvZGVDYWNoZTpdKToKKyAgICAgICAgKC1bSlNTY3JpcHQg ZGVhbGxvY10pOgorCiAyMDE5LTAyLTEyICBNaWNoYWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9A aWdhbGlhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCBmaXggLVdpbXBsaWNpdC1mYWxsdGhy b3VnaCB3YXJuaW5nIGFmdGVyIHIyNDExNDAKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9B UEkvSlNTY3JpcHQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL0FQSS9K U1NjcmlwdC5tbQkocmV2aXNpb24gMjQxMzM0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL0FQ SS9KU1NjcmlwdC5tbQkod29ya2luZyBjb3B5KQpAQCAtNDIsNyArNDIsNyBAQAogQGltcGxlbWVu dGF0aW9uIEpTU2NyaXB0IHsKICAgICBfX3dlYWsgSlNWaXJ0dWFsTWFjaGluZSogbV92aXJ0dWFs TWFjaGluZTsKICAgICBTdHJpbmcgbV9zb3VyY2U7Ci0gICAgTlNVUkwqIG1fY2FjaGVQYXRoOwor ICAgIFJldGFpblB0cjxOU1VSTD4gbV9jYWNoZVBhdGg7CiAgICAgSlNDOjpDYWNoZWRCeXRlY29k ZSBtX2NhY2hlZEJ5dGVjb2RlOwogICAgIEpTQzo6U3Ryb25nPEpTQzo6SlNTb3VyY2VDb2RlPiBt X2pzU291cmNlQ29kZTsKICAgICBVbmlxdWVkU3RyaW5nSW1wbCogbV9tb2R1bGVLZXk7CkBAIC0x MjgsNyArMTI4LDcgQEAgLSAodm9pZClyZWFkQ2FjaGUKICAgICBpZiAoIW1fY2FjaGVQYXRoKQog ICAgICAgICByZXR1cm47CiAKLSAgICBpbnQgZmQgPSBvcGVuKG1fY2FjaGVQYXRoLnBhdGguVVRG OFN0cmluZywgT19SRE9OTFkpOworICAgIGludCBmZCA9IG9wZW4oW21fY2FjaGVQYXRoIHBhdGhd LlVURjhTdHJpbmcsIE9fUkRPTkxZKTsKICAgICBpZiAoZmQgPT0gLTEpCiAgICAgICAgIHJldHVy bjsKIApAQCAtMTYxLDcgKzE2MSw3IEBAIC0gKHZvaWQpd3JpdGVDYWNoZQogICAgIG1fY2FjaGVk Qnl0ZWNvZGUgPSBKU0M6OmdlbmVyYXRlTW9kdWxlQnl0ZWNvZGUobV92aXJ0dWFsTWFjaGluZS52 bSwgbV9qc1NvdXJjZUNvZGUtPnNvdXJjZUNvZGUoKSwgZXJyb3IpOwogICAgIGlmIChlcnJvci5p c1ZhbGlkKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBpbnQgZmQgPSBvcGVuKG1fY2FjaGVQYXRo LnBhdGguVVRGOFN0cmluZywgT19DUkVBVCB8IE9fV1JPTkxZLCAwNjY2KTsKKyAgICBpbnQgZmQg PSBvcGVuKFttX2NhY2hlUGF0aCBwYXRoXS5VVEY4U3RyaW5nLCBPX0NSRUFUIHwgT19XUk9OTFks IDA2NjYpOwogICAgIGlmIChmZCA9PSAtMSkKICAgICAgICAgcmV0dXJuOwogICAgIGludCByYyA9 IGZsb2NrKGZkLCBMT0NLX0VYIHwgTE9DS19OQik7Cg==