106501 2013-01-09 16:39:27 -0800 [WK2] Get rid of LocalTerminationDisabler 2013-01-09 16:47:58 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap andersca beidson eric.carlson feature-media-reviews sam webkit.review.bot oldest_to_newest 803815 0 ap 2013-01-09 16:39:27 -0800 LocalTerminationDisabler stops auto-termination timer in a scope. But the timer can't possibly fire inside the scope anyway, unless an event loop is entered recursively. I don't think that we ever do that, or ever will. So, I think that LocalTerminationDisabler is a complete no-op. 803820 1 182011 ap 2013-01-09 16:41:29 -0800 Created attachment 182011 proposed patch 803829 2 ap 2013-01-09 16:47:58 -0800 Committed <http://trac.webkit.org/changeset/139257>. 182011 2013-01-09 16:41:29 -0800 2013-01-09 16:46:31 -0800 proposed patch TerminationDisabler.txt text/plain 13665 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzOTI1NCkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ1IEBACisyMDEzLTAxLTA5ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFtXSzJdIEdldCByaWQgb2Yg TG9jYWxUZXJtaW5hdGlvbkRpc2FibGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMDY1MDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBMb2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIgaXMgbm8tb3AgLSB0ZXJt aW5hdGlvbiB0aW1lciBjYW4ndCBmaXJlIGluc2lkZSBpdHMgc2NvcGUKKyAgICAgICAgZXZlbiBp ZiBub3Qgc3RvcHBlZC4KKworICAgICAgICAqIFBsdWdpblByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5j cHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb2Nlc3M6OmdldFNpdGVzV2l0aERhdGEpOgor ICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzOjpjbGVhclNpdGVEYXRhKToKKyAgICAgICAg KiBTaGFyZWQvQ2hpbGRQcm9jZXNzLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9BcHBsaWNhdGlv bkNhY2hlL1dlYkFwcGxpY2F0aW9uQ2FjaGVNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXI6OmdldEFwcGxpY2F0aW9uQ2FjaGVPcmlnaW5zKToK KyAgICAgICAgKFdlYktpdDo6V2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXI6OmRlbGV0ZUVudHJp ZXNGb3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdl cjo6ZGVsZXRlQWxsRW50cmllcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkFwcGxpY2F0aW9uQ2Fj aGVNYW5hZ2VyOjpzZXRBcHBDYWNoZU1heGltdW1TaXplKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L0tleVZhbHVlU3RvcmFnZS9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6Z2V0S2V5VmFsdWVTdG9yYWdlT3Jp Z2lucyk6CisgICAgICAgIChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmRlbGV0 ZUVudHJpZXNGb3JPcmlnaW4pOgorICAgICAgICAoV2ViS2l0OjpXZWJLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyOjpkZWxldGVBbGxFbnRyaWVzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL01lZGlhQ2Fj aGUvV2ViTWVkaWFDYWNoZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJNZWRpYUNh Y2hlTWFuYWdlcjo6Z2V0SG9zdG5hbWVzV2l0aE1lZGlhQ2FjaGUpOgorICAgICAgICAoV2ViS2l0 OjpXZWJNZWRpYUNhY2hlTWFuYWdlcjo6Y2xlYXJDYWNoZUZvckhvc3RuYW1lKToKKyAgICAgICAg KFdlYktpdDo6V2ViTWVkaWFDYWNoZU1hbmFnZXI6OmNsZWFyQ2FjaGVGb3JBbGxIb3N0bmFtZXMp OgorICAgICAgICAqIFdlYlByb2Nlc3MvUmVzb3VyY2VDYWNoZS9XZWJSZXNvdXJjZUNhY2hlTWFu YWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpnZXRD YWNoZU9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6 Y2xlYXJDYWNoZUZvck9yaWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYlJlc291cmNlQ2FjaGVN YW5hZ2VyOjpjbGVhckNhY2hlRm9yQWxsT3JpZ2lucyk6CisgICAgICAgICogV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJEYXRhYmFzZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJEYXRhYmFzZU1hbmFnZXI6OmdldERhdGFiYXNlc0J5T3JpZ2luKToKKyAgICAgICAgKFdlYktp dDo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpnZXREYXRhYmFzZU9yaWdpbnMpOgorICAgICAgICAoV2Vi S2l0OjpXZWJEYXRhYmFzZU1hbmFnZXI6OmRlbGV0ZURhdGFiYXNlV2l0aE5hbWVGb3JPcmlnaW4p OgorICAgICAgICAoV2ViS2l0OjpXZWJEYXRhYmFzZU1hbmFnZXI6OmRlbGV0ZURhdGFiYXNlc0Zv ck9yaWdpbik6CisgICAgICAgIChXZWJLaXQ6OldlYkRhdGFiYXNlTWFuYWdlcjo6ZGVsZXRlQWxs RGF0YWJhc2VzKToKKyAgICAgICAgKFdlYktpdDo6V2ViRGF0YWJhc2VNYW5hZ2VyOjpzZXRRdW90 YUZvck9yaWdpbik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzczo6Z2V0U2l0ZXNXaXRoUGx1Z2luRGF0YSk6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3M6OmNsZWFyUGx1Z2luU2l0ZURhdGEpOgorCiAyMDEzLTAxLTA5 ICBLaXJhbiBNdXBwYWxhICA8Y211cHBhbGFAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCB1c2Vy IGRlZmF1bHRzIHRvIG92ZXJyaWRlIHN5c3RlbSBwcm94eSBzZXR0aW5ncyBmb3IgTmV0d29ya1By b2Nlc3Mgb24gTWFjCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpblBy b2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1 Z2luUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDEzOTA4MikKKysrIFNvdXJjZS9XZWJLaXQyL1BsdWdp blByb2Nlc3MvUGx1Z2luUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIyMSw4ICsyMjEs NiBAQCB2b2lkIFBsdWdpblByb2Nlc3M6OmNyZWF0ZVdlYlByb2Nlc3NDb25uCiAKIHZvaWQgUGx1 Z2luUHJvY2Vzczo6Z2V0U2l0ZXNXaXRoRGF0YSh1aW50NjRfdCBjYWxsYmFja0lEKQogewotICAg IExvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCp0aGlzKTsKLQog ICAgIFZlY3RvcjxTdHJpbmc+IHNpdGVzOwogICAgIGlmIChOZXRzY2FwZVBsdWdpbk1vZHVsZSog bW9kdWxlID0gbmV0c2NhcGVQbHVnaW5Nb2R1bGUoKSkKICAgICAgICAgc2l0ZXMgPSBtb2R1bGUt PnNpdGVzV2l0aERhdGEoKTsKQEAgLTIzMiw4ICsyMzAsNiBAQCB2b2lkIFBsdWdpblByb2Nlc3M6 OmdldFNpdGVzV2l0aERhdGEodWluCiAKIHZvaWQgUGx1Z2luUHJvY2Vzczo6Y2xlYXJTaXRlRGF0 YShjb25zdCBWZWN0b3I8U3RyaW5nPiYgc2l0ZXMsIHVpbnQ2NF90IGZsYWdzLCB1aW50NjRfdCBt YXhBZ2VJblNlY29uZHMsIHVpbnQ2NF90IGNhbGxiYWNrSUQpCiB7Ci0gICAgTG9jYWxUZXJtaW5h dGlvbkRpc2FibGVyIHRlcm1pbmF0aW9uRGlzYWJsZXIoKnRoaXMpOwotCiAgICAgaWYgKE5ldHNj YXBlUGx1Z2luTW9kdWxlKiBtb2R1bGUgPSBuZXRzY2FwZVBsdWdpbk1vZHVsZSgpKSB7CiAgICAg ICAgIGlmIChzaXRlcy5pc0VtcHR5KCkpIHsKICAgICAgICAgICAgIC8vIENsZWFyIGV2ZXJ5dGhp bmcuCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzcy5oCShyZXZpc2lvbiAxMzkw ODIpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzLmgJKHdvcmtpbmcgY29w eSkKQEAgLTUyLDIzICs1Miw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpc2FibGVUZXJtaW5hdGlv bigpOwogICAgIHZvaWQgZW5hYmxlVGVybWluYXRpb24oKTsKIAotICAgIGNsYXNzIExvY2FsVGVy bWluYXRpb25EaXNhYmxlciB7Ci0gICAgcHVibGljOgotICAgICAgICBleHBsaWNpdCBMb2NhbFRl cm1pbmF0aW9uRGlzYWJsZXIoQ2hpbGRQcm9jZXNzJiBjaGlsZFByb2Nlc3MpCi0gICAgICAgICAg ICA6IG1fY2hpbGRQcm9jZXNzKGNoaWxkUHJvY2VzcykKLSAgICAgICAgewotICAgICAgICAgICAg bV9jaGlsZFByb2Nlc3MuZGlzYWJsZVRlcm1pbmF0aW9uKCk7Ci0gICAgICAgIH0KLQotICAgICAg ICB+TG9jYWxUZXJtaW5hdGlvbkRpc2FibGVyKCkKLSAgICAgICAgewotICAgICAgICAgICAgbV9j aGlsZFByb2Nlc3MuZW5hYmxlVGVybWluYXRpb24oKTsKLSAgICAgICAgfQotCi0gICAgcHJpdmF0 ZToKLSAgICAgICAgQ2hpbGRQcm9jZXNzJiBtX2NoaWxkUHJvY2VzczsKLSAgICB9OwotCiAgICAg dm9pZCBhZGRNZXNzYWdlUmVjZWl2ZXIoQ29yZUlQQzo6U3RyaW5nUmVmZXJlbmNlIG1lc3NhZ2VS ZWNlaXZlck5hbWUsIENvcmVJUEM6Ok1lc3NhZ2VSZWNlaXZlciopOwogICAgIHZvaWQgYWRkTWVz c2FnZVJlY2VpdmVyKENvcmVJUEM6OlN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2ZXJOYW1l LCB1aW50NjRfdCBkZXN0aW5hdGlvbklELCBDb3JlSVBDOjpNZXNzYWdlUmVjZWl2ZXIqKTsKICAg ICB2b2lkIHJlbW92ZU1lc3NhZ2VSZWNlaXZlcihDb3JlSVBDOjpTdHJpbmdSZWZlcmVuY2UgbWVz c2FnZVJlY2VpdmVyTmFtZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCk7CkluZGV4OiBTb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHJldmlzaW9uIDEzOTA4MikKKysrIFNv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTcyOSw4ICs3MjksNiBAQCB2b2lkIFdlYlByb2Nlc3M6OmNsZWFyQXBwbGljYXRpb25DYWNoZSgp CiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpICYmICFFTkFCTEUoUExVR0lOX1BST0NF U1MpCiB2b2lkIFdlYlByb2Nlc3M6OmdldFNpdGVzV2l0aFBsdWdpbkRhdGEoY29uc3QgVmVjdG9y PFN0cmluZz4mIHBsdWdpblBhdGhzLCB1aW50NjRfdCBjYWxsYmFja0lEKQogewotICAgIExvY2Fs VGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCp0aGlzKTsKLQogICAgIEhh c2hTZXQ8U3RyaW5nPiBzaXRlc1NldDsKIAogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJ KQpAQCAtNzU1LDggKzc1Myw2IEBAIHZvaWQgV2ViUHJvY2Vzczo6Z2V0U2l0ZXNXaXRoUGx1Z2lu RGF0YSgKIAogdm9pZCBXZWJQcm9jZXNzOjpjbGVhclBsdWdpblNpdGVEYXRhKGNvbnN0IFZlY3Rv cjxTdHJpbmc+JiBwbHVnaW5QYXRocywgY29uc3QgVmVjdG9yPFN0cmluZz4mIHNpdGVzLCB1aW50 NjRfdCBmbGFncywgdWludDY0X3QgbWF4QWdlSW5TZWNvbmRzLCB1aW50NjRfdCBjYWxsYmFja0lE KQogewotICAgIExvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCp0 aGlzKTsKLQogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIGZvciAoc2l6ZV90 IGkgPSAwOyBpIDwgcGx1Z2luUGF0aHMuc2l6ZSgpOyArK2kpIHsKICAgICAgICAgUmVmUHRyPE5l dHNjYXBlUGx1Z2luTW9kdWxlPiBuZXRzY2FwZVBsdWdpbk1vZHVsZSA9IE5ldHNjYXBlUGx1Z2lu TW9kdWxlOjpnZXRPckNyZWF0ZShwbHVnaW5QYXRoc1tpXSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL0FwcGxpY2F0aW9uQ2FjaGUvV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQXBwbGljYXRpb25D YWNoZS9XZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlci5jcHAJKHJldmlzaW9uIDEzOTA4MikKKysr IFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvQXBwbGljYXRpb25DYWNoZS9XZWJBcHBsaWNhdGlv bkNhY2hlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDggKzU5LDYgQEAgdm9pZCBX ZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlcjo6ZGlkUmVjZQogCiB2b2lkIFdlYkFwcGxpY2F0aW9u Q2FjaGVNYW5hZ2VyOjpnZXRBcHBsaWNhdGlvbkNhY2hlT3JpZ2lucyh1aW50NjRfdCBjYWxsYmFj a0lEKQogewotICAgIENoaWxkUHJvY2Vzczo6TG9jYWxUZXJtaW5hdGlvbkRpc2FibGVyIHRlcm1p bmF0aW9uRGlzYWJsZXIoKm1fY2hpbGRQcm9jZXNzKTsKLQogICAgIEhhc2hTZXQ8UmVmUHRyPFNl Y3VyaXR5T3JpZ2luPiwgU2VjdXJpdHlPcmlnaW5IYXNoPiBvcmlnaW5zOwogCiAgICAgY2FjaGVT dG9yYWdlKCkuZ2V0T3JpZ2luc1dpdGhDYWNoZShvcmlnaW5zKTsKQEAgLTg2LDggKzg0LDYgQEAg dm9pZCBXZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlcjo6Z2V0QXBwbAogCiB2b2lkIFdlYkFwcGxp Y2F0aW9uQ2FjaGVNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luKGNvbnN0IFNlY3VyaXR5 T3JpZ2luRGF0YSYgb3JpZ2luRGF0YSkKIHsKLSAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWlu YXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX2NoaWxkUHJvY2Vzcyk7Ci0KICAg ICBSZWZQdHI8U2VjdXJpdHlPcmlnaW4+IG9yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUo b3JpZ2luRGF0YS5wcm90b2NvbCwgb3JpZ2luRGF0YS5ob3N0LCBvcmlnaW5EYXRhLnBvcnQpOwog ICAgIGlmICghb3JpZ2luKQogICAgICAgICByZXR1cm47CkBAIC05NywxNSArOTMsMTEgQEAgdm9p ZCBXZWJBcHBsaWNhdGlvbkNhY2hlTWFuYWdlcjo6ZGVsZXRlRQogCiB2b2lkIFdlYkFwcGxpY2F0 aW9uQ2FjaGVNYW5hZ2VyOjpkZWxldGVBbGxFbnRyaWVzKCkKIHsKLSAgICBDaGlsZFByb2Nlc3M6 OkxvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX2NoaWxkUHJv Y2Vzcyk7Ci0KICAgICBjYWNoZVN0b3JhZ2UoKS5kZWxldGVBbGxFbnRyaWVzKCk7CiB9CiAKIHZv aWQgV2ViQXBwbGljYXRpb25DYWNoZU1hbmFnZXI6OnNldEFwcENhY2hlTWF4aW11bVNpemUodWlu dDY0X3Qgc2l6ZSkKIHsKLSAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxl ciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX2NoaWxkUHJvY2Vzcyk7Ci0KICAgICBjYWNoZVN0b3Jh Z2UoKS5zZXRNYXhpbXVtU2l6ZShzaXplKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9LZXlWYWx1ZVN0b3JhZ2UvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHAKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9LZXlWYWx1ZVN0b3JhZ2UvV2Vi S2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHAJKHJldmlzaW9uIDEzOTA4MikKKysrIFNvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvS2V5VmFsdWVTdG9yYWdlL1dlYktleVZhbHVlU3RvcmFnZU1hbmFn ZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05MSw4ICs5MSw2IEBAIHZvaWQgV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlcjo6ZGlzcGF0Y2gKIAogdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy OjpnZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKHVpbnQ2NF90IGNhbGxiYWNrSUQpCiB7Ci0gICAg Q2hpbGRQcm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxl cigqbV9wcm9jZXNzKTsKLQogICAgIGlmICghU3RvcmFnZVRyYWNrZXI6OnRyYWNrZXIoKS5vcmln aW5zTG9hZGVkKCkpIHsKICAgICAgICAgbV9vcmlnaW5zUmVxdWVzdENhbGxiYWNrSURzLmFwcGVu ZChjYWxsYmFja0lEKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMTIzLDggKzEyMSw2IEBAIHZvaWQg V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGlzcGF0Y2gKIAogdm9pZCBXZWJLZXlWYWx1ZVN0 b3JhZ2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVzRm9yT3JpZ2luKGNvbnN0IFNlY3VyaXR5T3JpZ2lu RGF0YSYgb3JpZ2luRGF0YSkKIHsKLSAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWluYXRpb25E aXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX3Byb2Nlc3MpOwotCiAgICAgUmVmUHRyPFNl Y3VyaXR5T3JpZ2luPiBvcmlnaW4gPSBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKG9yaWdpbkRhdGEu cHJvdG9jb2wsIG9yaWdpbkRhdGEuaG9zdCwgb3JpZ2luRGF0YS5wb3J0KTsKICAgICBpZiAoIW9y aWdpbikKICAgICAgICAgcmV0dXJuOwpAQCAtMTM0LDcgKzEzMCw2IEBAIHZvaWQgV2ViS2V5VmFs dWVTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlRW4KIAogdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5h Z2VyOjpkZWxldGVBbGxFbnRyaWVzKCkKIHsKLSAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWlu YXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX3Byb2Nlc3MpOwogICAgIFN0b3Jh Z2VUcmFja2VyOjp0cmFja2VyKCkuZGVsZXRlQWxsT3JpZ2lucygpOwogfQogCkluZGV4OiBTb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL01lZGlhQ2FjaGUvV2ViTWVkaWFDYWNoZU1hbmFnZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvTWVkaWFDYWNoZS9XZWJN ZWRpYUNhY2hlTWFuYWdlci5jcHAJKHJldmlzaW9uIDEzOTA4MikKKysrIFNvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvTWVkaWFDYWNoZS9XZWJNZWRpYUNhY2hlTWFuYWdlci5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTU0LDggKzU0LDYgQEAgdm9pZCBXZWJNZWRpYUNhY2hlTWFuYWdlcjo6ZGlkUmVj ZWl2ZU1lcwogCiB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyOjpnZXRIb3N0bmFtZXNXaXRoTWVk aWFDYWNoZSh1aW50NjRfdCBjYWxsYmFja0lEKQogewotICAgIENoaWxkUHJvY2Vzczo6TG9jYWxU ZXJtaW5hdGlvbkRpc2FibGVyIHRlcm1pbmF0aW9uRGlzYWJsZXIoKm1fcHJvY2Vzcyk7Ci0KICAg ICBWZWN0b3I8U3RyaW5nPiBtZWRpYUNhY2hlSG9zdG5hbWVzOwogCiAjaWYgRU5BQkxFKFZJREVP KQpAQCAtNjcsOCArNjUsNiBAQCB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyOjpnZXRIb3N0bmFt ZXNXCiAKIHZvaWQgV2ViTWVkaWFDYWNoZU1hbmFnZXI6OmNsZWFyQ2FjaGVGb3JIb3N0bmFtZShj b25zdCBTdHJpbmcmIGhvc3RuYW1lKQogewotICAgIENoaWxkUHJvY2Vzczo6TG9jYWxUZXJtaW5h dGlvbkRpc2FibGVyIHRlcm1pbmF0aW9uRGlzYWJsZXIoKm1fcHJvY2Vzcyk7Ci0KICNpZiBFTkFC TEUoVklERU8pCiAgICAgSFRNTE1lZGlhRWxlbWVudDo6Y2xlYXJNZWRpYUNhY2hlRm9yU2l0ZSho b3N0bmFtZSk7CiAjZW5kaWYKQEAgLTc2LDggKzcyLDYgQEAgdm9pZCBXZWJNZWRpYUNhY2hlTWFu YWdlcjo6Y2xlYXJDYWNoZUZvcgogCiB2b2lkIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyOjpjbGVhckNh Y2hlRm9yQWxsSG9zdG5hbWVzKCkKIHsKLSAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWluYXRp b25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX3Byb2Nlc3MpOwotCiAjaWYgRU5BQkxF KFZJREVPKQogICAgIEhUTUxNZWRpYUVsZW1lbnQ6OmNsZWFyTWVkaWFDYWNoZSgpOwogI2VuZGlm CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1Jlc291cmNlQ2FjaGUvV2ViUmVzb3Vy Y2VDYWNoZU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvUmVzb3VyY2VDYWNoZS9XZWJSZXNvdXJjZUNhY2hlTWFuYWdlci5jcHAJKHJldmlzaW9uIDEz OTA4MikKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUmVzb3VyY2VDYWNoZS9XZWJSZXNv dXJjZUNhY2hlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU5LDggKzU5LDYgQEAgdm9p ZCBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlcjo6ZGlkUmVjZWl2ZQogCiB2b2lkIFdlYlJlc291cmNl Q2FjaGVNYW5hZ2VyOjpnZXRDYWNoZU9yaWdpbnModWludDY0X3QgY2FsbGJhY2tJRCkgY29uc3QK IHsKLSAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlv bkRpc2FibGVyKCptX3Byb2Nlc3MpOwotCiAgICAgTWVtb3J5Q2FjaGU6OlNlY3VyaXR5T3JpZ2lu U2V0IG9yaWdpbnM7CiAgICAgbWVtb3J5Q2FjaGUoKS0+Z2V0T3JpZ2luc1dpdGhDYWNoZShvcmln aW5zKTsKIApAQCAtOTYsOCArOTQsNiBAQCB2b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpn ZXRDYWNoZU9yCiAKIHZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OmNsZWFyQ2FjaGVGb3JP cmlnaW4oU2VjdXJpdHlPcmlnaW5EYXRhIG9yaWdpbkRhdGEsIHVpbnQzMl90IGNhY2hlc1RvQ2xl YXIpIGNvbnN0CiB7Ci0gICAgQ2hpbGRQcm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIg dGVybWluYXRpb25EaXNhYmxlcigqbV9wcm9jZXNzKTsKLQogI2lmIFVTRShDRlVSTENBQ0hFKQog ICAgIFJlc291cmNlQ2FjaGVzVG9DbGVhciByZXNvdXJjZUNhY2hlc1RvQ2xlYXIgPSBzdGF0aWNf Y2FzdDxSZXNvdXJjZUNhY2hlc1RvQ2xlYXI+KGNhY2hlc1RvQ2xlYXIpOwogI2Vsc2UKQEAgLTEy Miw4ICsxMTgsNiBAQCB2b2lkIFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyOjpjbGVhckNhY2hlCiAK IHZvaWQgV2ViUmVzb3VyY2VDYWNoZU1hbmFnZXI6OmNsZWFyQ2FjaGVGb3JBbGxPcmlnaW5zKHVp bnQzMl90IGNhY2hlc1RvQ2xlYXIpIGNvbnN0CiB7Ci0gICAgQ2hpbGRQcm9jZXNzOjpMb2NhbFRl cm1pbmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxlcigqbV9wcm9jZXNzKTsKLQogICAg IFJlc291cmNlQ2FjaGVzVG9DbGVhciByZXNvdXJjZUNhY2hlc1RvQ2xlYXIgPSBzdGF0aWNfY2Fz dDxSZXNvdXJjZUNhY2hlc1RvQ2xlYXI+KGNhY2hlc1RvQ2xlYXIpOwogICAgIG1fcHJvY2Vzcy0+ Y2xlYXJSZXNvdXJjZUNhY2hlcyhyZXNvdXJjZUNhY2hlc1RvQ2xlYXIpOwogfQpJbmRleDogU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJEYXRhYmFzZU1hbmFnZXIu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViRGF0YWJhc2VNYW5hZ2VyLmNwcAkocmV2aXNpb24gMTM5MDgyKQorKysgU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJEYXRhYmFzZU1hbmFnZXIuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC02Nyw4ICs2Nyw2IEBAIHZvaWQgV2ViRGF0YWJhc2VNYW5hZ2VyOjpk aWRSZWNlaXZlTWVzc2EKIAogdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXI6OmdldERhdGFiYXNlc0J5 T3JpZ2luKHVpbnQ2NF90IGNhbGxiYWNrSUQpIGNvbnN0CiB7Ci0gICAgQ2hpbGRQcm9jZXNzOjpM b2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxlcigqbV9wcm9jZXNzKTsK LQogICAgIC8vIEZJWE1FOiBUaGlzIGNvdWxkIGJlIG1hZGUgbW9yZSBlZmZpY2llbnQgYnkgYWRk aW5nIGEgZnVuY3Rpb24gdG8gRGF0YWJhc2VNYW5hZ2VyCiAgICAgLy8gdG8gZ2V0IGJvdGggdGhl IG9yaWdpbnMgYW5kIHRoZSBWZWN0b3Igb2YgRGF0YWJhc2VEZXRhaWxzIGZvciBlYWNoIG9yaWdp biBpbiBvbmUKICAgICAvLyBzaG90LiAgVGhhdCB3b3VsZCBhdm9pZCB0YWtpbmcgdGhlIG51bWVy b3VzIGxvY2tzIHRoaXMgcmVxdWlyZXMuCkBAIC0xMTEsOCArMTA5LDYgQEAgdm9pZCBXZWJEYXRh YmFzZU1hbmFnZXI6OmdldERhdGFiYXNlc0J5TwogCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlcjo6 Z2V0RGF0YWJhc2VPcmlnaW5zKHVpbnQ2NF90IGNhbGxiYWNrSUQpIGNvbnN0CiB7Ci0gICAgQ2hp bGRQcm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9uRGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxlcigq bV9wcm9jZXNzKTsKLQogICAgIFZlY3RvcjxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+ID4gb3JpZ2lu czsKICAgICBEYXRhYmFzZU1hbmFnZXI6Om1hbmFnZXIoKS5vcmlnaW5zKG9yaWdpbnMpOwogCkBA IC0xMjYsOCArMTIyLDYgQEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXI6OmdldERhdGFiYXNlT3Jp ZwogCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlcjo6ZGVsZXRlRGF0YWJhc2VXaXRoTmFtZUZvck9y aWdpbihjb25zdCBTdHJpbmcmIGRhdGFiYXNlSWRlbnRpZmllciwgY29uc3QgU3RyaW5nJiBvcmln aW5JZGVudGlmaWVyKSBjb25zdAogewotICAgIENoaWxkUHJvY2Vzczo6TG9jYWxUZXJtaW5hdGlv bkRpc2FibGVyIHRlcm1pbmF0aW9uRGlzYWJsZXIoKm1fcHJvY2Vzcyk7Ci0KICAgICBSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+IG9yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGVGcm9tRGF0YWJh c2VJZGVudGlmaWVyKG9yaWdpbklkZW50aWZpZXIpOwogICAgIGlmICghb3JpZ2luKQogICAgICAg ICByZXR1cm47CkBAIC0xMzcsOCArMTMxLDYgQEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXI6OmRl bGV0ZURhdGFiYXNlVwogCiB2b2lkIFdlYkRhdGFiYXNlTWFuYWdlcjo6ZGVsZXRlRGF0YWJhc2Vz Rm9yT3JpZ2luKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikgY29uc3QKIHsKLSAgICBD aGlsZFByb2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVy KCptX3Byb2Nlc3MpOwotCiAgICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBvcmlnaW4gPSBTZWN1 cml0eU9yaWdpbjo6Y3JlYXRlRnJvbURhdGFiYXNlSWRlbnRpZmllcihvcmlnaW5JZGVudGlmaWVy KTsKICAgICBpZiAoIW9yaWdpbikKICAgICAgICAgcmV0dXJuOwpAQCAtMTQ4LDE1ICsxNDAsMTEg QEAgdm9pZCBXZWJEYXRhYmFzZU1hbmFnZXI6OmRlbGV0ZURhdGFiYXNlcwogCiB2b2lkIFdlYkRh dGFiYXNlTWFuYWdlcjo6ZGVsZXRlQWxsRGF0YWJhc2VzKCkgY29uc3QKIHsKLSAgICBDaGlsZFBy b2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKCptX3By b2Nlc3MpOwotCiAgICAgRGF0YWJhc2VNYW5hZ2VyOjptYW5hZ2VyKCkuZGVsZXRlQWxsRGF0YWJh c2VzKCk7CiB9CiAKIHZvaWQgV2ViRGF0YWJhc2VNYW5hZ2VyOjpzZXRRdW90YUZvck9yaWdpbihj b25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIHVuc2lnbmVkIGxvbmcgbG9uZyBxdW90YSkg Y29uc3QKIHsKLSAgICBDaGlsZFByb2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJt aW5hdGlvbkRpc2FibGVyKCptX3Byb2Nlc3MpOwotCiAgICAgLy8gSWYgdGhlIHF1b3RhIGlzIHNl dCB0byBhIHZhbHVlIGxvd2VyIHRoYW4gdGhlIGN1cnJlbnQgdXNhZ2UsIHRoYXQgcXVvdGEgd2ls bAogICAgIC8vICJzdGljayIgYnV0IG5vIGRhdGEgd2lsbCBiZSBwdXJnZWQgdG8gbWVldCB0aGUg bmV3IHF1b3RhLiBUaGlzIHdpbGwgc2ltcGx5CiAgICAgLy8gcHJldmVudCBuZXcgZGF0YSBmcm9t IGJlaW5nIGFkZGVkIHRvIGRhdGFiYXNlcyBpbiB0aGF0IG9yaWdpbi4K