131364 2014-04-08 09:42:31 -0700 WinCairo crashes on acid3 test 2014-05-11 00:01:49 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alex.christensen webkit-unassigned bfulgham commit-queue galpeter mmatyas peavo oldest_to_newest 998615 0 alex.christensen 2014-04-08 09:42:31 -0700 When opening http://acid3.acidtests.org/ in WinCairo's WinLauncher I get a "Frame load interrupted" Error dialog and then it crashes sometimes if you continue. Does anyone else have this problem? I think it might be from not cancelling something in the CURL code, but I have no idea what. 998638 1 peavo 2014-04-08 10:40:17 -0700 (In reply to comment #0) > When opening http://acid3.acidtests.org/ in WinCairo's WinLauncher I get a "Frame load interrupted" Error dialog and then it crashes sometimes if you continue. Does anyone else have this problem? I think it might be from not cancelling something in the CURL code, but I have no idea what. I've seen this too, on other web sites. Not sure what causes it, though. 1008306 2 231236 peavo 2014-05-10 14:37:03 -0700 Created attachment 231236 Patch 1008314 3 231236 bfulgham 2014-05-10 15:34:15 -0700 Comment on attachment 231236 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=231236&action=review Nice work tracking this down! Thank you for all your help. R=me. > Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:536 > + String url = job->firstRequest().url().string(); This should be a const reference to avoid making an extra copy. 1008325 4 231242 peavo 2014-05-10 15:43:23 -0700 Created attachment 231242 Patch 1008327 5 peavo 2014-05-10 15:45:15 -0700 (In reply to comment #3) > (From update of attachment 231236 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=231236&action=review > > Nice work tracking this down! Thank you for all your help. R=me. > Thanks :) > > Source/WebCore/platform/network/curl/ResourceHandleManager.cpp:536 > > + String url = job->firstRequest().url().string(); > > This should be a const reference to avoid making an extra copy. Updated patch. 1008387 6 231242 bfulgham 2014-05-10 23:31:16 -0700 Comment on attachment 231242 Patch R=me 1008393 7 231242 commit-queue 2014-05-11 00:01:44 -0700 Comment on attachment 231242 Patch Clearing flags on attachment: 231242 Committed r168596: <http://trac.webkit.org/changeset/168596> 1008394 8 commit-queue 2014-05-11 00:01:49 -0700 All reviewed patches have been landed. Closing bug. 231236 2014-05-10 14:37:03 -0700 2014-05-10 15:43:13 -0700 Patch bug-131364-20140510233624.patch text/plain 4102 peavo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODU4MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA1LTEwICBwZWF2b0Bv dXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFdpbkNhaXJvIGNyYXNo ZXMgb24gYWNpZDMgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMxMzY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiB0aGUgMzA0IChOb3QtbW9kaWZpZWQpIHJlc3BvbnNlIGlzIHJlY2VpdmVk LCB0aGUgQ3VybCBiYWNrZW5kIHNob3VsZCBsb29rIHVwIHRoZSBjYWNoZWQgcmVzcG9uc2UsCisg ICAgICAgIGFuZCBjYWxsIHRoZSBjbGllbnQgbWV0aG9kIGRpZFJlY2VpdmVSZXNwb25zZSB3aXRo IHRoZSBjYWNoZWQgcmVzcG9uc2UsIGluc3RlYWQgb2YgdGhlIDMwNCByZXNwb25zZS4KKyAgICAg ICAgT3RoZXJ3aXNlIHRoZSByZXNwb25zZSB3aWxsIGNvbnRhaW4gYW4gZW1wdHkgTUlNRSB0eXBl LCB3aGljaCBjYXVzZXMgdGhlIHJlcXVlc3QgdG8gYmUgY2FuY2VsbGVkLCBhbmQgdGhlIGNsaWVu dCBkZWxldGVkLgorICAgICAgICBXaGVuIHRoZSBDdXJsIGNhY2hlIG1hbmFnZXIgdGhlbiBhY2Nl c3NlcyB0aGUgY2xpZW50IGFmdGVyd2FyZHMsIGl0IGlzIGRlbGV0ZWQsIGFuZCB3ZSBjcmFzaC4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkN1cmxDYWNoZU1hbmFnZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6 IFJldHVybiBlYXJseSBpZiByZXF1ZXN0IGlzIGNhbmNlbGxlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkN1cmxDYWNoZU1hbmFnZXI6OmdldENhY2hlZFJlc3BvbnNlKTogQWRkZWQgbWV0aG9kIHRvIGdl dCBjYWNoZWQgcmVzcG9uc2UuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxD YWNoZU1hbmFnZXIuaDogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jl c291cmNlSGFuZGxlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoZWFkZXJDYWxsYmFj ayk6IFdoZW4gMzA0IHJlc3BvbnNlIGlzIHJlY2VpdmVkLCBsb29rIHVwIGNhY2hlZCByZXNwb25z ZSwgYW5kIHVzZSBpdC4KKwogMjAxNC0wNS0xMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE2Njg1Myk6IGZhc3QvcHJlbG9hZGVyL2RvY3Vt ZW50LXdyaXRlLmh0bWwgaXMgdmVyeSBmbGFreQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL0N1cmxDYWNoZU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmNwcAkocmV2 aXNpb24gMTY4NTc3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1 cmxDYWNoZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTYsNiArMTk2LDEwIEBAIHZv aWQgQ3VybENhY2hlTWFuYWdlcjo6ZGlkUmVjZWl2ZVJlc3BvbnMKICAgICBpZiAobV9kaXNhYmxl ZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IGpv Yi0+Z2V0SW50ZXJuYWwoKTsKKyAgICBpZiAoZC0+bV9jYW5jZWxsZWQpCisgICAgICAgIHJldHVy bjsKKwogICAgIFN0cmluZyB1cmwgPSBqb2ItPmZpcnN0UmVxdWVzdCgpLnVybCgpLnN0cmluZygp OwogCiAgICAgaWYgKHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgPT0gMzA0KSB7CkBAIC0yNDcs NiArMjUxLDE2IEBAIEhUVFBIZWFkZXJNYXAmIEN1cmxDYWNoZU1hbmFnZXI6OnJlcXVlc3QKICAg ICByZXR1cm4gbV9pbmRleC5maW5kKHVybCktPnZhbHVlLT5yZXF1ZXN0SGVhZGVycygpOwogfQog Citib29sIEN1cmxDYWNoZU1hbmFnZXI6OmdldENhY2hlZFJlc3BvbnNlKGNvbnN0IFN0cmluZyYg dXJsLCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKK3sKKyAgICBIYXNoTWFwPFN0cmluZywg c3RkOjp1bmlxdWVfcHRyPEN1cmxDYWNoZUVudHJ5Pj46Oml0ZXJhdG9yIGl0ID0gbV9pbmRleC5m aW5kKHVybCk7CisgICAgaWYgKGl0ICE9IG1faW5kZXguZW5kKCkpIHsKKyAgICAgICAgaXQtPnZh bHVlLT5zZXRSZXNwb25zZUZyb21DYWNoZWRIZWFkZXJzKHJlc3BvbnNlKTsKKyAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBDdXJsQ2FjaGVN YW5hZ2VyOjpkaWRSZWNlaXZlRGF0YShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgY2hhciogZGF0 YSwgc2l6ZV90IHNpemUpCiB7CiAgICAgaWYgKG1fZGlzYWJsZWQpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENhY2hlTWFuYWdlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2Vy LmgJKHJldmlzaW9uIDE2ODU3NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAg cHVibGljOgogCiAgICAgYm9vbCBpc0NhY2hlZChjb25zdCBTdHJpbmcmKTsKICAgICBIVFRQSGVh ZGVyTWFwJiByZXF1ZXN0SGVhZGVycyhjb25zdCBTdHJpbmcmKTsgLy8gTG9hZCBoZWFkZXJzCisg ICAgYm9vbCBnZXRDYWNoZWRSZXNwb25zZShjb25zdCBTdHJpbmcmIHVybCwgUmVzb3VyY2VSZXNw b25zZSYpOwogCiAgICAgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2UoUmVzb3VyY2VIYW5kbGUqLCBS ZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgdm9pZCBkaWRSZWNlaXZlRGF0YShjb25zdCBTdHJpbmcm LCBjb25zdCBjaGFyKiwgc2l6ZV90KTsgLy8gU2F2ZSBkYXRhCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5k bGVNYW5hZ2VyLmNwcAkocmV2aXNpb24gMTY4NTc3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTUzMiw3ICs1MzIsMTEgQEAgc3RhdGljIHNpemVfdCBoZWFkZXJDYWxsYmFjayhjaGFyKiBw dHIsCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoY2xpZW50KSB7Ci0gICAgICAgICAgICBjbGll bnQtPmRpZFJlY2VpdmVSZXNwb25zZShqb2IsIGQtPm1fcmVzcG9uc2UpOyAKKyAgICAgICAgICAg IGlmIChodHRwQ29kZSA9PSAzMDQpIHsKKyAgICAgICAgICAgICAgICBTdHJpbmcgdXJsID0gam9i LT5maXJzdFJlcXVlc3QoKS51cmwoKS5zdHJpbmcoKTsKKyAgICAgICAgICAgICAgICBDdXJsQ2Fj aGVNYW5hZ2VyOjpnZXRJbnN0YW5jZSgpLmdldENhY2hlZFJlc3BvbnNlKHVybCwgZC0+bV9yZXNw b25zZSk7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBjbGllbnQtPmRpZFJlY2VpdmVSZXNw b25zZShqb2IsIGQtPm1fcmVzcG9uc2UpOwogICAgICAgICAgICAgQ3VybENhY2hlTWFuYWdlcjo6 Z2V0SW5zdGFuY2UoKS5kaWRSZWNlaXZlUmVzcG9uc2Uoam9iLCBkLT5tX3Jlc3BvbnNlKTsKICAg ICAgICAgfQogICAgICAgICBkLT5tX3Jlc3BvbnNlLnNldFJlc3BvbnNlRmlyZWQodHJ1ZSk7Cg== 231242 2014-05-10 15:43:23 -0700 2014-05-11 00:01:44 -0700 Patch bug-131364-20140511004244.patch text/plain 4109 peavo SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2ODU4MykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTA1LTEwICBwZWF2b0Bv dXRsb29rLmNvbSAgPHBlYXZvQG91dGxvb2suY29tPgorCisgICAgICAgIFdpbkNhaXJvIGNyYXNo ZXMgb24gYWNpZDMgdGVzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTMxMzY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiB0aGUgMzA0IChOb3QtbW9kaWZpZWQpIHJlc3BvbnNlIGlzIHJlY2VpdmVk LCB0aGUgQ3VybCBiYWNrZW5kIHNob3VsZCBsb29rIHVwIHRoZSBjYWNoZWQgcmVzcG9uc2UsCisg ICAgICAgIGFuZCBjYWxsIHRoZSBjbGllbnQgbWV0aG9kIGRpZFJlY2VpdmVSZXNwb25zZSB3aXRo IHRoZSBjYWNoZWQgcmVzcG9uc2UsIGluc3RlYWQgb2YgdGhlIDMwNCByZXNwb25zZS4KKyAgICAg ICAgT3RoZXJ3aXNlIHRoZSByZXNwb25zZSB3aWxsIGNvbnRhaW4gYW4gZW1wdHkgTUlNRSB0eXBl LCB3aGljaCBjYXVzZXMgdGhlIHJlcXVlc3QgdG8gYmUgY2FuY2VsbGVkLCBhbmQgdGhlIGNsaWVu dCBkZWxldGVkLgorICAgICAgICBXaGVuIHRoZSBDdXJsIGNhY2hlIG1hbmFnZXIgdGhlbiBhY2Nl c3NlcyB0aGUgY2xpZW50IGFmdGVyd2FyZHMsIGl0IGlzIGRlbGV0ZWQsIGFuZCB3ZSBjcmFzaC4K KworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkN1cmxDYWNoZU1hbmFnZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6 IFJldHVybiBlYXJseSBpZiByZXF1ZXN0IGlzIGNhbmNlbGxlZC4KKyAgICAgICAgKFdlYkNvcmU6 OkN1cmxDYWNoZU1hbmFnZXI6OmdldENhY2hlZFJlc3BvbnNlKTogQWRkZWQgbWV0aG9kIHRvIGdl dCBjYWNoZWQgcmVzcG9uc2UuCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxD YWNoZU1hbmFnZXIuaDogRGl0dG8uCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jl c291cmNlSGFuZGxlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpoZWFkZXJDYWxsYmFj ayk6IFdoZW4gMzA0IHJlc3BvbnNlIGlzIHJlY2VpdmVkLCBsb29rIHVwIGNhY2hlZCByZXNwb25z ZSwgYW5kIHVzZSBpdC4KKwogMjAxNC0wNS0xMCAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUkVHUkVTU0lPTiAocjE2Njg1Myk6IGZhc3QvcHJlbG9hZGVyL2RvY3Vt ZW50LXdyaXRlLmh0bWwgaXMgdmVyeSBmbGFreQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL0N1cmxDYWNoZU1hbmFnZXIuY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmNwcAkocmV2 aXNpb24gMTY4NTc3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1 cmxDYWNoZU1hbmFnZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xOTYsNiArMTk2LDEwIEBAIHZv aWQgQ3VybENhY2hlTWFuYWdlcjo6ZGlkUmVjZWl2ZVJlc3BvbnMKICAgICBpZiAobV9kaXNhYmxl ZCkKICAgICAgICAgcmV0dXJuOwogCisgICAgUmVzb3VyY2VIYW5kbGVJbnRlcm5hbCogZCA9IGpv Yi0+Z2V0SW50ZXJuYWwoKTsKKyAgICBpZiAoZC0+bV9jYW5jZWxsZWQpCisgICAgICAgIHJldHVy bjsKKwogICAgIFN0cmluZyB1cmwgPSBqb2ItPmZpcnN0UmVxdWVzdCgpLnVybCgpLnN0cmluZygp OwogCiAgICAgaWYgKHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCkgPT0gMzA0KSB7CkBAIC0yNDcs NiArMjUxLDE2IEBAIEhUVFBIZWFkZXJNYXAmIEN1cmxDYWNoZU1hbmFnZXI6OnJlcXVlc3QKICAg ICByZXR1cm4gbV9pbmRleC5maW5kKHVybCktPnZhbHVlLT5yZXF1ZXN0SGVhZGVycygpOwogfQog Citib29sIEN1cmxDYWNoZU1hbmFnZXI6OmdldENhY2hlZFJlc3BvbnNlKGNvbnN0IFN0cmluZyYg dXJsLCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkKK3sKKyAgICBIYXNoTWFwPFN0cmluZywg c3RkOjp1bmlxdWVfcHRyPEN1cmxDYWNoZUVudHJ5Pj46Oml0ZXJhdG9yIGl0ID0gbV9pbmRleC5m aW5kKHVybCk7CisgICAgaWYgKGl0ICE9IG1faW5kZXguZW5kKCkpIHsKKyAgICAgICAgaXQtPnZh bHVlLT5zZXRSZXNwb25zZUZyb21DYWNoZWRIZWFkZXJzKHJlc3BvbnNlKTsKKyAgICAgICAgcmV0 dXJuIHRydWU7CisgICAgfQorICAgIHJldHVybiBmYWxzZTsKK30KKwogdm9pZCBDdXJsQ2FjaGVN YW5hZ2VyOjpkaWRSZWNlaXZlRGF0YShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgY2hhciogZGF0 YSwgc2l6ZV90IHNpemUpCiB7CiAgICAgaWYgKG1fZGlzYWJsZWQpCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENhY2hlTWFuYWdlci5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ2FjaGVNYW5hZ2Vy LmgJKHJldmlzaW9uIDE2ODU3NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv Y3VybC9DdXJsQ2FjaGVNYW5hZ2VyLmgJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDcgQEAg cHVibGljOgogCiAgICAgYm9vbCBpc0NhY2hlZChjb25zdCBTdHJpbmcmKTsKICAgICBIVFRQSGVh ZGVyTWFwJiByZXF1ZXN0SGVhZGVycyhjb25zdCBTdHJpbmcmKTsgLy8gTG9hZCBoZWFkZXJzCisg ICAgYm9vbCBnZXRDYWNoZWRSZXNwb25zZShjb25zdCBTdHJpbmcmIHVybCwgUmVzb3VyY2VSZXNw b25zZSYpOwogCiAgICAgdm9pZCBkaWRSZWNlaXZlUmVzcG9uc2UoUmVzb3VyY2VIYW5kbGUqLCBS ZXNvdXJjZVJlc3BvbnNlJik7CiAgICAgdm9pZCBkaWRSZWNlaXZlRGF0YShjb25zdCBTdHJpbmcm LCBjb25zdCBjaGFyKiwgc2l6ZV90KTsgLy8gU2F2ZSBkYXRhCkluZGV4OiBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVNYW5hZ2VyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5k bGVNYW5hZ2VyLmNwcAkocmV2aXNpb24gMTY4NTc3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlTWFuYWdlci5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTUzMiw3ICs1MzIsMTEgQEAgc3RhdGljIHNpemVfdCBoZWFkZXJDYWxsYmFjayhjaGFyKiBw dHIsCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoY2xpZW50KSB7Ci0gICAgICAgICAgICBjbGll bnQtPmRpZFJlY2VpdmVSZXNwb25zZShqb2IsIGQtPm1fcmVzcG9uc2UpOyAKKyAgICAgICAgICAg IGlmIChodHRwQ29kZSA9PSAzMDQpIHsKKyAgICAgICAgICAgICAgICBjb25zdCBTdHJpbmcmIHVy bCA9IGpvYi0+Zmlyc3RSZXF1ZXN0KCkudXJsKCkuc3RyaW5nKCk7CisgICAgICAgICAgICAgICAg Q3VybENhY2hlTWFuYWdlcjo6Z2V0SW5zdGFuY2UoKS5nZXRDYWNoZWRSZXNwb25zZSh1cmwsIGQt Pm1fcmVzcG9uc2UpOworICAgICAgICAgICAgfQorICAgICAgICAgICAgY2xpZW50LT5kaWRSZWNl aXZlUmVzcG9uc2Uoam9iLCBkLT5tX3Jlc3BvbnNlKTsKICAgICAgICAgICAgIEN1cmxDYWNoZU1h bmFnZXI6OmdldEluc3RhbmNlKCkuZGlkUmVjZWl2ZVJlc3BvbnNlKGpvYiwgZC0+bV9yZXNwb25z ZSk7CiAgICAgICAgIH0KICAgICAgICAgZC0+bV9yZXNwb25zZS5zZXRSZXNwb25zZUZpcmVkKHRy dWUpOwo=