29686 2009-09-23 09:38:32 -0700 Crash when website does a history.back() followed by an alert() 2009-09-23 16:27:26 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin oldest_to_newest 149418 0 darin 2009-09-23 09:38:32 -0700 Steps to reproduce: - go to http://www.astro.ucla.edu/~ghez/ - at the bottom of the page, click on the link for "Gaspard Duchene" - after dismissing the alert, Safari crashes I have a fix in the works. 149522 1 40022 darin 2009-09-23 15:33:19 -0700 Created attachment 40022 patch 149542 2 darin 2009-09-23 16:27:26 -0700 http://trac.webkit.org/changeset/48687 40022 2009-09-23 15:33:19 -0700 2009-09-23 16:23:02 -0700 patch BackForwardPatch.txt text/plain 15429 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODY4NikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsODAgQEAKKzIwMDktMDktMjMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENyYXNo IHdoZW4gd2Vic2l0ZSBkb2VzIGEgaGlzdG9yeS5iYWNrKCkgZm9sbG93ZWQgYnkgYW4gYWxlcnQo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Mjk2ODYK KyAgICAgICAgcmRhcjovL3Byb2JsZW0vNjk4NDk5NgorCisgICAgICAgIFdoZW4gbG9hZGluZyBp cyBkZWZlcnJlZCwgd2UgbmVlZCB0byBkZWZlciB0aW1lci1iYXNlZCBsb2FkcworICAgICAgICB0 b28sIG5vdCBqdXN0IG5ldHdvcmtpbmctZHJpdmVuIGxvYWRzLiBPdGhlcndpc2Ugd2UgY2FuIGdl dAorICAgICAgICBzeW5jcm9ub3VzZSBuYXZpZ2F0aW9uIHdoaWxlIHJ1bm5pbmcgYSBzY3JpcHQs IHdoaWNoIGxlYWRzIHRvCisgICAgICAgIGNyYXNoZXMgYW5kIG90aGVyIGJhZG5lc3MuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBpbmNsdWRlcyBhIG1hbnVhbCB0ZXN0OyBhbiBhdXRvbWF0ZWQgdGVz dCBtYXkgYmUKKyAgICAgICAgcG9zc2libGUgc29tZSB0aW1lIGluIHRoZSBmdXR1cmUuCisKKyAg ICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnBy b2Nlc3NIdHRwRXF1aXYpOiBVc2Ugc2NoZWR1bGVMb2NhdGlvbkNoYW5nZQorICAgICAgICBpbnN0 ZWFkIG9mIHNjaGVkdWxlSFRUUFJlZGlyZWN0aW9uIHRvIGltcGxlbWVudCB0aGUgbmF2aWdhdGlv bgorICAgICAgICBuZWVkZWQgZm9yIHgtZnJhbWUtb3B0aW9ucy4KKworICAgICAgICAqIGxvYWRl ci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6RnJhbWVM b2FkZXIpOiBVcGRhdGVkIGZvciBkYXRhIG1lbWJlcnMgd2l0aAorICAgICAgICBuZXcgbmFtZXMg YW5kIG5ldyBkYXRhIG1lbWJlcnMuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c2V0 RGVmZXJzTG9hZGluZyk6IFdoZW4gdHVybmluZyBkZWZlcnJhbAorICAgICAgICBvZmYsIGNhbGwg c3RhcnRSZWRpcmVjdGlvblRpbWVyIGFuZCBzdGFydENoZWNrQ29tcGxldGVUaW1lciwgc2luY2UK KyAgICAgICAgZWl0aGVyIG9mIHRoZW0gbWlnaHQgaGF2ZSBiZWVuIGZpcmVkIGFuZCBpZ25vcmVk IHdoaWxlIGRlZmVyc0xvYWRpbmcKKyAgICAgICAgd2FzIHRydWUuCisgICAgICAgIChXZWJDb3Jl OjpGcmFtZUxvYWRlcjo6Y2xlYXIpOiBVcGRhdGVkIGZvciByZXBsYWNlbWVudCBvZiB0aGUKKyAg ICAgICAgbV9jaGVja0NvbXBsZXRlZFRpbWVyIGFuZCBtX2NoZWNrTG9hZENvbXBsZXRlVGltZXIg dGltZXJzLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OmFsbEFuY2VzdG9yc0FyZUNv bXBsZXRlKTogQWRkZWQuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y2hlY2tDb21w bGV0ZWQpOiBBZGRlZCBjb2RlIHRvIHNldAorICAgICAgICBtX3Nob3VsZENhbGxDaGVja0NvbXBs ZXRlZCB0byBmYWxzZS4gQ2hhbmdlZCBjb2RlIHRoYXQgY2FsbHMKKyAgICAgICAgc3RhcnRSZWRp cmVjdGlvblRpbWVyIHRvIGNhbGwgaXQgdW5jb25kaXRpb25hbGx5LCBzaW5jZSB0aGF0CisgICAg ICAgIGZ1bmN0aW9uIG5vdyBrbm93cyB3aGVuIHRvIGRvIHdvcmsgYW5kIGRvZXNuJ3QgZXhwZWN0 IGNhbGxlcnMKKyAgICAgICAgdG8gaGFuZGxlIHRoYXQgYW55IG1vcmUuCisgICAgICAgIChXZWJD b3JlOjpGcmFtZUxvYWRlcjo6Y2hlY2tUaW1lckZpcmVkKTogQWRkZWQuIFJlcGxhY2VzIHRoZSBv bGQKKyAgICAgICAgdGltZXIgZmlyZWQgY2FsbGJhY2tzLiBDYWxscyBjaGVja0NvbXBsZXRlZCBh bmQgY2hlY2tMb2FkQ29tcGxldGUKKyAgICAgICAgYXMgYXBwcm9wcmlhdGUsIGJ1dCBub3Qgd2hl biBkZWZlcnNMb2FkaW5nIGlzIHRydWUuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6 c3RhcnRDaGVja0NvbXBsZXRlVGltZXIpOiBBZGRlZC4gUmVwbGFjZXMKKyAgICAgICAgdGhlIHR3 byBkaWZmZXJlbnQgY2FsbHMgdG8gc3RhcnQgdGltZXJzIGJlZm9yZS4gT25seSBzdGFydHMgdGhl CisgICAgICAgIHRpbWVycyBpZiB0aGV5IGFyZSBuZWVkZWQuCisgICAgICAgIChXZWJDb3JlOjpG cmFtZUxvYWRlcjo6c2NoZWR1bGVDaGVja0NvbXBsZXRlZCk6IENoYW5nZWQgdG8gY2FsbAorICAg ICAgICBzdGFydENoZWNrQ29tcGxldGVUaW1lciBhZnRlciBzZXR0aW5nIGJvb2xlYW4uCisgICAg ICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6c2NoZWR1bGVDaGVja0xvYWRDb21wbGV0ZSk6IERp dHRvLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnNjaGVkdWxlSGlzdG9yeU5hdmln YXRpb24pOiBSZW1vdmVkCisgICAgICAgIGNhbkdvQmFja09yRm9yd2FyZCBjaGVjay4gVGhlIGxv Z2ljIHdvcmtzIG1vcmUgbmF0dXJhbGx5IHdoZW4KKyAgICAgICAgd2UgZG9uJ3QgZG8gYW55dGhp bmcgdW50aWwgdGhlIHRpbWVyIGZpcmVzLgorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6 OnJlZGlyZWN0aW9uVGltZXJGaXJlZCk6IERvIG5vdGhpbmcgaWYKKyAgICAgICAgZGVmZXJzTG9h ZGluZyBpcyB0cnVlLiBBbHNvIG1vdmVkIGNhbkdvQmFja09yRm9yd2FyZCBjaGVjayBoZXJlLgor ICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2FkZXI6OnNjaGVkdWxlUmVkaXJlY3Rpb24pOiBDaGFu Z2VkIGNvZGUgdGhhdAorICAgICAgICBjYWxscyBzdGFydFJlZGlyZWN0aW9uVGltZXIgdG8gZG8g c28gdW5jb25kaXRpb25hbGx5LiBUaGF0CisgICAgICAgIGZ1bmN0aW9uIG5vdyBoYW5kbGVzIHRo ZSBydWxlcyBhYm91dCB3aGVuIHRvIHN0YXJ0IHRoZSB0aW1lcgorICAgICAgICByYXRoZXIgdGhh biBleHBlY3RpbmcgdGhlIGNhbGxlciB0byBkbyBzby4KKyAgICAgICAgKFdlYkNvcmU6OkZyYW1l TG9hZGVyOjpzdGFydFJlZGlyZWN0aW9uVGltZXIpOiBBZGRlZCBjb2RlIHRvCisgICAgICAgIGhh bmRsZSB0aGUgY2FzZSB3aGVyZSB0aGVyZSBpcyBubyByZWRpcmVjdGlvbiBzY2hlZHVsZWQsCisg ICAgICAgIHdoZXJlIHRoZSB0aW1lciBpcyBhbHJlYWR5IGFjdGl2ZSwgb3Igd2hlcmUgdGhpcyBp cyBhIGNsYXNzaWMKKyAgICAgICAgcmVkaXJlY3Rpb24gYW5kIHRoZXJlIGlzIGFuIGFuY2VzdG9y IHRoYXQgaGFzIG5vdCB5ZXQgY29tcGxldGVkCisgICAgICAgIGxvYWRpbmcuCisgICAgICAgIChX ZWJDb3JlOjpGcmFtZUxvYWRlcjo6Y29tcGxldGVkKTogQ2FsbCBzdGFydFJlZGlyZWN0aW9uVGlt ZXIKKyAgICAgICAgaGVyZSBkaXJlY3RseSBpbnN0ZWFkIG9mIGNhbGxpbmcgYSBjb3ZlciBuYW1l ZCBwYXJlbnRDb21wbGV0ZWQuCisgICAgICAgIEhvb3JheSEgT25lIGxlc3MgZnVuY3Rpb24gaW4g dGhlIGdpYW50IEZyYW1lTG9hZGVyIGNsYXNzIQorICAgICAgICAoV2ViQ29yZTo6RnJhbWVMb2Fk ZXI6OmNoZWNrTG9hZENvbXBsZXRlKTogQWRkZWQgY29kZSB0byBzZXQKKyAgICAgICAgbV9zaG91 bGRDYWxsQ2hlY2tMb2FkQ29tcGxldGUgdG8gZmFsc2UuCisKKyAgICAgICAgKiBsb2FkZXIvRnJh bWVMb2FkZXIuaDogUmVwbGFjZWQgdGhlIHR3byBmdW5jdGlvbnMKKyAgICAgICAgY2hlY2tDb21w bGV0ZWRUaW1lckZpcmVkIGFuZCBjaGVja0xvYWRDb21wbGV0ZVRpbWVyRmlyZWQgd2l0aAorICAg ICAgICBvbmUgZnVuY3Rpb24sIGNoZWNrVGltZXJGaXJlZC4gUmVtb3ZlZCB0aGUgcGFyZW50Q29t cGxldGVkCisgICAgICAgIGZ1bmN0aW9uLiBBZGRlZCB0aGUgc3RhcnRDaGVja0NvbXBsZXRlVGlt ZXIgYW5kCisgICAgICAgIGFsbEFuY2VzdG9yc0FyZUNvbXBsZXRlIGZ1bmN0aW9ucy4gUmVwbGFj ZWQgdGhlCisgICAgICAgIG1fY2hlY2tDb21wbGV0ZWRUaW1lciBhbmQgbV9jaGVja0xvYWRDb21w bGV0ZVRpbWVyIGRhdGEKKyAgICAgICAgbWVtYmVycyB3aXRoIG1fY2hlY2tUaW1lciwgbV9zaG91 bGRDYWxsQ2hlY2tDb21wbGV0ZWQsIGFuZAorICAgICAgICBtX3Nob3VsZENhbGxDaGVja0xvYWRD b21wbGV0ZS4KKworICAgICAgICAqIG1hbnVhbC10ZXN0cy9nby1iYWNrLWFmdGVyLWFsZXJ0Lmh0 bWw6IEFkZGVkLgorICAgICAgICAqIG1hbnVhbC10ZXN0cy9yZXNvdXJjZXMvYWxlcnQtYW5kLWdv LWJhY2suaHRtbDogQWRkZWQuCisKIDIwMDktMDktMjMgIERhdmlkIEtpbHplciAgPGRka2lsemVy QGFwcGxlLmNvbT4KIAogICAgICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi8yOTY2MD4gTW92ZSAi R2VuZXJhdGUgNjQtYml0IEV4cG9ydCBGaWxlIiBidWlsZCBwaGFzZSBzY3JpcHQgaW50byBEZXJp dmVkU291cmNlcy5tYWtlCkluZGV4OiBXZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiA0ODY4NikKKysrIFdlYkNv cmUvZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE3Myw3ICsyMTczLDcgQEAg dm9pZCBEb2N1bWVudDo6cHJvY2Vzc0h0dHBFcXVpdihjb25zdCBTdAogICAgICAgICBGcmFtZUxv YWRlciogZnJhbWVMb2FkZXIgPSBmcmFtZS0+bG9hZGVyKCk7CiAgICAgICAgIGlmIChmcmFtZUxv YWRlci0+c2hvdWxkSW50ZXJydXB0TG9hZEZvclhGcmFtZU9wdGlvbnMoY29udGVudCwgdXJsKCkp KSB7CiAgICAgICAgICAgICBmcmFtZUxvYWRlci0+c3RvcEFsbExvYWRlcnMoKTsKLSAgICAgICAg ICAgIGZyYW1lTG9hZGVyLT5zY2hlZHVsZUhUVFBSZWRpcmVjdGlvbigwLCBibGFua1VSTCgpKTsK KyAgICAgICAgICAgIGZyYW1lTG9hZGVyLT5zY2hlZHVsZUxvY2F0aW9uQ2hhbmdlKGJsYW5rVVJM KCksIFN0cmluZygpKTsKICAgICAgICAgfQogICAgIH0KIH0KSW5kZXg6IFdlYkNvcmUvbG9hZGVy L0ZyYW1lTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRl ci5jcHAJKHJldmlzaW9uIDQ4Njg2KQorKysgV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0yNzIsOCArMjcyLDkgQEAgRnJhbWVMb2FkZXI6OkZyYW1lTG9h ZGVyKEZyYW1lKiBmcmFtZSwgRgogICAgICwgbV9lbmNvZGluZ1dhc0Nob3NlbkJ5VXNlcihmYWxz ZSkKICAgICAsIG1fY29udGFpbnNQbHVnSW5zKGZhbHNlKQogICAgICwgbV9yZWRpcmVjdGlvblRp bWVyKHRoaXMsICZGcmFtZUxvYWRlcjo6cmVkaXJlY3Rpb25UaW1lckZpcmVkKQotICAgICwgbV9j aGVja0NvbXBsZXRlZFRpbWVyKHRoaXMsICZGcmFtZUxvYWRlcjo6Y2hlY2tDb21wbGV0ZWRUaW1l ckZpcmVkKQotICAgICwgbV9jaGVja0xvYWRDb21wbGV0ZVRpbWVyKHRoaXMsICZGcmFtZUxvYWRl cjo6Y2hlY2tMb2FkQ29tcGxldGVUaW1lckZpcmVkKQorICAgICwgbV9jaGVja1RpbWVyKHRoaXMs ICZGcmFtZUxvYWRlcjo6Y2hlY2tUaW1lckZpcmVkKQorICAgICwgbV9zaG91bGRDYWxsQ2hlY2tD b21wbGV0ZWQoZmFsc2UpCisgICAgLCBtX3Nob3VsZENhbGxDaGVja0xvYWRDb21wbGV0ZShmYWxz ZSkKICAgICAsIG1fb3BlbmVyKDApCiAgICAgLCBtX29wZW5lZEJ5RE9NKGZhbHNlKQogICAgICwg bV9jcmVhdGluZ0luaXRpYWxFbXB0eURvY3VtZW50KGZhbHNlKQpAQCAtMzIzLDYgKzMyNCwxMSBA QCB2b2lkIEZyYW1lTG9hZGVyOjpzZXREZWZlcnNMb2FkaW5nKGJvb2wgCiAgICAgICAgIG1fcHJv dmlzaW9uYWxEb2N1bWVudExvYWRlci0+c2V0RGVmZXJzTG9hZGluZyhkZWZlcnMpOwogICAgIGlm IChtX3BvbGljeURvY3VtZW50TG9hZGVyKQogICAgICAgICBtX3BvbGljeURvY3VtZW50TG9hZGVy LT5zZXREZWZlcnNMb2FkaW5nKGRlZmVycyk7CisKKyAgICBpZiAoIWRlZmVycykgeworICAgICAg ICBzdGFydFJlZGlyZWN0aW9uVGltZXIoKTsKKyAgICAgICAgc3RhcnRDaGVja0NvbXBsZXRlVGlt ZXIoKTsKKyAgICB9CiB9CiAKIEZyYW1lKiBGcmFtZUxvYWRlcjo6Y3JlYXRlV2luZG93KEZyYW1l TG9hZGVyKiBmcmFtZUxvYWRlckZvckZyYW1lTG9va3VwLCBjb25zdCBGcmFtZUxvYWRSZXF1ZXN0 JiByZXF1ZXN0LCBjb25zdCBXaW5kb3dGZWF0dXJlcyYgZmVhdHVyZXMsIGJvb2wmIGNyZWF0ZWQp CkBAIC04NDksOCArODU1LDkgQEAgdm9pZCBGcmFtZUxvYWRlcjo6Y2xlYXIoYm9vbCBjbGVhcldp bmRvdwogICAgIG1fcmVkaXJlY3Rpb25UaW1lci5zdG9wKCk7CiAgICAgbV9zY2hlZHVsZWRSZWRp cmVjdGlvbi5jbGVhcigpOwogCi0gICAgbV9jaGVja0NvbXBsZXRlZFRpbWVyLnN0b3AoKTsKLSAg ICBtX2NoZWNrTG9hZENvbXBsZXRlVGltZXIuc3RvcCgpOworICAgIG1fY2hlY2tUaW1lci5zdG9w KCk7CisgICAgbV9zaG91bGRDYWxsQ2hlY2tDb21wbGV0ZWQgPSBmYWxzZTsKKyAgICBtX3Nob3Vs ZENhbGxDaGVja0xvYWRDb21wbGV0ZSA9IGZhbHNlOwogCiAgICAgbV9yZWNlaXZlZERhdGEgPSBm YWxzZTsKICAgICBtX2lzRGlzcGxheWluZ0luaXRpYWxFbXB0eURvY3VtZW50ID0gZmFsc2U7CkBA IC0xMjUyLDggKzEyNTksMTkgQEAgYm9vbCBGcmFtZUxvYWRlcjo6YWxsQ2hpbGRyZW5BcmVDb21w bGV0ZQogICAgIHJldHVybiB0cnVlOwogfQogCitib29sIEZyYW1lTG9hZGVyOjphbGxBbmNlc3Rv cnNBcmVDb21wbGV0ZSgpIGNvbnN0Cit7CisgICAgZm9yIChGcmFtZSogYW5jZXN0b3IgPSBtX2Zy YW1lOyBhbmNlc3RvcjsgYW5jZXN0b3IgPSBhbmNlc3Rvci0+dHJlZSgpLT5wYXJlbnQoKSkgewor ICAgICAgICBpZiAoIWFuY2VzdG9yLT5sb2FkZXIoKS0+bV9pc0NvbXBsZXRlKQorICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOworICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogdm9pZCBGcmFt ZUxvYWRlcjo6Y2hlY2tDb21wbGV0ZWQoKQogeworICAgIG1fc2hvdWxkQ2FsbENoZWNrQ29tcGxl dGVkID0gZmFsc2U7CisKICAgICBpZiAobV9mcmFtZS0+dmlldygpKQogICAgICAgICBtX2ZyYW1l LT52aWV3KCktPmNoZWNrU3RvcERlbGF5aW5nRGVmZXJyZWRSZXBhaW50cygpOwogCkBAIC0xMjc5 LDM4ICsxMjk3LDQ0IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNoZWNrQ29tcGxldGVkKCkKICAgICBS ZWZQdHI8RnJhbWU+IHByb3RlY3QobV9mcmFtZSk7CiAgICAgY2hlY2tDYWxsSW1wbGljaXRDbG9z ZSgpOyAvLyBpZiB3ZSBkaWRuJ3QgZG8gaXQgYmVmb3JlCiAKLSAgICAvLyBEbyBub3Qgc3RhcnQg YSByZWRpcmVjdGlvbiB0aW1lciBmb3Igc3ViZnJhbWVzIGhlcmUuCi0gICAgLy8gVGhhdCBpcyBk ZWZlcnJlZCB1bnRpbCB0aGUgcGFyZW50IGlzIGNvbXBsZXRlZC4KLSAgICBpZiAobV9zY2hlZHVs ZWRSZWRpcmVjdGlvbiAmJiAhbV9mcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSkKLSAgICAgICAgc3Rh cnRSZWRpcmVjdGlvblRpbWVyKCk7CisgICAgc3RhcnRSZWRpcmVjdGlvblRpbWVyKCk7CiAKICAg ICBjb21wbGV0ZWQoKTsKICAgICBpZiAobV9mcmFtZS0+cGFnZSgpKQogICAgICAgICBjaGVja0xv YWRDb21wbGV0ZSgpOwogfQogCi12b2lkIEZyYW1lTG9hZGVyOjpjaGVja0NvbXBsZXRlZFRpbWVy RmlyZWQoVGltZXI8RnJhbWVMb2FkZXI+KikKK3ZvaWQgRnJhbWVMb2FkZXI6OmNoZWNrVGltZXJG aXJlZChUaW1lcjxGcmFtZUxvYWRlcj4qKQogewotICAgIGNoZWNrQ29tcGxldGVkKCk7CisgICAg aWYgKFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLT5wYWdlKCkpIHsKKyAgICAgICAgaWYgKHBhZ2UtPmRl ZmVyc0xvYWRpbmcoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgaWYgKG1fc2hv dWxkQ2FsbENoZWNrQ29tcGxldGVkKQorICAgICAgICBjaGVja0NvbXBsZXRlZCgpOworICAgIGlm IChtX3Nob3VsZENhbGxDaGVja0xvYWRDb21wbGV0ZSkKKyAgICAgICAgY2hlY2tMb2FkQ29tcGxl dGUoKTsKIH0KIAotdm9pZCBGcmFtZUxvYWRlcjo6c2NoZWR1bGVDaGVja0NvbXBsZXRlZCgpCit2 b2lkIEZyYW1lTG9hZGVyOjpzdGFydENoZWNrQ29tcGxldGVUaW1lcigpCiB7Ci0gICAgaWYgKCFt X2NoZWNrQ29tcGxldGVkVGltZXIuaXNBY3RpdmUoKSkKLSAgICAgICAgbV9jaGVja0NvbXBsZXRl ZFRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKKyAgICBpZiAoIShtX3Nob3VsZENhbGxDaGVja0NvbXBs ZXRlZCB8fCBtX3Nob3VsZENhbGxDaGVja0xvYWRDb21wbGV0ZSkpCisgICAgICAgIHJldHVybjsK KyAgICBpZiAobV9jaGVja1RpbWVyLmlzQWN0aXZlKCkpCisgICAgICAgIHJldHVybjsKKyAgICBt X2NoZWNrVGltZXIuc3RhcnRPbmVTaG90KDApOwogfQogCi12b2lkIEZyYW1lTG9hZGVyOjpjaGVj a0xvYWRDb21wbGV0ZVRpbWVyRmlyZWQoVGltZXI8RnJhbWVMb2FkZXI+KikKK3ZvaWQgRnJhbWVM b2FkZXI6OnNjaGVkdWxlQ2hlY2tDb21wbGV0ZWQoKQogewotICAgIGlmICghbV9mcmFtZS0+cGFn ZSgpKQotICAgICAgICByZXR1cm47Ci0gICAgY2hlY2tMb2FkQ29tcGxldGUoKTsKKyAgICBtX3No b3VsZENhbGxDaGVja0NvbXBsZXRlZCA9IHRydWU7CisgICAgc3RhcnRDaGVja0NvbXBsZXRlVGlt ZXIoKTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6c2NoZWR1bGVDaGVja0xvYWRDb21wbGV0ZSgp CiB7Ci0gICAgaWYgKCFtX2NoZWNrTG9hZENvbXBsZXRlVGltZXIuaXNBY3RpdmUoKSkKLSAgICAg ICAgbV9jaGVja0xvYWRDb21wbGV0ZVRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKKyAgICBtX3Nob3Vs ZENhbGxDaGVja0xvYWRDb21wbGV0ZSA9IHRydWU7CisgICAgc3RhcnRDaGVja0NvbXBsZXRlVGlt ZXIoKTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6Y2hlY2tDYWxsSW1wbGljaXRDbG9zZSgpCkBA IC0xNDM5LDEyICsxNDYzLDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6c2NoZWR1bGVIaXN0b3J5TmF2 aWdhdAogICAgIGlmICghbV9mcmFtZS0+cGFnZSgpKQogICAgICAgICByZXR1cm47CiAKLSAgICAv LyBuYXZpZ2F0aW9uIHdpbGwgYWx3YXlzIGJlIGFsbG93ZWQgaW4gdGhlIDAgc3RlcHMgY2FzZSwg d2hpY2ggaXMgT0sgYmVjYXVzZSB0aGF0J3Mgc3VwcG9zZWQgdG8gZm9yY2UgYSByZWxvYWQuCi0g ICAgaWYgKCFjYW5Hb0JhY2tPckZvcndhcmQoc3RlcHMpKSB7Ci0gICAgICAgIGNhbmNlbFJlZGly ZWN0aW9uKCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KICAgICBzY2hlZHVsZVJlZGlyZWN0 aW9uKG5ldyBTY2hlZHVsZWRSZWRpcmVjdGlvbihzdGVwcykpOwogfQogCkBAIC0xNDgyLDYgKzE1 MDAsOSBAQCB2b2lkIEZyYW1lTG9hZGVyOjpyZWRpcmVjdGlvblRpbWVyRmlyZWQoCiB7CiAgICAg QVNTRVJUKG1fZnJhbWUtPnBhZ2UoKSk7CiAKKyAgICBpZiAobV9mcmFtZS0+cGFnZSgpLT5kZWZl cnNMb2FkaW5nKCkpCisgICAgICAgIHJldHVybjsKKwogICAgIE93blB0cjxTY2hlZHVsZWRSZWRp cmVjdGlvbj4gcmVkaXJlY3Rpb24obV9zY2hlZHVsZWRSZWRpcmVjdGlvbi5yZWxlYXNlKCkpOwog CiAgICAgc3dpdGNoIChyZWRpcmVjdGlvbi0+dHlwZSkgewpAQCAtMTQ5OCw3ICsxNTE5LDggQEAg dm9pZCBGcmFtZUxvYWRlcjo6cmVkaXJlY3Rpb25UaW1lckZpcmVkKAogICAgICAgICAgICAgfQog ICAgICAgICAgICAgLy8gZ28oaSE9MCkgZnJvbSBhIGZyYW1lIG5hdmlnYXRlcyBpbnRvIHRoZSBo aXN0b3J5IG9mIHRoZSBmcmFtZSBvbmx5LAogICAgICAgICAgICAgLy8gaW4gYm90aCBJRSBhbmQg TlMgKGJ1dCBub3QgaW4gTW96aWxsYSkuIFdlIGNhbid0IGVhc2lseSBkbyB0aGF0LgotICAgICAg ICAgICAgZ29CYWNrT3JGb3J3YXJkKHJlZGlyZWN0aW9uLT5oaXN0b3J5U3RlcHMpOworICAgICAg ICAgICAgaWYgKGNhbkdvQmFja09yRm9yd2FyZChyZWRpcmVjdGlvbi0+aGlzdG9yeVN0ZXBzKSkK KyAgICAgICAgICAgICAgICBnb0JhY2tPckZvcndhcmQocmVkaXJlY3Rpb24tPmhpc3RvcnlTdGVw cyk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIGNhc2UgU2NoZWR1bGVkUmVkaXJlY3Rp b246OmZvcm1TdWJtaXNzaW9uOgogICAgICAgICAgICAgLy8gVGhlIHN1Ym1pdEZvcm0gZnVuY3Rp b24gd2lsbCBmaW5kIGEgdGFyZ2V0IGZyYW1lIGJlZm9yZSB1c2luZyB0aGUgcmVkaXJlY3Rpb24g dGltZXIuCkBAIC0xNzIyLDEyICsxNzQ0LDYgQEAgYm9vbCBGcmFtZUxvYWRlcjo6bG9hZFBsdWdp bihSZW5kZXJQYXJ0KgogICAgIHJldHVybiB3aWRnZXQgIT0gMDsKIH0KIAotdm9pZCBGcmFtZUxv YWRlcjo6cGFyZW50Q29tcGxldGVkKCkKLXsKLSAgICBpZiAobV9zY2hlZHVsZWRSZWRpcmVjdGlv biAmJiAhbV9yZWRpcmVjdGlvblRpbWVyLmlzQWN0aXZlKCkpCi0gICAgICAgIHN0YXJ0UmVkaXJl Y3Rpb25UaW1lcigpOwotfQotCiBTdHJpbmcgRnJhbWVMb2FkZXI6Om91dGdvaW5nUmVmZXJyZXIo KSBjb25zdAogewogICAgIHJldHVybiBtX291dGdvaW5nUmVmZXJyZXI7CkBAIC0yMTM5LDE2ICsy MTU1LDIyIEBAIHZvaWQgRnJhbWVMb2FkZXI6OnNjaGVkdWxlUmVkaXJlY3Rpb24oUGEKICAgICBt X3NjaGVkdWxlZFJlZGlyZWN0aW9uID0gcmVkaXJlY3Rpb247CiAgICAgaWYgKCFtX2lzQ29tcGxl dGUgJiYgbV9zY2hlZHVsZWRSZWRpcmVjdGlvbi0+dHlwZSAhPSBTY2hlZHVsZWRSZWRpcmVjdGlv bjo6cmVkaXJlY3Rpb24pCiAgICAgICAgIGNvbXBsZXRlZCgpOwotICAgIGlmIChtX2lzQ29tcGxl dGUgfHwgbV9zY2hlZHVsZWRSZWRpcmVjdGlvbi0+dHlwZSAhPSBTY2hlZHVsZWRSZWRpcmVjdGlv bjo6cmVkaXJlY3Rpb24pCi0gICAgICAgIHN0YXJ0UmVkaXJlY3Rpb25UaW1lcigpOworICAgIHN0 YXJ0UmVkaXJlY3Rpb25UaW1lcigpOwogfQogCiB2b2lkIEZyYW1lTG9hZGVyOjpzdGFydFJlZGly ZWN0aW9uVGltZXIoKQogeworICAgIGlmICghbV9zY2hlZHVsZWRSZWRpcmVjdGlvbikKKyAgICAg ICAgcmV0dXJuOworCiAgICAgQVNTRVJUKG1fZnJhbWUtPnBhZ2UoKSk7Ci0gICAgQVNTRVJUKG1f c2NoZWR1bGVkUmVkaXJlY3Rpb24pOwogCi0gICAgbV9yZWRpcmVjdGlvblRpbWVyLnN0b3AoKTsK KyAgICBpZiAobV9yZWRpcmVjdGlvblRpbWVyLmlzQWN0aXZlKCkpCisgICAgICAgIHJldHVybjsK KworICAgIGlmIChtX3NjaGVkdWxlZFJlZGlyZWN0aW9uLT50eXBlID09IFNjaGVkdWxlZFJlZGly ZWN0aW9uOjpyZWRpcmVjdGlvbiAmJiAhYWxsQW5jZXN0b3JzQXJlQ29tcGxldGUoKSkKKyAgICAg ICAgcmV0dXJuOworCiAgICAgbV9yZWRpcmVjdGlvblRpbWVyLnN0YXJ0T25lU2hvdChtX3NjaGVk dWxlZFJlZGlyZWN0aW9uLT5kZWxheSk7CiAKICAgICBzd2l0Y2ggKG1fc2NoZWR1bGVkUmVkaXJl Y3Rpb24tPnR5cGUpIHsKQEAgLTIxODcsNyArMjIwOSw3IEBAIHZvaWQgRnJhbWVMb2FkZXI6OmNv bXBsZXRlZCgpCiB7CiAgICAgUmVmUHRyPEZyYW1lPiBwcm90ZWN0KG1fZnJhbWUpOwogICAgIGZv ciAoRnJhbWUqIGNoaWxkID0gbV9mcmFtZS0+dHJlZSgpLT5maXJzdENoaWxkKCk7IGNoaWxkOyBj aGlsZCA9IGNoaWxkLT50cmVlKCktPm5leHRTaWJsaW5nKCkpCi0gICAgICAgIGNoaWxkLT5sb2Fk ZXIoKS0+cGFyZW50Q29tcGxldGVkKCk7CisgICAgICAgIGNoaWxkLT5sb2FkZXIoKS0+c3RhcnRS ZWRpcmVjdGlvblRpbWVyKCk7CiAgICAgaWYgKEZyYW1lKiBwYXJlbnQgPSBtX2ZyYW1lLT50cmVl KCktPnBhcmVudCgpKQogICAgICAgICBwYXJlbnQtPmxvYWRlcigpLT5jaGVja0NvbXBsZXRlZCgp OwogICAgIGlmIChtX2ZyYW1lLT52aWV3KCkpCkBAIC0zNTU5LDYgKzM1ODEsOCBAQCB2b2lkIEZy YW1lTG9hZGVyOjpjaGVja0xvYWRDb21wbGV0ZSgpCiB7CiAgICAgQVNTRVJUKG1fY2xpZW50LT5o YXNXZWJWaWV3KCkpOwogICAgIAorICAgIG1fc2hvdWxkQ2FsbENoZWNrTG9hZENvbXBsZXRlID0g ZmFsc2U7CisKICAgICAvLyBGSVhNRTogQWx3YXlzIHRyYXZlcnNpbmcgdGhlIGVudGlyZSBmcmFt ZSB0cmVlIGlzIGEgYml0IGluZWZmaWNpZW50LCBidXQgCiAgICAgLy8gaXMgY3VycmVudGx5IG5l ZWRlZCBpbiBvcmRlciB0byBudWxsIG91dCB0aGUgcHJldmlvdXMgaGlzdG9yeSBpdGVtIGZvciBh bGwgZnJhbWVzLgogICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS0+cGFnZSgpKQpJbmRleDog V2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5oCShyZXZpc2lvbiA0ODY4NikKKysrIFdlYkNvcmUvbG9hZGVyL0ZyYW1l TG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQxMiwxNSArNDEyLDEzIEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgdm9pZCB1cGRhdGVIaXN0b3J5Rm9yQW5jaG9yU2Nyb2xsKCk7CiAg ICAgCiAgICAgICAgIHZvaWQgcmVkaXJlY3Rpb25UaW1lckZpcmVkKFRpbWVyPEZyYW1lTG9hZGVy PiopOwotICAgICAgICB2b2lkIGNoZWNrQ29tcGxldGVkVGltZXJGaXJlZChUaW1lcjxGcmFtZUxv YWRlcj4qKTsKLSAgICAgICAgdm9pZCBjaGVja0xvYWRDb21wbGV0ZVRpbWVyRmlyZWQoVGltZXI8 RnJhbWVMb2FkZXI+Kik7CisgICAgICAgIHZvaWQgY2hlY2tUaW1lckZpcmVkKFRpbWVyPEZyYW1l TG9hZGVyPiopOwogICAgICAgICAKICAgICAgICAgdm9pZCBjYW5jZWxSZWRpcmVjdGlvbihib29s IG5ld0xvYWRJblByb2dyZXNzID0gZmFsc2UpOwogCiAgICAgICAgIHZvaWQgc3RhcnRlZCgpOwog CiAgICAgICAgIHZvaWQgY29tcGxldGVkKCk7Ci0gICAgICAgIHZvaWQgcGFyZW50Q29tcGxldGVk KCk7CiAKICAgICAgICAgYm9vbCBzaG91bGRVc2VQbHVnaW4oY29uc3QgS1VSTCYsIGNvbnN0IFN0 cmluZyYgbWltZVR5cGUsIGJvb2wgaGFzRmFsbGJhY2ssIGJvb2wmIHVzZUZhbGxiYWNrKTsKICAg ICAgICAgYm9vbCBsb2FkUGx1Z2luKFJlbmRlclBhcnQqLCBjb25zdCBLVVJMJiwgY29uc3QgU3Ry aW5nJiBtaW1lVHlwZSwKQEAgLTUzOSw2ICs1MzcsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK ICAgICAgICAgdm9pZCBzY2hlZHVsZUNoZWNrQ29tcGxldGVkKCk7CiAgICAgICAgIHZvaWQgc2No ZWR1bGVDaGVja0xvYWRDb21wbGV0ZSgpOworICAgICAgICB2b2lkIHN0YXJ0Q2hlY2tDb21wbGV0 ZVRpbWVyKCk7CiAKICAgICAgICAgS1VSTCBvcmlnaW5hbFJlcXVlc3RVUkwoKSBjb25zdDsKIApA QCAtNTQ2LDYgKzU0NSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHNh dmVTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZVRvSXRlbShIaXN0b3J5SXRlbSopOwogCisgICAg ICAgIGJvb2wgYWxsQW5jZXN0b3JzQXJlQ29tcGxldGUoKSBjb25zdDsgLy8gaW5jbHVkaW5nIHRo aXMKICAgICAgICAgYm9vbCBhbGxDaGlsZHJlbkFyZUNvbXBsZXRlKCkgY29uc3Q7IC8vIGltbWVk aWF0ZSBjaGlsZHJlbiwgbm90IGFsbCBkZXNjZW5kYW50cwogCiAgICAgICAgIEZyYW1lKiBtX2Zy YW1lOwpAQCAtNjEyLDggKzYxMiw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgS1VS TCBtX3N1Ym1pdHRlZEZvcm1VUkw7CiAgICAgCiAgICAgICAgIFRpbWVyPEZyYW1lTG9hZGVyPiBt X3JlZGlyZWN0aW9uVGltZXI7Ci0gICAgICAgIFRpbWVyPEZyYW1lTG9hZGVyPiBtX2NoZWNrQ29t cGxldGVkVGltZXI7Ci0gICAgICAgIFRpbWVyPEZyYW1lTG9hZGVyPiBtX2NoZWNrTG9hZENvbXBs ZXRlVGltZXI7CisgICAgICAgIFRpbWVyPEZyYW1lTG9hZGVyPiBtX2NoZWNrVGltZXI7CisgICAg ICAgIGJvb2wgbV9zaG91bGRDYWxsQ2hlY2tDb21wbGV0ZWQ7CisgICAgICAgIGJvb2wgbV9zaG91 bGRDYWxsQ2hlY2tMb2FkQ29tcGxldGU7CiAKICAgICAgICAgRnJhbWUqIG1fb3BlbmVyOwogICAg ICAgICBIYXNoU2V0PEZyYW1lKj4gbV9vcGVuZWRGcmFtZXM7CkluZGV4OiBXZWJDb3JlL21hbnVh bC10ZXN0cy9nby1iYWNrLWFmdGVyLWFsZXJ0Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9t YW51YWwtdGVzdHMvZ28tYmFjay1hZnRlci1hbGVydC5odG1sCShyZXZpc2lvbiAwKQorKysgV2Vi Q29yZS9tYW51YWwtdGVzdHMvZ28tYmFjay1hZnRlci1hbGVydC5odG1sCShyZXZpc2lvbiAwKQpA QCAtMCwwICsxLDcgQEAKKzxodG1sPgorPGJvZHk+CitUaGlzIHRlc3RzIGEgYnVnIHdoZXJlIGdv aW5nIGJhY2sganVzdCBiZWZvcmUgcHV0dGluZyB1cCBhbiBhbGVydCBjYW4gbGVhZCB0byBhIGNy YXNoLgorPGhyPgorPGEgaHJlZj0icmVzb3VyY2VzL2FsZXJ0LWFuZC1nby1iYWNrLmh0bWwiPkNs aWNrIHRoaXMgbGluayB0byBydW4gdGhlIHRlc3QuPC9hPgorPC9ib2R5PgorPC9odG1sPgoKUHJv cGVydHkgY2hhbmdlcyBvbjogV2ViQ29yZS9tYW51YWwtdGVzdHMvZ28tYmFjay1hZnRlci1hbGVy dC5odG1sCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX18KQWRkZWQ6IHN2bjptaW1lLXR5cGUKICAgKyB0ZXh0L2h0bWwKQWRk ZWQ6IHN2bjplb2wtc3R5bGUKICAgKyBuYXRpdmUKCkluZGV4OiBXZWJDb3JlL21hbnVhbC10ZXN0 cy9yZXNvdXJjZXMvYWxlcnQtYW5kLWdvLWJhY2suaHRtbAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3Jl L21hbnVhbC10ZXN0cy9yZXNvdXJjZXMvYWxlcnQtYW5kLWdvLWJhY2suaHRtbAkocmV2aXNpb24g MCkKKysrIFdlYkNvcmUvbWFudWFsLXRlc3RzL3Jlc291cmNlcy9hbGVydC1hbmQtZ28tYmFjay5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQgQEAKKzxzY3JpcHQ+CitoaXN0b3J5LmJhY2so KTsKK2FsZXJ0KCJXYWl0IGEgbW9tZW50IGFuZCB0aGVuIGRpc21pc3MgdGhpcyBhbGVydC4gSWYg dGhlcmUgaXMgbm8gY3Jhc2gsIHRoZSB0ZXN0IHN1Y2NlZWRlZC4iKTsKKzwvc2NyaXB0PgoKUHJv cGVydHkgY2hhbmdlcyBvbjogV2ViQ29yZS9tYW51YWwtdGVzdHMvcmVzb3VyY2VzL2FsZXJ0LWFu ZC1nby1iYWNrLmh0bWwKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fXwpBZGRlZDogc3ZuOm1pbWUtdHlwZQogICArIHRleHQv aHRtbApBZGRlZDogc3ZuOmVvbC1zdHlsZQogICArIG5hdGl2ZQoK