144084 2015-04-22 18:44:23 -0700 Nodes should have an optional epoch field 2015-04-22 19:37:58 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 143735 1 fpizlo fpizlo oldest_to_newest 1087676 0 fpizlo 2015-04-22 18:44:23 -0700 Patch forthcoming. 1087678 1 251394 fpizlo 2015-04-22 18:47:03 -0700 Created attachment 251394 the patch 1087682 2 251394 rniwa 2015-04-22 18:56:53 -0700 Comment on attachment 251394 the patch r=me. 1087701 3 fpizlo 2015-04-22 19:37:58 -0700 Landed in http://trac.webkit.org/changeset/183162 251394 2015-04-22 18:47:03 -0700 2015-04-22 18:56:53 -0700 the patch blah.patch text/plain 11745 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTgzMTU1KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM0IEBA CisyMDE1LTA0LTIyICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg Tm9kZXMgc2hvdWxkIGhhdmUgYW4gb3B0aW9uYWwgZXBvY2ggZmllbGQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDA4NAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhpcyBtYWtlcyBpdCBl YXNpZXIgdG8gZG8gZXBvY2gtYmFzZWQgYW5hbHlzZXMgb24gbm9kZXMuIEkgcGxhbiB0byBkbyBq dXN0IHRoYXQgaW4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0MzczNS4KKworICAgICAgICAqIGRmZy9ERkdDUFNSZXRocmVhZGluZ1BoYXNlLmNwcDoK KyAgICAgICAgKEpTQzo6REZHOjpDUFNSZXRocmVhZGluZ1BoYXNlOjpjYW5vbmljYWxpemVHZXRM b2NhbEZvcik6CisgICAgICAgICogZGZnL0RGR0NTRVBoYXNlLmNwcDoKKyAgICAgICAgKiBkZmcv REZHRXBvY2guaDoKKyAgICAgICAgKEpTQzo6REZHOjpFcG9jaDo6ZnJvbVVuc2lnbmVkKToKKyAg ICAgICAgKEpTQzo6REZHOjpFcG9jaDo6dG9VbnNpZ25lZCk6CisgICAgICAgICogZGZnL0RGR0dy YXBoLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpHcmFwaDo6Y2xlYXJSZXBsYWNlbWVudHMpOgor ICAgICAgICAoSlNDOjpERkc6OkdyYXBoOjpjbGVhckVwb2Nocyk6CisgICAgICAgICogZGZnL0RG R0dyYXBoLmg6CisgICAgICAgIChKU0M6OkRGRzo6R3JhcGg6OnBlcmZvcm1TdWJzdGl0dXRpb25G b3JFZGdlKToKKyAgICAgICAgKiBkZmcvREZHTm9kZS5oOgorICAgICAgICAoSlNDOjpERkc6Ok5v ZGU6Ok5vZGUpOgorICAgICAgICAoSlNDOjpERkc6Ok5vZGU6OnJlcGxhY2VXaXRoKToKKyAgICAg ICAgKEpTQzo6REZHOjpOb2RlOjpyZXBsYWNlbWVudCk6CisgICAgICAgIChKU0M6OkRGRzo6Tm9k ZTo6c2V0UmVwbGFjZW1lbnQpOgorICAgICAgICAoSlNDOjpERkc6Ok5vZGU6OmVwb2NoKToKKyAg ICAgICAgKEpTQzo6REZHOjpOb2RlOjpzZXRFcG9jaCk6CisgICAgICAgICogZGZnL0RGR1NTQUNv bnZlcnNpb25QaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U1NBQ29udmVyc2lvblBoYXNl OjpydW4pOgorCiAyMDE1LTA0LTIyICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBJbXBsZW1lbnQgU3RyaW5nLmNvZGVQb2ludEF0KCkKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ1BTUmV0aHJlYWRpbmdQaGFzZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDUFNSZXRocmVhZGluZ1BoYXNl LmNwcAkocmV2aXNpb24gMTgzMDk0KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdD UFNSZXRocmVhZGluZ1BoYXNlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTk0LDEyICsxOTQsMTIg QEAgcHJpdmF0ZToKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKG90aGVyTm9kZS0+b3Ao KSA9PSBHZXRMb2NhbCkgewogICAgICAgICAgICAgICAgIC8vIFJlcGxhY2UgYWxsIHJlZmVyZW5j ZXMgdG8gdGhpcyBHZXRMb2NhbCB3aXRoIG90aGVyTm9kZS4KLSAgICAgICAgICAgICAgICBub2Rl LT5yZXBsYWNlbWVudCA9IG90aGVyTm9kZTsKKyAgICAgICAgICAgICAgICBub2RlLT5zZXRSZXBs YWNlbWVudChvdGhlck5vZGUpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAg IH0KICAgICAgICAgICAgIAogICAgICAgICAgICAgQVNTRVJUKG90aGVyTm9kZS0+b3AoKSA9PSBT ZXRMb2NhbCk7Ci0gICAgICAgICAgICBub2RlLT5yZXBsYWNlbWVudCA9IG90aGVyTm9kZS0+Y2hp bGQxKCkubm9kZSgpOworICAgICAgICAgICAgbm9kZS0+c2V0UmVwbGFjZW1lbnQob3RoZXJOb2Rl LT5jaGlsZDEoKS5ub2RlKCkpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAgICAg ICAgIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDU0VQaGFzZS5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdDU0VQaGFzZS5jcHAJKHJl dmlzaW9uIDE4MzA5NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHQ1NFUGhhc2Uu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMzUsNyArMjM1LDcgQEAgcHJpdmF0ZToKICAgICAgICAg ICAgIAogICAgICAgICAgICAgICAgIGlmIChtX25vZGUtPm9wKCkgPT0gSWRlbnRpdHkpIHsKICAg ICAgICAgICAgICAgICAgICAgbV9ub2RlLT5jb252ZXJ0VG9DaGVjaygpOwotICAgICAgICAgICAg ICAgICAgICBtX25vZGUtPnJlcGxhY2VtZW50ID0gbV9ub2RlLT5jaGlsZDEoKS5ub2RlKCk7Cisg ICAgICAgICAgICAgICAgICAgIG1fbm9kZS0+c2V0UmVwbGFjZW1lbnQobV9ub2RlLT5jaGlsZDEo KS5ub2RlKCkpOwogICAgICAgICAgICAgICAgICAgICBtX2NoYW5nZWQgPSB0cnVlOwogICAgICAg ICAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgIC8vIFRoaXMgcnVsZSBvbmx5 IG1ha2VzIHNlbnNlIGZvciBsb2NhbCBDU0UsIHNpbmNlIGluIFNTQSBmb3JtIHdlIGhhdmUgYWxy ZWFkeQpAQCAtNDM4LDcgKzQzOCw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICAKICAgICAg ICAgICAgICAgICBpZiAobV9ub2RlLT5vcCgpID09IElkZW50aXR5KSB7CiAgICAgICAgICAgICAg ICAgICAgIG1fbm9kZS0+Y29udmVydFRvQ2hlY2soKTsKLSAgICAgICAgICAgICAgICAgICAgbV9u b2RlLT5yZXBsYWNlbWVudCA9IG1fbm9kZS0+Y2hpbGQxKCkubm9kZSgpOworICAgICAgICAgICAg ICAgICAgICBtX25vZGUtPnNldFJlcGxhY2VtZW50KG1fbm9kZS0+Y2hpbGQxKCkubm9kZSgpKTsK ICAgICAgICAgICAgICAgICAgICAgbV9jaGFuZ2VkID0gdHJ1ZTsKICAgICAgICAgICAgICAgICB9 IGVsc2UKICAgICAgICAgICAgICAgICAgICAgY2xvYmJlcml6ZShtX2dyYXBoLCBtX25vZGUsICp0 aGlzKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRXBvY2guaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Vwb2NoLmgJKHJldmlzaW9uIDE4 MzA5NCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRXBvY2guaAkod29ya2luZyBj b3B5KQpAQCAtNDEsNiArNDEsMTggQEAgcHVibGljOgogICAgIHsKICAgICB9CiAgICAgCisgICAg c3RhdGljIEVwb2NoIGZyb21VbnNpZ25lZCh1bnNpZ25lZCB2YWx1ZSkKKyAgICB7CisgICAgICAg IEVwb2NoIHJlc3VsdDsKKyAgICAgICAgcmVzdWx0Lm1fZXBvY2ggPSB2YWx1ZTsKKyAgICAgICAg cmV0dXJuIHJlc3VsdDsKKyAgICB9CisgICAgCisgICAgdW5zaWduZWQgdG9VbnNpZ25lZCgpIGNv bnN0CisgICAgeworICAgICAgICByZXR1cm4gbV9lcG9jaDsKKyAgICB9CisgICAgCiAgICAgc3Rh dGljIEVwb2NoIGZpcnN0KCkKICAgICB7CiAgICAgICAgIEVwb2NoIHJlc3VsdDsKSW5kZXg6IFNv dXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGguY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGguY3BwCShyZXZpc2lvbiAxODMwOTQpCisrKyBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmNwcAkod29ya2luZyBjb3B5KQpAQCAt ODMyLDkgKzgzMiwyMiBAQCB2b2lkIEdyYXBoOjpjbGVhclJlcGxhY2VtZW50cygpCiAgICAgICAg IGlmICghYmxvY2spCiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgZm9yICh1bnNpZ25l ZCBwaGlJbmRleCA9IGJsb2NrLT5waGlzLnNpemUoKTsgcGhpSW5kZXgtLTspCi0gICAgICAgICAg ICBibG9jay0+cGhpc1twaGlJbmRleF0tPnJlcGxhY2VtZW50ID0gMDsKKyAgICAgICAgICAgIGJs b2NrLT5waGlzW3BoaUluZGV4XS0+c2V0UmVwbGFjZW1lbnQobnVsbHB0cik7CiAgICAgICAgIGZv ciAodW5zaWduZWQgbm9kZUluZGV4ID0gYmxvY2stPnNpemUoKTsgbm9kZUluZGV4LS07KQotICAg ICAgICAgICAgYmxvY2stPmF0KG5vZGVJbmRleCktPnJlcGxhY2VtZW50ID0gMDsKKyAgICAgICAg ICAgIGJsb2NrLT5hdChub2RlSW5kZXgpLT5zZXRSZXBsYWNlbWVudChudWxscHRyKTsKKyAgICB9 Cit9CisKK3ZvaWQgR3JhcGg6OmNsZWFyRXBvY2hzKCkKK3sKKyAgICBmb3IgKEJsb2NrSW5kZXgg YmxvY2tJbmRleCA9IG51bUJsb2NrcygpOyBibG9ja0luZGV4LS07KSB7CisgICAgICAgIEJhc2lj QmxvY2sqIGJsb2NrID0gbV9ibG9ja3NbYmxvY2tJbmRleF0uZ2V0KCk7CisgICAgICAgIGlmICgh YmxvY2spCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgZm9yICh1bnNpZ25lZCBwaGlJ bmRleCA9IGJsb2NrLT5waGlzLnNpemUoKTsgcGhpSW5kZXgtLTspCisgICAgICAgICAgICBibG9j ay0+cGhpc1twaGlJbmRleF0tPnNldEVwb2NoKEVwb2NoKCkpOworICAgICAgICBmb3IgKHVuc2ln bmVkIG5vZGVJbmRleCA9IGJsb2NrLT5zaXplKCk7IG5vZGVJbmRleC0tOykKKyAgICAgICAgICAg IGJsb2NrLT5hdChub2RlSW5kZXgpLT5zZXRFcG9jaChFcG9jaCgpKTsKICAgICB9CiB9CiAKSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGguaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0dyYXBoLmgJKHJldmlzaW9uIDE4MzA5NCkKKysr IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHR3JhcGguaAkod29ya2luZyBjb3B5KQpAQCAt MTYyLDcgKzE2Miw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgCiAg ICAgICAgIC8vIENoZWNrIGlmIHRoZXJlIGlzIGFueSByZXBsYWNlbWVudC4KLSAgICAgICAgTm9k ZSogcmVwbGFjZW1lbnQgPSBjaGlsZC0+cmVwbGFjZW1lbnQ7CisgICAgICAgIE5vZGUqIHJlcGxh Y2VtZW50ID0gY2hpbGQtPnJlcGxhY2VtZW50KCk7CiAgICAgICAgIGlmICghcmVwbGFjZW1lbnQp CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIApAQCAtNTYzLDYgKzU2Myw3IEBAIHB1Ymxp YzoKICAgICB2b2lkIGNsZWFyRmxhZ3NPbkFsbE5vZGVzKE5vZGVGbGFncyk7CiAgICAgCiAgICAg dm9pZCBjbGVhclJlcGxhY2VtZW50cygpOworICAgIHZvaWQgY2xlYXJFcG9jaHMoKTsKICAgICB2 b2lkIGluaXRpYWxpemVOb2RlT3duZXJzKCk7CiAgICAgCiAgICAgQmxvY2tMaXN0IGJsb2Nrc0lu UHJlT3JkZXIoKTsKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oCShyZXZpc2lv biAxODMwOTQpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIkRGR0FyaXRoTW9kZS5oIgogI2lu Y2x1ZGUgIkRGR0FycmF5TW9kZS5oIgogI2luY2x1ZGUgIkRGR0NvbW1vbi5oIgorI2luY2x1ZGUg IkRGR0Vwb2NoLmgiCiAjaW5jbHVkZSAiREZHTGF6eUpTVmFsdWUuaCIKICNpbmNsdWRlICJERkdO b2RlRmxhZ3MuaCIKICNpbmNsdWRlICJERkdOb2RlT3JpZ2luLmgiCkBAIC0yNDUsOSArMjQ2LDkg QEAgc3RydWN0IE5vZGUgewogICAgICAgICAsIG1fdmlydHVhbFJlZ2lzdGVyKFZpcnR1YWxSZWdp c3RlcigpKQogICAgICAgICAsIG1fcmVmQ291bnQoMSkKICAgICAgICAgLCBtX3ByZWRpY3Rpb24o U3BlY05vbmUpCi0gICAgICAgICwgcmVwbGFjZW1lbnQobnVsbHB0cikKICAgICAgICAgLCBvd25l cihudWxscHRyKQogICAgIHsKKyAgICAgICAgbV9taXNjLnJlcGxhY2VtZW50ID0gbnVsbHB0cjsK ICAgICAgICAgc2V0T3BBbmREZWZhdWx0RmxhZ3Mob3ApOwogICAgIH0KICAgICAKQEAgLTI2MCw5 ICsyNjEsOSBAQCBzdHJ1Y3QgTm9kZSB7CiAgICAgICAgICwgbV9wcmVkaWN0aW9uKFNwZWNOb25l KQogICAgICAgICAsIG1fb3BJbmZvKDApCiAgICAgICAgICwgbV9vcEluZm8yKDApCi0gICAgICAg ICwgcmVwbGFjZW1lbnQobnVsbHB0cikKICAgICAgICAgLCBvd25lcihudWxscHRyKQogICAgIHsK KyAgICAgICAgbV9taXNjLnJlcGxhY2VtZW50ID0gbnVsbHB0cjsKICAgICAgICAgc2V0T3BBbmRE ZWZhdWx0RmxhZ3Mob3ApOwogICAgICAgICBBU1NFUlQoIShtX2ZsYWdzICYgTm9kZUhhc1ZhckFy Z3MpKTsKICAgICB9CkBAIC0yNzYsOSArMjc3LDkgQEAgc3RydWN0IE5vZGUgewogICAgICAgICAs IG1fcHJlZGljdGlvbihTcGVjTm9uZSkKICAgICAgICAgLCBtX29wSW5mbygwKQogICAgICAgICAs IG1fb3BJbmZvMigwKQotICAgICAgICAsIHJlcGxhY2VtZW50KG51bGxwdHIpCiAgICAgICAgICwg b3duZXIobnVsbHB0cikKICAgICB7CisgICAgICAgIG1fbWlzYy5yZXBsYWNlbWVudCA9IG51bGxw dHI7CiAgICAgICAgIHNldE9wQW5kRGVmYXVsdEZsYWdzKG9wKTsKICAgICAgICAgc2V0UmVzdWx0 KHJlc3VsdCk7CiAgICAgICAgIEFTU0VSVCghKG1fZmxhZ3MgJiBOb2RlSGFzVmFyQXJncykpOwpA QCAtMjkzLDkgKzI5NCw5IEBAIHN0cnVjdCBOb2RlIHsKICAgICAgICAgLCBtX3ByZWRpY3Rpb24o U3BlY05vbmUpCiAgICAgICAgICwgbV9vcEluZm8oaW1tLm1fdmFsdWUpCiAgICAgICAgICwgbV9v cEluZm8yKDApCi0gICAgICAgICwgcmVwbGFjZW1lbnQobnVsbHB0cikKICAgICAgICAgLCBvd25l cihudWxscHRyKQogICAgIHsKKyAgICAgICAgbV9taXNjLnJlcGxhY2VtZW50ID0gbnVsbHB0cjsK ICAgICAgICAgc2V0T3BBbmREZWZhdWx0RmxhZ3Mob3ApOwogICAgICAgICBBU1NFUlQoIShtX2Zs YWdzICYgTm9kZUhhc1ZhckFyZ3MpKTsKICAgICB9CkBAIC0zMDksOSArMzEwLDkgQEAgc3RydWN0 IE5vZGUgewogICAgICAgICAsIG1fcHJlZGljdGlvbihTcGVjTm9uZSkKICAgICAgICAgLCBtX29w SW5mbyhpbW0ubV92YWx1ZSkKICAgICAgICAgLCBtX29wSW5mbzIoMCkKLSAgICAgICAgLCByZXBs YWNlbWVudChudWxscHRyKQogICAgICAgICAsIG93bmVyKG51bGxwdHIpCiAgICAgeworICAgICAg ICBtX21pc2MucmVwbGFjZW1lbnQgPSBudWxscHRyOwogICAgICAgICBzZXRPcEFuZERlZmF1bHRG bGFncyhvcCk7CiAgICAgICAgIHNldFJlc3VsdChyZXN1bHQpOwogICAgICAgICBBU1NFUlQoISht X2ZsYWdzICYgTm9kZUhhc1ZhckFyZ3MpKTsKQEAgLTMyNiw5ICszMjcsOSBAQCBzdHJ1Y3QgTm9k ZSB7CiAgICAgICAgICwgbV9wcmVkaWN0aW9uKFNwZWNOb25lKQogICAgICAgICAsIG1fb3BJbmZv KGltbTEubV92YWx1ZSkKICAgICAgICAgLCBtX29wSW5mbzIoaW1tMi5tX3ZhbHVlKQotICAgICAg ICAsIHJlcGxhY2VtZW50KG51bGxwdHIpCiAgICAgICAgICwgb3duZXIobnVsbHB0cikKICAgICB7 CisgICAgICAgIG1fbWlzYy5yZXBsYWNlbWVudCA9IG51bGxwdHI7CiAgICAgICAgIHNldE9wQW5k RGVmYXVsdEZsYWdzKG9wKTsKICAgICAgICAgQVNTRVJUKCEobV9mbGFncyAmIE5vZGVIYXNWYXJB cmdzKSk7CiAgICAgfQpAQCAtMzQyLDkgKzM0Myw5IEBAIHN0cnVjdCBOb2RlIHsKICAgICAgICAg LCBtX3ByZWRpY3Rpb24oU3BlY05vbmUpCiAgICAgICAgICwgbV9vcEluZm8oaW1tMS5tX3ZhbHVl KQogICAgICAgICAsIG1fb3BJbmZvMihpbW0yLm1fdmFsdWUpCi0gICAgICAgICwgcmVwbGFjZW1l bnQobnVsbHB0cikKICAgICAgICAgLCBvd25lcihudWxscHRyKQogICAgIHsKKyAgICAgICAgbV9t aXNjLnJlcGxhY2VtZW50ID0gbnVsbHB0cjsKICAgICAgICAgc2V0T3BBbmREZWZhdWx0RmxhZ3Mo b3ApOwogICAgICAgICBBU1NFUlQobV9mbGFncyAmIE5vZGVIYXNWYXJBcmdzKTsKICAgICB9CkBA IC00MjUsNyArNDI2LDcgQEAgc3RydWN0IE5vZGUgewogICAgIHZvaWQgcmVwbGFjZVdpdGgoTm9k ZSogb3RoZXIpCiAgICAgewogICAgICAgICBjb252ZXJ0VG9QaGFudG9tKCk7Ci0gICAgICAgIHJl cGxhY2VtZW50ID0gb3RoZXI7CisgICAgICAgIHNldFJlcGxhY2VtZW50KG90aGVyKTsKICAgICB9 CiAKICAgICB2b2lkIGNvbnZlcnRUb0lkZW50aXR5KCk7CkBAIC0xOTM2LDYgKzE5MzcsMjYgQEAg c3RydWN0IE5vZGUgewogICAgICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxCYXNpY0Jsb2Nr TG9jYXRpb24qPihtX29wSW5mbyk7CiAgICAgfQogICAgIAorICAgIE5vZGUqIHJlcGxhY2VtZW50 KCkgY29uc3QKKyAgICB7CisgICAgICAgIHJldHVybiBtX21pc2MucmVwbGFjZW1lbnQ7CisgICAg fQorICAgIAorICAgIHZvaWQgc2V0UmVwbGFjZW1lbnQoTm9kZSogcmVwbGFjZW1lbnQpCisgICAg eworICAgICAgICBtX21pc2MucmVwbGFjZW1lbnQgPSByZXBsYWNlbWVudDsKKyAgICB9CisgICAg CisgICAgRXBvY2ggZXBvY2goKSBjb25zdAorICAgIHsKKyAgICAgICAgcmV0dXJuIEVwb2NoOjpm cm9tVW5zaWduZWQobV9taXNjLmVwb2NoKTsKKyAgICB9CisgICAgCisgICAgdm9pZCBzZXRFcG9j aChFcG9jaCBlcG9jaCkKKyAgICB7CisgICAgICAgIG1fbWlzYy5lcG9jaCA9IGVwb2NoLnRvVW5z aWduZWQoKTsKKyAgICB9CisgICAgCiAgICAgdm9pZCBkdW1wQ2hpbGRyZW4oUHJpbnRTdHJlYW0m IG91dCkKICAgICB7CiAgICAgICAgIGlmICghY2hpbGQxKCkpCkBAIC0xOTc5LDEyICsyMDAwLDE3 IEBAIHB1YmxpYzoKICAgICAvLyB3aWxsIHRlbGwgeW91IHdoaWNoIGJhc2ljIGJsb2NrIGEgbm9k ZSBiZWxvbmdzIHRvLiBZb3UgY2Fubm90IHJlbHkgb24gdGhpcyBwZXJzaXN0aW5nCiAgICAgLy8g YWNyb3NzIHRyYW5zZm9ybWF0aW9ucyB1bmxlc3MgeW91IGRvIHRoZSBtYWludGVuYW5jZSB3b3Jr IHlvdXJzZWxmLiBPdGhlciBwaGFzZXMgdXNlCiAgICAgLy8gTm9kZTo6cmVwbGFjZW1lbnQsIGJ1 dCB0aGV5IGRvIHNvIG1hbnVhbGx5OiBmaXJzdCB5b3UgZG8gR3JhcGg6OmNsZWFyUmVwbGFjZW1l bnRzKCkKLSAgICAvLyBhbmQgdGhlbiB5b3Ugc2V0LCBhbmQgdXNlLCByZXBsYWNlbWVudCdzIHlv dXJzZWxmLgorICAgIC8vIGFuZCB0aGVuIHlvdSBzZXQsIGFuZCB1c2UsIHJlcGxhY2VtZW50J3Mg eW91cnNlbGYuIFNhbWUgdGhpbmcgZm9yIGVwb2NoLgogICAgIC8vCiAgICAgLy8gQm90dG9tIGxp bmU6IGRvbid0IHVzZSB0aGVzZSBmaWVsZHMgdW5sZXNzIHlvdSBpbml0aWFsaXplIHRoZW0geW91 cnNlbGYsIG9yIGJ5CiAgICAgLy8gY2FsbGluZyBzb21lIGFwcHJvcHJpYXRlIG1ldGhvZHMgdGhh dCBpbml0aWFsaXplIHRoZW0gdGhlIHdheSB5b3Ugd2FudC4gT3RoZXJ3aXNlLAogICAgIC8vIHRo ZXNlIGZpZWxkcyBhcmUgbWVhbmluZ2xlc3MuCi0gICAgTm9kZSogcmVwbGFjZW1lbnQ7Citwcml2 YXRlOgorICAgIHVuaW9uIHsKKyAgICAgICAgTm9kZSogcmVwbGFjZW1lbnQ7CisgICAgICAgIHVu c2lnbmVkIGVwb2NoOworICAgIH0gbV9taXNjOworcHVibGljOgogICAgIEJhc2ljQmxvY2sqIG93 bmVyOwogfTsKIApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTU0FDb252ZXJz aW9uUGhhc2UuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH U1NBQ29udmVyc2lvblBoYXNlLmNwcAkocmV2aXNpb24gMTgzMDk0KQorKysgU291cmNlL0phdmFT Y3JpcHRDb3JlL2RmZy9ERkdTU0FDb252ZXJzaW9uUGhhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC0yMjcsMTMgKzIyNywxMyBAQCBwdWJsaWM6CiAgICAgICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgIE5vZGUqIG5vZGUgPSBkZWYtPnZh bHVlKCk7Ci0gICAgICAgICAgICAgICAgICAgIGlmIChub2RlLT5yZXBsYWNlbWVudCkgeworICAg ICAgICAgICAgICAgICAgICBpZiAobm9kZS0+cmVwbGFjZW1lbnQoKSkgewogICAgICAgICAgICAg ICAgICAgICAgICAgLy8gVGhpcyB3aWxsIG9jY3VyIHdoZW4gYSBTZXRMb2NhbCBoYWQgYSBHZXRM b2NhbCBhcyBpdHMgc291cmNlLiBUaGUKICAgICAgICAgICAgICAgICAgICAgICAgIC8vIEdldExv Y2FsIHdvdWxkIGdldCByZXBsYWNlZCB3aXRoIGFuIGFjdHVhbCBTU0EgdmFsdWUgYnkgdGhlIHRp bWUgd2UgZ2V0CiAgICAgICAgICAgICAgICAgICAgICAgICAvLyBoZXJlLiBOb3RlIHRoYXQgdGhl IFNTQSB2YWx1ZSB3aXRoIHdoaWNoIHRoZSBHZXRMb2NhbCBnb3QgcmVwbGFjZWQKICAgICAgICAg ICAgICAgICAgICAgICAgIC8vIHdvdWxkIG5vdCBpbiB0dXJuIGhhdmUgYSByZXBsYWNlbWVudC4K LSAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUgPSBub2RlLT5yZXBsYWNlbWVudDsKLSAgICAg ICAgICAgICAgICAgICAgICAgIEFTU0VSVCghbm9kZS0+cmVwbGFjZW1lbnQpOworICAgICAgICAg ICAgICAgICAgICAgICAgbm9kZSA9IG5vZGUtPnJlcGxhY2VtZW50KCk7CisgICAgICAgICAgICAg ICAgICAgICAgICBBU1NFUlQoIW5vZGUtPnJlcGxhY2VtZW50KCkpOwogICAgICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgICAgIGlmICh2ZXJib3NlKQogICAgICAgICAgICAgICAg ICAgICAgICAgZGF0YUxvZygiTWFwcGluZzogIiwgVmlydHVhbFJlZ2lzdGVyKHZhbHVlRm9yT3Bl cmFuZC5vcGVyYW5kRm9ySW5kZXgoaSkpLCAiIC0+ICIsIG5vZGUsICJcbiIpOwpAQCAtMzAzLDcg KzMwMyw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgICAgICAgICAgbm9kZS0+Y29udmVydFRvUGhh bnRvbSgpOwogICAgICAgICAgICAgICAgICAgICBpZiAodmVyYm9zZSkKICAgICAgICAgICAgICAg ICAgICAgICAgIGRhdGFMb2coIlJlcGxhY2luZyBub2RlICIsIG5vZGUsICIgd2l0aCAiLCB2YWx1 ZUZvck9wZXJhbmQub3BlcmFuZCh2YXJpYWJsZS0+bG9jYWwoKSksICJcbiIpOwotICAgICAgICAg ICAgICAgICAgICBub2RlLT5yZXBsYWNlbWVudCA9IHZhbHVlRm9yT3BlcmFuZC5vcGVyYW5kKHZh cmlhYmxlLT5sb2NhbCgpKTsKKyAgICAgICAgICAgICAgICAgICAgbm9kZS0+c2V0UmVwbGFjZW1l bnQodmFsdWVGb3JPcGVyYW5kLm9wZXJhbmQodmFyaWFibGUtPmxvY2FsKCkpKTsKICAgICAgICAg ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAg ICAK