112642 2013-03-18 17:21:52 -0700 Assertion in LegacyWebArchive::create() in editing tests 2014-11-12 12:07:49 -0800 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser rniwa darin enrica rniwa simon.fraser oldest_to_newest 857772 0 simon.fraser 2013-03-18 17:21:52 -0700 editing/deleting/paste-with-transparent-background-color.html sometimes asserts: http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK2%20(Tests)/r146140%20(7889)/results.html http://build.webkit.org/results/Apple%20MountainLion%20Debug%20WK2%20(Tests)/r146140%20(7889)/editing/deleting/paste-with-transparent-background-color-crash-log.txt ASSERTION FAILED: data /Volumes/Data/slave/mountainlion-debug/build/Source/WebCore/loader/archive/cf/LegacyWebArchive.cpp(269) : static PassRefPtr<WebCore::LegacyWebArchive> WebCore::LegacyWebArchive::create(const WebCore::KURL &, WebCore::SharedBuffer *) 1 0x10a39652a WebCore::LegacyWebArchive::create(WebCore::KURL const&, WebCore::SharedBuffer*) 2 0x10a4ecadc WebCore::Pasteboard::documentFragment(WebCore::Frame*, WTF::PassRefPtr<WebCore::Range>, bool, bool&) 3 0x1097ff5f4 WebCore::Editor::pasteWithPasteboard(WebCore::Pasteboard*, bool) 4 0x1097e5db9 WebCore::Editor::paste() 5 0x1097f9b91 WebCore::executePaste(WebCore::Frame*, WebCore::Event*, WebCore::EditorCommandSource, WTF::String const&) 6 0x1097f60c0 WebCore::Editor::Command::execute(WTF::String const&, WebCore::Event*) const 7 0x1095f7d2e WebCore::Document::execCommand(WTF::String const&, bool, WTF::String const&) 8 0x109e53266 WebCore::jsDocumentPrototypeFunctionExecCommand(JSC::ExecState*) 9 0x5e9083a01045 10 0x10833dc34 JSC::JITCode::execute(JSC::JSStack*, JSC::ExecState*, JSC::JSGlobalData*) 11 0x10833a6f8 JSC::Interpreter::execute(JSC::ProgramExecutable*, JSC::ExecState*, JSC::JSObject*) 12 0x1081a82f7 JSC::evaluate(JSC::ExecState*, JSC::SourceCode const&, JSC::JSValue, JSC::JSValue*) 13 0x10a02db02 WebCore::JSMainThreadExecState::evaluate(JSC::ExecState*, JSC::SourceCode const&, JSC::JSValue, JSC::JSValue*) 14 0x10a8bdc13 WebCore::ScriptController::evaluateInWorld(WebCore::ScriptSourceCode const&, WebCore::DOMWrapperWorld*) 15 0x10a8bdd64 WebCore::ScriptController::evaluate(WebCore::ScriptSourceCode const&) 16 0x10a8d5dfa WebCore::ScriptElement::executeScript(WebCore::ScriptSourceCode const&) 17 0x10a8d4b8d WebCore::ScriptElement::prepareScript(WTF::TextPosition const&, WebCore::ScriptElement::LegacyTypeSupport) 18 0x109b54d1e WebCore::HTMLScriptRunner::runScript(WebCore::Element*, WTF::TextPosition const&) 19 0x109b54af0 WebCore::HTMLScriptRunner::execute(WTF::PassRefPtr<WebCore::Element>, WTF::TextPosition const&) 20 0x109abb338 WebCore::HTMLDocumentParser::runScriptsForPausedTreeBuilder() 21 0x109abb44f WebCore::HTMLDocumentParser::canTakeNextToken(WebCore::HTMLDocumentParser::SynchronousMode, WebCore::PumpSession&) 22 0x109abab87 WebCore::HTMLDocumentParser::pumpTokenizer(WebCore::HTMLDocumentParser::SynchronousMode) 23 0x109aba610 WebCore::HTMLDocumentParser::pumpTokenizerIfPossible(WebCore::HTMLDocumentParser::SynchronousMode) 24 0x109abbb9c WebCore::HTMLDocumentParser::append(WTF::PassRefPtr<WTF::StringImpl>) 25 0x1095b5c9c WebCore::DecodedDataDocumentParser::appendBytes(WebCore::DocumentWriter*, char const*, unsigned long) 26 0x10968a733 WebCore::DocumentWriter::addData(char const*, unsigned long) 27 0x10964f357 WebCore::DocumentLoader::commitData(char const*, unsigned long) 28 0x106e6c1a1 WebKit::WebFrameLoaderClient::committedLoad(WebCore::DocumentLoader*, char const*, int) 29 0x10964fd80 WebCore::DocumentLoader::commitLoad(char const*, int) 30 0x10964eda0 WebCore::DocumentLoader::receivedData(char const*, int) 31 0x10a3b5c42 WebCore::MainResourceLoader::dataReceived(WebCore::CachedResource*, char const*, int) 858451 1 simon.fraser 2013-03-19 10:44:38 -0700 Also editing/pasteboard/5780697-1.html http://build.webkit.org/results/Apple%20Lion%20Debug%20WK2%20(Tests)/r146209%20(8187)/editing/pasteboard/5780697-1-crash-log.txt 859695 2 194113 rniwa 2013-03-20 13:57:18 -0700 Created attachment 194113 Fixes the bug 859699 3 194113 simon.fraser 2013-03-20 13:59:38 -0700 Comment on attachment 194113 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=194113&action=review > Source/WebCore/platform/mac/PasteboardMac.mm:482 > + return createFragmentFromMarkup(frame->document(), markupString, mainResource->url(), DisallowScriptingAndPluginContent); > + [markupString release]; return then release? 859704 4 194113 enrica 2013-03-20 14:04:33 -0700 Comment on attachment 194113 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=194113&action=review > Source/WebCore/ChangeLog:8 > + It's possible for clipboard to be overriden between the time we retrieve clipboard types and the time typo overwritten > Source/WebCore/platform/mac/PasteboardMac.mm:476 > + NSString *markupString = [[NSString alloc] initWithData:[mainResource->data()->createNSData() autorelease] encoding:NSUTF8StringEncoding]; Since you're refactoring the code, you could use RetainPtr and avoid the release. 859706 5 194116 rniwa 2013-03-20 14:05:15 -0700 Created attachment 194116 Fix that 859709 6 194116 enrica 2013-03-20 14:07:19 -0700 Comment on attachment 194116 Fix that View in context: https://bugs.webkit.org/attachment.cgi?id=194116&action=review Please fix the typo. > Source/WebCore/ChangeLog:8 > + It's possible for clipboard to be overriden between the time we retrieve clipboard types and the time typo overwritten. > Source/WebCore/platform/mac/PasteboardMac.mm:476 > + NSString *markupString = [[NSString alloc] initWithData:[mainResource->data()->createNSData() autorelease] encoding:NSUTF8StringEncoding]; You could have used RetainPtr here and avoid calling release. 859710 7 194116 simon.fraser 2013-03-20 14:09:07 -0700 Comment on attachment 194116 Fix that View in context: https://bugs.webkit.org/attachment.cgi?id=194116&action=review > Source/WebCore/platform/mac/PasteboardMac.mm:475 > + NSString *MIMEType = mainResource->mimeType(); > + if (!frame || !frame->document()) > + return 0; > + > + if (frame->loader()->client()->canShowMIMETypeAsHTML(MIMEType)) { Is this doing conversions between NSString* and String? >> Source/WebCore/platform/mac/PasteboardMac.mm:476 >> + NSString *markupString = [[NSString alloc] initWithData:[mainResource->data()->createNSData() autorelease] encoding:NSUTF8StringEncoding]; > > You could have used RetainPtr here and avoid calling release. There seems little point in avoiding a single autorelease here. 860005 8 rniwa 2013-03-20 21:38:32 -0700 Landed in http://trac.webkit.org/changeset/146389 and http://trac.webkit.org/changeset/146391. 1048212 9 ap 2014-11-12 12:07:49 -0800 The tests were still marked as crashing, will remove the expectations now. 194113 2013-03-20 13:57:18 -0700 2013-03-20 14:05:12 -0700 Fixes the bug bug-112642-20130320135309.patch text/plain 4688 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NjM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDEzLTAzLTIwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEFzc2VydGlvbiBpbiBMZWdhY3lX ZWJBcmNoaXZlOjpjcmVhdGUoKSBpbiBlZGl0aW5nIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI2NDIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCdzIHBvc3NpYmxlIGZvciBjbGlwYm9hcmQg dG8gYmUgb3ZlcnJpZGVuIGJldHdlZW4gdGhlIHRpbWUgd2UgcmV0cmlldmUgY2xpcGJvYXJkIHR5 cGVzIGFuZCB0aGUgdGltZQorICAgICAgICB3ZSBhY3R1YWxseSByZXRyaWV2ZSB0aGUgV2ViIGFy Y2hpdmUgYnVmZmVyLiBBZGQgYSBudWxsIGNoZWNrIHRvIHRha2UgdGhpcyBpbnRvIGFjY291bnQu CisKKyAgICAgICAgQWxzbyBleHRyYWN0ZWQgZnJhZ21lbnRGcm9tV2ViQXJjaGl2ZSBmb3IgY2xh cml0eS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAg ICAoV2ViQ29yZTo6ZnJhZ21lbnRGcm9tV2ViQXJjaGl2ZSk6IEV4dHJhY3RlZC4KKyAgICAgICAg KFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmRvY3VtZW50RnJhZ21lbnQpOgorCiAyMDEzLTAzLTIwICBF cmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIGZpeCBNYWMgcmVsZWFzZSBidWlsZC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9QYXN0ZWJvYXJkTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCShyZXZpc2lvbiAxNDYyOTApCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDYy LDYgKzQ2MiwzMiBAQCBzdGF0aWMgTlNVUkwqIHVuaXF1ZVVSTFdpdGhSZWxhdGl2ZVBhcnQoCiAg ICAgcmV0dXJuIFVSTDsKIH0KIAorc3RhdGljIFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4g ZnJhZ21lbnRGcm9tV2ViQXJjaGl2ZShGcmFtZSogZnJhbWUsIFBhc3NSZWZQdHI8TGVnYWN5V2Vi QXJjaGl2ZT4gY29yZUFyY2hpdmUpCit7CisgICAgUmVmUHRyPEFyY2hpdmVSZXNvdXJjZT4gbWFp blJlc291cmNlID0gY29yZUFyY2hpdmUtPm1haW5SZXNvdXJjZSgpOworICAgIGlmICghbWFpblJl c291cmNlKQorICAgICAgICByZXR1cm4gMDsKKworICAgIE5TU3RyaW5nICpNSU1FVHlwZSA9IG1h aW5SZXNvdXJjZS0+bWltZVR5cGUoKTsKKyAgICBpZiAoIWZyYW1lIHx8ICFmcmFtZS0+ZG9jdW1l bnQoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAoZnJhbWUtPmxvYWRlcigpLT5jbGll bnQoKS0+Y2FuU2hvd01JTUVUeXBlQXNIVE1MKE1JTUVUeXBlKSkgeworICAgICAgICBOU1N0cmlu ZyAqbWFya3VwU3RyaW5nID0gW1tOU1N0cmluZyBhbGxvY10gaW5pdFdpdGhEYXRhOlttYWluUmVz b3VyY2UtPmRhdGEoKS0+Y3JlYXRlTlNEYXRhKCkgYXV0b3JlbGVhc2VdIGVuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nXTsKKyAgICAgICAgLy8gRklYTUU6IHNlZW1zIHBvb3IgZm9ybSB0byBk byB0aGlzIGFzIGEgc2lkZSBlZmZlY3Qgb2YgZ2V0dGluZyBhIGRvY3VtZW50IGZyYWdtZW50Cisg ICAgICAgIGlmIChEb2N1bWVudExvYWRlciogbG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLT5kb2N1 bWVudExvYWRlcigpKQorICAgICAgICAgICAgbG9hZGVyLT5hZGRBbGxBcmNoaXZlUmVzb3VyY2Vz KGNvcmVBcmNoaXZlLmdldCgpKTsKKyAgICAgICAgCisgICAgICAgIHJldHVybiBjcmVhdGVGcmFn bWVudEZyb21NYXJrdXAoZnJhbWUtPmRvY3VtZW50KCksIG1hcmt1cFN0cmluZywgbWFpblJlc291 cmNlLT51cmwoKSwgRGlzYWxsb3dTY3JpcHRpbmdBbmRQbHVnaW5Db250ZW50KTsKKyAgICAgICAg W21hcmt1cFN0cmluZyByZWxlYXNlXTsKKyAgICB9CisKKyAgICBpZiAoTUlNRVR5cGVSZWdpc3Ry eTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKE1JTUVUeXBlKSkKKyAgICAgICAgcmV0dXJuIGRv Y3VtZW50RnJhZ21lbnRXaXRoSW1hZ2VSZXNvdXJjZShmcmFtZSwgbWFpblJlc291cmNlKTsKKwor ICAgIHJldHVybiAwOworfQorCiBQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+IFBhc3RlYm9h cmQ6OmRvY3VtZW50RnJhZ21lbnQoRnJhbWUqIGZyYW1lLCBQYXNzUmVmUHRyPFJhbmdlPiBjb250 ZXh0LCBib29sIGFsbG93UGxhaW5UZXh0LCBib29sJiBjaG9zZVBsYWluVGV4dCkKIHsKICAgICBW ZWN0b3I8U3RyaW5nPiB0eXBlczsKQEAgLTQ3MCwyOCArNDk2LDEzIEBAIFBhc3NSZWZQdHI8RG9j dW1lbnRGcmFnbWVudD4gUGFzdGVib2FyZDoKICAgICBjaG9zZVBsYWluVGV4dCA9IGZhbHNlOwog CiAgICAgaWYgKHR5cGVzLmNvbnRhaW5zKFdlYkFyY2hpdmVQYm9hcmRUeXBlKSkgewotICAgICAg ICBSZWZQdHI8TGVnYWN5V2ViQXJjaGl2ZT4gY29yZUFyY2hpdmUgPSBMZWdhY3lXZWJBcmNoaXZl OjpjcmVhdGUoS1VSTCgpLCBwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0cmF0ZWd5 KCktPmJ1ZmZlckZvclR5cGUoV2ViQXJjaGl2ZVBib2FyZFR5cGUsIG1fcGFzdGVib2FyZE5hbWUp LmdldCgpKTsKLSAgICAgICAgaWYgKGNvcmVBcmNoaXZlKSB7Ci0gICAgICAgICAgICBSZWZQdHI8 QXJjaGl2ZVJlc291cmNlPiBtYWluUmVzb3VyY2UgPSBjb3JlQXJjaGl2ZS0+bWFpblJlc291cmNl KCk7Ci0gICAgICAgICAgICBpZiAobWFpblJlc291cmNlKSB7Ci0gICAgICAgICAgICAgICAgTlNT dHJpbmcgKk1JTUVUeXBlID0gbWFpblJlc291cmNlLT5taW1lVHlwZSgpOwotICAgICAgICAgICAg ICAgIGlmICghZnJhbWUgfHwgIWZyYW1lLT5kb2N1bWVudCgpKQotICAgICAgICAgICAgICAgICAg ICByZXR1cm4gMDsKLSAgICAgICAgICAgICAgICBpZiAoZnJhbWUtPmxvYWRlcigpLT5jbGllbnQo KS0+Y2FuU2hvd01JTUVUeXBlQXNIVE1MKE1JTUVUeXBlKSkgewotICAgICAgICAgICAgICAgICAg ICBOU1N0cmluZyAqbWFya3VwU3RyaW5nID0gW1tOU1N0cmluZyBhbGxvY10gaW5pdFdpdGhEYXRh OlttYWluUmVzb3VyY2UtPmRhdGEoKS0+Y3JlYXRlTlNEYXRhKCkgYXV0b3JlbGVhc2VdIGVuY29k aW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXTsKLSAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6 IHNlZW1zIHBvb3IgZm9ybSB0byBkbyB0aGlzIGFzIGEgc2lkZSBlZmZlY3Qgb2YgZ2V0dGluZyBh IGRvY3VtZW50IGZyYWdtZW50Ci0gICAgICAgICAgICAgICAgICAgIGlmIChEb2N1bWVudExvYWRl ciogbG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLT5kb2N1bWVudExvYWRlcigpKQotICAgICAgICAg ICAgICAgICAgICAgICAgbG9hZGVyLT5hZGRBbGxBcmNoaXZlUmVzb3VyY2VzKGNvcmVBcmNoaXZl LmdldCgpKTsKLQotICAgICAgICAgICAgICAgICAgICBmcmFnbWVudCA9IGNyZWF0ZUZyYWdtZW50 RnJvbU1hcmt1cChmcmFtZS0+ZG9jdW1lbnQoKSwgbWFya3VwU3RyaW5nLCBtYWluUmVzb3VyY2Ut PnVybCgpLCBEaXNhbGxvd1NjcmlwdGluZ0FuZFBsdWdpbkNvbnRlbnQpOwotICAgICAgICAgICAg ICAgICAgICBbbWFya3VwU3RyaW5nIHJlbGVhc2VdOwotICAgICAgICAgICAgICAgIH0gZWxzZSBp ZiAoTUlNRVR5cGVSZWdpc3RyeTo6aXNTdXBwb3J0ZWRJbWFnZU1JTUVUeXBlKE1JTUVUeXBlKSkK LSAgICAgICAgICAgICAgICAgICBmcmFnbWVudCA9IGRvY3VtZW50RnJhZ21lbnRXaXRoSW1hZ2VS ZXNvdXJjZShmcmFtZSwgbWFpblJlc291cmNlKTsgICAgICAgICAgICAgICAgICAgIAorICAgICAg ICBpZiAoUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gd2ViQXJjaGl2ZUJ1ZmZlciA9IHBsYXRmb3JtU3Ry YXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+YnVmZmVyRm9yVHlwZShXZWJBcmNoaXZl UGJvYXJkVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSkpIHsKKyAgICAgICAgICAgIGlmIChSZWZQdHI8 TGVnYWN5V2ViQXJjaGl2ZT4gY29yZUFyY2hpdmUgPSBMZWdhY3lXZWJBcmNoaXZlOjpjcmVhdGUo S1VSTCgpLCB3ZWJBcmNoaXZlQnVmZmVyLmdldCgpKSkgeworICAgICAgICAgICAgICAgIGlmICgo ZnJhZ21lbnQgPSBmcmFnbWVudEZyb21XZWJBcmNoaXZlKGZyYW1lLCBjb3JlQXJjaGl2ZSkpKQor ICAgICAgICAgICAgICAgICAgICByZXR1cm4gZnJhZ21lbnQucmVsZWFzZSgpOwogICAgICAgICAg ICAgfQogICAgICAgICB9Ci0gICAgICAgIGlmIChmcmFnbWVudCkKLSAgICAgICAgICAgIHJldHVy biBmcmFnbWVudC5yZWxlYXNlKCk7Ci0gICAgfSAKKyAgICB9CiAKICAgICBpZiAodHlwZXMuY29u dGFpbnMoU3RyaW5nKE5TRmlsZW5hbWVzUGJvYXJkVHlwZSkpKSB7CiAgICAgICAgIFZlY3RvcjxT dHJpbmc+IHBhdGhzOwo= 194116 2013-03-20 14:05:15 -0700 2013-03-20 14:09:07 -0700 Fix that bug-112642-20130320140106.patch text/plain 4735 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NjM4NSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE5IEBACisyMDExLTAzLTIwICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEFzc2VydGlvbiBpbiBMZWdhY3lX ZWJBcmNoaXZlOjpjcmVhdGUoKSBpbiBlZGl0aW5nIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTI2NDIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJdCdzIHBvc3NpYmxlIGZvciBjbGlwYm9hcmQg dG8gYmUgb3ZlcnJpZGVuIGJldHdlZW4gdGhlIHRpbWUgd2UgcmV0cmlldmUgY2xpcGJvYXJkIHR5 cGVzIGFuZCB0aGUgdGltZQorICAgICAgICB3ZSBhY3R1YWxseSByZXRyaWV2ZSB0aGUgV2ViIGFy Y2hpdmUgYnVmZmVyLiBBZGQgYSBudWxsIGNoZWNrIHRvIHRha2UgdGhpcyBpbnRvIGFjY291bnQu CisKKyAgICAgICAgQWxzbyBleHRyYWN0ZWQgZnJhZ21lbnRGcm9tV2ViQXJjaGl2ZSBmb3IgY2xh cml0eS4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tOgorICAgICAg ICAoV2ViQ29yZTo6ZnJhZ21lbnRGcm9tV2ViQXJjaGl2ZSk6IEV4dHJhY3RlZC4KKyAgICAgICAg KFdlYkNvcmU6OlBhc3RlYm9hcmQ6OmRvY3VtZW50RnJhZ21lbnQpOgorCiAyMDEzLTAzLTIwICBF cmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQsIGZpeCBNYWMgcmVsZWFzZSBidWlsZC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L21hYy9QYXN0ZWJvYXJkTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9QYXN0ZWJvYXJkTWFjLm1tCShyZXZpc2lvbiAxNDYyOTApCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9tYWMvUGFzdGVib2FyZE1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDYy LDYgKzQ2MiwzMyBAQCBzdGF0aWMgTlNVUkwqIHVuaXF1ZVVSTFdpdGhSZWxhdGl2ZVBhcnQoCiAg ICAgcmV0dXJuIFVSTDsKIH0KIAorc3RhdGljIFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4g ZnJhZ21lbnRGcm9tV2ViQXJjaGl2ZShGcmFtZSogZnJhbWUsIFBhc3NSZWZQdHI8TGVnYWN5V2Vi QXJjaGl2ZT4gY29yZUFyY2hpdmUpCit7CisgICAgUmVmUHRyPEFyY2hpdmVSZXNvdXJjZT4gbWFp blJlc291cmNlID0gY29yZUFyY2hpdmUtPm1haW5SZXNvdXJjZSgpOworICAgIGlmICghbWFpblJl c291cmNlKQorICAgICAgICByZXR1cm4gMDsKKworICAgIE5TU3RyaW5nICpNSU1FVHlwZSA9IG1h aW5SZXNvdXJjZS0+bWltZVR5cGUoKTsKKyAgICBpZiAoIWZyYW1lIHx8ICFmcmFtZS0+ZG9jdW1l bnQoKSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAoZnJhbWUtPmxvYWRlcigpLT5jbGll bnQoKS0+Y2FuU2hvd01JTUVUeXBlQXNIVE1MKE1JTUVUeXBlKSkgeworICAgICAgICBOU1N0cmlu ZyAqbWFya3VwU3RyaW5nID0gW1tOU1N0cmluZyBhbGxvY10gaW5pdFdpdGhEYXRhOlttYWluUmVz b3VyY2UtPmRhdGEoKS0+Y3JlYXRlTlNEYXRhKCkgYXV0b3JlbGVhc2VdIGVuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nXTsKKyAgICAgICAgLy8gRklYTUU6IHNlZW1zIHBvb3IgZm9ybSB0byBk byB0aGlzIGFzIGEgc2lkZSBlZmZlY3Qgb2YgZ2V0dGluZyBhIGRvY3VtZW50IGZyYWdtZW50Cisg ICAgICAgIGlmIChEb2N1bWVudExvYWRlciogbG9hZGVyID0gZnJhbWUtPmxvYWRlcigpLT5kb2N1 bWVudExvYWRlcigpKQorICAgICAgICAgICAgbG9hZGVyLT5hZGRBbGxBcmNoaXZlUmVzb3VyY2Vz KGNvcmVBcmNoaXZlLmdldCgpKTsKKworICAgICAgICBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4g ZnJhZ21lbnQgPSBjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAoZnJhbWUtPmRvY3VtZW50KCksIG1h cmt1cFN0cmluZywgbWFpblJlc291cmNlLT51cmwoKSwgRGlzYWxsb3dTY3JpcHRpbmdBbmRQbHVn aW5Db250ZW50KTsKKyAgICAgICAgW21hcmt1cFN0cmluZyByZWxlYXNlXTsKKyAgICAgICAgcmV0 dXJuIGZyYWdtZW50OworICAgIH0KKworICAgIGlmIChNSU1FVHlwZVJlZ2lzdHJ5Ojppc1N1cHBv cnRlZEltYWdlTUlNRVR5cGUoTUlNRVR5cGUpKQorICAgICAgICByZXR1cm4gZG9jdW1lbnRGcmFn bWVudFdpdGhJbWFnZVJlc291cmNlKGZyYW1lLCBtYWluUmVzb3VyY2UpOworCisgICAgcmV0dXJu IDA7Cit9CisKIFBhc3NSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gUGFzdGVib2FyZDo6ZG9jdW1l bnRGcmFnbWVudChGcmFtZSogZnJhbWUsIFBhc3NSZWZQdHI8UmFuZ2U+IGNvbnRleHQsIGJvb2wg YWxsb3dQbGFpblRleHQsIGJvb2wmIGNob3NlUGxhaW5UZXh0KQogewogICAgIFZlY3RvcjxTdHJp bmc+IHR5cGVzOwpAQCAtNDcwLDI4ICs0OTcsMTMgQEAgUGFzc1JlZlB0cjxEb2N1bWVudEZyYWdt ZW50PiBQYXN0ZWJvYXJkOgogICAgIGNob3NlUGxhaW5UZXh0ID0gZmFsc2U7CiAKICAgICBpZiAo dHlwZXMuY29udGFpbnMoV2ViQXJjaGl2ZVBib2FyZFR5cGUpKSB7Ci0gICAgICAgIFJlZlB0cjxM ZWdhY3lXZWJBcmNoaXZlPiBjb3JlQXJjaGl2ZSA9IExlZ2FjeVdlYkFyY2hpdmU6OmNyZWF0ZShL VVJMKCksIHBsYXRmb3JtU3RyYXRlZ2llcygpLT5wYXN0ZWJvYXJkU3RyYXRlZ3koKS0+YnVmZmVy Rm9yVHlwZShXZWJBcmNoaXZlUGJvYXJkVHlwZSwgbV9wYXN0ZWJvYXJkTmFtZSkuZ2V0KCkpOwot ICAgICAgICBpZiAoY29yZUFyY2hpdmUpIHsKLSAgICAgICAgICAgIFJlZlB0cjxBcmNoaXZlUmVz b3VyY2U+IG1haW5SZXNvdXJjZSA9IGNvcmVBcmNoaXZlLT5tYWluUmVzb3VyY2UoKTsKLSAgICAg ICAgICAgIGlmIChtYWluUmVzb3VyY2UpIHsKLSAgICAgICAgICAgICAgICBOU1N0cmluZyAqTUlN RVR5cGUgPSBtYWluUmVzb3VyY2UtPm1pbWVUeXBlKCk7Ci0gICAgICAgICAgICAgICAgaWYgKCFm cmFtZSB8fCAhZnJhbWUtPmRvY3VtZW50KCkpCi0gICAgICAgICAgICAgICAgICAgIHJldHVybiAw OwotICAgICAgICAgICAgICAgIGlmIChmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT5jYW5TaG93 TUlNRVR5cGVBc0hUTUwoTUlNRVR5cGUpKSB7Ci0gICAgICAgICAgICAgICAgICAgIE5TU3RyaW5n ICptYXJrdXBTdHJpbmcgPSBbW05TU3RyaW5nIGFsbG9jXSBpbml0V2l0aERhdGE6W21haW5SZXNv dXJjZS0+ZGF0YSgpLT5jcmVhdGVOU0RhdGEoKSBhdXRvcmVsZWFzZV0gZW5jb2Rpbmc6TlNVVEY4 U3RyaW5nRW5jb2RpbmddOwotICAgICAgICAgICAgICAgICAgICAvLyBGSVhNRTogc2VlbXMgcG9v ciBmb3JtIHRvIGRvIHRoaXMgYXMgYSBzaWRlIGVmZmVjdCBvZiBnZXR0aW5nIGEgZG9jdW1lbnQg ZnJhZ21lbnQKLSAgICAgICAgICAgICAgICAgICAgaWYgKERvY3VtZW50TG9hZGVyKiBsb2FkZXIg PSBmcmFtZS0+bG9hZGVyKCktPmRvY3VtZW50TG9hZGVyKCkpCi0gICAgICAgICAgICAgICAgICAg ICAgICBsb2FkZXItPmFkZEFsbEFyY2hpdmVSZXNvdXJjZXMoY29yZUFyY2hpdmUuZ2V0KCkpOwot Ci0gICAgICAgICAgICAgICAgICAgIGZyYWdtZW50ID0gY3JlYXRlRnJhZ21lbnRGcm9tTWFya3Vw KGZyYW1lLT5kb2N1bWVudCgpLCBtYXJrdXBTdHJpbmcsIG1haW5SZXNvdXJjZS0+dXJsKCksIERp c2FsbG93U2NyaXB0aW5nQW5kUGx1Z2luQ29udGVudCk7Ci0gICAgICAgICAgICAgICAgICAgIFtt YXJrdXBTdHJpbmcgcmVsZWFzZV07Ci0gICAgICAgICAgICAgICAgfSBlbHNlIGlmIChNSU1FVHlw ZVJlZ2lzdHJ5Ojppc1N1cHBvcnRlZEltYWdlTUlNRVR5cGUoTUlNRVR5cGUpKQotICAgICAgICAg ICAgICAgICAgIGZyYWdtZW50ID0gZG9jdW1lbnRGcmFnbWVudFdpdGhJbWFnZVJlc291cmNlKGZy YW1lLCBtYWluUmVzb3VyY2UpOyAgICAgICAgICAgICAgICAgICAgCisgICAgICAgIGlmIChSZWZQ dHI8U2hhcmVkQnVmZmVyPiB3ZWJBcmNoaXZlQnVmZmVyID0gcGxhdGZvcm1TdHJhdGVnaWVzKCkt PnBhc3RlYm9hcmRTdHJhdGVneSgpLT5idWZmZXJGb3JUeXBlKFdlYkFyY2hpdmVQYm9hcmRUeXBl LCBtX3Bhc3RlYm9hcmROYW1lKSkgeworICAgICAgICAgICAgaWYgKFJlZlB0cjxMZWdhY3lXZWJB cmNoaXZlPiBjb3JlQXJjaGl2ZSA9IExlZ2FjeVdlYkFyY2hpdmU6OmNyZWF0ZShLVVJMKCksIHdl YkFyY2hpdmVCdWZmZXIuZ2V0KCkpKSB7CisgICAgICAgICAgICAgICAgaWYgKChmcmFnbWVudCA9 IGZyYWdtZW50RnJvbVdlYkFyY2hpdmUoZnJhbWUsIGNvcmVBcmNoaXZlKSkpCisgICAgICAgICAg ICAgICAgICAgIHJldHVybiBmcmFnbWVudC5yZWxlYXNlKCk7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KLSAgICAgICAgaWYgKGZyYWdtZW50KQotICAgICAgICAgICAgcmV0dXJuIGZyYWdtZW50 LnJlbGVhc2UoKTsKLSAgICB9IAorICAgIH0KIAogICAgIGlmICh0eXBlcy5jb250YWlucyhTdHJp bmcoTlNGaWxlbmFtZXNQYm9hcmRUeXBlKSkpIHsKICAgICAgICAgVmVjdG9yPFN0cmluZz4gcGF0 aHM7Cg==