221385 2021-02-03 23:16:04 -0800 Nullptr crash in Document::contextDocument() inside FontFaceSet::FontFaceSet 2021-02-24 19:31:18 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rniwa webkit-unassigned bfulgham cdumez cgarcia ews-feeder fred.wang gpoo mmaxfield product-security rbuis svillar webkit-bug-importer zalan oldest_to_newest 1725514 0 rniwa 2021-02-03 23:16:04 -0800 e.g. Thread 0 Crashed:: Dispatch queue: com.apple.main-thread 0 com.apple.WebCore 0x00007fff3af505ca WebCore::FontFaceSet::FontFaceSet(WebCore::Document&, WebCore::CSSFontFaceSet&) + 90 1 com.apple.WebCore 0x00007fff3af5027e WebCore::FontFaceSet::create(WebCore::Document&, WebCore::CSSFontFaceSet&) + 190 2 com.apple.WebCore 0x00007fff3af03be5 WebCore::CSSFontSelector::fontFaceSet() + 53 3 com.apple.WebCore 0x00007fff3a21ca1e WebCore::jsDocumentFonts(JSC::JSGlobalObject*, long long, JSC::PropertyName) + 110 4 com.apple.JavaScriptCore 0x00007fff3747d381 JSC::LLInt::performLLIntGetByID(JSC::Instruction const*, JSC::CodeBlock*, JSC::JSGlobalObject*, JSC::JSValue, JSC::Identifier const&, JSC::GetByIdModeMetadata&) + 1681 5 com.apple.JavaScriptCore 0x00007fff36b592bb llint_slow_path_get_by_id + 347 6 com.apple.JavaScriptCore 0x00007fff36d64c3a llint_entry + 36118 7 com.apple.JavaScriptCore 0x00007fff36d5bd2f vmEntryToJavaScript + 216 8 com.apple.JavaScriptCore 0x00007fff373992ea JSC::Interpreter::executeProgram(JSC::SourceCode const&, JSC::JSGlobalObject*, JSC::JSObject*) + 12426 9 com.apple.JavaScriptCore 0x00007fff375edce5 JSC::evaluate(JSC::JSGlobalObject*, JSC::SourceCode const&, JSC::JSValue, WTF::NakedPtr<JSC::Exception>&) + 245 10 com.apple.WebCore 0x00007fff3ade1ac4 WebCore::JSExecState::profiledEvaluate(JSC::JSGlobalObject*, JSC::ProfilingReason, JSC::SourceCode const&, JSC::JSValue, WTF::NakedPtr<JSC::Exception>&) + 84 11 com.apple.WebCore 0x00007fff3ade17f2 WebCore::ScriptController::evaluateInWorld(WebCore::ScriptSourceCode const&, WebCore::DOMWrapperWorld&) + 178 12 com.apple.WebCore 0x00007fff3ade1b48 WebCore::ScriptController::evaluateIgnoringException(WebCore::ScriptSourceCode const&) + 40 13 com.apple.WebCore 0x00007fff3b0d1060 WebCore::ScriptElement::executeClassicScript(WebCore::ScriptSourceCode const&) + 528 14 com.apple.WebCore 0x00007fff39ca3551 WebCore::ScriptElement::prepareScript(WTF::TextPosition const&, WebCore::ScriptElement::LegacyTypeSupport) + 4369 15 com.apple.WebCore 0x00007fff3b3adcb9 WebCore::HTMLScriptRunner::runScript(WebCore::ScriptElement&, WTF::TextPosition const&) + 425 16 com.apple.WebCore 0x00007fff39c4ac35 WebCore::HTMLDocumentParser::pumpTokenizer(WebCore::HTMLDocumentParser::SynchronousMode) + 2597 17 com.apple.WebCore 0x00007fff3b3a4336 WebCore::HTMLDocumentParser::append(WTF::RefPtr<WTF::StringImpl, WTF::DumbPtrTraits<WTF::StringImpl> >&&) + 1494 18 com.apple.WebCore 0x00007fff3b02f534 WebCore::DecodedDataDocumentParser::flush(WebCore::DocumentWriter&) + 196 19 com.apple.WebCore 0x00007fff3b509eed WebCore::DocumentLoader::finishedLoading() + 669 20 com.apple.WebCore 0x00007fff3b59fe6f WebCore::CachedResource::checkNotify(WebCore::NetworkLoadMetrics const&) + 95 21 com.apple.WebCore 0x00007fff3b59deed WebCore::CachedRawResource::finishLoading(WebCore::SharedBuffer*, WebCore::NetworkLoadMetrics const&) + 1117 22 com.apple.WebCore 0x00007fff3b56c8dc WebCore::SubresourceLoader::didFinishLoading(WebCore::NetworkLoadMetrics const&) + 1148 23 com.apple.WebKit 0x00007fff3d279fd5 WebKit::WebResourceLoader::didFinishResourceLoad(WebCore::NetworkLoadMetrics const&) + 227 24 com.apple.WebKit 0x00007fff3d3ca2da WebKit::WebResourceLoader::didReceiveWebResourceLoaderMessage(IPC::Connection&, IPC::Decoder&) + 310 25 com.apple.WebKit 0x00007fff3cda1370 IPC::Connection::dispatchMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >) + 696 26 com.apple.WebKit 0x00007fff3cda3ddc WTF::Detail::CallableWrapper<IPC::Connection::enqueueIncomingMessage(std::__1::unique_ptr<IPC::Decoder, std::__1::default_delete<IPC::Decoder> >)::$_7, void>::call() + 214 27 com.apple.JavaScriptCore 0x00007fff379c6abd WTF::RunLoop::performWork() + 573 <rdar://problem/73661979> 1725515 1 419240 rniwa 2021-02-03 23:16:23 -0800 Created attachment 419240 Test 1728061 2 419983 cgarcia 2021-02-11 06:41:11 -0800 Created attachment 419983 Patch This was introduced in r201799. The problem is that we are clearing the CSSFontSelector document when document's last reference is removed but still refeenced by other nodes. Since CSSFontSelector::fontFaceSet() hasn't been called before, it will try to create a FontFaceSet::create() with a nullptr document. This should assert in FontFaceSet::create() for debug builds. So, I think we should not clear the document in that case. 1728236 3 419983 rniwa 2021-02-11 12:32:27 -0800 Comment on attachment 419983 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=419983&action=review > Source/WebCore/dom/Document.cpp:-809 > - m_fontSelector->clearDocument(); I don't think this is quite right. We probably still want to stop font loading timer, etc... 1728505 4 420110 cgarcia 2021-02-12 02:25:30 -0800 Created attachment 420110 Patch 1728775 5 420110 rniwa 2021-02-12 13:56:37 -0800 Comment on attachment 420110 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420110&action=review > Source/WebCore/css/CSSFontSelector.cpp:357 > +void CSSFontSelector::clearDocument() > +{ It seems that this function is no longer needed? We can just call detach in ~CSSFontSelector. There is no need to call this function in ~Document since m_document is a WeakPtr. 1728912 6 rniwa 2021-02-12 23:02:08 -0800 By the way, can we add a test here? I don't think there is any security implication here. 1729093 7 cgarcia 2021-02-15 02:35:13 -0800 (In reply to Ryosuke Niwa from comment #6) > By the way, can we add a test here? I don't think there is any security > implication here. Isn't this a use after free? We end up calling the Document::contextDocument() on an already freed Document. 1729108 8 420300 cgarcia 2021-02-15 03:18:14 -0800 Created attachment 420300 Patch 1729378 9 rniwa 2021-02-15 14:29:32 -0800 (In reply to Carlos Garcia Campos from comment #7) > (In reply to Ryosuke Niwa from comment #6) > > By the way, can we add a test here? I don't think there is any security > > implication here. > > Isn't this a use after free? We end up calling the > Document::contextDocument() on an already freed Document. How could that be? The bug here is that we're clearing m_document in CSSFontSelector too early, and m_document is WeakPtr<Document>. 1729380 10 420300 rniwa 2021-02-15 14:32:36 -0800 Comment on attachment 420300 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420300&action=review > Source/WebCore/css/CSSFontSelector.cpp:340 > -void CSSFontSelector::clearDocument() > +void CSSFontSelector::detach() We're not really detaching from anything, are we? This is about freeing stuff & stopping timers so that document may be delete later. I'd call something like stopLoadingForDocumentTeardown or something. > Source/WebCore/dom/Document.cpp:-762 > - m_fontSelector->unregisterForInvalidationCallbacks(*this); Why are we removing the call to unregisterForInvalidationCallbacks? 1729591 11 420300 cgarcia 2021-02-16 01:45:02 -0800 Comment on attachment 420300 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420300&action=review >> Source/WebCore/css/CSSFontSelector.cpp:340 >> +void CSSFontSelector::detach() > > We're not really detaching from anything, are we? > This is about freeing stuff & stopping timers so that document may be delete later. > I'd call something like stopLoadingForDocumentTeardown or something. I used detach for consistency with other similar functions, but I agree we are not detaching from the document because we still need it. I'll find a better name. >> Source/WebCore/dom/Document.cpp:-762 >> - m_fontSelector->unregisterForInvalidationCallbacks(*this); > > Why are we removing the call to unregisterForInvalidationCallbacks? Because clearDocument clears all the clients, so this is always called on an empty m_clients. 1729597 12 420440 cgarcia 2021-02-16 02:09:37 -0800 Created attachment 420440 Patch 1730013 13 rniwa 2021-02-16 16:19:48 -0800 Hold on a sec, I'm checking if there is any security implication related to this crash or not. 1732427 14 420440 rniwa 2021-02-22 18:42:55 -0800 Comment on attachment 420440 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=420440&action=review > Source/WebCore/css/CSSFontSelector.cpp:340 > -void CSSFontSelector::clearDocument() > +void CSSFontSelector::clear() clear is a very generic term. I would have preferred calling it something like stopLoading. 1732465 15 421291 cgarcia 2021-02-23 01:24:51 -0800 Created attachment 421291 Patch for landing 1732801 16 ews-feeder 2021-02-24 00:42:23 -0800 Committed r273374: <https://commits.webkit.org/r273374> All reviewed patches have been landed. Closing bug and clearing flags on attachment 421291. 419240 2021-02-03 23:16:23 -0800 2021-02-03 23:16:23 -0800 Test repro_493b.html text/html 297 rniwa PHNjcmlwdD4KICBsZXQgY2RhdGEgPSBuZXcgRG9jdW1lbnQoKS5jcmVhdGVDREFUQVNlY3Rpb24o JycpOwogIGZvciAobGV0IGkgPSAwOyBpIDwgMjU7IGkrKykgewogICAgbmV3IEFycmF5QnVmZmVy KDIgKiogaSk7CiAgfQogIGNkYXRhLnNwbGl0VGV4dCgwKS5vd25lckRvY3VtZW50LmZvbnRzOwog IGlmICh3aW5kb3cudGVzdFJ1bm5lcikgewogICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7 CiAgICBzZXRUaW1lb3V0KCgpID0+IHRlc3RSdW5uZXIubm90aWZ5RG9uZSgpLCAxMDAwKQogIH0K PC9zY3JpcHQ+CmEK 419983 2021-02-11 06:41:11 -0800 2021-02-12 02:25:30 -0800 Patch wcore-fonts-crash.diff text/plain 1264 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZGE5ZjI5ODJiNjEuLjBhMDliY2FhZmFjYSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE2IEBACisyMDIxLTAyLTExICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBEbyBub3QgY2xlYXIgdGhlIENTU0ZvbnRTZWxlY3RvciBk b2N1bWVudCB3aGlsZSBzdGlsbCByZWZlcmVuY2VkIGJ5IG90aGVyIG5vZGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEzODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSBkb2N1bWVudCBs YXN0IHJlZmVyZW5jZSBpcyByZW1vdmVkIGJ1dCBzdGlsbCBoYXMgbm9kZSByZWZlcmVuY2VzLCB3 ZSBuZWVkIHRvIGtlZXAgdGhlIGRvY3VtZW50IHZhbGlkCisgICAgICAgIGZvciBDU1NGb250U2Vs ZWN0b3IgdG8gYmUgYWJsZSB0byBjcmVhdGUgYSBGb250RmFjZVNldCBpZiBkb2N1bWVudC5mb250 cyBpcyByZXF1ZXN0ZWQuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6RG9jdW1lbnQ6OnJlbW92ZWRMYXN0UmVmKToKKwogMjAyMS0wMi0xMCAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVsZWFzZSBh c3NlcnQgZmFpbHVyZSBpbiBOb2RlOjp+Tm9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXgg NDRmOWQwZWE1MDUyLi5kNDQ2NDcxNTFjZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Rv bS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAt ODA2LDcgKzgwNiw2IEBAIHZvaWQgRG9jdW1lbnQ6OnJlbW92ZWRMYXN0UmVmKCkKICNlbmRpZgog ICAgICAgICBtX2Fzc29jaWF0ZWRGb3JtQ29udHJvbHMuY2xlYXIoKTsKIAotICAgICAgICBtX2Zv bnRTZWxlY3Rvci0+Y2xlYXJEb2N1bWVudCgpOwogICAgICAgICBtX2ZvbnRTZWxlY3Rvci0+dW5y ZWdpc3RlckZvckludmFsaWRhdGlvbkNhbGxiYWNrcygqdGhpcyk7CiAKICAgICAgICAgZGV0YWNo UGFyc2VyKCk7Cg== 420110 2021-02-12 02:25:30 -0800 2021-02-15 03:18:14 -0800 Patch wcore-fonts-crash.diff text/plain 4717 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAzZGE5ZjI5ODJiNjEuLjRhN2U1ODg1NmY0NiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI1IEBACisyMDIxLTAyLTEyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBEbyBub3QgY2xlYXIgdGhlIENTU0ZvbnRTZWxlY3RvciBk b2N1bWVudCB3aGlsZSBzdGlsbCByZWZlcmVuY2VkIGJ5IG90aGVyIG5vZGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEzODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSBkb2N1bWVudCBs YXN0IHJlZmVyZW5jZSBpcyByZW1vdmVkIGJ1dCBzdGlsbCBoYXMgbm9kZSByZWZlcmVuY2VzLCB3 ZSBuZWVkIHRvIGtlZXAgdGhlIGRvY3VtZW50IHZhbGlkCisgICAgICAgIGZvciBDU1NGb250U2Vs ZWN0b3IgdG8gYmUgYWJsZSB0byBjcmVhdGUgYSBGb250RmFjZVNldCBpZiBkb2N1bWVudC5mb250 cyBpcyByZXF1ZXN0ZWQuIEluIHRoYXQgY2FzZSB0aGUgZm9udAorICAgICAgICBzZWxlY3RvciBp cyBtYXJrZWQgYXMgZGV0YWNoZWQsIG9uZ29pbmcgZm9udCBsb2FkIHN0b3BwZWQgYW5kIGNsaWVu dHMgdW5lZ2lzdGVyZWQsIGJ1dCBrZWVwaW5nIHRoZSBkb2N1bWVudC4KKworICAgICAgICAqIGNz cy9DU1NGb250U2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9y OjpkZXRhY2gpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpjbGVhckRvY3Vt ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6YmVnaW5Mb2FkaW5nRm9u dFNvb24pOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpmYWxsYmFja0ZvbnRD b3VudCk6CisgICAgICAgIChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmZhbGxiYWNrRm9udEF0 KToKKyAgICAgICAgKiBjc3MvQ1NTRm9udFNlbGVjdG9yLmg6CisgICAgICAgICogZG9tL0RvY3Vt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50Ojp+RG9jdW1lbnQpOgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnQ6OnJlbW92ZWRMYXN0UmVmKToKKwogMjAyMS0wMi0xMCAgQ2Fy bG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmVsZWFz ZSBhc3NlcnQgZmFpbHVyZSBpbiBOb2RlOjp+Tm9kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNl bGVjdG9yLmNwcAppbmRleCA0MzRlNGNjY2FhMjEuLjMzOWJmNWE3NDJjNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5jcHAKQEAgLTMzMSwxNCArMzMxLDE1IEBAIEZvbnRSYW5n ZXMgQ1NTRm9udFNlbGVjdG9yOjpmb250UmFuZ2VzRm9yRmFtaWx5KGNvbnN0IEZvbnREZXNjcmlw dGlvbiYgZm9udERlc2NyCiAgICAgcmV0dXJuIEZvbnRSYW5nZXMgeyBXVEZNb3ZlKGZvbnQpIH07 CiB9CiAKLXZvaWQgQ1NTRm9udFNlbGVjdG9yOjpjbGVhckRvY3VtZW50KCkKK3ZvaWQgQ1NTRm9u dFNlbGVjdG9yOjpkZXRhY2goKQogewotICAgIGlmICghbV9kb2N1bWVudCkgeworICAgIGlmICht X2lzRGV0YWNoZWQpIHsKICAgICAgICAgQVNTRVJUKCFtX2ZvbnRMb2FkaW5nVGltZXIuaXNBY3Rp dmUoKSk7CiAgICAgICAgIEFTU0VSVChtX2ZvbnRzVG9CZWdpbkxvYWRpbmcuaXNFbXB0eSgpKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIG1faXNEZXRhY2hlZCA9IHRydWU7CiAgICAg bV9mb250TG9hZGluZ1RpbWVyLnN0b3AoKTsKIAogICAgIENhY2hlZFJlc291cmNlTG9hZGVyJiBj YWNoZWRSZXNvdXJjZUxvYWRlciA9IG1fZG9jdW1lbnQtPmNhY2hlZFJlc291cmNlTG9hZGVyKCk7 CkBAIC0zNDgsMTUgKzM0OSwxOSBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6Y2xlYXJEb2N1bWVu dCgpCiAgICAgfQogICAgIG1fZm9udHNUb0JlZ2luTG9hZGluZy5jbGVhcigpOwogCi0gICAgbV9k b2N1bWVudCA9IG51bGxwdHI7Ci0KICAgICBtX2Nzc0ZvbnRGYWNlU2V0LT5jbGVhcigpOwogICAg IG1fY2xpZW50cy5jbGVhcigpOwogfQogCit2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6Y2xlYXJEb2N1 bWVudCgpCit7CisgICAgZGV0YWNoKCk7CisgICAgbV9kb2N1bWVudCA9IG51bGxwdHI7Cit9CisK IHZvaWQgQ1NTRm9udFNlbGVjdG9yOjpiZWdpbkxvYWRpbmdGb250U29vbihDYWNoZWRGb250JiBm b250KQogewotICAgIGlmICghbV9kb2N1bWVudCkKKyAgICBpZiAobV9pc0RldGFjaGVkKQogICAg ICAgICByZXR1cm47CiAKICAgICBtX2ZvbnRzVG9CZWdpbkxvYWRpbmcuYXBwZW5kKCZmb250KTsK QEAgLTQxMSw3ICs0MTYsNyBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6Zm9udExvYWRpbmdUaW1l ckZpcmVkKCkKIAogc2l6ZV90IENTU0ZvbnRTZWxlY3Rvcjo6ZmFsbGJhY2tGb250Q291bnQoKQog ewotICAgIGlmICghbV9kb2N1bWVudCkKKyAgICBpZiAobV9pc0RldGFjaGVkKQogICAgICAgICBy ZXR1cm4gMDsKIAogICAgIHJldHVybiBtX2RvY3VtZW50LT5zZXR0aW5ncygpLmZvbnRGYWxsYmFj a1ByZWZlcnNQaWN0b2dyYXBocygpID8gMSA6IDA7CkBAIC00MjEsNyArNDI2LDcgQEAgUmVmUHRy PEZvbnQ+IENTU0ZvbnRTZWxlY3Rvcjo6ZmFsbGJhY2tGb250QXQoY29uc3QgRm9udERlc2NyaXB0 aW9uJiBmb250RGVzY3JpcHQKIHsKICAgICBBU1NFUlRfVU5VU0VEKGluZGV4LCAhaW5kZXgpOwog Ci0gICAgaWYgKCFtX2RvY3VtZW50KQorICAgIGlmIChtX2lzRGV0YWNoZWQpCiAgICAgICAgIHJl dHVybiBudWxscHRyOwogCiAgICAgaWYgKCFtX2RvY3VtZW50LT5zZXR0aW5ncygpLmZvbnRGYWxs YmFja1ByZWZlcnNQaWN0b2dyYXBocygpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3Nz L0NTU0ZvbnRTZWxlY3Rvci5oIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5o CmluZGV4IDg4MGEwZGNlZDU0Mi4uMTZmNGE1MzI5Njk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0Zv bnRTZWxlY3Rvci5oCkBAIC02Myw2ICs2Myw3IEBAIHB1YmxpYzoKICAgICBzaXplX3QgZmFsbGJh Y2tGb250Q291bnQoKSBmaW5hbDsKICAgICBSZWZQdHI8Rm9udD4gZmFsbGJhY2tGb250QXQoY29u c3QgRm9udERlc2NyaXB0aW9uJiwgc2l6ZV90KSBmaW5hbDsKIAorICAgIHZvaWQgZGV0YWNoKCk7 CiAgICAgdm9pZCBjbGVhckRvY3VtZW50KCk7CiAgICAgdm9pZCBlbXB0eUNhY2hlcygpOwogICAg IHZvaWQgYnVpbGRTdGFydGVkKCk7CkBAIC0xMzMsNiArMTM0LDcgQEAgcHJpdmF0ZToKICAgICB1 bnNpZ25lZCBtX2NvbXB1dGluZ1Jvb3RTdHlsZUZvbnRDb3VudCB7IDAgfTsKICAgICBib29sIG1f Y3JlYXRpbmdGb250IHsgZmFsc2UgfTsKICAgICBib29sIG1fYnVpbGRJc1VuZGVyd2F5IHsgZmFs c2UgfTsKKyAgICBib29sIG1faXNEZXRhY2hlZCB7IGZhbHNlIH07CiB9OwogCiB9IC8vIG5hbWVz cGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA0NGY5ZDBlYTUwNTIuLjc1 NTlmY2M4YWIzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC03NTksNyArNzU5LDYgQEAg RG9jdW1lbnQ6On5Eb2N1bWVudCgpCiAKICAgICBzdHlsZVNjb3BlKCkuY2xlYXJSZXNvbHZlcigp OyAvLyBXZSBuZWVkIHRvIGRlc3Ryb3kgQ1NTRm9udFNlbGVjdG9yIGJlZm9yZSBkZXN0cm95aW5n IG1fY2FjaGVkUmVzb3VyY2VMb2FkZXIuCiAgICAgbV9mb250U2VsZWN0b3ItPmNsZWFyRG9jdW1l bnQoKTsKLSAgICBtX2ZvbnRTZWxlY3Rvci0+dW5yZWdpc3RlckZvckludmFsaWRhdGlvbkNhbGxi YWNrcygqdGhpcyk7CiAKICAgICAvLyBJdCdzIHBvc3NpYmxlIGZvciBtdWx0aXBsZSBEb2N1bWVu dHMgdG8gZW5kIHVwIHJlZmVyZW5jaW5nIHRoZSBzYW1lIENhY2hlZFJlc291cmNlTG9hZGVyIChl LmcuLCBTVkdJbWFnZXMKICAgICAvLyBsb2FkIHRoZSBpbml0aWFsIGVtcHR5IGRvY3VtZW50IGFu ZCB0aGUgU1ZHRG9jdW1lbnQgd2l0aCB0aGUgc2FtZSBEb2N1bWVudExvYWRlcikuCkBAIC04MDYs OCArODA1LDcgQEAgdm9pZCBEb2N1bWVudDo6cmVtb3ZlZExhc3RSZWYoKQogI2VuZGlmCiAgICAg ICAgIG1fYXNzb2NpYXRlZEZvcm1Db250cm9scy5jbGVhcigpOwogCi0gICAgICAgIG1fZm9udFNl bGVjdG9yLT5jbGVhckRvY3VtZW50KCk7Ci0gICAgICAgIG1fZm9udFNlbGVjdG9yLT51bnJlZ2lz dGVyRm9ySW52YWxpZGF0aW9uQ2FsbGJhY2tzKCp0aGlzKTsKKyAgICAgICAgbV9mb250U2VsZWN0 b3ItPmRldGFjaCgpOwogCiAgICAgICAgIGRldGFjaFBhcnNlcigpOwogCg== 420300 2021-02-15 03:18:14 -0800 2021-02-16 02:09:37 -0800 Patch wcore-document-fonts-crash.diff text/plain 5366 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYTI4YTFjZGJjNGEuLjE1MGRmZTY2NzZmOCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI0IEBACisyMDIxLTAyLTE1ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFA aWdhbGlhLmNvbT4KKworICAgICAgICBEbyBub3QgY2xlYXIgdGhlIENTU0ZvbnRTZWxlY3RvciBk b2N1bWVudCB3aGlsZSBzdGlsbCByZWZlcmVuY2VkIGJ5IG90aGVyIG5vZGVzCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEzODUKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIHRoZSBkb2N1bWVudCBs YXN0IHJlZmVyZW5jZSBpcyByZW1vdmVkIGJ1dCBzdGlsbCBoYXMgbm9kZSByZWZlcmVuY2VzLCB3 ZSBuZWVkIHRvIGtlZXAgdGhlIGRvY3VtZW50IHZhbGlkCisgICAgICAgIGZvciBDU1NGb250U2Vs ZWN0b3IgdG8gYmUgYWJsZSB0byBjcmVhdGUgYSBGb250RmFjZVNldCBpZiBkb2N1bWVudC5mb250 cyBpcyByZXF1ZXN0ZWQuIEluIHRoYXQgY2FzZSB0aGUgZm9udAorICAgICAgICBzZWxlY3RvciBp cyBtYXJrZWQgYXMgZGV0YWNoZWQsIG9uZ29pbmcgZm9udCBsb2FkIHN0b3BwZWQgYW5kIGNsaWVu dHMgdW5lZ2lzdGVyZWQsIGJ1dCBrZWVwaW5nIHRoZSBkb2N1bWVudC4KKworICAgICAgICAqIGNz cy9DU1NGb250U2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9y OjpkZXRhY2gpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpiZWdpbkxvYWRp bmdGb250U29vbik6CisgICAgICAgIChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmZhbGxiYWNr Rm9udENvdW50KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6ZmFsbGJhY2tG b250QXQpOgorICAgICAgICAqIGNzcy9DU1NGb250U2VsZWN0b3IuaDoKKyAgICAgICAgKiBkb20v RG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6On5Eb2N1bWVudCk6Cisg ICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cmVtb3ZlZExhc3RSZWYpOgorCiAyMDIxLTAyLTE1 ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBS ZWxlYXNlIGFzc2VydCBmYWlsdXJlIGluIE5vZGU6On5Ob2RlCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NG b250U2VsZWN0b3IuY3BwCmluZGV4IGQwYzIzMzY5NmEyZi4uNGQ5YzQyNjA5NzI4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmNwcApAQCAtODIsNyArODIsNyBAQCBDU1NGb250 U2VsZWN0b3I6On5DU1NGb250U2VsZWN0b3IoKQogewogICAgIExPRyhGb250cywgIkNTU0ZvbnRT ZWxlY3RvciAlcCBkdG9yIiwgdGhpcyk7CiAKLSAgICBjbGVhckRvY3VtZW50KCk7CisgICAgZGV0 YWNoKCk7CiAgICAgRm9udENhY2hlOjpzaW5nbGV0b24oKS5yZW1vdmVDbGllbnQoKnRoaXMpOwog fQogCkBAIC0zMzcsMTQgKzMzNywxNSBAQCBGb250UmFuZ2VzIENTU0ZvbnRTZWxlY3Rvcjo6Zm9u dFJhbmdlc0ZvckZhbWlseShjb25zdCBGb250RGVzY3JpcHRpb24mIGZvbnREZXNjcgogICAgIHJl dHVybiBGb250UmFuZ2VzIHsgV1RGTW92ZShmb250KSB9OwogfQogCi12b2lkIENTU0ZvbnRTZWxl Y3Rvcjo6Y2xlYXJEb2N1bWVudCgpCit2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6ZGV0YWNoKCkKIHsK LSAgICBpZiAoIW1fZG9jdW1lbnQpIHsKKyAgICBpZiAobV9pc0RldGFjaGVkKSB7CiAgICAgICAg IEFTU0VSVCghbV9mb250TG9hZGluZ1RpbWVyLmlzQWN0aXZlKCkpOwogICAgICAgICBBU1NFUlQo bV9mb250c1RvQmVnaW5Mb2FkaW5nLmlzRW1wdHkoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKKyAgICBtX2lzRGV0YWNoZWQgPSB0cnVlOwogICAgIG1fZm9udExvYWRpbmdUaW1lci5zdG9w KCk7CiAKICAgICBDYWNoZWRSZXNvdXJjZUxvYWRlciYgY2FjaGVkUmVzb3VyY2VMb2FkZXIgPSBt X2RvY3VtZW50LT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpOwpAQCAtMzU0LDIxICszNTUsMTkgQEAg dm9pZCBDU1NGb250U2VsZWN0b3I6OmNsZWFyRG9jdW1lbnQoKQogICAgIH0KICAgICBtX2ZvbnRz VG9CZWdpbkxvYWRpbmcuY2xlYXIoKTsKIAotICAgIG1fZG9jdW1lbnQgPSBudWxscHRyOwotCiAg ICAgbV9jc3NGb250RmFjZVNldC0+Y2xlYXIoKTsKICAgICBtX2NsaWVudHMuY2xlYXIoKTsKIH0K IAogdm9pZCBDU1NGb250U2VsZWN0b3I6OmJlZ2luTG9hZGluZ0ZvbnRTb29uKENhY2hlZEZvbnQm IGZvbnQpCiB7Ci0gICAgaWYgKCFtX2RvY3VtZW50KQorICAgIGlmIChtX2lzRGV0YWNoZWQpCiAg ICAgICAgIHJldHVybjsKIAogICAgIG1fZm9udHNUb0JlZ2luTG9hZGluZy5hcHBlbmQoJmZvbnQp OwogICAgIC8vIEluY3JlbWVudCB0aGUgcmVxdWVzdCBjb3VudCBub3csIGluIG9yZGVyIHRvIHBy ZXZlbnQgZGlkRmluaXNoTG9hZCBmcm9tIGJlaW5nIGRpc3BhdGNoZWQKICAgICAvLyBhZnRlciB0 aGlzIGZvbnQgaGFzIGJlZW4gcmVxdWVzdGVkIGJ1dCBiZWZvcmUgaXQgYmVnYW4gbG9hZGluZy4g QmFsYW5jZWQgYnkKLSAgICAvLyBkZWNyZW1lbnRSZXF1ZXN0Q291bnQoKSBpbiBmb250TG9hZGlu Z1RpbWVyRmlyZWQoKSBhbmQgaW4gY2xlYXJEb2N1bWVudCgpLgorICAgIC8vIGRlY3JlbWVudFJl cXVlc3RDb3VudCgpIGluIGZvbnRMb2FkaW5nVGltZXJGaXJlZCgpIGFuZCBpbiBkZXRhY2goKS4K ICAgICBtX2RvY3VtZW50LT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpLmluY3JlbWVudFJlcXVlc3RD b3VudChmb250KTsKIAogICAgIGlmICghbV9pc0ZvbnRMb2FkaW5nU3VzcGVuZGVkICYmICFtX2Zv bnRMb2FkaW5nVGltZXIuaXNBY3RpdmUoKSkKQEAgLTQxNyw3ICs0MTYsNyBAQCB2b2lkIENTU0Zv bnRTZWxlY3Rvcjo6Zm9udExvYWRpbmdUaW1lckZpcmVkKCkKIAogc2l6ZV90IENTU0ZvbnRTZWxl Y3Rvcjo6ZmFsbGJhY2tGb250Q291bnQoKQogewotICAgIGlmICghbV9kb2N1bWVudCkKKyAgICBp ZiAobV9pc0RldGFjaGVkKQogICAgICAgICByZXR1cm4gMDsKIAogICAgIHJldHVybiBtX2RvY3Vt ZW50LT5zZXR0aW5ncygpLmZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocygpID8gMSA6IDA7 CkBAIC00MjcsNyArNDI2LDcgQEAgUmVmUHRyPEZvbnQ+IENTU0ZvbnRTZWxlY3Rvcjo6ZmFsbGJh Y2tGb250QXQoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3JpcHQKIHsKICAgICBBU1NF UlRfVU5VU0VEKGluZGV4LCAhaW5kZXgpOwogCi0gICAgaWYgKCFtX2RvY3VtZW50KQorICAgIGlm IChtX2lzRGV0YWNoZWQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgaWYgKCFtX2Rv Y3VtZW50LT5zZXR0aW5ncygpLmZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocygpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oIGIvU291cmNlL1dl YkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCmluZGV4IGRhNDMxNzJkZTBmNC4uOWNhYTZjYWNh NDMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmgKKysr IGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCkBAIC02Myw3ICs2Myw3IEBA IHB1YmxpYzoKICAgICBzaXplX3QgZmFsbGJhY2tGb250Q291bnQoKSBmaW5hbDsKICAgICBSZWZQ dHI8Rm9udD4gZmFsbGJhY2tGb250QXQoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgc2l6ZV90KSBm aW5hbDsKIAotICAgIHZvaWQgY2xlYXJEb2N1bWVudCgpOworICAgIHZvaWQgZGV0YWNoKCk7CiAg ICAgdm9pZCBlbXB0eUNhY2hlcygpOwogICAgIHZvaWQgYnVpbGRTdGFydGVkKCk7CiAgICAgdm9p ZCBidWlsZENvbXBsZXRlZCgpOwpAQCAtMTM5LDYgKzEzOSw3IEBAIHByaXZhdGU6CiAgICAgdW5z aWduZWQgbV9jb21wdXRpbmdSb290U3R5bGVGb250Q291bnQgeyAwIH07CiAgICAgYm9vbCBtX2Ny ZWF0aW5nRm9udCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2J1aWxkSXNVbmRlcndheSB7IGZhbHNl IH07CisgICAgYm9vbCBtX2lzRGV0YWNoZWQgeyBmYWxzZSB9OwogfTsKIAogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggMzhlYzE4YjlmNGI2Li44NzA4 OWNmMjg5MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApAQCAtNzU4LDggKzc1OCw3IEBAIERv Y3VtZW50Ojp+RG9jdW1lbnQoKQogICAgIGV4dGVuc2lvblN0eWxlU2hlZXRzKCkuZGV0YWNoRnJv bURvY3VtZW50KCk7CiAKICAgICBzdHlsZVNjb3BlKCkuY2xlYXJSZXNvbHZlcigpOyAvLyBXZSBu ZWVkIHRvIGRlc3Ryb3kgQ1NTRm9udFNlbGVjdG9yIGJlZm9yZSBkZXN0cm95aW5nIG1fY2FjaGVk UmVzb3VyY2VMb2FkZXIuCi0gICAgbV9mb250U2VsZWN0b3ItPmNsZWFyRG9jdW1lbnQoKTsKLSAg ICBtX2ZvbnRTZWxlY3Rvci0+dW5yZWdpc3RlckZvckludmFsaWRhdGlvbkNhbGxiYWNrcygqdGhp cyk7CisgICAgbV9mb250U2VsZWN0b3ItPmRldGFjaCgpOwogCiAgICAgLy8gSXQncyBwb3NzaWJs ZSBmb3IgbXVsdGlwbGUgRG9jdW1lbnRzIHRvIGVuZCB1cCByZWZlcmVuY2luZyB0aGUgc2FtZSBD YWNoZWRSZXNvdXJjZUxvYWRlciAoZS5nLiwgU1ZHSW1hZ2VzCiAgICAgLy8gbG9hZCB0aGUgaW5p dGlhbCBlbXB0eSBkb2N1bWVudCBhbmQgdGhlIFNWR0RvY3VtZW50IHdpdGggdGhlIHNhbWUgRG9j dW1lbnRMb2FkZXIpLgpAQCAtODA2LDggKzgwNSw3IEBAIHZvaWQgRG9jdW1lbnQ6OnJlbW92ZWRM YXN0UmVmKCkKICNlbmRpZgogICAgICAgICBtX2Fzc29jaWF0ZWRGb3JtQ29udHJvbHMuY2xlYXIo KTsKIAotICAgICAgICBtX2ZvbnRTZWxlY3Rvci0+Y2xlYXJEb2N1bWVudCgpOwotICAgICAgICBt X2ZvbnRTZWxlY3Rvci0+dW5yZWdpc3RlckZvckludmFsaWRhdGlvbkNhbGxiYWNrcygqdGhpcyk7 CisgICAgICAgIG1fZm9udFNlbGVjdG9yLT5kZXRhY2goKTsKIAogICAgICAgICBkZXRhY2hQYXJz ZXIoKTsKIAo= 420440 2021-02-16 02:09:37 -0800 2021-02-23 01:24:51 -0800 Patch wcore-document-fonts-crash.diff text/plain 7240 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiM2IyOTg2NTA5ZWUuLjZkMDIzYjc0MzZiNyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDIxLTAyLTE2ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KworICAgICAgICBOdWxscHRyIGNyYXNoIGluIERvY3VtZW50Ojpjb250ZXh0RG9jdW1lbnQoKSBp bnNpZGUgRm9udEZhY2VTZXQ6OkZvbnRGYWNlU2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEzODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvY3NzL2ZvbnRsb2FkZXItb24tZGV0YWNoZWQt ZG9jdW1lbnQtY3Jhc2gtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2Nzcy9m b250bG9hZGVyLW9uLWRldGFjaGVkLWRvY3VtZW50LWNyYXNoLmh0bWw6IEFkZGVkLgorCiAyMDIx LTAyLTE1ICBBbGV4ZXkgU2h2YXlrYSAgPHNodmFpa2FsZXNoQGdtYWlsLmNvbT4KIAogICAgICAg ICBbSlNDXSBQcm9wZXJ0eVNsb3Qgc2hvdWxkIGFsbG93IHBhc3NpbmcgY3VzdG9tIHNldHRlcnMK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvY3NzL2ZvbnRsb2FkZXItb24tZGV0YWNoZWQt ZG9jdW1lbnQtY3Jhc2gtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udGxv YWRlci1vbi1kZXRhY2hlZC1kb2N1bWVudC1jcmFzaC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi43ZWYyMmU5YTQzMWEKLS0tIC9kZXYvbnVsbAor KysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250bG9hZGVyLW9uLWRldGFjaGVkLWRvY3VtZW50 LWNyYXNoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQQVNTCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2Nzcy9mb250bG9hZGVyLW9uLWRldGFjaGVkLWRvY3VtZW50LWNyYXNoLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250bG9hZGVyLW9uLWRldGFjaGVkLWRvY3VtZW50 LWNyYXNoLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwLi40YTAx YmE5MWI1ZTQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250bG9h ZGVyLW9uLWRldGFjaGVkLWRvY3VtZW50LWNyYXNoLmh0bWwKQEAgLTAsMCArMSwxNSBAQAorPHNj cmlwdD4KKyAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgdGVzdFJ1bm5lci5kdW1wQXNU ZXh0KCk7CisKKyAgbGV0IGNkYXRhID0gbmV3IERvY3VtZW50KCkuY3JlYXRlQ0RBVEFTZWN0aW9u KCcnKTsKKyAgaWYgKHdpbmRvdy5HQ0NvbnRyb2xsZXIpIHsKKyAgICAgIEdDQ29udHJvbGxlci5j b2xsZWN0KCk7CisgIH0gZWxzZSB7CisgICAgICBmb3IgKGxldCBpID0gMDsgaSA8IDI1OyBpKysp IHsKKyAgICAgICAgICBuZXcgQXJyYXlCdWZmZXIoMiAqKiBpKTsKKyAgICAgIH0KKyAgfQorICBj ZGF0YS5zcGxpdFRleHQoMCkub3duZXJEb2N1bWVudC5mb250czsKKzwvc2NyaXB0PgorUEFTUwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDhiMWViYjhhYzM5OC4uY2I3YjgyNjk2MjgyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjggQEAKKzIwMjEtMDItMTYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgorCisgICAgICAgIE51bGxwdHIgY3Jhc2ggaW4gRG9jdW1lbnQ6OmNvbnRleHRE b2N1bWVudCgpIGluc2lkZSBGb250RmFjZVNldDo6Rm9udEZhY2VTZXQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTM4NQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gdGhlIGRvY3VtZW50IGxhc3Qg cmVmZXJlbmNlIGlzIHJlbW92ZWQgYnV0IHN0aWxsIGhhcyBub2RlIHJlZmVyZW5jZXMsIHdlIG5l ZWQgdG8ga2VlcCB0aGUgZG9jdW1lbnQgdmFsaWQKKyAgICAgICAgZm9yIENTU0ZvbnRTZWxlY3Rv ciB0byBiZSBhYmxlIHRvIGNyZWF0ZSBhIEZvbnRGYWNlU2V0IGlmIGRvY3VtZW50LmZvbnRzIGlz IHJlcXVlc3RlZC4gSW4gdGhhdCBjYXNlIHRoZSBmb250CisgICAgICAgIHNlbGVjdG9yIGlzIG1h cmtlZCBhcyBjbGVhcmVkLCBvbmdvaW5nIGZvbnQgbG9hZCBzdG9wcGVkIGFuZCBjbGllbnRzIHVu ZWdpc3RlcmVkLCBidXQga2VlcGluZyB0aGUgZG9jdW1lbnQgdW50aWwKKyAgICAgICAgaXQncyBh Y3R1YWxseSBkZXN0cm95ZWQuCisKKyAgICAgICAgVGVzdDogZmFzdC9jc3MvZm9udGxvYWRlci1v bi1kZXRhY2hlZC1kb2N1bWVudC1jcmFzaC5odG1sCisKKyAgICAgICAgKiBjc3MvQ1NTRm9udFNl bGVjdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6fkNTU0ZvbnRT ZWxlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmNsZWFyKToKKyAg ICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6Zm9udFJlcXVlc3RlZCk6CisgICAgICAg IChXZWJDb3JlOjpDU1NGb250U2VsZWN0b3I6OmZhbGxiYWNrRm9udENvdW50KToKKyAgICAgICAg KFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6ZmFsbGJhY2tGb250QXQpOgorICAgICAgICAqIGNz cy9DU1NGb250U2VsZWN0b3IuaDoKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6RG9jdW1lbnQ6On5Eb2N1bWVudCk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1 bWVudDo6cmVtb3ZlZExhc3RSZWYpOgorCiAyMDIxLTAyLTE2ICBBbnRvaW5lIFF1aW50ICA8Z3Jh b3V0c0B3ZWJraXQub3JnPgogCiAgICAgICAgIFN0eWxlOjpSZXNvbHZlcjo6c3R5bGVGb3JLZXlm cmFtZSgpIHNob3VsZCB0YWtlIGluIHRoZSBwYXJlbnQgc3R5bGUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U0ZvbnRTZWxlY3Rvci5jcHAKaW5kZXggNjJmZGJjOTQ5YTZjLi41MTNjMDIyZGM2OTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCkBAIC04Miw3ICs4Miw3IEBAIENTU0Zv bnRTZWxlY3Rvcjo6fkNTU0ZvbnRTZWxlY3RvcigpCiB7CiAgICAgTE9HKEZvbnRzLCAiQ1NTRm9u dFNlbGVjdG9yICVwIGR0b3IiLCB0aGlzKTsKIAotICAgIGNsZWFyRG9jdW1lbnQoKTsKKyAgICBj bGVhcigpOwogICAgIEZvbnRDYWNoZTo6c2luZ2xldG9uKCkucmVtb3ZlQ2xpZW50KCp0aGlzKTsK IH0KIApAQCAtMzM3LDE1ICszMzcsMTYgQEAgRm9udFJhbmdlcyBDU1NGb250U2VsZWN0b3I6OmZv bnRSYW5nZXNGb3JGYW1pbHkoY29uc3QgRm9udERlc2NyaXB0aW9uJiBmb250RGVzY3IKICAgICBy ZXR1cm4gRm9udFJhbmdlcyB7IFdURk1vdmUoZm9udCkgfTsKIH0KIAotdm9pZCBDU1NGb250U2Vs ZWN0b3I6OmNsZWFyRG9jdW1lbnQoKQordm9pZCBDU1NGb250U2VsZWN0b3I6OmNsZWFyKCkKIHsK LSAgICBpZiAoIW1fZG9jdW1lbnQpIHsKKyAgICBpZiAobV9pc0NsZWFyZWQpIHsKICAgICAgICAg QVNTRVJUKCFtX2ZvbnRMb2FkaW5nVGltZXIuaXNBY3RpdmUoKSk7CiAgICAgICAgIEFTU0VSVCht X2ZvbnRzVG9CZWdpbkxvYWRpbmcuaXNFbXB0eSgpKTsKICAgICAgICAgQVNTRVJUKG1fZm9udHMu aXNFbXB0eSgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIG1faXNDbGVhcmVkID0g dHJ1ZTsKICAgICBtX2ZvbnRMb2FkaW5nVGltZXIuc3RvcCgpOwogCiAgICAgZm9yIChhdXRvKiBm b250IDogbV9mb250cykKQEAgLTM1OSw4ICszNjAsNiBAQCB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6 Y2xlYXJEb2N1bWVudCgpCiAgICAgfQogICAgIG1fZm9udHNUb0JlZ2luTG9hZGluZy5jbGVhcigp OwogCi0gICAgbV9kb2N1bWVudCA9IG51bGxwdHI7Ci0KICAgICBtX2Nzc0ZvbnRGYWNlU2V0LT5j bGVhcigpOwogICAgIG1fY2xpZW50cy5jbGVhcigpOwogfQpAQCAtMzczLDEzICszNzIsMTMgQEAg dm9pZCBDU1NGb250U2VsZWN0b3I6OndpbGxCZWdpbkxvYWRpbmdGb250U29vbihDYWNoZWRGb250 JiBmb250KQogCiB2b2lkIENTU0ZvbnRTZWxlY3Rvcjo6Zm9udFJlcXVlc3RlZChDYWNoZWRGb250 JiBmb250KQogewotICAgIGlmICghbV9kb2N1bWVudCkKKyAgICBpZiAobV9pc0NsZWFyZWQpCiAg ICAgICAgIHJldHVybjsKIAogICAgIG1fZm9udHNUb0JlZ2luTG9hZGluZy5hcHBlbmQoJmZvbnQp OwogICAgIC8vIEluY3JlbWVudCB0aGUgcmVxdWVzdCBjb3VudCBub3csIGluIG9yZGVyIHRvIHBy ZXZlbnQgZGlkRmluaXNoTG9hZCBmcm9tIGJlaW5nIGRpc3BhdGNoZWQKICAgICAvLyBhZnRlciB0 aGlzIGZvbnQgaGFzIGJlZW4gcmVxdWVzdGVkIGJ1dCBiZWZvcmUgaXQgYmVnYW4gbG9hZGluZy4g QmFsYW5jZWQgYnkKLSAgICAvLyBkZWNyZW1lbnRSZXF1ZXN0Q291bnQoKSBpbiBmb250TG9hZGlu Z1RpbWVyRmlyZWQoKSBhbmQgaW4gY2xlYXJEb2N1bWVudCgpLgorICAgIC8vIGRlY3JlbWVudFJl cXVlc3RDb3VudCgpIGluIGZvbnRMb2FkaW5nVGltZXJGaXJlZCgpIGFuZCBpbiBjbGVhcigpLgog ICAgIG1fZG9jdW1lbnQtPmNhY2hlZFJlc291cmNlTG9hZGVyKCkuaW5jcmVtZW50UmVxdWVzdENv dW50KGZvbnQpOwogCiAgICAgaWYgKCFtX2lzRm9udExvYWRpbmdTdXNwZW5kZWQgJiYgIW1fZm9u dExvYWRpbmdUaW1lci5pc0FjdGl2ZSgpKQpAQCAtNDI4LDcgKzQyNyw3IEBAIHZvaWQgQ1NTRm9u dFNlbGVjdG9yOjpmb250TG9hZGluZ1RpbWVyRmlyZWQoKQogCiBzaXplX3QgQ1NTRm9udFNlbGVj dG9yOjpmYWxsYmFja0ZvbnRDb3VudCgpCiB7Ci0gICAgaWYgKCFtX2RvY3VtZW50KQorICAgIGlm IChtX2lzQ2xlYXJlZCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICByZXR1cm4gbV9kb2N1bWVu dC0+c2V0dGluZ3MoKS5mb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMoKSA/IDEgOiAwOwpA QCAtNDM4LDcgKzQzNyw3IEBAIFJlZlB0cjxGb250PiBDU1NGb250U2VsZWN0b3I6OmZhbGxiYWNr Rm9udEF0KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0CiB7CiAgICAgQVNTRVJU X1VOVVNFRChpbmRleCwgIWluZGV4KTsKIAotICAgIGlmICghbV9kb2N1bWVudCkKKyAgICBpZiAo bV9pc0NsZWFyZWQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgaWYgKCFtX2RvY3Vt ZW50LT5zZXR0aW5ncygpLmZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocygpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oIGIvU291cmNlL1dlYkNv cmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCmluZGV4IGU2YjgzMGQ3ZmM3NC4uODE3ZmZhYWY3NDUx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmgKKysrIGIv U291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCkBAIC02NCw3ICs2NCw3IEBAIHB1 YmxpYzoKICAgICBzaXplX3QgZmFsbGJhY2tGb250Q291bnQoKSBmaW5hbDsKICAgICBSZWZQdHI8 Rm9udD4gZmFsbGJhY2tGb250QXQoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgc2l6ZV90KSBmaW5h bDsKIAotICAgIHZvaWQgY2xlYXJEb2N1bWVudCgpOworICAgIHZvaWQgY2xlYXIoKTsKICAgICB2 b2lkIGVtcHR5Q2FjaGVzKCk7CiAgICAgdm9pZCBidWlsZFN0YXJ0ZWQoKTsKICAgICB2b2lkIGJ1 aWxkQ29tcGxldGVkKCk7CkBAIC0xNDUsNiArMTQ1LDcgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25l ZCBtX2NvbXB1dGluZ1Jvb3RTdHlsZUZvbnRDb3VudCB7IDAgfTsKICAgICBib29sIG1fY3JlYXRp bmdGb250IHsgZmFsc2UgfTsKICAgICBib29sIG1fYnVpbGRJc1VuZGVyd2F5IHsgZmFsc2UgfTsK KyAgICBib29sIG1faXNDbGVhcmVkIHsgZmFsc2UgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmluZGV4IDM4ZWMxOGI5ZjRiNi4uZmQxZDlhZjVh Y2U2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTc1OCw4ICs3NTgsNyBAQCBEb2N1bWVu dDo6fkRvY3VtZW50KCkKICAgICBleHRlbnNpb25TdHlsZVNoZWV0cygpLmRldGFjaEZyb21Eb2N1 bWVudCgpOwogCiAgICAgc3R5bGVTY29wZSgpLmNsZWFyUmVzb2x2ZXIoKTsgLy8gV2UgbmVlZCB0 byBkZXN0cm95IENTU0ZvbnRTZWxlY3RvciBiZWZvcmUgZGVzdHJveWluZyBtX2NhY2hlZFJlc291 cmNlTG9hZGVyLgotICAgIG1fZm9udFNlbGVjdG9yLT5jbGVhckRvY3VtZW50KCk7Ci0gICAgbV9m b250U2VsZWN0b3ItPnVucmVnaXN0ZXJGb3JJbnZhbGlkYXRpb25DYWxsYmFja3MoKnRoaXMpOwor ICAgIG1fZm9udFNlbGVjdG9yLT5jbGVhcigpOwogCiAgICAgLy8gSXQncyBwb3NzaWJsZSBmb3Ig bXVsdGlwbGUgRG9jdW1lbnRzIHRvIGVuZCB1cCByZWZlcmVuY2luZyB0aGUgc2FtZSBDYWNoZWRS ZXNvdXJjZUxvYWRlciAoZS5nLiwgU1ZHSW1hZ2VzCiAgICAgLy8gbG9hZCB0aGUgaW5pdGlhbCBl bXB0eSBkb2N1bWVudCBhbmQgdGhlIFNWR0RvY3VtZW50IHdpdGggdGhlIHNhbWUgRG9jdW1lbnRM b2FkZXIpLgpAQCAtODA2LDggKzgwNSw3IEBAIHZvaWQgRG9jdW1lbnQ6OnJlbW92ZWRMYXN0UmVm KCkKICNlbmRpZgogICAgICAgICBtX2Fzc29jaWF0ZWRGb3JtQ29udHJvbHMuY2xlYXIoKTsKIAot ICAgICAgICBtX2ZvbnRTZWxlY3Rvci0+Y2xlYXJEb2N1bWVudCgpOwotICAgICAgICBtX2ZvbnRT ZWxlY3Rvci0+dW5yZWdpc3RlckZvckludmFsaWRhdGlvbkNhbGxiYWNrcygqdGhpcyk7CisgICAg ICAgIG1fZm9udFNlbGVjdG9yLT5jbGVhcigpOwogCiAgICAgICAgIGRldGFjaFBhcnNlcigpOwog Cg== 421291 2021-02-23 01:24:51 -0800 2021-02-24 00:42:25 -0800 Patch for landing wcore-fonts-crash.diff text/plain 7294 cgarcia ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiYmU4N2QzNTRiZDMuLmNhZmNiMDU3NjFiZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBA CisyMDIxLTAyLTIzICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4K KworICAgICAgICBOdWxscHRyIGNyYXNoIGluIERvY3VtZW50Ojpjb250ZXh0RG9jdW1lbnQoKSBp bnNpZGUgRm9udEZhY2VTZXQ6OkZvbnRGYWNlU2V0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEzODUKKworICAgICAgICBSZXZpZXdlZCBieSBSeW9z dWtlIE5pd2EuCisKKyAgICAgICAgKiBmYXN0L2Nzcy9mb250bG9hZGVyLW9uLWRldGFjaGVkLWRv Y3VtZW50LWNyYXNoLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9jc3MvZm9u dGxvYWRlci1vbi1kZXRhY2hlZC1kb2N1bWVudC1jcmFzaC5odG1sOiBBZGRlZC4KKwogMjAyMS0w Mi0yMyAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUuY29tPgogCiAgICAgICAgIEhU TUxDYW52YXNFbGVtZW50Ojpjb3BpZWRJbWFnZSgpIGNvbnRhaW5zIG9sZCBpbWFnZSB3aXRoIEdQ VSBQcm9jZXNzIG9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Nzcy9mb250bG9hZGVy LW9uLWRldGFjaGVkLWRvY3VtZW50LWNyYXNoLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2Zh c3QvY3NzL2ZvbnRsb2FkZXItb24tZGV0YWNoZWQtZG9jdW1lbnQtY3Jhc2gtZXhwZWN0ZWQudHh0 Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMC4uN2VmMjJlOWE0MzFhCi0t LSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udGxvYWRlci1vbi1kZXRh Y2hlZC1kb2N1bWVudC1jcmFzaC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSBAQAorUEFTUwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udGxvYWRlci1vbi1kZXRhY2hlZC1kb2N1 bWVudC1jcmFzaC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9jc3MvZm9udGxvYWRlci1vbi1kZXRh Y2hlZC1kb2N1bWVudC1jcmFzaC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAwMDAwMC4uNGEwMWJhOTFiNWU0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9jc3MvZm9udGxvYWRlci1vbi1kZXRhY2hlZC1kb2N1bWVudC1jcmFzaC5odG1sCkBAIC0wLDAg KzEsMTUgQEAKKzxzY3JpcHQ+CisgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgIHRlc3RS dW5uZXIuZHVtcEFzVGV4dCgpOworCisgIGxldCBjZGF0YSA9IG5ldyBEb2N1bWVudCgpLmNyZWF0 ZUNEQVRBU2VjdGlvbignJyk7CisgIGlmICh3aW5kb3cuR0NDb250cm9sbGVyKSB7CisgICAgICBH Q0NvbnRyb2xsZXIuY29sbGVjdCgpOworICB9IGVsc2UgeworICAgICAgZm9yIChsZXQgaSA9IDA7 IGkgPCAyNTsgaSsrKSB7CisgICAgICAgICAgbmV3IEFycmF5QnVmZmVyKDIgKiogaSk7CisgICAg ICB9CisgIH0KKyAgY2RhdGEuc3BsaXRUZXh0KDApLm93bmVyRG9jdW1lbnQuZm9udHM7Cis8L3Nj cmlwdD4KK1BBU1MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA2NDA4YmY1ZmMyYWMuLjI1NWYzMGJmNjlhNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIxLTAyLTIzICBDYXJsb3MgR2FyY2lhIENhbXBv cyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKworICAgICAgICBOdWxscHRyIGNyYXNoIGluIERvY3Vt ZW50Ojpjb250ZXh0RG9jdW1lbnQoKSBpbnNpZGUgRm9udEZhY2VTZXQ6OkZvbnRGYWNlU2V0Cisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjEzODUKKwor ICAgICAgICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgV2hlbiB0aGUgZG9j dW1lbnQgbGFzdCByZWZlcmVuY2UgaXMgcmVtb3ZlZCBidXQgc3RpbGwgaGFzIG5vZGUgcmVmZXJl bmNlcywgd2UgbmVlZCB0byBrZWVwIHRoZSBkb2N1bWVudCB2YWxpZAorICAgICAgICBmb3IgQ1NT Rm9udFNlbGVjdG9yIHRvIGJlIGFibGUgdG8gY3JlYXRlIGEgRm9udEZhY2VTZXQgaWYgZG9jdW1l bnQuZm9udHMgaXMgcmVxdWVzdGVkLiBJbiB0aGF0IGNhc2UgdGhlIGZvbnQKKyAgICAgICAgc2Vs ZWN0b3IgaXMgbWFya2VkIGFzIGNsZWFyZWQsIG9uZ29pbmcgZm9udCBsb2FkIHN0b3BwZWQgYW5k IGNsaWVudHMgdW5lZ2lzdGVyZWQsIGJ1dCBrZWVwaW5nIHRoZSBkb2N1bWVudCB1bnRpbAorICAg ICAgICBpdCdzIGFjdHVhbGx5IGRlc3Ryb3llZC4KKworICAgICAgICBUZXN0OiBmYXN0L2Nzcy9m b250bG9hZGVyLW9uLWRldGFjaGVkLWRvY3VtZW50LWNyYXNoLmh0bWwKKworICAgICAgICAqIGNz cy9DU1NGb250U2VsZWN0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9y Ojp+Q1NTRm9udFNlbGVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6 Y2xlYXIpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpmb250UmVxdWVzdGVk KToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0ZvbnRTZWxlY3Rvcjo6ZmFsbGJhY2tGb250Q291bnQp OgorICAgICAgICAoV2ViQ29yZTo6Q1NTRm9udFNlbGVjdG9yOjpmYWxsYmFja0ZvbnRBdCk6Cisg ICAgICAgICogY3NzL0NTU0ZvbnRTZWxlY3Rvci5oOgorICAgICAgICAqIGRvbS9Eb2N1bWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6fkRvY3VtZW50KToKKyAgICAgICAgKFdl YkNvcmU6OkRvY3VtZW50OjpyZW1vdmVkTGFzdFJlZik6CisKIDIwMjEtMDItMjMgIFJ5b3N1a2Ug Tml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgSGFuZGxlIFBhZ2U6OmRpZEZpbmlz aExvYWRpbmdJbWFnZUZvckVsZW1lbnQgYXN5bmNocm9ub3VzbHkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL0NT U0ZvbnRTZWxlY3Rvci5jcHAKaW5kZXggZDBjMjMzNjk2YTJmLi43OGQwYTk4ZTlkODggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2Nzcy9DU1NGb250U2VsZWN0b3IuY3BwCkBAIC04Miw3ICs4Miw3IEBAIENTU0Zv bnRTZWxlY3Rvcjo6fkNTU0ZvbnRTZWxlY3RvcigpCiB7CiAgICAgTE9HKEZvbnRzLCAiQ1NTRm9u dFNlbGVjdG9yICVwIGR0b3IiLCB0aGlzKTsKIAotICAgIGNsZWFyRG9jdW1lbnQoKTsKKyAgICBz dG9wTG9hZGluZ0FuZENsZWFyRm9udHMoKTsKICAgICBGb250Q2FjaGU6OnNpbmdsZXRvbigpLnJl bW92ZUNsaWVudCgqdGhpcyk7CiB9CiAKQEAgLTMzNywxNCArMzM3LDE1IEBAIEZvbnRSYW5nZXMg Q1NTRm9udFNlbGVjdG9yOjpmb250UmFuZ2VzRm9yRmFtaWx5KGNvbnN0IEZvbnREZXNjcmlwdGlv biYgZm9udERlc2NyCiAgICAgcmV0dXJuIEZvbnRSYW5nZXMgeyBXVEZNb3ZlKGZvbnQpIH07CiB9 CiAKLXZvaWQgQ1NTRm9udFNlbGVjdG9yOjpjbGVhckRvY3VtZW50KCkKK3ZvaWQgQ1NTRm9udFNl bGVjdG9yOjpzdG9wTG9hZGluZ0FuZENsZWFyRm9udHMoKQogewotICAgIGlmICghbV9kb2N1bWVu dCkgeworICAgIGlmIChtX2lzU3RvcHBlZCkgewogICAgICAgICBBU1NFUlQoIW1fZm9udExvYWRp bmdUaW1lci5pc0FjdGl2ZSgpKTsKICAgICAgICAgQVNTRVJUKG1fZm9udHNUb0JlZ2luTG9hZGlu Zy5pc0VtcHR5KCkpOwogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgbV9pc1N0b3BwZWQg PSB0cnVlOwogICAgIG1fZm9udExvYWRpbmdUaW1lci5zdG9wKCk7CiAKICAgICBDYWNoZWRSZXNv dXJjZUxvYWRlciYgY2FjaGVkUmVzb3VyY2VMb2FkZXIgPSBtX2RvY3VtZW50LT5jYWNoZWRSZXNv dXJjZUxvYWRlcigpOwpAQCAtMzU0LDIxICszNTUsMTkgQEAgdm9pZCBDU1NGb250U2VsZWN0b3I6 OmNsZWFyRG9jdW1lbnQoKQogICAgIH0KICAgICBtX2ZvbnRzVG9CZWdpbkxvYWRpbmcuY2xlYXIo KTsKIAotICAgIG1fZG9jdW1lbnQgPSBudWxscHRyOwotCiAgICAgbV9jc3NGb250RmFjZVNldC0+ Y2xlYXIoKTsKICAgICBtX2NsaWVudHMuY2xlYXIoKTsKIH0KIAogdm9pZCBDU1NGb250U2VsZWN0 b3I6OmJlZ2luTG9hZGluZ0ZvbnRTb29uKENhY2hlZEZvbnQmIGZvbnQpCiB7Ci0gICAgaWYgKCFt X2RvY3VtZW50KQorICAgIGlmIChtX2lzU3RvcHBlZCkKICAgICAgICAgcmV0dXJuOwogCiAgICAg bV9mb250c1RvQmVnaW5Mb2FkaW5nLmFwcGVuZCgmZm9udCk7CiAgICAgLy8gSW5jcmVtZW50IHRo ZSByZXF1ZXN0IGNvdW50IG5vdywgaW4gb3JkZXIgdG8gcHJldmVudCBkaWRGaW5pc2hMb2FkIGZy b20gYmVpbmcgZGlzcGF0Y2hlZAogICAgIC8vIGFmdGVyIHRoaXMgZm9udCBoYXMgYmVlbiByZXF1 ZXN0ZWQgYnV0IGJlZm9yZSBpdCBiZWdhbiBsb2FkaW5nLiBCYWxhbmNlZCBieQotICAgIC8vIGRl Y3JlbWVudFJlcXVlc3RDb3VudCgpIGluIGZvbnRMb2FkaW5nVGltZXJGaXJlZCgpIGFuZCBpbiBj bGVhckRvY3VtZW50KCkuCisgICAgLy8gZGVjcmVtZW50UmVxdWVzdENvdW50KCkgaW4gZm9udExv YWRpbmdUaW1lckZpcmVkKCkgYW5kIGluIHN0b3BMb2FkaW5nQW5kQ2xlYXJGb250cygpLgogICAg IG1fZG9jdW1lbnQtPmNhY2hlZFJlc291cmNlTG9hZGVyKCkuaW5jcmVtZW50UmVxdWVzdENvdW50 KGZvbnQpOwogCiAgICAgaWYgKCFtX2lzRm9udExvYWRpbmdTdXNwZW5kZWQgJiYgIW1fZm9udExv YWRpbmdUaW1lci5pc0FjdGl2ZSgpKQpAQCAtNDE3LDcgKzQxNiw3IEBAIHZvaWQgQ1NTRm9udFNl bGVjdG9yOjpmb250TG9hZGluZ1RpbWVyRmlyZWQoKQogCiBzaXplX3QgQ1NTRm9udFNlbGVjdG9y OjpmYWxsYmFja0ZvbnRDb3VudCgpCiB7Ci0gICAgaWYgKCFtX2RvY3VtZW50KQorICAgIGlmICht X2lzU3RvcHBlZCkKICAgICAgICAgcmV0dXJuIDA7CiAKICAgICByZXR1cm4gbV9kb2N1bWVudC0+ c2V0dGluZ3MoKS5mb250RmFsbGJhY2tQcmVmZXJzUGljdG9ncmFwaHMoKSA/IDEgOiAwOwpAQCAt NDI3LDcgKzQyNiw3IEBAIFJlZlB0cjxGb250PiBDU1NGb250U2VsZWN0b3I6OmZhbGxiYWNrRm9u dEF0KGNvbnN0IEZvbnREZXNjcmlwdGlvbiYgZm9udERlc2NyaXB0CiB7CiAgICAgQVNTRVJUX1VO VVNFRChpbmRleCwgIWluZGV4KTsKIAotICAgIGlmICghbV9kb2N1bWVudCkKKyAgICBpZiAobV9p c1N0b3BwZWQpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCiAgICAgaWYgKCFtX2RvY3VtZW50 LT5zZXR0aW5ncygpLmZvbnRGYWxsYmFja1ByZWZlcnNQaWN0b2dyYXBocygpKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oIGIvU291cmNlL1dlYkNvcmUv Y3NzL0NTU0ZvbnRTZWxlY3Rvci5oCmluZGV4IGRhNDMxNzJkZTBmNC4uMTI3MzIzNGNkNDU5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NTRm9udFNlbGVjdG9yLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvY3NzL0NTU0ZvbnRTZWxlY3Rvci5oCkBAIC02Myw3ICs2Myw3IEBAIHB1Ymxp YzoKICAgICBzaXplX3QgZmFsbGJhY2tGb250Q291bnQoKSBmaW5hbDsKICAgICBSZWZQdHI8Rm9u dD4gZmFsbGJhY2tGb250QXQoY29uc3QgRm9udERlc2NyaXB0aW9uJiwgc2l6ZV90KSBmaW5hbDsK IAotICAgIHZvaWQgY2xlYXJEb2N1bWVudCgpOworICAgIHZvaWQgc3RvcExvYWRpbmdBbmRDbGVh ckZvbnRzKCk7CiAgICAgdm9pZCBlbXB0eUNhY2hlcygpOwogICAgIHZvaWQgYnVpbGRTdGFydGVk KCk7CiAgICAgdm9pZCBidWlsZENvbXBsZXRlZCgpOwpAQCAtMTM5LDYgKzEzOSw3IEBAIHByaXZh dGU6CiAgICAgdW5zaWduZWQgbV9jb21wdXRpbmdSb290U3R5bGVGb250Q291bnQgeyAwIH07CiAg ICAgYm9vbCBtX2NyZWF0aW5nRm9udCB7IGZhbHNlIH07CiAgICAgYm9vbCBtX2J1aWxkSXNVbmRl cndheSB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzU3RvcHBlZCB7IGZhbHNlIH07CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCA5MTc5MjU0 YTFlMDguLjMzM2YyOGE4YWExNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC03NTgsOCAr NzU4LDcgQEAgRG9jdW1lbnQ6On5Eb2N1bWVudCgpCiAgICAgZXh0ZW5zaW9uU3R5bGVTaGVldHMo KS5kZXRhY2hGcm9tRG9jdW1lbnQoKTsKIAogICAgIHN0eWxlU2NvcGUoKS5jbGVhclJlc29sdmVy KCk7IC8vIFdlIG5lZWQgdG8gZGVzdHJveSBDU1NGb250U2VsZWN0b3IgYmVmb3JlIGRlc3Ryb3lp bmcgbV9jYWNoZWRSZXNvdXJjZUxvYWRlci4KLSAgICBtX2ZvbnRTZWxlY3Rvci0+Y2xlYXJEb2N1 bWVudCgpOwotICAgIG1fZm9udFNlbGVjdG9yLT51bnJlZ2lzdGVyRm9ySW52YWxpZGF0aW9uQ2Fs bGJhY2tzKCp0aGlzKTsKKyAgICBtX2ZvbnRTZWxlY3Rvci0+c3RvcExvYWRpbmdBbmRDbGVhckZv bnRzKCk7CiAKICAgICAvLyBJdCdzIHBvc3NpYmxlIGZvciBtdWx0aXBsZSBEb2N1bWVudHMgdG8g ZW5kIHVwIHJlZmVyZW5jaW5nIHRoZSBzYW1lIENhY2hlZFJlc291cmNlTG9hZGVyIChlLmcuLCBT VkdJbWFnZXMKICAgICAvLyBsb2FkIHRoZSBpbml0aWFsIGVtcHR5IGRvY3VtZW50IGFuZCB0aGUg U1ZHRG9jdW1lbnQgd2l0aCB0aGUgc2FtZSBEb2N1bWVudExvYWRlcikuCkBAIC04MDcsOCArODA2 LDcgQEAgdm9pZCBEb2N1bWVudDo6cmVtb3ZlZExhc3RSZWYoKQogI2VuZGlmCiAgICAgICAgIG1f YXNzb2NpYXRlZEZvcm1Db250cm9scy5jbGVhcigpOwogCi0gICAgICAgIG1fZm9udFNlbGVjdG9y LT5jbGVhckRvY3VtZW50KCk7Ci0gICAgICAgIG1fZm9udFNlbGVjdG9yLT51bnJlZ2lzdGVyRm9y SW52YWxpZGF0aW9uQ2FsbGJhY2tzKCp0aGlzKTsKKyAgICAgICAgbV9mb250U2VsZWN0b3ItPnN0 b3BMb2FkaW5nQW5kQ2xlYXJGb250cygpOwogCiAgICAgICAgIGRldGFjaFBhcnNlcigpOwogCg==