57775 2011-04-04 12:23:40 -0700 Renamed Finalizer => WeakHandleOwner (in preparation for adding a reachability callback) 2011-04-04 13:40:39 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 ggaren ggaren oliver oldest_to_newest 378956 0 ggaren 2011-04-04 12:23:40 -0700 Renamed Finalizer => WeakHandleOwner (in preparation for adding a reachability callback) 378965 1 88098 ggaren 2011-04-04 12:34:23 -0700 Created attachment 88098 Patch 379025 2 ggaren 2011-04-04 13:40:39 -0700 Committed r82866: <http://trac.webkit.org/changeset/82866> 88098 2011-04-04 12:34:23 -0700 2011-04-04 13:38:10 -0700 Patch bug-57775-20110404123422.patch text/plain 11796 ggaren SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gODI4NTIpCisrKyBTb3VyY2Uv SmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDAgQEAK KzIwMTEtMDQtMDQgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWVkIEZpbmFsaXpl ciA9PiBXZWFrSGFuZGxlT3duZXIgKGluIHByZXBhcmF0aW9uIGZvciBhZGRpbmcgYSByZWFjaGFi aWxpdHkgY2FsbGJhY2spCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD01Nzc3NQorICAgICAgICAKKyAgICAgICAgQWxzbyByZW5hbWVkIG5vRmluYWxpemVy ID0+IGVtcHR5V2Vha093bmVyLCBzaW5jZSB0aGlzIGlzIHJlYWxseSBhbgorICAgICAgICBvcHRp bWl6YXRpb24gZm9yIGEgd2VhayBvd25lciB3aXRoIGVtcHR5IGNhbGxiYWNrcy4KKworICAgICAg ICAqIGNvbGxlY3Rvci9oYW5kbGVzL0hhbmRsZUhlYXAuY3BwOgorICAgICAgICAoSlNDOjpIYW5k bGVIZWFwOjpjbGVhcldlYWtQb2ludGVycyk6IFVwZGF0ZWQgZm9yIHJlbmFtZXMuIFJlbW92ZWQK KyAgICAgICAgcmVkdW5kYW50IGluaXRpYWxpemF0aW9uIG9mIG1fbmV4dFRvRmluYWxpemUuIE1v dmVkIGRlbGV0aW9uIGNoZWNrIGluc2lkZQorICAgICAgICB3ZWFrIG93bmVyIGNoZWNrLCBzaW5j ZSB0aGUgd2VhayBvd25lciBjYW4ndCBkZWxldGUgdGhlIG5vZGUgaWYgdGhlcmUgaXMKKyAgICAg ICAgbm8gd2VhayBvd25lciEKKworICAgICAgICAqIGNvbGxlY3Rvci9oYW5kbGVzL0hhbmRsZUhl YXAuaDoKKyAgICAgICAgKEpTQzo6V2Vha0hhbmRsZU93bmVyOjp+V2Vha0hhbmRsZU93bmVyKToK KyAgICAgICAgKEpTQzo6SGFuZGxlSGVhcDo6bWFrZVdlYWspOiBVcGRhdGVkIGZvciByZW5hbWVz LgorCisgICAgICAgIChKU0M6OkhhbmRsZUhlYXA6Omhhc1dlYWtPd25lcik6IENoYW5nZWQgZ2V0 RmluYWxpemVyIHRvIGhhc1dlYWtPd25lciwKKyAgICAgICAgdG8gY2xhcmlmeSB0aGlzIGZ1bmN0 aW9uJ3Mgcm9sZSBpbiBhc3NlcnRpb25zLgorCisgICAgICAgIChKU0M6OkhhbmRsZUhlYXA6Ok5v ZGU6Ok5vZGUpOgorICAgICAgICAoSlNDOjpIYW5kbGVIZWFwOjpOb2RlOjptYWtlV2Vhayk6Cisg ICAgICAgIChKU0M6OkhhbmRsZUhlYXA6Ok5vZGU6OmlzV2Vhayk6CisgICAgICAgIChKU0M6Okhh bmRsZUhlYXA6Ok5vZGU6OndlYWtPd25lcik6CisgICAgICAgIChKU0M6OkhhbmRsZUhlYXA6Ok5v ZGU6OndlYWtPd25lckNvbnRleHQpOgorICAgICAgICAoSlNDOjpIYW5kbGVIZWFwOjpOb2RlOjpl bXB0eVdlYWtPd25lcik6CisgICAgICAgICogaW50ZXJwcmV0ZXIvUmVnaXN0ZXJGaWxlLmNwcDoK KyAgICAgICAgKEpTQzo6UmVnaXN0ZXJGaWxlOjpnbG9iYWxPYmplY3RDb2xsZWN0ZWROb3RpZmll cik6CisgICAgICAgICogaW50ZXJwcmV0ZXIvUmVnaXN0ZXJGaWxlLmg6CisgICAgICAgICogcnVu dGltZS9XZWFrR0NNYXAuaDoKKyAgICAgICAgKiBydW50aW1lL1dlYWtHQ1B0ci5oOgorICAgICAg ICAoSlNDOjpXZWFrR0NQdHI6OldlYWtHQ1B0cik6CisgICAgICAgIChKU0M6OldlYWtHQ1B0cjo6 c2V0KTogVXBkYXRlZCBmb3IgcmVuYW1lcy4KKwogMjAxMS0wNC0wMSAgT2xpdmVyIEh1bnQgIDxv bGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgpJ bmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2NvbGxlY3Rvci9oYW5kbGVzL0hhbmRsZUhlYXAu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9jb2xsZWN0b3IvaGFuZGxl cy9IYW5kbGVIZWFwLmNwcAkocmV2aXNpb24gODI4NTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENv cmUvY29sbGVjdG9yL2hhbmRsZXMvSGFuZGxlSGVhcC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTg2 LDEyICs4NiwxMSBAQCB2b2lkIEhhbmRsZUhlYXA6OmNsZWFyV2Vha1BvaW50ZXJzKCkKICAgICAg ICAgaWYgKEhlYXA6OmlzTWFya2VkKGNlbGwpKQogICAgICAgICAgICAgY29udGludWU7CiAKLSAg ICAgICAgbV9uZXh0VG9GaW5hbGl6ZSA9IG5vZGUtPm5leHQoKTsKLSAgICAgICAgaWYgKEZpbmFs aXplciogZmluYWxpemVyID0gbm9kZS0+ZmluYWxpemVyKCkpCi0gICAgICAgICAgICBmaW5hbGl6 ZXItPmZpbmFsaXplKEhhbmRsZTxVbmtub3duPjo6d3JhcFNsb3Qobm9kZS0+c2xvdCgpKSwgbm9k ZS0+ZmluYWxpemVyQ29udGV4dCgpKTsKLQotICAgICAgICBpZiAobV9uZXh0VG9GaW5hbGl6ZSAh PSBub2RlLT5uZXh0KCkpIC8vIEZpbmFsaXplciBkZWFsbG9jYXRlZCBub2RlLgotICAgICAgICAg ICAgY29udGludWU7CisgICAgICAgIGlmIChXZWFrSGFuZGxlT3duZXIqIHdlYWtPd25lciA9IG5v ZGUtPndlYWtPd25lcigpKSB7CisgICAgICAgICAgICB3ZWFrT3duZXItPmZpbmFsaXplKEhhbmRs ZTxVbmtub3duPjo6d3JhcFNsb3Qobm9kZS0+c2xvdCgpKSwgbm9kZS0+d2Vha093bmVyQ29udGV4 dCgpKTsKKyAgICAgICAgICAgIGlmIChtX25leHRUb0ZpbmFsaXplICE9IG5vZGUtPm5leHQoKSkg Ly8gT3duZXIgZGVhbGxvY2F0ZWQgbm9kZS4KKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAg ICAgICAgfQogCiAgICAgICAgICpub2RlLT5zbG90KCkgPSBKU1ZhbHVlKCk7CiAgICAgICAgIFNl bnRpbmVsTGlua2VkTGlzdDxOb2RlPjo6cmVtb3ZlKG5vZGUpOwpJbmRleDogU291cmNlL0phdmFT Y3JpcHRDb3JlL2NvbGxlY3Rvci9oYW5kbGVzL0hhbmRsZUhlYXAuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvSmF2YVNjcmlwdENvcmUvY29sbGVjdG9yL2hhbmRsZXMvSGFuZGxlSGVhcC5oCShyZXZp c2lvbiA4Mjg1MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9jb2xsZWN0b3IvaGFuZGxlcy9I YW5kbGVIZWFwLmgJKHdvcmtpbmcgY29weSkKQEAgLTM4LDEwICszOCwxMCBAQCBjbGFzcyBKU0ds b2JhbERhdGE7CiBjbGFzcyBKU1ZhbHVlOwogY2xhc3MgSGVhcFJvb3RNYXJrZXI7CiAKLWNsYXNz IEZpbmFsaXplciB7CitjbGFzcyBXZWFrSGFuZGxlT3duZXIgewogcHVibGljOgogICAgIHZpcnR1 YWwgdm9pZCBmaW5hbGl6ZShIYW5kbGU8VW5rbm93bj4sIHZvaWQqKSA9IDA7Ci0gICAgdmlydHVh bCB+RmluYWxpemVyKCkge30KKyAgICB2aXJ0dWFsIH5XZWFrSGFuZGxlT3duZXIoKSB7fQogfTsK IAogY2xhc3MgSGFuZGxlSGVhcCB7CkBAIC01Myw3ICs1Myw3IEBAIHB1YmxpYzoKICAgICBIYW5k bGVTbG90IGFsbG9jYXRlKCk7CiAgICAgdm9pZCBkZWFsbG9jYXRlKEhhbmRsZVNsb3QpOwogCi0g ICAgdm9pZCBtYWtlV2VhayhIYW5kbGVTbG90LCBGaW5hbGl6ZXIqID0gMCwgdm9pZCogY29udGV4 dCA9IDApOworICAgIHZvaWQgbWFrZVdlYWsoSGFuZGxlU2xvdCwgV2Vha0hhbmRsZU93bmVyKiA9 IDAsIHZvaWQqIGNvbnRleHQgPSAwKTsKIAogICAgIHZvaWQgbWFya1N0cm9uZ0hhbmRsZXMoSGVh cFJvb3RNYXJrZXImKTsKICAgICB2b2lkIHVwZGF0ZUFmdGVyTWFyaygpOwpAQCAtNjQsMTAgKzY0 LDcgQEAgcHVibGljOgogICAgIHZvaWQgd3JpdGVCYXJyaWVyKEhhbmRsZVNsb3QsIGNvbnN0IEpT VmFsdWUmKTsKIAogI2lmICFBU1NFUlRfRElTQUJMRUQKLSAgICBGaW5hbGl6ZXIqIGdldEZpbmFs aXplcihIYW5kbGVTbG90IGhhbmRsZSkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0b05vZGUoaGFu ZGxlKS0+ZmluYWxpemVyKCk7Ci0gICAgfQorICAgIGJvb2wgaGFzV2Vha093bmVyKEhhbmRsZVNs b3QsIFdlYWtIYW5kbGVPd25lciopOwogI2VuZGlmCiAKICAgICB1bnNpZ25lZCBwcm90ZWN0ZWRH bG9iYWxPYmplY3RDb3VudCgpOwpAQCAtODEsMTEgKzc4LDExIEBAIHByaXZhdGU6CiAgICAgICAg IEhhbmRsZVNsb3Qgc2xvdCgpOwogICAgICAgICBIYW5kbGVIZWFwKiBoYW5kbGVIZWFwKCk7CiAK LSAgICAgICAgdm9pZCBtYWtlV2VhayhGaW5hbGl6ZXIqLCB2b2lkKiBjb250ZXh0KTsKKyAgICAg ICAgdm9pZCBtYWtlV2VhayhXZWFrSGFuZGxlT3duZXIqLCB2b2lkKiBjb250ZXh0KTsKICAgICAg ICAgYm9vbCBpc1dlYWsoKTsKICAgICAgICAgCi0gICAgICAgIEZpbmFsaXplciogZmluYWxpemVy KCk7Ci0gICAgICAgIHZvaWQqIGZpbmFsaXplckNvbnRleHQoKTsKKyAgICAgICAgV2Vha0hhbmRs ZU93bmVyKiB3ZWFrT3duZXIoKTsKKyAgICAgICAgdm9pZCogd2Vha093bmVyQ29udGV4dCgpOwog CiAgICAgICAgIHZvaWQgc2V0UHJldihOb2RlKik7CiAgICAgICAgIE5vZGUqIHByZXYoKTsKQEAg LTk0LDEyICs5MSwxMiBAQCBwcml2YXRlOgogICAgICAgICBOb2RlKiBuZXh0KCk7CiAKICAgICBw cml2YXRlOgotICAgICAgICBGaW5hbGl6ZXIqIG5vRmluYWxpemVyKCk7CisgICAgICAgIFdlYWtI YW5kbGVPd25lciogZW1wdHlXZWFrT3duZXIoKTsKIAogICAgICAgICBKU1ZhbHVlIG1fdmFsdWU7 CiAgICAgICAgIEhhbmRsZUhlYXAqIG1faGFuZGxlSGVhcDsKLSAgICAgICAgRmluYWxpemVyKiBt X2ZpbmFsaXplcjsKLSAgICAgICAgdm9pZCogbV9maW5hbGl6ZXJDb250ZXh0OworICAgICAgICBX ZWFrSGFuZGxlT3duZXIqIG1fd2Vha093bmVyOworICAgICAgICB2b2lkKiBtX3dlYWtPd25lckNv bnRleHQ7CiAgICAgICAgIE5vZGUqIG1fcHJldjsKICAgICAgICAgTm9kZSogbV9uZXh0OwogICAg IH07CkBAIC0xNjAsMjggKzE1NywzNSBAQCBpbmxpbmUgdm9pZCBIYW5kbGVIZWFwOjpkZWFsbG9j YXRlKEhhbmRsCiAgICAgbV9mcmVlTGlzdC5wdXNoKG5vZGUpOwogfQogCi1pbmxpbmUgdm9pZCBI YW5kbGVIZWFwOjptYWtlV2VhayhIYW5kbGVTbG90IGhhbmRsZSwgRmluYWxpemVyKiBmaW5hbGl6 ZXIsIHZvaWQqIGNvbnRleHQpCitpbmxpbmUgdm9pZCBIYW5kbGVIZWFwOjptYWtlV2VhayhIYW5k bGVTbG90IGhhbmRsZSwgV2Vha0hhbmRsZU93bmVyKiB3ZWFrT3duZXIsIHZvaWQqIGNvbnRleHQp CiB7CiAgICAgTm9kZSogbm9kZSA9IHRvTm9kZShoYW5kbGUpOwogICAgIFNlbnRpbmVsTGlua2Vk TGlzdDxOb2RlPjo6cmVtb3ZlKG5vZGUpOwotICAgIG5vZGUtPm1ha2VXZWFrKGZpbmFsaXplciwg Y29udGV4dCk7CisgICAgbm9kZS0+bWFrZVdlYWsod2Vha093bmVyLCBjb250ZXh0KTsKICAgICBp ZiAoaGFuZGxlLT5pc0NlbGwoKSAmJiAqaGFuZGxlKQogICAgICAgICBtX3dlYWtMaXN0LnB1c2go bm9kZSk7CiAgICAgZWxzZQogICAgICAgICBtX2ltbWVkaWF0ZUxpc3QucHVzaChub2RlKTsKIH0K IAorI2lmICFBU1NFUlRfRElTQUJMRUQKK2lubGluZSBib29sIEhhbmRsZUhlYXA6Omhhc1dlYWtP d25lcihIYW5kbGVTbG90IGhhbmRsZSwgV2Vha0hhbmRsZU93bmVyKiB3ZWFrT3duZXIpCit7Cisg ICAgcmV0dXJuIHRvTm9kZShoYW5kbGUpLT53ZWFrT3duZXIoKSA9PSB3ZWFrT3duZXI7Cit9Cisj ZW5kaWYKKwogaW5saW5lIEhhbmRsZUhlYXA6Ok5vZGU6Ok5vZGUoSGFuZGxlSGVhcCogaGFuZGxl SGVhcCkKICAgICA6IG1faGFuZGxlSGVhcChoYW5kbGVIZWFwKQotICAgICwgbV9maW5hbGl6ZXIo MCkKLSAgICAsIG1fZmluYWxpemVyQ29udGV4dCgwKQorICAgICwgbV93ZWFrT3duZXIoMCkKKyAg ICAsIG1fd2Vha093bmVyQ29udGV4dCgwKQogewogfQogCiBpbmxpbmUgSGFuZGxlSGVhcDo6Tm9k ZTo6Tm9kZShXVEY6OlNlbnRpbmVsVGFnKQogICAgIDogbV9oYW5kbGVIZWFwKDApCi0gICAgLCBt X2ZpbmFsaXplcigwKQotICAgICwgbV9maW5hbGl6ZXJDb250ZXh0KDApCisgICAgLCBtX3dlYWtP d25lcigwKQorICAgICwgbV93ZWFrT3duZXJDb250ZXh0KDApCiB7CiB9CiAKQEAgLTE5NSwyNiAr MTk5LDI2IEBAIGlubGluZSBIYW5kbGVIZWFwKiBIYW5kbGVIZWFwOjpOb2RlOjpoYW4KICAgICBy ZXR1cm4gbV9oYW5kbGVIZWFwOwogfQogCi1pbmxpbmUgdm9pZCBIYW5kbGVIZWFwOjpOb2RlOjpt YWtlV2VhayhGaW5hbGl6ZXIqIGZpbmFsaXplciwgdm9pZCogY29udGV4dCkKK2lubGluZSB2b2lk IEhhbmRsZUhlYXA6Ok5vZGU6Om1ha2VXZWFrKFdlYWtIYW5kbGVPd25lciogd2Vha093bmVyLCB2 b2lkKiBjb250ZXh0KQogewotICAgIG1fZmluYWxpemVyID0gZmluYWxpemVyID8gZmluYWxpemVy IDogbm9GaW5hbGl6ZXIoKTsKLSAgICBtX2ZpbmFsaXplckNvbnRleHQgPSBjb250ZXh0OworICAg IG1fd2Vha093bmVyID0gd2Vha093bmVyID8gd2Vha093bmVyIDogZW1wdHlXZWFrT3duZXIoKTsK KyAgICBtX3dlYWtPd25lckNvbnRleHQgPSBjb250ZXh0OwogfQogCiBpbmxpbmUgYm9vbCBIYW5k bGVIZWFwOjpOb2RlOjppc1dlYWsoKQogewotICAgIHJldHVybiBtX2ZpbmFsaXplcjsgLy8gVHJ1 ZSBmb3Igbm9GaW5hbGl6ZXIoKS4KKyAgICByZXR1cm4gbV93ZWFrT3duZXI7IC8vIFRydWUgZm9y IGVtcHR5V2Vha093bmVyKCkuCiB9CiAKLWlubGluZSBGaW5hbGl6ZXIqIEhhbmRsZUhlYXA6Ok5v ZGU6OmZpbmFsaXplcigpCitpbmxpbmUgV2Vha0hhbmRsZU93bmVyKiBIYW5kbGVIZWFwOjpOb2Rl Ojp3ZWFrT3duZXIoKQogewotICAgIHJldHVybiBtX2ZpbmFsaXplciA9PSBub0ZpbmFsaXplcigp ID8gMCA6IG1fZmluYWxpemVyOworICAgIHJldHVybiBtX3dlYWtPd25lciA9PSBlbXB0eVdlYWtP d25lcigpID8gMCA6IG1fd2Vha093bmVyOyAvLyAwIGZvciBlbXB0eVdlYWtPd25lcigpLgogfQog Ci1pbmxpbmUgdm9pZCogSGFuZGxlSGVhcDo6Tm9kZTo6ZmluYWxpemVyQ29udGV4dCgpCitpbmxp bmUgdm9pZCogSGFuZGxlSGVhcDo6Tm9kZTo6d2Vha093bmVyQ29udGV4dCgpCiB7Ci0gICAgQVNT RVJUKGZpbmFsaXplcigpKTsKLSAgICByZXR1cm4gbV9maW5hbGl6ZXJDb250ZXh0OworICAgIEFT U0VSVCh3ZWFrT3duZXIoKSk7CisgICAgcmV0dXJuIG1fd2Vha093bmVyQ29udGV4dDsKIH0KIAog aW5saW5lIHZvaWQgSGFuZGxlSGVhcDo6Tm9kZTo6c2V0UHJldihOb2RlKiBwcmV2KQpAQCAtMjM3 LDkgKzI0MSwxMSBAQCBpbmxpbmUgSGFuZGxlSGVhcDo6Tm9kZSogSGFuZGxlSGVhcDo6Tm9kCiAg ICAgcmV0dXJuIG1fbmV4dDsKIH0KIAotaW5saW5lIEZpbmFsaXplciogSGFuZGxlSGVhcDo6Tm9k ZTo6bm9GaW5hbGl6ZXIoKQorLy8gU2VudGluZWwgdG8gaW5kaWNhdGUgdGhhdCBhIG5vZGUgaXMg d2VhaywgYnV0IGl0cyBvd25lciBoYXMgbm8gbWVhbmluZ2Z1bAorLy8gY2FsbGJhY2tzLiBUaGlz IGFsbG93cyB1cyB0byBvcHRpbWl6ZSBieSBza2lwcGluZyBzdWNoIG5vZGVzLgoraW5saW5lIFdl YWtIYW5kbGVPd25lciogSGFuZGxlSGVhcDo6Tm9kZTo6ZW1wdHlXZWFrT3duZXIoKQogewotICAg IHJldHVybiByZWludGVycHJldF9jYXN0PEZpbmFsaXplcio+KC0xKTsgLy8gU2VudGluZWwgdG8g aW5kaWNhdGUgYSBub2RlIGlzIHdlYWsgYnV0IGhhcyBubyByZWFsIGZpbmFsaXplci4KKyAgICBy ZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxXZWFrSGFuZGxlT3duZXIqPigtMSk7CiB9CiAKIH0KSW5k ZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9SZWdpc3RlckZpbGUuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9SZWdpc3RlckZp bGUuY3BwCShyZXZpc2lvbiA4Mjg1MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnBy ZXRlci9SZWdpc3RlckZpbGUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NSw3ICs3NSw3IEBAIHZv aWQgUmVnaXN0ZXJGaWxlOjpzZXRHbG9iYWxPYmplY3QoSlNHbG8KICAgICBtX2dsb2JhbE9iamVj dC5zZXQoZ2xvYmFsT2JqZWN0LT5nbG9iYWxEYXRhKCksIGdsb2JhbE9iamVjdCwgUmVnaXN0ZXJG aWxlOjpnbG9iYWxPYmplY3RDb2xsZWN0ZWROb3RpZmllcigpKTsKIH0KIAotY2xhc3MgR2xvYmFs T2JqZWN0Tm90aWZpZXIgOiBwdWJsaWMgRmluYWxpemVyIHsKK2NsYXNzIEdsb2JhbE9iamVjdE5v dGlmaWVyIDogcHVibGljIFdlYWtIYW5kbGVPd25lciB7CiBwdWJsaWM6CiAgICAgdm9pZCBmaW5h bGl6ZShIYW5kbGU8VW5rbm93bj4gdmFsdWUsIHZvaWQqKQogICAgIHsKQEAgLTg0LDcgKzg0LDcg QEAgcHVibGljOgogICAgIH0KIH07CiAKLUZpbmFsaXplciogUmVnaXN0ZXJGaWxlOjpnbG9iYWxP YmplY3RDb2xsZWN0ZWROb3RpZmllcigpCitXZWFrSGFuZGxlT3duZXIqIFJlZ2lzdGVyRmlsZTo6 Z2xvYmFsT2JqZWN0Q29sbGVjdGVkTm90aWZpZXIoKQogewogICAgIC8vIFRoaXMgd2lsbCBsZWFr IGFsYXMsIGJ1dCB3ZSBvbmx5IGNyZWF0ZSBvbmUgb2YgdGhlbSwgYW5kIGl0IGRvZXNuJ3QKICAg ICAvLyB0YWtlIHVwIGFueSBzaWduaWZpY2FudCBhbW91bnQgb2Ygc3BhY2UuCkluZGV4OiBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaW50ZXJwcmV0ZXIvUmVnaXN0ZXJGaWxlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2ludGVycHJldGVyL1JlZ2lzdGVyRmlsZS5oCShyZXZp c2lvbiA4Mjg1MCkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnRlcnByZXRlci9SZWdpc3Rl ckZpbGUuaAkod29ya2luZyBjb3B5KQpAQCAtMTM1LDcgKzEzNSw3IEBAIG5hbWVzcGFjZSBKU0Mg ewogICAgICAgICBzdGF0aWMgc2l6ZV90IGNvbW1pdHRlZEJ5dGVDb3VudCgpOwogICAgICAgICBz dGF0aWMgdm9pZCBpbml0aWFsaXplVGhyZWFkaW5nKCk7CiAKLSAgICAgICAgc3RhdGljIEZpbmFs aXplciogZ2xvYmFsT2JqZWN0Q29sbGVjdGVkTm90aWZpZXIoKTsKKyAgICAgICAgc3RhdGljIFdl YWtIYW5kbGVPd25lciogZ2xvYmFsT2JqZWN0Q29sbGVjdGVkTm90aWZpZXIoKTsKIAogICAgICAg ICBSZWdpc3RlciogY29uc3QgKiBhZGRyZXNzT2ZFbmQoKSBjb25zdAogICAgICAgICB7CkluZGV4 OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrR0NNYXAuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrR0NNYXAuaAkocmV2aXNpb24gODI4 NTApCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9XZWFrR0NNYXAuaAkod29ya2lu ZyBjb3B5KQpAQCAtMzQsNyArMzQsNyBAQCBuYW1lc3BhY2UgSlNDIHsKIAogLy8gQSBIYXNoTWFw IGZvciBHQydkIHZhbHVlcyB0aGF0IHJlbW92ZXMgZW50cmllcyB3aGVuIHRoZSBhc3NvY2lhdGVk IHZhbHVlCiAvLyBkaWVzLgotdGVtcGxhdGU8dHlwZW5hbWUgS2V5VHlwZSwgdHlwZW5hbWUgTWFw cGVkVHlwZT4gY2xhc3MgV2Vha0dDTWFwIDogcHJpdmF0ZSBGaW5hbGl6ZXIgewordGVtcGxhdGU8 dHlwZW5hbWUgS2V5VHlwZSwgdHlwZW5hbWUgTWFwcGVkVHlwZT4gY2xhc3MgV2Vha0dDTWFwIDog cHJpdmF0ZSBXZWFrSGFuZGxlT3duZXIgewogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwog ICAgIFdURl9NQUtFX05PTkNPUFlBQkxFKFdlYWtHQ01hcCk7CiAKSW5kZXg6IFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1dlYWtHQ1B0ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZh U2NyaXB0Q29yZS9ydW50aW1lL1dlYWtHQ1B0ci5oCShyZXZpc2lvbiA4Mjg1MCkKKysrIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL1dlYWtHQ1B0ci5oCSh3b3JraW5nIGNvcHkpCkBAIC00 MywxNiArNDMsMTYgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAgICAgCi0gICAgV2Vha0dDUHRy KEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSwgRmluYWxpemVyKiBmaW5hbGl6ZXIgPSAwLCB2b2lk KiBjb250ZXh0ID0gMCkKKyAgICBXZWFrR0NQdHIoSlNHbG9iYWxEYXRhJiBnbG9iYWxEYXRhLCBX ZWFrSGFuZGxlT3duZXIqIHdlYWtPd25lciA9IDAsIHZvaWQqIGNvbnRleHQgPSAwKQogICAgICAg ICA6IG1fc2xvdChnbG9iYWxEYXRhLmFsbG9jYXRlR2xvYmFsSGFuZGxlKCkpCiAgICAgewotICAg ICAgICBIYW5kbGVIZWFwOjpoZWFwRm9yKG1fc2xvdCktPm1ha2VXZWFrKG1fc2xvdCwgZmluYWxp emVyLCBjb250ZXh0KTsKKyAgICAgICAgSGFuZGxlSGVhcDo6aGVhcEZvcihtX3Nsb3QpLT5tYWtl V2VhayhtX3Nsb3QsIHdlYWtPd25lciwgY29udGV4dCk7CiAgICAgfQogICAgIAotICAgIFdlYWtH Q1B0cihKU0dsb2JhbERhdGEmIGdsb2JhbERhdGEsIEV4dGVybmFsVHlwZSB2YWx1ZSwgRmluYWxp emVyKiBmaW5hbGl6ZXIgPSAwLCB2b2lkKiBjb250ZXh0ID0gMCkKKyAgICBXZWFrR0NQdHIoSlNH bG9iYWxEYXRhJiBnbG9iYWxEYXRhLCBFeHRlcm5hbFR5cGUgdmFsdWUsIFdlYWtIYW5kbGVPd25l ciogd2Vha093bmVyID0gMCwgdm9pZCogY29udGV4dCA9IDApCiAgICAgICAgIDogbV9zbG90KGds b2JhbERhdGEuYWxsb2NhdGVHbG9iYWxIYW5kbGUoKSkKICAgICB7Ci0gICAgICAgIEhhbmRsZUhl YXA6OmhlYXBGb3IobV9zbG90KS0+bWFrZVdlYWsobV9zbG90LCBmaW5hbGl6ZXIsIGNvbnRleHQp OworICAgICAgICBIYW5kbGVIZWFwOjpoZWFwRm9yKG1fc2xvdCktPm1ha2VXZWFrKG1fc2xvdCwg d2Vha093bmVyLCBjb250ZXh0KTsKICAgICAgICAgaW50ZXJuYWxTZXQodmFsdWUpOwogICAgIH0K IApAQCAtNzcsMTMgKzc3LDEzIEBAIHB1YmxpYzoKICAgICAgICAgSGFuZGxlSGVhcDo6aGVhcEZv cihtX3Nsb3QpLT5kZWFsbG9jYXRlKG1fc2xvdCk7CiAgICAgfQogCi0gICAgdm9pZCBzZXQoSlNH bG9iYWxEYXRhJiBnbG9iYWxEYXRhLCBFeHRlcm5hbFR5cGUgdmFsdWUsIEZpbmFsaXplciogZmlu YWxpemVyKQorICAgIHZvaWQgc2V0KEpTR2xvYmFsRGF0YSYgZ2xvYmFsRGF0YSwgRXh0ZXJuYWxU eXBlIHZhbHVlLCBXZWFrSGFuZGxlT3duZXIqIHdlYWtPd25lcikKICAgICB7CiAgICAgICAgIGlm ICghdGhpcy0+bV9zbG90KSB7CiAgICAgICAgICAgICB0aGlzLT5tX3Nsb3QgPSBnbG9iYWxEYXRh LmFsbG9jYXRlR2xvYmFsSGFuZGxlKCk7Ci0gICAgICAgICAgICBIYW5kbGVIZWFwOjpoZWFwRm9y KHRoaXMtPm1fc2xvdCktPm1ha2VXZWFrKHRoaXMtPm1fc2xvdCwgZmluYWxpemVyLCAwKTsKLSAg ICAgICAgfSBlbHNlCi0gICAgICAgICAgICBBU1NFUlQoSGFuZGxlSGVhcDo6aGVhcEZvcih0aGlz LT5tX3Nsb3QpLT5nZXRGaW5hbGl6ZXIodGhpcy0+bV9zbG90KSA9PSBmaW5hbGl6ZXIpOworICAg ICAgICAgICAgSGFuZGxlSGVhcDo6aGVhcEZvcih0aGlzLT5tX3Nsb3QpLT5tYWtlV2Vhayh0aGlz LT5tX3Nsb3QsIHdlYWtPd25lcik7CisgICAgICAgIH0KKyAgICAgICAgQVNTRVJUKEhhbmRsZUhl YXA6OmhlYXBGb3IodGhpcy0+bV9zbG90KS0+aGFzV2Vha093bmVyKHRoaXMtPm1fc2xvdCwgd2Vh a093bmVyKSk7CiAgICAgICAgIHRoaXMtPmludGVybmFsU2V0KHZhbHVlKTsKICAgICB9CiAK