189568 2018-09-12 16:58:58 -0700 WebPageProxy::reportPageLoadResult can crash on some code paths 2018-09-13 15:32:43 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 krollin krollin cdumez commit-queue ddkilzer webkit-bug-importer oldest_to_newest 1459164 0 krollin 2018-09-12 16:58:58 -0700 WebPageProxy::reportPageLoadResult (which is called from WebPageProxy::didFinishLoadForFrame) can sometimes crash when accessing m_pageLoadStart (a std::optional) in its unloaded state. Normally, m_pageLoadStart is initialized in WebPageProxy::didStartProvisionalLoadForFrame, which one would expect would be called before WebPageProxy::didFinishLoadForFrame. But that turns out to not always be the case. It's not apparent under what conditions didStartProvisionalLoadForFrame will not be called, but it's happening in the wild, leading to crashes now that std::optional asserts in release builds on bad accesses (see Bug 187669). rdar://problem/44356683 1459170 1 krollin 2018-09-12 17:04:36 -0700 Fix this by adding checks of m_pageLoadState before all calls to reportPageLoadResult. The check of m_pageLoadState is made outside of reportPageLoadResult rather than inside of it because of review comments suggesting that they worked better outside and ended up being more efficient (Bug 183221, comment #30). 1459171 2 krollin 2018-09-12 17:06:08 -0700 Also remove an ASSERT that is no longer needed now that std::optional provides its own. 1459174 3 349599 krollin 2018-09-12 17:06:33 -0700 Created attachment 349599 Patch 1459190 4 349599 ddkilzer 2018-09-12 18:05:32 -0700 Comment on attachment 349599 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349599&action=review r- to fix patch applying to trunk and consider feedback. > Source/WebKit/UIProcess/WebPageProxy.cpp:3564 > + if (m_pageLoadStart) Why not just add an early return to reportPageLoadResult() so that the engineer that adds new calls to it doesn’t have to remember this prerequisite? Then you can remove all the checks (or add Debug asserts if you want to document the expected state of m_pageLoadStart). 1459386 5 349599 cdumez 2018-09-13 09:45:52 -0700 Comment on attachment 349599 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349599&action=review >> Source/WebKit/UIProcess/WebPageProxy.cpp:3564 >> + if (m_pageLoadStart) > > Why not just add an early return to reportPageLoadResult() so that the engineer that adds new calls to it doesn’t have to remember this prerequisite? > > Then you can remove all the checks (or add Debug asserts if you want to document the expected state of m_pageLoadStart). I initially suggested to have the check outside to avoid unnecessarily constructing the ResourceError parameters in some cases. That said, since this is apparently error-prone (proof being this bug), I wouldn't be opposed to moving the check inside anymore. 1459391 6 krollin 2018-09-13 09:55:51 -0700 OK. Fix is now to check m_pageLoadStart inside of reportPageLoadResult. 1459414 7 349678 krollin 2018-09-13 10:24:37 -0700 Created attachment 349678 Patch 1459415 8 349678 cdumez 2018-09-13 10:26:33 -0700 Comment on attachment 349678 Patch r=me 1459554 9 349678 commit-queue 2018-09-13 15:32:41 -0700 Comment on attachment 349678 Patch Clearing flags on attachment: 349678 Committed r235992: <https://trac.webkit.org/changeset/235992> 1459555 10 commit-queue 2018-09-13 15:32:43 -0700 All reviewed patches have been landed. Closing bug. 349599 2018-09-12 17:06:33 -0700 2018-09-13 10:24:36 -0700 Patch bug-189568-20180912170632.patch text/plain 4147 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1NjI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJmNWFlMTgyZjY1ODQ1ZDhk MjY5ZjI3Yjc0MjE0ODFmOGJhYTM0NDYuLjRjYjJjYWU5YWZjODk4MGNkOTVkZjQ0MTMyYmVlYzNi ZWE2MGJhNjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMTgtMDktMTIgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFdlYlBhZ2VQcm94eTo6cmVwb3J0 UGFnZUxvYWRSZXN1bHQgY2FuIGNyYXNoIG9uIHNvbWUgY29kZSBwYXRocworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NTY4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViUGFnZVByb3h5OjpyZXBvcnRQ YWdlTG9hZFJlc3VsdCAod2hpY2ggaXMgY2FsbGVkIGZyb20KKyAgICAgICAgV2ViUGFnZVByb3h5 OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUpIGNhbiBzb21ldGltZXMgY3Jhc2ggd2hlbgorICAgICAg ICBhY2Nlc3NpbmcgbV9wYWdlTG9hZFN0YXJ0IChhIHN0ZDo6b3B0aW9uYWwpIGluIGl0cyB1bmxv YWRlZCBzdGF0ZS4KKyAgICAgICAgTm9ybWFsbHksIG1fcGFnZUxvYWRTdGFydCBpcyBpbml0aWFs aXplZCBpbgorICAgICAgICBXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUsIHdoaWNoIG9uZSB3b3VsZCBleHBlY3QKKyAgICAgICAgd291bGQgYmUgY2FsbGVkIGJl Zm9yZSBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZS4gQnV0IHRoYXQKKyAgICAg ICAgdHVybnMgb3V0IHRvIG5vdCBhbHdheXMgYmUgdGhlIGNhc2UuIEl0J3Mgbm90IGFwcGFyZW50 IHVuZGVyIHdoYXQKKyAgICAgICAgY29uZGl0aW9ucyBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lIHdpbGwgbm90IGJlIGNhbGxlZCwgYnV0CisgICAgICAgIGl0J3MgaGFwcGVuaW5nIGlu IHRoZSB3aWxkLCBsZWFkaW5nIHRvIGNyYXNoZXMgbm93IHRoYXQgc3RkOjpvcHRpb25hbAorICAg ICAgICBhc3NlcnRzIGluIHJlbGVhc2UgYnVpbGRzIG9uIGJhZCBhY2Nlc3NlcyAoc2VlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk1NjgpLgorCisg ICAgICAgIEZpeCB0aGlzIGJ5IGFkZGluZyBjaGVja3Mgb2YgbV9wYWdlTG9hZFN0YXRlIGJlZm9y ZSBhbGwgY2FsbHMgdG8KKyAgICAgICAgcmVwb3J0UGFnZUxvYWRSZXN1bHQuIFRoZSBjaGVjayBv ZiBtX3BhZ2VMb2FkU3RhdGUgaXMgbWFkZSBvdXRzaWRlIG9mCisgICAgICAgIHJlcG9ydFBhZ2VM b2FkUmVzdWx0IHJhdGhlciB0aGFuIGluc2lkZSBvZiBpdCBiZWNhdXNlIG9mIHJldmlldworICAg ICAgICBjb21tZW50cyBzdWdnZXN0aW5nIHRoYXQgdGhleSB3b3JrZWQgYmV0dGVyIG91dHNpZGUg YW5kIGVuZGVkIHVwIGJlaW5nCisgICAgICAgIG1vcmUgZWZmaWNpZW50IChodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzMjIxI2MzMCkuCisKKyAgICAgICAgQWxzbyBy ZW1vdmUgYW4gQVNTRVJUIHRoYXQgaXMgbm8gbG9uZ2VyIG5lZWRlZCBub3cgdGhhdCBzdGQ6Om9w dGlvbmFsCisgICAgICAgIHByb3ZpZGVzIGl0cyBvd24uCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWls UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6 OmRpZEZpbmlzaExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 ZGlkRmFpbExvYWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVw b3J0UGFnZUxvYWRSZXN1bHQpOgorCiAyMDE4LTA5LTA0ICBGcmVkZXJpYyBXYW5nICA8ZndhbmdA aWdhbGlhLmNvbT4KIAogICAgICAgICBCdWcgMTg5MTkwIC0gUkVHUkVTU0lPTihyMjM1Mzk4KSBB U1NFUlRJT04gZmFpbHVyZSAhbV9jbGllbnQuZGlkRmluaXNoRG9jdW1lbnRMb2FkRm9yRnJhbWUK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IGUyODMxMGJhNjBh OTI4MzM3YTA4Zjc2OTNkOGVkYzkxNTZlYmE0MzYuLjg5NTEzZWVjNWQ4ZmU0MjgxZjlkM2JkOWRj NDEwNzJiMDBjNDY5YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBh Z2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cApAQCAtMzU2MSw3ICszNTYxLDggQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNp b25hbExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cmkKICAgICBhdXRv IHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CiAKICAgICBpZiAo ZnJhbWUtPmlzTWFpbkZyYW1lKCkpIHsKLSAgICAgICAgcmVwb3J0UGFnZUxvYWRSZXN1bHQoZXJy b3IpOworICAgICAgICBpZiAobV9wYWdlTG9hZFN0YXJ0KQorICAgICAgICAgICAgcmVwb3J0UGFn ZUxvYWRSZXN1bHQoZXJyb3IpOwogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuZGlkRmFpbFByb3Zp c2lvbmFsTG9hZCh0cmFuc2FjdGlvbik7CiAgICAgICAgIG1fcGFnZUNsaWVudC5kaWRGYWlsUHJv dmlzaW9uYWxMb2FkRm9yTWFpbkZyYW1lKCk7CiAgICAgfQpAQCAtMzc0MCw3ICszNzQxLDggQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZSh1aW50NjRfdCBmcmFtZUlE LCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQKICAgICAgICAgbV9sb2FkZXJDbGllbnQtPmRpZEZpbmlz aExvYWRGb3JGcmFtZSgqdGhpcywgKmZyYW1lLCBuYXZpZ2F0aW9uLmdldCgpLCBtX3Byb2Nlc3Mt PnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEub2JqZWN0KCkpLmdldCgpKTsKIAog ICAgIGlmIChpc01haW5GcmFtZSkgewotICAgICAgICByZXBvcnRQYWdlTG9hZFJlc3VsdCgpOwor ICAgICAgICBpZiAobV9wYWdlTG9hZFN0YXJ0KQorICAgICAgICAgICAgcmVwb3J0UGFnZUxvYWRS ZXN1bHQoKTsKICAgICAgICAgbV9wYWdlQ2xpZW50LmRpZEZpbmlzaExvYWRGb3JNYWluRnJhbWUo KTsKIAogICAgICAgICByZXNldFJlY2VudENyYXNoQ291bnRTb29uKCk7CkBAIC0zNzg3LDcgKzM3 ODksOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRmFpbExvYWRGb3JGcmFtZSh1aW50NjRfdCBm cmFtZUlELCB1aW50NjRfdCBuYXZpZ2F0aW9uSUQsCiAgICAgICAgIG1fbG9hZGVyQ2xpZW50LT5k aWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lKCp0aGlzLCAqZnJhbWUsIG5hdmlnYXRpb24uZ2V0 KCksIGVycm9yLCBtX3Byb2Nlc3MtPnRyYW5zZm9ybUhhbmRsZXNUb09iamVjdHModXNlckRhdGEu b2JqZWN0KCkpLmdldCgpKTsKIAogICAgIGlmIChpc01haW5GcmFtZSkgewotICAgICAgICByZXBv cnRQYWdlTG9hZFJlc3VsdChlcnJvcik7CisgICAgICAgIGlmIChtX3BhZ2VMb2FkU3RhcnQpCisg ICAgICAgICAgICByZXBvcnRQYWdlTG9hZFJlc3VsdChlcnJvcik7CiAgICAgICAgIG1fcGFnZUNs aWVudC5kaWRGYWlsTG9hZEZvck1haW5GcmFtZSgpOwogICAgIH0KIH0KQEAgLTc4ODUsOCArNzg4 OCw2IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZXBvcnRQYWdlTG9hZFJlc3VsdChjb25zdCBSZXNv dXJjZUVycm9yJiBlcnJvcikKICAgICAgICAgeyBDb21wbGV0aW9uQ29uZGl0aW9uOjpUaW1lb3V0 LCBTZWNvbmRzOjppbmZpbml0eSgpLCBEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnRpbWVkT3V0S2V5 KCkgfQogICAgICAgICB9KTsKIAotICAgIEFTU0VSVChtX3BhZ2VMb2FkU3RhcnQpOwotCiAgICAg YXV0byBwYWdlTG9hZFRpbWUgPSBNb25vdG9uaWNUaW1lOjpub3coKSAtICptX3BhZ2VMb2FkU3Rh cnQ7CiAgICAgbV9wYWdlTG9hZFN0YXJ0ID0gc3RkOjpudWxsb3B0OwogCg== 349678 2018-09-13 10:24:37 -0700 2018-09-13 15:32:41 -0700 Patch bug-189568-20180913102437.patch text/plain 3352 krollin U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1OTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGUwYjkwY2ViNzNmM2ZjNTZi MjQxMTI2MzJkNWYwNDc4YjhlM2U5ZTkuLmY0ZTU4MmNlYWZhMTYzNzNmM2MxZWJkZTViZjA2NDgy NDU0NDNjMDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMDktMTIgIEtlaXRoIFJv bGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgorCisgICAgICAgIFdlYlBhZ2VQcm94eTo6cmVwb3J0 UGFnZUxvYWRSZXN1bHQgY2FuIGNyYXNoIG9uIHNvbWUgY29kZSBwYXRocworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg5NTY4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2ViUGFnZVByb3h5OjpyZXBvcnRQ YWdlTG9hZFJlc3VsdCAod2hpY2ggaXMgY2FsbGVkIGZyb20KKyAgICAgICAgV2ViUGFnZVByb3h5 OjpkaWRGaW5pc2hMb2FkRm9yRnJhbWUpIGNhbiBzb21ldGltZXMgY3Jhc2ggd2hlbgorICAgICAg ICBhY2Nlc3NpbmcgbV9wYWdlTG9hZFN0YXJ0IChhIHN0ZDo6b3B0aW9uYWwpIGluIGl0cyB1bmxv YWRlZCBzdGF0ZS4KKyAgICAgICAgTm9ybWFsbHksIG1fcGFnZUxvYWRTdGFydCBpcyBpbml0aWFs aXplZCBpbgorICAgICAgICBXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9y RnJhbWUsIHdoaWNoIG9uZSB3b3VsZCBleHBlY3QKKyAgICAgICAgd291bGQgYmUgY2FsbGVkIGJl Zm9yZSBXZWJQYWdlUHJveHk6OmRpZEZpbmlzaExvYWRGb3JGcmFtZS4gQnV0IHRoYXQKKyAgICAg ICAgdHVybnMgb3V0IHRvIG5vdCBhbHdheXMgYmUgdGhlIGNhc2UuIEl0J3Mgbm90IGFwcGFyZW50 IHVuZGVyIHdoYXQKKyAgICAgICAgY29uZGl0aW9ucyBkaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZv ckZyYW1lIHdpbGwgbm90IGJlIGNhbGxlZCwgYnV0CisgICAgICAgIGl0J3MgaGFwcGVuaW5nIGlu IHRoZSB3aWxkLCBsZWFkaW5nIHRvIGNyYXNoZXMgbm93IHRoYXQgc3RkOjpvcHRpb25hbAorICAg ICAgICBhc3NlcnRzIGluIHJlbGVhc2UgYnVpbGRzIG9uIGJhZCBhY2Nlc3NlcyAoc2VlCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk1NjgpLgorCisg ICAgICAgIEZpeCB0aGlzIGJ5IGNoZWNraW5nIG1fcGFnZUxvYWRTdGF0ZSBvbiBlbnRyeSB0byBy ZXBvcnRQYWdlTG9hZFJlc3VsdC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZEZhaWxQcm92aXNpb25hbExv YWRGb3JGcmFtZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkRmluaXNoTG9h ZEZvckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRGYWlsTG9hZEZv ckZyYW1lKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpyZXBvcnRQYWdlTG9hZFJl c3VsdCk6CisKIDIwMTgtMDktMTMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2Fs aWEuY29tPgogCiAgICAgICAgIFtHVEtdW1dQRV0gQWxsb3cgdG8gcnVuIHNjcmlwdCBkaWFsb2dz IGFzeW5jaHJvbm91c2x5IGluIHRoZSBVSSBwcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmNwcAppbmRleCA3OWRjYzU5ODAwMzlkY2EyMzk4NjlkNzdmMTEyODdiN2Fl MWExYWQ1Li5kMzBkMzBjYmEwNGY1OTUxMDdiYzk3NDEyMjAxYzcwMTY3YzE4ZDc2IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTg4NCw4ICs4ODQsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6Y2xvc2UoKQogCiAgICAgbV9pc0Nsb3NlZCA9IHRydWU7CiAKLSAg ICBpZiAobV9wYWdlTG9hZFN0YXJ0KQotICAgICAgICByZXBvcnRQYWdlTG9hZFJlc3VsdChSZXNv dXJjZUVycm9yIHsgUmVzb3VyY2VFcnJvcjo6VHlwZTo6Q2FuY2VsbGF0aW9uIH0pOworICAgIHJl cG9ydFBhZ2VMb2FkUmVzdWx0KFJlc291cmNlRXJyb3IgeyBSZXNvdXJjZUVycm9yOjpUeXBlOjpD YW5jZWxsYXRpb24gfSk7CiAKICAgICBpZiAobV9hY3RpdmVQb3B1cE1lbnUpCiAgICAgICAgIG1f YWN0aXZlUG9wdXBNZW51LT5jYW5jZWxUcmFja2luZygpOwpAQCAtMzQ1OSw4ICszNDU4LDcgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUodWludDY0 X3QgZnJhbWVJRCwgdWludDY0X3QgbmEKICAgICBtX3BhZ2VMb2FkU3RhdGUuY2xlYXJQZW5kaW5n QVBJUmVxdWVzdFVSTCh0cmFuc2FjdGlvbik7CiAKICAgICBpZiAoZnJhbWUtPmlzTWFpbkZyYW1l KCkpIHsKLSAgICAgICAgaWYgKG1fcGFnZUxvYWRTdGFydCkKLSAgICAgICAgICAgIHJlcG9ydFBh Z2VMb2FkUmVzdWx0KFJlc291cmNlRXJyb3IgeyBSZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxs YXRpb24gfSk7CisgICAgICAgIHJlcG9ydFBhZ2VMb2FkUmVzdWx0KFJlc291cmNlRXJyb3IgeyBS ZXNvdXJjZUVycm9yOjpUeXBlOjpDYW5jZWxsYXRpb24gfSk7CiAgICAgICAgIG1fcGFnZUxvYWRT dGFydCA9IE1vbm90b25pY1RpbWU6Om5vdygpOwogICAgICAgICBtX3BhZ2VMb2FkU3RhdGUuZGlk U3RhcnRQcm92aXNpb25hbExvYWQodHJhbnNhY3Rpb24sIHVybCwgdW5yZWFjaGFibGVVUkwpOwog ICAgICAgICBwYWdlQ2xpZW50KCkuZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JNYWluRnJhbWUo KTsKQEAgLTc5MDMsNyArNzkwMSw4IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZXBvcnRQYWdlTG9h ZFJlc3VsdChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKICAgICAgICAgeyBDb21wbGV0aW9u Q29uZGl0aW9uOjpUaW1lb3V0LCBTZWNvbmRzOjppbmZpbml0eSgpLCBEaWFnbm9zdGljTG9nZ2lu Z0tleXM6OnRpbWVkT3V0S2V5KCkgfQogICAgICAgICB9KTsKIAotICAgIEFTU0VSVChtX3BhZ2VM b2FkU3RhcnQpOworICAgIGlmICghbV9wYWdlTG9hZFN0YXJ0KQorICAgICAgICByZXR1cm47CiAK ICAgICBhdXRvIHBhZ2VMb2FkVGltZSA9IE1vbm90b25pY1RpbWU6Om5vdygpIC0gKm1fcGFnZUxv YWRTdGFydDsKICAgICBtX3BhZ2VMb2FkU3RhcnQgPSBzdGQ6Om51bGxvcHQ7Cg==