59746 2011-04-28 15:17:33 -0700 WebKit2: Frequent crashes in acceptsFirstMouse 2011-04-28 16:02:15 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Mac OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 1 ap ap oldest_to_newest 394801 0 ap 2011-04-28 15:17:33 -0700 We are making sync calls without checking that connection is valid. 394811 1 ap 2011-04-28 15:22:53 -0700 <rdar://problem/9281270> 394818 2 91569 ap 2011-04-28 15:27:05 -0700 Created attachment 91569 proposed fix 394846 3 91569 andersca 2011-04-28 15:53:41 -0700 Comment on attachment 91569 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=91569&action=review > Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm:186 > + location = 0; > + length = 0; > + return; Shouldn't location be NSNotFound here? > Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm:194 > + location = 0; Ditto 394857 4 ap 2011-04-28 16:02:15 -0700 Maybe, not sure. Changed to NSNotFound. Committed <http://trac.webkit.org/changeset/85252>. 91569 2011-04-28 15:27:05 -0700 2011-04-28 15:53:40 -0700 proposed fix NullConnection.txt text/plain 9744 ap SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDg1MjQ3KQorKysgU291cmNlL1dlYktpdDIvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzggQEAKKzIwMTEtMDQtMjggIEFsZXhleSBQ cm9za3VyeWFrb3YgIDxhcEBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgV2ViS2l0MjogRnJlcXVlbnQgY3Jhc2hlcyBpbiBhY2NlcHRz Rmlyc3RNb3VzZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NTk3NDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkyODEyNzA+CisKKyAgICAgICAgVGhl IGNyYXNoIG9jY3VycmVkIHdoZW4gY29ubmVjdGlvbiB3YXMgbnVsbCAoYW5kIGl0IGNhbiBiZWNv bWUgbnVsbCBhdCBhbnkgdGltZSkuCisKKyAgICAgICAgQWRkZWQgY2hlY2tzIGZvciB0aGUgcHJv eHkgYmVpbmcgdmFsaWQgaW4gYWxsIHN5bmMgY2FsbHMgdGhhdCBsYWNrZWQgc3VjaC4KKyAgICAg ICAgV2ViUGFnZVByb3h5Ojppc1ZhbGlkKCkgaXMgbm90IHRoZSBzYW1lIGFzIFdlYlByb2Nlc3NQ cm94eTo6aXNWYWxpZCgpLCBidXQgZXhpc3RpbmcgY2hlY2tzCisgICAgICAgIGxvb2tlZCBhdCB0 aGUgZm9ybWVyLCBzbyBJIHVzZWQgdGhhdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmZpcnN0UmVjdEZvckNo YXJhY3RlckluU2VsZWN0ZWRSYW5nZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 Z2V0U2VsZWN0ZWRUZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpnZXN0dXJl V2lsbEJlZ2luKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpjcmVhdGVTbmFwc2hv dE9mVmlzaWJsZUNvbnRlbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5 TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldENvbXBvc2l0aW9uKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpjb25maXJtQ29tcG9zaXRpb24pOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmNvbmZpcm1Db21wb3NpdGlvbldpdGhvdXREaXN0 dXJiaW5nU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjppbnNlcnRU ZXh0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpnZXRNYXJrZWRSYW5nZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z2V0U2VsZWN0ZWRSYW5nZSk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Z2V0QXR0cmlidXRlZFN1YnN0cmluZ0Zyb21SYW5nZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y2hhcmFjdGVySW5kZXhGb3JQb2ludCk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Zmlyc3RSZWN0Rm9yQ2hhcmFjdGVyUmFu Z2UpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmV4ZWN1dGVLZXlwcmVzc0NvbW1h bmRzKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3cml0ZVNlbGVjdGlvblRvUGFz dGVib2FyZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVhZFNlbGVjdGlvbkZy b21QYXN0ZWJvYXJkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzaG91bGREZWxh eVdpbmRvd09yZGVyaW5nRm9yRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmFjY2VwdHNGaXJzdE1vdXNlKToKKwogMjAxMS0wNC0yNyAgQnJpYW4gV2VpbnN0ZWluICA8Yndl aW5zdGVpbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgVGltb3RoeSBIYXRjaGVy LgpJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHJldmlz aW9uIDg1MjQ1KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTY2Niw4ICs2NjYsMTEgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmV4 ZWN1dGVFZGl0Q29tbWFuZChjbwogfQogICAgIAogI2lmIFBMQVRGT1JNKFdJTikKLVdlYkNvcmU6 OkludFJlY3QgV2ViUGFnZVByb3h5OjpmaXJzdFJlY3RGb3JDaGFyYWN0ZXJJblNlbGVjdGVkUmFu Z2UoaW50IGNoYXJhY3RlclBvc2l0aW9uKQorSW50UmVjdCBXZWJQYWdlUHJveHk6OmZpcnN0UmVj dEZvckNoYXJhY3RlckluU2VsZWN0ZWRSYW5nZShpbnQgY2hhcmFjdGVyUG9zaXRpb24pCiB7Cisg ICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CisKICAgICBJbnRS ZWN0IHJlc3VsdFJlY3Q7CiAgICAgcHJvY2VzcygpLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFn ZTo6Rmlyc3RSZWN0Rm9yQ2hhcmFjdGVySW5TZWxlY3RlZFJhbmdlKGNoYXJhY3RlclBvc2l0aW9u KSwgTWVzc2FnZXM6OldlYlBhZ2U6OkZpcnN0UmVjdEZvckNoYXJhY3RlckluU2VsZWN0ZWRSYW5n ZTo6UmVwbHkocmVzdWx0UmVjdCksIG1fcGFnZUlEKTsKICAgICByZXR1cm4gcmVzdWx0UmVjdDsK QEAgLTY3NSw2ICs2NzgsOSBAQCBXZWJDb3JlOjpJbnRSZWN0IFdlYlBhZ2VQcm94eTo6Zmlyc3RS ZWN0CiAKIFN0cmluZyBXZWJQYWdlUHJveHk6OmdldFNlbGVjdGVkVGV4dCgpCiB7CisgICAgaWYg KCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKwogICAgIFN0cmluZyB0ZXh0 OwogICAgIHByb2Nlc3MoKS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2U6OkdldFNlbGVjdGVk VGV4dCgpLCBNZXNzYWdlczo6V2ViUGFnZTo6R2V0U2VsZWN0ZWRUZXh0OjpSZXBseSh0ZXh0KSwg bV9wYWdlSUQpOwogICAgIHJldHVybiB0ZXh0OwpAQCAtNjgyLDYgKzY4OCw5IEBAIFN0cmluZyBX ZWJQYWdlUHJveHk6OmdldFNlbGVjdGVkVGV4dCgpCiAKIGJvb2wgV2ViUGFnZVByb3h5OjpnZXN0 dXJlV2lsbEJlZ2luKGNvbnN0IEludFBvaW50JiBwb2ludCkKIHsKKyAgICBpZiAoIWlzVmFsaWQo KSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAgICAgYm9vbCBjYW5CZWdpblBhbm5pbmcgPSBm YWxzZTsKICAgICBwcm9jZXNzKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXN0dXJl V2lsbEJlZ2luKHBvaW50KSwgTWVzc2FnZXM6OldlYlBhZ2U6Okdlc3R1cmVXaWxsQmVnaW46OlJl cGx5KGNhbkJlZ2luUGFubmluZyksIG1fcGFnZUlEKTsKICAgICByZXR1cm4gY2FuQmVnaW5QYW5u aW5nOwpAQCAtMzA3Miw2ICszMDgxLDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmxpbmtDbGlja2Vk KGNvbnN0IFN0cgogCiBQYXNzUmVmUHRyPFdlYkltYWdlPiBXZWJQYWdlUHJveHk6OmNyZWF0ZVNu YXBzaG90T2ZWaXNpYmxlQ29udGVudCgpCiB7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAg IHJldHVybiAwOworCiAgICAgU2hhcmVhYmxlQml0bWFwOjpIYW5kbGUgc25hcHNob3RIYW5kbGU7 CiAgICAgLy8gRG8gbm90IHdhaXQgZm9yIG1vcmUgdGhhbiBhIHNlY29uZCAoYXJiaXRyYXJ5KSBm b3IgdGhlIFdlYlByb2Nlc3MgdG8gZ2V0IHRoZSBzbmFwc2hvdCBzbwogICAgIC8vIHRoYXQgdGhl IFVJIFByb2Nlc3MgaXMgbm90IHBlcm1hbmVudGx5IHN0dWNrIHdhaXRpbmcgb24gYSBwb3RlbnRp YWxseSBjcmFzaGluZyBXZWIgUHJvY2Vzcy4KSW5kZXg6IFNvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCShyZXZpc2lvbiA4NTI0NSkKKysrIFNvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCSh3b3JraW5nIGNvcHkp CkBAIC0xNDMsMjEgKzE0MywzNiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6d2luZG93QW5kVmlld0Zy YW1lc0NoCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpzZXRDb21wb3NpdGlvbihjb25zdCBTdHJpbmcm IHRleHQsIFZlY3RvcjxDb21wb3NpdGlvblVuZGVybGluZT4gdW5kZXJsaW5lcywgdWludDY0X3Qg c2VsZWN0aW9uU3RhcnQsIHVpbnQ2NF90IHNlbGVjdGlvbkVuZCwgdWludDY0X3QgcmVwbGFjZW1l bnRSYW5nZVN0YXJ0LCB1aW50NjRfdCByZXBsYWNlbWVudFJhbmdlRW5kKQogeworICAgIGlmICgh aXNWYWxpZCgpKSB7CisgICAgICAgIC8vIElmIHRoaXMgZmFpbHMsIHdlIHNob3VsZCBjYWxsIC1k aXNjYXJkTWFya2VkVGV4dCBvbiBpbnB1dCBjb250ZXh0IHRvIG5vdGlmeSB0aGUgaW5wdXQgbWV0 aG9kLgorICAgICAgICAvLyBUaGlzIHdpbGwgaGFwcGVuIG5hdHVyYWxseSBsYXRlciwgYXMgcGFy dCBvZiByZWxvYWRpbmcgdGhlIHBhZ2UuCisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBw cm9jZXNzKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpTZXRDb21wb3NpdGlvbih0ZXh0 LCB1bmRlcmxpbmVzLCBzZWxlY3Rpb25TdGFydCwgc2VsZWN0aW9uRW5kLCByZXBsYWNlbWVudFJh bmdlU3RhcnQsIHJlcGxhY2VtZW50UmFuZ2VFbmQpLCBNZXNzYWdlczo6V2ViUGFnZTo6U2V0Q29t cG9zaXRpb246OlJlcGx5KG1fZWRpdG9yU3RhdGUpLCBtX3BhZ2VJRCk7CiB9CiAKIHZvaWQgV2Vi UGFnZVByb3h5Ojpjb25maXJtQ29tcG9zaXRpb24oKQogeworICAgIGlmICghaXNWYWxpZCgpKQor ICAgICAgICByZXR1cm47CisKICAgICBwcm9jZXNzKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQ YWdlOjpDb25maXJtQ29tcG9zaXRpb24oKSwgTWVzc2FnZXM6OldlYlBhZ2U6OkNvbmZpcm1Db21w b3NpdGlvbjo6UmVwbHkobV9lZGl0b3JTdGF0ZSksIG1fcGFnZUlEKTsKIH0KIAogdm9pZCBXZWJQ YWdlUHJveHk6OmNvbmZpcm1Db21wb3NpdGlvbldpdGhvdXREaXN0dXJiaW5nU2VsZWN0aW9uKCkK IHsKKyAgICBpZiAoIWlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgcHJvY2Vzcygp LT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZTo6Q29uZmlybUNvbXBvc2l0aW9uV2l0aG91dERp c3R1cmJpbmdTZWxlY3Rpb24oKSwgTWVzc2FnZXM6OldlYlBhZ2U6OkNvbmZpcm1Db21wb3NpdGlv bjo6UmVwbHkobV9lZGl0b3JTdGF0ZSksIG1fcGFnZUlEKTsKIH0KIAogYm9vbCBXZWJQYWdlUHJv eHk6Omluc2VydFRleHQoY29uc3QgU3RyaW5nJiB0ZXh0LCB1aW50NjRfdCByZXBsYWNlbWVudFJh bmdlU3RhcnQsIHVpbnQ2NF90IHJlcGxhY2VtZW50UmFuZ2VFbmQpCiB7CisgICAgaWYgKCFpc1Zh bGlkKCkpCisgICAgICAgIHJldHVybiB0cnVlOworCiAgICAgYm9vbCBoYW5kbGVkOwogICAgIHBy b2Nlc3MoKS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2U6Okluc2VydFRleHQodGV4dCwgcmVw bGFjZW1lbnRSYW5nZVN0YXJ0LCByZXBsYWNlbWVudFJhbmdlRW5kKSwgTWVzc2FnZXM6OldlYlBh Z2U6Okluc2VydFRleHQ6OlJlcGx5KGhhbmRsZWQsIG1fZWRpdG9yU3RhdGUpLCBtX3BhZ2VJRCk7 CiAgICAgcmV0dXJuIGhhbmRsZWQ7CkBAIC0xNjUsMjggKzE4MCw0NiBAQCBib29sIFdlYlBhZ2VQ cm94eTo6aW5zZXJ0VGV4dChjb25zdCBTdHJpCiAKIHZvaWQgV2ViUGFnZVByb3h5OjpnZXRNYXJr ZWRSYW5nZSh1aW50NjRfdCYgbG9jYXRpb24sIHVpbnQ2NF90JiBsZW5ndGgpCiB7CisgICAgaWYg KCFpc1ZhbGlkKCkpIHsKKyAgICAgICAgbG9jYXRpb24gPSAwOworICAgICAgICBsZW5ndGggPSAw OworICAgICAgICByZXR1cm47CisgICAgfQogICAgIHByb2Nlc3MoKS0+c2VuZFN5bmMoTWVzc2Fn ZXM6OldlYlBhZ2U6OkdldE1hcmtlZFJhbmdlKCksIE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRNYXJr ZWRSYW5nZTo6UmVwbHkobG9jYXRpb24sIGxlbmd0aCksIG1fcGFnZUlEKTsKIH0KIAogdm9pZCBX ZWJQYWdlUHJveHk6OmdldFNlbGVjdGVkUmFuZ2UodWludDY0X3QmIGxvY2F0aW9uLCB1aW50NjRf dCYgbGVuZ3RoKQogeworICAgIGlmICghaXNWYWxpZCgpKSB7CisgICAgICAgIGxvY2F0aW9uID0g MDsKKyAgICAgICAgbGVuZ3RoID0gMDsKKyAgICAgICAgcmV0dXJuOworICAgIH0KICAgICBwcm9j ZXNzKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRTZWxlY3RlZFJhbmdlKCksIE1l c3NhZ2VzOjpXZWJQYWdlOjpHZXRTZWxlY3RlZFJhbmdlOjpSZXBseShsb2NhdGlvbiwgbGVuZ3Ro KSwgbV9wYWdlSUQpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0QXR0cmlidXRlZFN1YnN0 cmluZ0Zyb21SYW5nZSh1aW50NjRfdCBsb2NhdGlvbiwgdWludDY0X3QgbGVuZ3RoLCBBdHRyaWJ1 dGVkU3RyaW5nJiByZXN1bHQpCiB7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVy bjsKICAgICBwcm9jZXNzKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlOjpHZXRBdHRyaWJ1 dGVkU3Vic3RyaW5nRnJvbVJhbmdlKGxvY2F0aW9uLCBsZW5ndGgpLCBNZXNzYWdlczo6V2ViUGFn ZTo6R2V0QXR0cmlidXRlZFN1YnN0cmluZ0Zyb21SYW5nZTo6UmVwbHkocmVzdWx0KSwgbV9wYWdl SUQpOwogfQogCiB1aW50NjRfdCBXZWJQYWdlUHJveHk6OmNoYXJhY3RlckluZGV4Rm9yUG9pbnQo Y29uc3QgSW50UG9pbnQgcG9pbnQpCiB7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJl dHVybiAwOworCiAgICAgdWludDY0X3QgcmVzdWx0OwogICAgIHByb2Nlc3MoKS0+c2VuZFN5bmMo TWVzc2FnZXM6OldlYlBhZ2U6OkNoYXJhY3RlckluZGV4Rm9yUG9pbnQocG9pbnQpLCBNZXNzYWdl czo6V2ViUGFnZTo6Q2hhcmFjdGVySW5kZXhGb3JQb2ludDo6UmVwbHkocmVzdWx0KSwgbV9wYWdl SUQpOwogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLVdlYkNvcmU6OkludFJlY3QgV2ViUGFnZVBy b3h5OjpmaXJzdFJlY3RGb3JDaGFyYWN0ZXJSYW5nZSh1aW50NjRfdCBsb2NhdGlvbiwgdWludDY0 X3QgbGVuZ3RoKQorSW50UmVjdCBXZWJQYWdlUHJveHk6OmZpcnN0UmVjdEZvckNoYXJhY3RlclJh bmdlKHVpbnQ2NF90IGxvY2F0aW9uLCB1aW50NjRfdCBsZW5ndGgpCiB7CisgICAgaWYgKCFpc1Zh bGlkKCkpCisgICAgICAgIHJldHVybiBJbnRSZWN0KCk7CisKICAgICBJbnRSZWN0IHJlc3VsdFJl Y3Q7CiAgICAgcHJvY2VzcygpLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZTo6Rmlyc3RSZWN0 Rm9yQ2hhcmFjdGVyUmFuZ2UobG9jYXRpb24sIGxlbmd0aCksIE1lc3NhZ2VzOjpXZWJQYWdlOjpG aXJzdFJlY3RGb3JDaGFyYWN0ZXJSYW5nZTo6UmVwbHkocmVzdWx0UmVjdCksIG1fcGFnZUlEKTsK ICAgICByZXR1cm4gcmVzdWx0UmVjdDsKQEAgLTE5NCw2ICsyMjcsOSBAQCBXZWJDb3JlOjpJbnRS ZWN0IFdlYlBhZ2VQcm94eTo6Zmlyc3RSZWN0CiAKIGJvb2wgV2ViUGFnZVByb3h5OjpleGVjdXRl S2V5cHJlc3NDb21tYW5kcyhjb25zdCBWZWN0b3I8V2ViQ29yZTo6S2V5cHJlc3NDb21tYW5kPiYg Y29tbWFuZHMpCiB7CisgICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiBmYWxzZTsK KwogICAgIGJvb2wgcmVzdWx0OwogICAgIHByb2Nlc3MoKS0+c2VuZFN5bmMoTWVzc2FnZXM6Oldl YlBhZ2U6OkV4ZWN1dGVLZXlwcmVzc0NvbW1hbmRzKGNvbW1hbmRzKSwgTWVzc2FnZXM6OldlYlBh Z2U6OkV4ZWN1dGVLZXlwcmVzc0NvbW1hbmRzOjpSZXBseShyZXN1bHQsIG1fZWRpdG9yU3RhdGUp LCBtX3BhZ2VJRCk7CiAgICAgcmV0dXJuIHJlc3VsdDsKQEAgLTIwMSw2ICsyMzcsOSBAQCBib29s IFdlYlBhZ2VQcm94eTo6ZXhlY3V0ZUtleXByZXNzQ29tbWFuCiAKIGJvb2wgV2ViUGFnZVByb3h5 Ojp3cml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZChjb25zdCBTdHJpbmcmIHBhc3RlYm9hcmROYW1l LCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgcGFzdGVib2FyZFR5cGVzKQogeworICAgIGlmICghaXNW YWxpZCgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICBib29sIHJlc3VsdDsKICAgICBj b25zdCBkb3VibGUgbWVzc2FnZVRpbWVvdXQgPSAyMDsKICAgICBwcm9jZXNzKCktPnNlbmRTeW5j KE1lc3NhZ2VzOjpXZWJQYWdlOjpXcml0ZVNlbGVjdGlvblRvUGFzdGVib2FyZChwYXN0ZWJvYXJk TmFtZSwgcGFzdGVib2FyZFR5cGVzKSwgTWVzc2FnZXM6OldlYlBhZ2U6OldyaXRlU2VsZWN0aW9u VG9QYXN0ZWJvYXJkOjpSZXBseShyZXN1bHQpLCBtX3BhZ2VJRCwgbWVzc2FnZVRpbWVvdXQpOwpA QCAtMjA5LDYgKzI0OCw5IEBAIGJvb2wgV2ViUGFnZVByb3h5Ojp3cml0ZVNlbGVjdGlvblRvUGFz dGUKIAogYm9vbCBXZWJQYWdlUHJveHk6OnJlYWRTZWxlY3Rpb25Gcm9tUGFzdGVib2FyZChjb25z dCBTdHJpbmcmIHBhc3RlYm9hcmROYW1lKQogeworICAgIGlmICghaXNWYWxpZCgpKQorICAgICAg ICByZXR1cm4gZmFsc2U7CisKICAgICBib29sIHJlc3VsdDsKICAgICBjb25zdCBkb3VibGUgbWVz c2FnZVRpbWVvdXQgPSAyMDsKICAgICBwcm9jZXNzKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQ YWdlOjpSZWFkU2VsZWN0aW9uRnJvbVBhc3RlYm9hcmQocGFzdGVib2FyZE5hbWUpLCBNZXNzYWdl czo6V2ViUGFnZTo6UmVhZFNlbGVjdGlvbkZyb21QYXN0ZWJvYXJkOjpSZXBseShyZXN1bHQpLCBt X3BhZ2VJRCwgbWVzc2FnZVRpbWVvdXQpOwpAQCAtMzAyLDYgKzM0NCw5IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpleGVjdXRlU2F2ZWRDb21tYW5kQnkKIAogYm9vbCBXZWJQYWdlUHJveHk6OnNob3Vs ZERlbGF5V2luZG93T3JkZXJpbmdGb3JFdmVudChjb25zdCBXZWJLaXQ6OldlYk1vdXNlRXZlbnQm IGV2ZW50KQogeworICAgIGlmICghcHJvY2VzcygpLT5pc1ZhbGlkKCkpCisgICAgICAgIHJldHVy biBmYWxzZTsKKwogICAgIGJvb2wgcmVzdWx0ID0gZmFsc2U7CiAgICAgY29uc3QgZG91YmxlIG1l c3NhZ2VUaW1lb3V0ID0gMzsKICAgICBwcm9jZXNzKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQ YWdlOjpTaG91bGREZWxheVdpbmRvd09yZGVyaW5nRXZlbnQoZXZlbnQpLCBNZXNzYWdlczo6V2Vi UGFnZTo6U2hvdWxkRGVsYXlXaW5kb3dPcmRlcmluZ0V2ZW50OjpSZXBseShyZXN1bHQpLCBtX3Bh Z2VJRCwgbWVzc2FnZVRpbWVvdXQpOwpAQCAtMzEwLDYgKzM1NSw5IEBAIGJvb2wgV2ViUGFnZVBy b3h5OjpzaG91bGREZWxheVdpbmRvd09yZGUKIAogYm9vbCBXZWJQYWdlUHJveHk6OmFjY2VwdHNG aXJzdE1vdXNlKGludCBldmVudE51bWJlciwgY29uc3QgV2ViS2l0OjpXZWJNb3VzZUV2ZW50JiBl dmVudCkKIHsKKyAgICBpZiAoIWlzVmFsaWQoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCiAg ICAgYm9vbCByZXN1bHQgPSBmYWxzZTsKICAgICBjb25zdCBkb3VibGUgbWVzc2FnZVRpbWVvdXQg PSAzOwogICAgIHByb2Nlc3MoKS0+c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2U6OkFjY2VwdHNG aXJzdE1vdXNlKGV2ZW50TnVtYmVyLCBldmVudCksIE1lc3NhZ2VzOjpXZWJQYWdlOjpBY2NlcHRz Rmlyc3RNb3VzZTo6UmVwbHkocmVzdWx0KSwgbV9wYWdlSUQsIG1lc3NhZ2VUaW1lb3V0KTsK