199435 2019-07-03 00:37:17 -0700 AX: CrashTracer: com.apple.WebKit.WebContent at WebKit: WebKit::WebSpeechSynthesisClient::speak 2019-07-06 01:14:24 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 cfleizach cfleizach commit-queue pvollan rniwa webkit-bug-importer oldest_to_newest 1549852 0 cfleizach 2019-07-03 00:37:17 -0700 Thread 0 name: Dispatch queue: com.apple.main-thread Thread 0 Crashed ↩: 0 WebCore 0x000000019a80adc4 non-virtual thunk to WebCore::SpeechSynthesis::didStartSpeaking() + 20 (DumbPtrTraits.h:43) 1 WebKit 0x0000000199ae8ab8 WebKit::WebSpeechSynthesisClient::speak(WTF::RefPtr<WebCore::PlatformSpeechSynthesisUtterance, WTF::DumbPtrTraits<WebCore::PlatformSpeechSynthesisUtterance> >) + 424 (WebSpeechSynthesisClient.cpp:69) 2 WebCore 0x000000019a80a49c WebCore::SpeechSynthesis::startSpeakingImmediately(WebCore::SpeechSynthesisUtterance&) + 124 (SpeechSynthesis.cpp:125) 3 WebCore 0x000000019a4b7064 WebCore::jsSpeechSynthesisPrototypeFunctionSpeakBody(JSC::ExecState*, WebCore::JSSpeechSynthesis*, JSC::ThrowScope&) + 248 (JSSpeechSynthesis.cpp:202) 4 WebCore 0x000000019a4a88a8 WebCore::jsSpeechSynthesisPrototypeFunctionSpeak(JSC::ExecState*) + 152 (JSDOMOperation.h:53) 5 ??? 0x0000000c038d9098 0 + 51599216792 <rdar://problem/52563665> 1549908 1 373396 cfleizach 2019-07-03 10:06:38 -0700 Created attachment 373396 patch 1549922 2 373396 pvollan 2019-07-03 10:23:15 -0700 Comment on attachment 373396 patch View in context: https://bugs.webkit.org/attachment.cgi?id=373396&action=review > Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp:57 > + if (auto observer = m_page.corePage()->speechSynthesisClient()->observer()) > + observer->didFinishSpeaking(); Could speechSynthesisClient() also possibly return nullptr? 1549927 3 cfleizach 2019-07-03 10:35:27 -0700 (In reply to Per Arne Vollan from comment #2) > Comment on attachment 373396 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=373396&action=review > > > Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp:57 > > + if (auto observer = m_page.corePage()->speechSynthesisClient()->observer()) > > + observer->didFinishSpeaking(); > > Could speechSynthesisClient() also possibly return nullptr? I looked into it and to my eyes it did not seem so. It looks like it's set unconditionally 1549930 4 373396 pvollan 2019-07-03 10:42:21 -0700 Comment on attachment 373396 patch View in context: https://bugs.webkit.org/attachment.cgi?id=373396&action=review >>> Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp:57 >>> + observer->didFinishSpeaking(); >> >> Could speechSynthesisClient() also possibly return nullptr? > > I looked into it and to my eyes it did not seem so. It looks like it's set unconditionally Perhaps it could return a reference, then? I don't think this is required in this patch, though. It can be done in a follow-up patch. 1549931 5 373396 cfleizach 2019-07-03 10:42:51 -0700 Comment on attachment 373396 patch View in context: https://bugs.webkit.org/attachment.cgi?id=373396&action=review >>>> Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp:57 >>>> + observer->didFinishSpeaking(); >>> >>> Could speechSynthesisClient() also possibly return nullptr? >> >> I looked into it and to my eyes it did not seem so. It looks like it's set unconditionally > > Perhaps it could return a reference, then? I don't think this is required in this patch, though. It can be done in a follow-up patch. let me look into that 1550026 6 373396 rniwa 2019-07-03 15:14:57 -0700 Comment on attachment 373396 patch View in context: https://bugs.webkit.org/attachment.cgi?id=373396&action=review >>>>> Source/WebKit/WebProcess/WebCoreSupport/WebSpeechSynthesisClient.cpp:57 >>>>> + observer->didFinishSpeaking(); >>>> >>>> Could speechSynthesisClient() also possibly return nullptr? >>> >>> I looked into it and to my eyes it did not seem so. It looks like it's set unconditionally >> >> Perhaps it could return a reference, then? I don't think this is required in this patch, though. It can be done in a follow-up patch. > > let me look into that m_speechSynthesisClient(WTFMove(pageConfiguration.speechSynthesisClient)) so if pageConfiguration.speechSynthesisClient is null, it could be null. I think we should add an extra null check for now. We can turn it to a reference in the future. 1550030 7 rniwa 2019-07-03 15:15:31 -0700 r=me with an extra null check for speechSynthesisClient() everywhere. 1550595 8 373557 cfleizach 2019-07-05 18:06:53 -0700 Created attachment 373557 patch 1550617 9 373557 commit-queue 2019-07-06 01:14:22 -0700 Comment on attachment 373557 patch Clearing flags on attachment: 373557 Committed r247192: <https://trac.webkit.org/changeset/247192> 1550618 10 commit-queue 2019-07-06 01:14:24 -0700 All reviewed patches have been landed. Closing bug. 373396 2019-07-03 10:06:38 -0700 2019-07-05 18:06:53 -0700 patch patch text/plain 5549 cfleizach ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNGM5NDI1YTYxZGMuLjdlYmJhZDUyZmNlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDIyIEBACisyMDE5LTA3LTAzICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+ CisKKyAgICAgICAgQVg6IENyYXNoVHJhY2VyOiBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQg YXQgV2ViS2l0OiBXZWJLaXQ6OldlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6c3BlYWsKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTQzNQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuc3VyZSB3ZSBkb24n dCBhY2Nlc3MgbnVsbCBvYnNlcnZlcnMgaW4gc3BlZWNoIGNhbGxiYWNrcy4KKworICAgICAgICAq IFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50LmNwcDoK KyAgICAgICAgKFdlYktpdDo6V2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50Ojp2b2ljZUxpc3QpOgor ICAgICAgICAoV2ViS2l0OjpXZWJTcGVlY2hTeW50aGVzaXNDbGllbnQ6OnNwZWFrKToKKyAgICAg ICAgKFdlYktpdDo6V2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50OjpwYXVzZSk6CisgICAgICAgIChX ZWJLaXQ6OldlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6cmVzdW1lKToKKyAgICAgICAgKiBXZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnNw ZWFraW5nRXJyb3JPY2N1cnJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmJvdW5kYXJ5 RXZlbnRPY2N1cnJlZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnZvaWNlc0RpZENoYW5n ZSk6CisKIDIwMTktMDctMDIgIEpvb25naHVuIFBhcmsgIDxqaDcxOC5wYXJrQHNhbXN1bmcuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQuIEZpeCBidWlsZCBicmVhayBpbnRyb2R1Y2VkIGluIHIy NDcwNTguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJTcGVlY2hTeW50aGVzaXNDbGllbnQuY3BwCmluZGV4IGRiYmU4 NDMzMTJmLi40ZmJhMTYyYzYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYlNwZWVjaFN5bnRoZXNpc0NsaWVudC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlNwZWVjaFN5bnRoZXNpc0NsaWVu dC5jcHAKQEAgLTQzLDE4ICs0MywxOCBAQCBjb25zdCBWZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlBs YXRmb3JtU3BlZWNoU3ludGhlc2lzVm9pY2U+PiYgV2ViU3BlZWNoU3ludGhlc2lzQwogICAgIG1f cGFnZS5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTcGVlY2hTeW50aGVzaXNWb2lj ZUxpc3QoKSwgdm9pY2VMaXN0KTsKIAogICAgIG1fdm9pY2VzLmNsZWFyKCk7Ci0gICAgZm9yIChh dXRvJiB2b2ljZSA6IHZvaWNlTGlzdCkgeworICAgIGZvciAoYXV0byYgdm9pY2UgOiB2b2ljZUxp c3QpCiAgICAgICAgIG1fdm9pY2VzLmFwcGVuZChXZWJDb3JlOjpQbGF0Zm9ybVNwZWVjaFN5bnRo ZXNpc1ZvaWNlOjpjcmVhdGUodm9pY2Uudm9pY2VVUkksIHZvaWNlLm5hbWUsIHZvaWNlLmxhbmcs IHZvaWNlLmxvY2FsU2VydmljZSwgdm9pY2UuZGVmYXVsdExhbmcpKTsKLSAgICAgICAgCi0gICAg fQogICAgIHJldHVybiBtX3ZvaWNlczsKIH0KIAogdm9pZCBXZWJTcGVlY2hTeW50aGVzaXNDbGll bnQ6OnNwZWFrKFJlZlB0cjxXZWJDb3JlOjpQbGF0Zm9ybVNwZWVjaFN5bnRoZXNpc1V0dGVyYW5j ZT4gdXR0ZXJhbmNlKQogewogICAgIFdURjo6Q29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiBjb21w bGV0aW9uSGFuZGxlciA9IFt0aGlzLCB3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKV0oKSBt dXRhYmxlIHsKLSAgICAgICAgaWYgKHdlYWtUaGlzKQotICAgICAgICAgICAgbV9wYWdlLmNvcmVQ YWdlKCktPnNwZWVjaFN5bnRoZXNpc0NsaWVudCgpLT5vYnNlcnZlcigpLT5kaWRGaW5pc2hTcGVh a2luZygpOworICAgICAgICBpZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICBpZiAoYXV0byBvYnNlcnZlciA9IG1fcGFnZS5jb3JlUGFnZSgpLT5zcGVlY2hTeW50aGVz aXNDbGllbnQoKS0+b2JzZXJ2ZXIoKSkKKyAgICAgICAgICAgIG9ic2VydmVyLT5kaWRGaW5pc2hT cGVha2luZygpOwogICAgIH07CiAKICAgICBhdXRvIHZvaWNlID0gdXR0ZXJhbmNlLT52b2ljZSgp OwpAQCAtNjUsOCArNjUsOCBAQCB2b2lkIFdlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6c3BlYWso UmVmUHRyPFdlYkNvcmU6OlBsYXRmb3JtU3BlZWNoU3ludGhlc2lzVXR0ZQogICAgIGF1dG8gaXNE ZWZhdWx0ID0gdm9pY2UgPyB2b2ljZS0+aXNEZWZhdWx0KCkgOiBmYWxzZTsKIAogICAgIG1fcGFn ZS5zZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U3BlZWNoU3ludGhl c2lzU3BlYWsodXR0ZXJhbmNlLT50ZXh0KCksIHV0dGVyYW5jZS0+bGFuZygpLCB1dHRlcmFuY2Ut PnZvbHVtZSgpLCB1dHRlcmFuY2UtPnJhdGUoKSwgdXR0ZXJhbmNlLT5waXRjaCgpLCB1dHRlcmFu Y2UtPnN0YXJ0VGltZSgpLCB2b2ljZVVSSSwgbmFtZSwgbGFuZywgbG9jYWxTZXJ2aWNlLCBpc0Rl ZmF1bHQpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7Ci0KLSAgICBtX3BhZ2UuY29yZVBh Z2UoKS0+c3BlZWNoU3ludGhlc2lzQ2xpZW50KCktPm9ic2VydmVyKCktPmRpZFN0YXJ0U3BlYWtp bmcoKTsKKyAgICBpZiAoYXV0byBvYnNlcnZlciA9IG1fcGFnZS5jb3JlUGFnZSgpLT5zcGVlY2hT eW50aGVzaXNDbGllbnQoKS0+b2JzZXJ2ZXIoKSkKKyAgICAgICAgb2JzZXJ2ZXItPmRpZFN0YXJ0 U3BlYWtpbmcoKTsKIH0KIAogdm9pZCBXZWJTcGVlY2hTeW50aGVzaXNDbGllbnQ6OmNhbmNlbCgp CkBAIC03Nyw4ICs3NywxMCBAQCB2b2lkIFdlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6Y2FuY2Vs KCkKIHZvaWQgV2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50OjpwYXVzZSgpCiB7CiAgICAgV1RGOjpD b21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVyID0gW3RoaXMsIHdlYWtU aGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSgpIG11dGFibGUgewotICAgICAgICBpZiAod2Vha1Ro aXMpCi0gICAgICAgICAgICBtX3BhZ2UuY29yZVBhZ2UoKS0+c3BlZWNoU3ludGhlc2lzQ2xpZW50 KCktPm9ic2VydmVyKCktPmRpZFBhdXNlU3BlYWtpbmcoKTsKKyAgICAgICAgaWYgKCF3ZWFrVGhp cykKKyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgaWYgKGF1dG8gb2JzZXJ2ZXIgPSBtX3Bh Z2UuY29yZVBhZ2UoKS0+c3BlZWNoU3ludGhlc2lzQ2xpZW50KCktPm9ic2VydmVyKCkpCisgICAg ICAgICAgICBvYnNlcnZlci0+ZGlkUGF1c2VTcGVha2luZygpOwogICAgIH07CiAgICAgCiAgICAg bV9wYWdlLnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTcGVlY2hT eW50aGVzaXNQYXVzZSgpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CkBAIC04Nyw4ICs4 OSwxMCBAQCB2b2lkIFdlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6cGF1c2UoKQogdm9pZCBXZWJT cGVlY2hTeW50aGVzaXNDbGllbnQ6OnJlc3VtZSgpCiB7CiAgICAgV1RGOjpDb21wbGV0aW9uSGFu ZGxlcjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVyID0gW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdl YWtQdHIoKnRoaXMpXSgpIG11dGFibGUgewotICAgICAgICBpZiAod2Vha1RoaXMpCi0gICAgICAg ICAgICBtX3BhZ2UuY29yZVBhZ2UoKS0+c3BlZWNoU3ludGhlc2lzQ2xpZW50KCktPm9ic2VydmVy KCktPmRpZFJlc3VtZVNwZWFraW5nKCk7CisgICAgICAgIGlmICghd2Vha1RoaXMpCisgICAgICAg ICAgICByZXR1cm47CisgICAgICAgIGlmIChhdXRvIG9ic2VydmVyID0gbV9wYWdlLmNvcmVQYWdl KCktPnNwZWVjaFN5bnRoZXNpc0NsaWVudCgpLT5vYnNlcnZlcigpKQorICAgICAgICAgICAgb2Jz ZXJ2ZXItPmRpZFJlc3VtZVNwZWFraW5nKCk7CiAgICAgfTsKICAgICAKICAgICBtX3BhZ2Uuc2Vu ZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNwZWVjaFN5bnRoZXNpc1Jl c3VtZSgpLCBXVEZNb3ZlKGNvbXBsZXRpb25IYW5kbGVyKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IDNiY2YwZDc4NWZmLi5jODVjYTYwNGVm YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAg LTY1NzksMTcgKzY1NzksMjAgQEAgdm9pZCBXZWJQYWdlOjpzaW11bGF0ZURldmljZU9yaWVudGF0 aW9uQ2hhbmdlKGRvdWJsZSBhbHBoYSwgZG91YmxlIGJldGEsIGRvdWJsZQogI2lmIEVOQUJMRShT UEVFQ0hfU1lOVEhFU0lTKQogdm9pZCBXZWJQYWdlOjpzcGVha2luZ0Vycm9yT2NjdXJyZWQoKQog ewotICAgIGNvcmVQYWdlKCktPnNwZWVjaFN5bnRoZXNpc0NsaWVudCgpLT5vYnNlcnZlcigpLT5z cGVha2luZ0Vycm9yT2NjdXJyZWQoKTsKKyAgICBpZiAoYXV0byBvYnNlcnZlciA9IGNvcmVQYWdl KCktPnNwZWVjaFN5bnRoZXNpc0NsaWVudCgpLT5vYnNlcnZlcigpKQorICAgICAgICBvYnNlcnZl ci0+c3BlYWtpbmdFcnJvck9jY3VycmVkKCk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6Ym91bmRhcnlF dmVudE9jY3VycmVkKGJvb2wgd29yZEJvdW5kYXJ5LCB1bnNpZ25lZCBjaGFySW5kZXgpCiB7Ci0g ICAgY29yZVBhZ2UoKS0+c3BlZWNoU3ludGhlc2lzQ2xpZW50KCktPm9ic2VydmVyKCktPmJvdW5k YXJ5RXZlbnRPY2N1cnJlZCh3b3JkQm91bmRhcnksIGNoYXJJbmRleCk7CisgICAgaWYgKGF1dG8g b2JzZXJ2ZXIgPSBjb3JlUGFnZSgpLT5zcGVlY2hTeW50aGVzaXNDbGllbnQoKS0+b2JzZXJ2ZXIo KSkKKyAgICAgICAgb2JzZXJ2ZXItPmJvdW5kYXJ5RXZlbnRPY2N1cnJlZCh3b3JkQm91bmRhcnks IGNoYXJJbmRleCk7CiB9CiAKIHZvaWQgV2ViUGFnZTo6dm9pY2VzRGlkQ2hhbmdlKCkKIHsKLSAg ICBjb3JlUGFnZSgpLT5zcGVlY2hTeW50aGVzaXNDbGllbnQoKS0+b2JzZXJ2ZXIoKS0+dm9pY2Vz Q2hhbmdlZCgpOworICAgIGlmIChhdXRvIG9ic2VydmVyID0gY29yZVBhZ2UoKS0+c3BlZWNoU3lu dGhlc2lzQ2xpZW50KCktPm9ic2VydmVyKCkpCisgICAgICAgIG9ic2VydmVyLT52b2ljZXNDaGFu Z2VkKCk7CiB9CiAjZW5kaWYKIAo= 373557 2019-07-05 18:06:53 -0700 2019-07-06 01:14:22 -0700 patch patch text/plain 6666 cfleizach ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNGM5NDI1YTYxZGMuLjA4Y2UyNWFiNWFjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsx LDIyIEBACisyMDE5LTA3LTAzICBDaHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+ CisKKyAgICAgICAgQVg6IENyYXNoVHJhY2VyOiBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQg YXQgV2ViS2l0OiBXZWJLaXQ6OldlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6c3BlYWsKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5OTQzNQorCisgICAg ICAgIFJldmlld2VkIGJ5IFJ5b3N1a2UgTml3YS4KKworICAgICAgICBFbnN1cmUgd2UgZG9uJ3Qg YWNjZXNzIG51bGwgb2JzZXJ2ZXJzIGluIHNwZWVjaCBjYWxsYmFja3MuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYlNwZWVjaFN5bnRoZXNpc0NsaWVudC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6dm9pY2VMaXN0KToKKyAg ICAgICAgKFdlYktpdDo6V2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50OjpzcGVhayk6CisgICAgICAg IChXZWJLaXQ6OldlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6cGF1c2UpOgorICAgICAgICAoV2Vi S2l0OjpXZWJTcGVlY2hTeW50aGVzaXNDbGllbnQ6OnJlc3VtZSk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzcGVh a2luZ0Vycm9yT2NjdXJyZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpib3VuZGFyeUV2 ZW50T2NjdXJyZWQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp2b2ljZXNEaWRDaGFuZ2Up OgorCiAyMDE5LTA3LTAyICBKb29uZ2h1biBQYXJrICA8amg3MTgucGFya0BzYW1zdW5nLmNvbT4K IAogICAgICAgICBVbnJldmlld2VkLiBGaXggYnVpbGQgYnJlYWsgaW50cm9kdWNlZCBpbiByMjQ3 MDU4LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYlNwZWVjaFN5bnRoZXNpc0NsaWVudC5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50LmNwcAppbmRleCBkYmJlODQz MzEyZi4uZTM1ZjMyMjlmZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9X ZWJDb3JlU3VwcG9ydC9XZWJTcGVlY2hTeW50aGVzaXNDbGllbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJTcGVlY2hTeW50aGVzaXNDbGllbnQu Y3BwCkBAIC00MywxOCArNDMsMjUgQEAgY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpQbGF0 Zm9ybVNwZWVjaFN5bnRoZXNpc1ZvaWNlPj4mIFdlYlNwZWVjaFN5bnRoZXNpc0MKICAgICBtX3Bh Z2Uuc2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U3BlZWNoU3ludGhlc2lzVm9pY2VM aXN0KCksIHZvaWNlTGlzdCk7CiAKICAgICBtX3ZvaWNlcy5jbGVhcigpOwotICAgIGZvciAoYXV0 byYgdm9pY2UgOiB2b2ljZUxpc3QpIHsKKyAgICBmb3IgKGF1dG8mIHZvaWNlIDogdm9pY2VMaXN0 KQogICAgICAgICBtX3ZvaWNlcy5hcHBlbmQoV2ViQ29yZTo6UGxhdGZvcm1TcGVlY2hTeW50aGVz aXNWb2ljZTo6Y3JlYXRlKHZvaWNlLnZvaWNlVVJJLCB2b2ljZS5uYW1lLCB2b2ljZS5sYW5nLCB2 b2ljZS5sb2NhbFNlcnZpY2UsIHZvaWNlLmRlZmF1bHRMYW5nKSk7Ci0gICAgICAgIAotICAgIH0K ICAgICByZXR1cm4gbV92b2ljZXM7CiB9CiAKK1dlYkNvcmU6OlNwZWVjaFN5bnRoZXNpc0NsaWVu dE9ic2VydmVyKiBXZWJTcGVlY2hTeW50aGVzaXNDbGllbnQ6OmNvcmVQYWdlT2JzZXJ2ZXIoKSBj b25zdAoreworICAgIGlmIChtX3BhZ2UuY29yZVBhZ2UoKSAmJiBtX3BhZ2UuY29yZVBhZ2UoKS0+ c3BlZWNoU3ludGhlc2lzQ2xpZW50KCkgJiYgbV9wYWdlLmNvcmVQYWdlKCktPnNwZWVjaFN5bnRo ZXNpc0NsaWVudCgpLT5vYnNlcnZlcigpKQorICAgICAgICByZXR1cm4gbV9wYWdlLmNvcmVQYWdl KCktPnNwZWVjaFN5bnRoZXNpc0NsaWVudCgpLT5vYnNlcnZlcigpLmdldCgpOworICAgIHJldHVy biBudWxscHRyOworfQorCiB2b2lkIFdlYlNwZWVjaFN5bnRoZXNpc0NsaWVudDo6c3BlYWsoUmVm UHRyPFdlYkNvcmU6OlBsYXRmb3JtU3BlZWNoU3ludGhlc2lzVXR0ZXJhbmNlPiB1dHRlcmFuY2Up CiB7CiAgICAgV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+IGNvbXBsZXRpb25IYW5kbGVy ID0gW3RoaXMsIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpXSgpIG11dGFibGUgewotICAg ICAgICBpZiAod2Vha1RoaXMpCi0gICAgICAgICAgICBtX3BhZ2UuY29yZVBhZ2UoKS0+c3BlZWNo U3ludGhlc2lzQ2xpZW50KCktPm9ic2VydmVyKCktPmRpZEZpbmlzaFNwZWFraW5nKCk7CisgICAg ICAgIGlmICghd2Vha1RoaXMpCisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGlmIChhdXRv IG9ic2VydmVyID0gY29yZVBhZ2VPYnNlcnZlcigpKQorICAgICAgICAgICAgb2JzZXJ2ZXItPmRp ZEZpbmlzaFNwZWFraW5nKCk7CiAgICAgfTsKIAogICAgIGF1dG8gdm9pY2UgPSB1dHRlcmFuY2Ut PnZvaWNlKCk7CkBAIC02NSw4ICs3Miw4IEBAIHZvaWQgV2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50 OjpzcGVhayhSZWZQdHI8V2ViQ29yZTo6UGxhdGZvcm1TcGVlY2hTeW50aGVzaXNVdHRlCiAgICAg YXV0byBpc0RlZmF1bHQgPSB2b2ljZSA/IHZvaWNlLT5pc0RlZmF1bHQoKSA6IGZhbHNlOwogCiAg ICAgbV9wYWdlLnNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTcGVl Y2hTeW50aGVzaXNTcGVhayh1dHRlcmFuY2UtPnRleHQoKSwgdXR0ZXJhbmNlLT5sYW5nKCksIHV0 dGVyYW5jZS0+dm9sdW1lKCksIHV0dGVyYW5jZS0+cmF0ZSgpLCB1dHRlcmFuY2UtPnBpdGNoKCks IHV0dGVyYW5jZS0+c3RhcnRUaW1lKCksIHZvaWNlVVJJLCBuYW1lLCBsYW5nLCBsb2NhbFNlcnZp Y2UsIGlzRGVmYXVsdCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKLQotICAgIG1fcGFn ZS5jb3JlUGFnZSgpLT5zcGVlY2hTeW50aGVzaXNDbGllbnQoKS0+b2JzZXJ2ZXIoKS0+ZGlkU3Rh cnRTcGVha2luZygpOworICAgIGlmIChhdXRvIG9ic2VydmVyID0gY29yZVBhZ2VPYnNlcnZlcigp KQorICAgICAgICBvYnNlcnZlci0+ZGlkU3RhcnRTcGVha2luZygpOwogfQogCiB2b2lkIFdlYlNw ZWVjaFN5bnRoZXNpc0NsaWVudDo6Y2FuY2VsKCkKQEAgLTc3LDggKzg0LDEwIEBAIHZvaWQgV2Vi U3BlZWNoU3ludGhlc2lzQ2xpZW50OjpjYW5jZWwoKQogdm9pZCBXZWJTcGVlY2hTeW50aGVzaXND bGllbnQ6OnBhdXNlKCkKIHsKICAgICBXVEY6OkNvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4gY29t cGxldGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigqdGhpcyldKCkg bXV0YWJsZSB7Ci0gICAgICAgIGlmICh3ZWFrVGhpcykKLSAgICAgICAgICAgIG1fcGFnZS5jb3Jl UGFnZSgpLT5zcGVlY2hTeW50aGVzaXNDbGllbnQoKS0+b2JzZXJ2ZXIoKS0+ZGlkUGF1c2VTcGVh a2luZygpOworICAgICAgICBpZiAoIXdlYWtUaGlzKQorICAgICAgICAgICAgcmV0dXJuOworICAg ICAgICBpZiAoYXV0byBvYnNlcnZlciA9IGNvcmVQYWdlT2JzZXJ2ZXIoKSkKKyAgICAgICAgICAg IG9ic2VydmVyLT5kaWRQYXVzZVNwZWFraW5nKCk7CiAgICAgfTsKICAgICAKICAgICBtX3BhZ2Uu c2VuZFdpdGhBc3luY1JlcGx5KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNwZWVjaFN5bnRoZXNp c1BhdXNlKCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKQEAgLTg3LDggKzk2LDEwIEBA IHZvaWQgV2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50OjpwYXVzZSgpCiB2b2lkIFdlYlNwZWVjaFN5 bnRoZXNpc0NsaWVudDo6cmVzdW1lKCkKIHsKICAgICBXVEY6OkNvbXBsZXRpb25IYW5kbGVyPHZv aWQoKT4gY29tcGxldGlvbkhhbmRsZXIgPSBbdGhpcywgd2Vha1RoaXMgPSBtYWtlV2Vha1B0cigq dGhpcyldKCkgbXV0YWJsZSB7Ci0gICAgICAgIGlmICh3ZWFrVGhpcykKLSAgICAgICAgICAgIG1f cGFnZS5jb3JlUGFnZSgpLT5zcGVlY2hTeW50aGVzaXNDbGllbnQoKS0+b2JzZXJ2ZXIoKS0+ZGlk UmVzdW1lU3BlYWtpbmcoKTsKKyAgICAgICAgaWYgKCF3ZWFrVGhpcykKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgaWYgKGF1dG8gb2JzZXJ2ZXIgPSBjb3JlUGFnZU9ic2VydmVyKCkpCisg ICAgICAgICAgICBvYnNlcnZlci0+ZGlkUmVzdW1lU3BlYWtpbmcoKTsKICAgICB9OwogICAgIAog ICAgIG1fcGFnZS5zZW5kV2l0aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U3Bl ZWNoU3ludGhlc2lzUmVzdW1lKCksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJTcGVlY2hT eW50aGVzaXNDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9y dC9XZWJTcGVlY2hTeW50aGVzaXNDbGllbnQuaAppbmRleCBlMzliOTNhOWI5Ny4uZWFkMTdkMzBm MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJTcGVlY2hTeW50aGVzaXNDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViU3BlZWNoU3ludGhlc2lzQ2xpZW50LmgKQEAgLTQ5LDEyICs0OSwx MiBAQCBwdWJsaWM6CiAgICAgdm9pZCBjYW5jZWwoKSBvdmVycmlkZTsKICAgICB2b2lkIHBhdXNl KCkgb3ZlcnJpZGU7CiAgICAgdm9pZCByZXN1bWUoKSBvdmVycmlkZTsKLSAgICAKK3ByaXZhdGU6 CiAgICAgdm9pZCBzZXRPYnNlcnZlcihXZWFrUHRyPFdlYkNvcmU6OlNwZWVjaFN5bnRoZXNpc0Ns aWVudE9ic2VydmVyPiBvYnNlcnZlcikgb3ZlcnJpZGUgeyBtX29ic2VydmVyID0gb2JzZXJ2ZXI7 IH0KICAgICBXZWFrUHRyPFdlYkNvcmU6OlNwZWVjaFN5bnRoZXNpc0NsaWVudE9ic2VydmVyPiBv YnNlcnZlcigpIGNvbnN0IG92ZXJyaWRlIHsgcmV0dXJuIG1fb2JzZXJ2ZXI7IH0KLSAgICAKIAot cHJpdmF0ZToKKyAgICBXZWJDb3JlOjpTcGVlY2hTeW50aGVzaXNDbGllbnRPYnNlcnZlciogY29y ZVBhZ2VPYnNlcnZlcigpIGNvbnN0OworICAgIAogICAgIFdlYlBhZ2UmIG1fcGFnZTsKICAgICBX ZWFrUHRyPFdlYkNvcmU6OlNwZWVjaFN5bnRoZXNpc0NsaWVudE9ic2VydmVyPiBtX29ic2VydmVy OwogICAgIFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6UGxhdGZvcm1TcGVlY2hTeW50aGVzaXNWb2lj ZT4+IG1fdm9pY2VzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmNwcAppbmRleCAzYmNmMGQ3ODVmZi4uYzg1Y2E2MDRlZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC02NTc5LDE3ICs2NTc5LDIwIEBAIHZv aWQgV2ViUGFnZTo6c2ltdWxhdGVEZXZpY2VPcmllbnRhdGlvbkNoYW5nZShkb3VibGUgYWxwaGEs IGRvdWJsZSBiZXRhLCBkb3VibGUKICNpZiBFTkFCTEUoU1BFRUNIX1NZTlRIRVNJUykKIHZvaWQg V2ViUGFnZTo6c3BlYWtpbmdFcnJvck9jY3VycmVkKCkKIHsKLSAgICBjb3JlUGFnZSgpLT5zcGVl Y2hTeW50aGVzaXNDbGllbnQoKS0+b2JzZXJ2ZXIoKS0+c3BlYWtpbmdFcnJvck9jY3VycmVkKCk7 CisgICAgaWYgKGF1dG8gb2JzZXJ2ZXIgPSBjb3JlUGFnZSgpLT5zcGVlY2hTeW50aGVzaXNDbGll bnQoKS0+b2JzZXJ2ZXIoKSkKKyAgICAgICAgb2JzZXJ2ZXItPnNwZWFraW5nRXJyb3JPY2N1cnJl ZCgpOwogfQogCiB2b2lkIFdlYlBhZ2U6OmJvdW5kYXJ5RXZlbnRPY2N1cnJlZChib29sIHdvcmRC b3VuZGFyeSwgdW5zaWduZWQgY2hhckluZGV4KQogewotICAgIGNvcmVQYWdlKCktPnNwZWVjaFN5 bnRoZXNpc0NsaWVudCgpLT5vYnNlcnZlcigpLT5ib3VuZGFyeUV2ZW50T2NjdXJyZWQod29yZEJv dW5kYXJ5LCBjaGFySW5kZXgpOworICAgIGlmIChhdXRvIG9ic2VydmVyID0gY29yZVBhZ2UoKS0+ c3BlZWNoU3ludGhlc2lzQ2xpZW50KCktPm9ic2VydmVyKCkpCisgICAgICAgIG9ic2VydmVyLT5i b3VuZGFyeUV2ZW50T2NjdXJyZWQod29yZEJvdW5kYXJ5LCBjaGFySW5kZXgpOwogfQogCiB2b2lk IFdlYlBhZ2U6OnZvaWNlc0RpZENoYW5nZSgpCiB7Ci0gICAgY29yZVBhZ2UoKS0+c3BlZWNoU3lu dGhlc2lzQ2xpZW50KCktPm9ic2VydmVyKCktPnZvaWNlc0NoYW5nZWQoKTsKKyAgICBpZiAoYXV0 byBvYnNlcnZlciA9IGNvcmVQYWdlKCktPnNwZWVjaFN5bnRoZXNpc0NsaWVudCgpLT5vYnNlcnZl cigpKQorICAgICAgICBvYnNlcnZlci0+dm9pY2VzQ2hhbmdlZCgpOwogfQogI2VuZGlmCiAK