70168 2011-10-14 22:45:12 -0700 Calling WKPageLoadAlternateHTMLString() where baseURL does not point to a directory causes an invalid message to be returned from WebProcess 2011-10-17 11:01:24 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 adachan adachan ap oldest_to_newest 484468 0 adachan 2011-10-14 22:45:12 -0700 Calling WKPageLoadAlternateHTMLString() where baseURL does not point to a directory causes an invalid message to be returned from WebProcess, which then terminates the WebProcess. In WebPageProxy::loadAlternateHTMLString(), it calls WebProcessProxy::assumeReadAccessToBaseURL() which adds the baseURL argument to the list of local directories that have read access (m_localPathsWithAssumedReadAccess). But if that URL actually points to a file, we just add its file path to that list without removing its last path component. So any subresource that's in the same folder as that file will fail the URL check in WebProcessProxy::checkURLReceivedFromWebProcess() during load because it does not reside in any directories specified in m_localPathsWithAssumedReadAccess. If the URL check fails, the message ends up being marked as invalid, causing the WebProcess to terminate. One possible fix is in WebProcessProxy::assumeReadAccessToBaseURL(), we can get the base URL of the passed in URL, and then add its path to m_localPathsWithAssumedReadAccess. If the passed in URL is a directory, the behavior remains the same. If the URL points to a file though, we'll add the path to the containing directory to m_localPathsWithAssumedReadAccess instead. 484470 1 adachan 2011-10-14 22:46:35 -0700 <rdar://problem/10289392> 484476 2 ap 2011-10-14 22:56:08 -0700 > If the passed in URL is a directory, the behavior remains the same. If the URL points to a file though, we'll add the path to the containing directory to m_localPathsWithAssumedReadAccess instead. That would match the behavior of HTML <base> tag, and thus makes good sense to me. 484482 3 adachan 2011-10-14 23:01:04 -0700 > In WebPageProxy::loadAlternateHTMLString(), it calls WebProcessProxy::assumeReadAccessToBaseURL() which adds the baseURL argument to the list of local directories that have read access I meant the *urlString* argument. 484490 4 111126 adachan 2011-10-14 23:09:40 -0700 Created attachment 111126 Patch 484515 5 111126 ap 2011-10-15 00:08:13 -0700 Comment on attachment 111126 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111126&action=review > Source/WebCore/ChangeLog:8 > + No new tests. (OOPS!) The patch cannot be landed with this line. > Source/WebCore/ChangeLog:10 > + * WebCore.exp.in: Please describe what's changed. 485285 6 adachan 2011-10-17 11:01:24 -0700 (In reply to comment #5) > (From update of attachment 111126 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=111126&action=review > > > Source/WebCore/ChangeLog:8 > > + No new tests. (OOPS!) > > The patch cannot be landed with this line. Fixed. > > > Source/WebCore/ChangeLog:10 > > + * WebCore.exp.in: > > Please describe what's changed. Fixed. Thanks for reviewing! Patch has been landed: http://trac.webkit.org/changeset/97633 111126 2011-10-14 23:09:40 -0700 2011-10-15 00:08:13 -0700 Patch 70168.patch.txt text/plain 11569 adachan SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NTM4KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTEtMTAtMTQgIEFkYSBDaGFu ICA8YWRhY2hhbkBhcHBsZS5jb20+CisKKyAgICAgICAgRXhwb3J0IEtVUkw6OmJhc2VBc1N0cmlu ZygpIHNvIGl0IGNhbiBiZSBjYWxsZWQgaW4gV2ViUHJvY2Vzc1Byb3h5Ojphc3N1bWVSZWFkQWNj ZXNzVG9CYXNlVVJMKCkgaW4gV2ViS2l0Mi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTcwMTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLiAoT09QUyEpCisKKyAgICAgICAgKiBXZWJD b3JlLmV4cC5pbjoKKwogMjAxMS0xMC0xNCAgRGF2aWQgS2lsemVyICA8ZGRraWx6ZXJAYXBwbGUu Y29tPgogCiAgICAgICAgIDxodHRwOi8vd2Via2l0Lm9yZy9iLzcwMTU4PiBGaXggY2xhbmcgY29t cGlsZXIgd2FybmluZ3MKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCShyZXZpc2lvbiA5NzUwNykK KysrIFNvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluCSh3b3JraW5nIGNvcHkpCkBAIC0xMjc0 LDYgKzEyNzQsNyBAQCBfX1pOSzdXZWJDb3JlNEZvbnQ4ZHJhd1RleHRFUE5TXzE1R3JhcGhpCiBf X1pOSzdXZWJDb3JlNEtVUkwxMHByb3RvY29sSXNFUEtjCiBfX1pOSzdXZWJDb3JlNEtVUkwxMWNy ZWF0ZUNGVVJMRXYKIF9fWk5LN1dlYkNvcmU0S1VSTDExaXNMb2NhbEZpbGVFdgorX19aTks3V2Vi Q29yZTRLVVJMMTJiYXNlQXNTdHJpbmdFdgogX19aTks3V2ViQ29yZTRLVVJMMTRmaWxlU3lzdGVt UGF0aEV2CiBfX1pOSzdXZWJDb3JlNEtVUkwxN2xhc3RQYXRoQ29tcG9uZW50RXYKIF9fWk5LN1dl YkNvcmU0S1VSTDRob3N0RXYKSW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDk3NTM4KQorKysgU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIw MTEtMTAtMTQgIEFkYSBDaGFuICA8YWRhY2hhbkBhcHBsZS5jb20+CisKKyAgICAgICAgQ2FsbGlu ZyBXS1BhZ2VMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZygpIHdoZXJlIGJhc2VVUkwgZG9lcyBub3Qg cG9pbnQgdG8gYSBkaXJlY3RvcnkgY2F1c2VzIGFuIGludmFsaWQgbWVzc2FnZSB0byBiZSByZXR1 cm5lZCBmcm9tIFdlYlByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTcwMTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc1Byb3h5Ojphc3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKTogQWRkIHRo ZSBmaWxlIHBhdGggb2YgdXJsJ3MgYmFzZSBVUkwgdG8gbV9sb2NhbFBhdGhzV2l0aEFzc3VtZWRS ZWFkQWNjZXNzLAorICAgICAgICBzaW5jZSB1cmwgbWF5IG5vdCBwb2ludCB0byBhIGRpcmVjdG9y eS4KKwogMjAxMS0xMC0xNCAgTWFyayBIYWhuZW5iZXJnICA8bWhhaG5lbmJlcmdAYXBwbGUuY29t PgogCiAgICAgICAgIFJlbmFtZSBnZXRPd25Qcm9wZXJ0eVNsb3QgdG8gZ2V0T3duUHJvcGVydHlT bG90VmlydHVhbApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ cm94eS5jcHAJKHJldmlzaW9uIDk3NTA3KQorKysgU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIwOSw5ICsyMDksMTMgQEAgdm9p ZCBXZWJQcm9jZXNzUHJveHk6OmFzc3VtZVJlYWRBY2Nlc3NUbwogICAgIGlmICghdXJsLmlzTG9j YWxGaWxlKCkpCiAgICAgICAgIHJldHVybjsKIAorICAgIC8vIFRoZXJlJ3MgYSBjaGFuY2UgdGhh dCB1cmxTdHJpbmcgZG9lcyBub3QgcG9pbnQgdG8gYSBkaXJlY3RvcnkuCisgICAgLy8gR2V0IHVy bCdzIGJhc2UgVVJMIHRvIGFkZCB0byBtX2xvY2FsUGF0aHNXaXRoQXNzdW1lZFJlYWRBY2Nlc3Mu CisgICAgS1VSTCBiYXNlVVJMKEtVUkwoKSwgdXJsLmJhc2VBc1N0cmluZygpKTsKKyAgICAKICAg ICAvLyBDbGllbnQgbG9hZHMgYW4gYWx0ZXJuYXRlIHN0cmluZy4gVGhpcyBkb2Vzbid0IGdyYW50 IHVuaXZlcnNhbCBmaWxlIHJlYWQsIGJ1dCB0aGUgd2ViIHByb2Nlc3MgaXMgYXNzdW1lZAogICAg IC8vIHRvIGhhdmUgcmVhZCBhY2Nlc3MgdG8gdGhpcyBkaXJlY3RvcnkgYWxyZWFkeS4KLSAgICBt X2xvY2FsUGF0aHNXaXRoQXNzdW1lZFJlYWRBY2Nlc3MuYWRkKHVybC5maWxlU3lzdGVtUGF0aCgp KTsKKyAgICBtX2xvY2FsUGF0aHNXaXRoQXNzdW1lZFJlYWRBY2Nlc3MuYWRkKGJhc2VVUkwuZmls ZVN5c3RlbVBhdGgoKSk7CiB9CiAKIGJvb2wgV2ViUHJvY2Vzc1Byb3h5OjpjaGVja1VSTFJlY2Vp dmVkRnJvbVdlYlByb2Nlc3MoY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcpCkluZGV4OiBUb29scy9D aGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lvbiA5NzUzOCkK KysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDEx LTEwLTE0ICBBZGEgQ2hhbiAgPGFkYWNoYW5AYXBwbGUuY29tPgorCisgICAgICAgIEFkZCBhIHRl c3QgdG8gY2FsbCBXS1BhZ2VMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZygpIHdpdGggYSBub24tZGly ZWN0b3J5IFVSTC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTcwMTY4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmdX aXRoTm9uRGlyZWN0b3J5VVJMLmNwcDogQWRkZWQuCisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpk aWRGaW5pc2hMb2FkRm9yRnJhbWUpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6IENh bGwgV0tQYWdlTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcoKSB3aXRoIGEgZmlsZSBVUkwgYW5kIG1h a2Ugc3VyZSBpdCBmaW5pc2hlcyBsb2FkaW5nLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9U ZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAgICogVGVzdFdl YktpdEFQSS93aW4vVGVzdFdlYktpdEFQSS52Y3Byb2o6CisgICAgICAgIEFkZCB0aGUgbmV3IGZp bGUuCisKIDIwMTEtMTAtMTQgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAg ICAgICBIaWRlIHN0YXR1cyBidWJibGVzIGZyb20gcXVldWVzIHdoaWNoIGFyZSB2ZXJ5IGZhciBi ZWhpbmQKSW5kZXg6IFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdl YktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCShyZXZpc2lvbiA5NzUwNykKKysrIFRv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9q CSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAJCTRCRkRGRkE5MTMxNDc3NzcwMDYx RjI0QiAvKiBIaXRUZXN0UmVzdWx0Tm9kZUhhbmRsZS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0QkZERkZBODEzMTQ3Nzc3MDA2MUYyNEIgLyogSGl0 VGVzdFJlc3VsdE5vZGVIYW5kbGUuY3BwICovOyB9OwogCQk1MjBCQ0Y0QzE0MUVCMDlFMDA5MzdF QTggLyogV2ViQXJjaGl2ZV9CdW5kbGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gNTIwQkNGNEExNDFFQjA5RTAwOTM3RUE4IC8qIFdlYkFyY2hpdmVf QnVuZGxlLmNwcCAqLzsgfTsKIAkJNTIwQkNGNEQxNDFFQjA5RTAwOTM3RUE4IC8qIFdlYkFyY2hp dmUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNTIw QkNGNEIxNDFFQjA5RTAwOTM3RUE4IC8qIFdlYkFyY2hpdmUuY3BwICovOyB9OworCQk1MkNCNDc0 MTE0NDhGQjkzMDA4NzM5OTUgLyogTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmdXaXRoTm9uRGlyZWN0 b3J5VVJMLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDUyQ0I0NzQwMTQ0OEZCOTMwMDg3Mzk5NSAvKiBMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZ1dpdGhO b25EaXJlY3RvcnlVUkwuY3BwICovOyB9OwogCQk4MUI1MDE5MzE0MEYyMzIzMDBEOUVCNTggLyog U3RyaW5nQnVpbGRlci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSA4MUI1MDE5MjE0MEYyMzIzMDBEOUVCNTggLyogU3RyaW5nQnVpbGRlci5jcHAgKi87 IH07CiAJCTkzOUJBOTE3MTQxMDM0MTIwMDFBMDFCRCAvKiBEZXZpY2VTY2FsZUZhY3Rvck9uQmFj ay5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkzOUJB OTE2MTQxMDM0MTIwMDFBMDFCRCAvKiBEZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5tbSAqLzsgfTsK IAkJQTdBOTY2REIxNDBFQ0NDODAwNUVGOUI0IC8qIENoZWNrZWRBcml0aG1ldGljT3BlcmF0aW9u cy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBN0E5 NjZEQTE0MEVDQ0M4MDA1RUY5QjQgLyogQ2hlY2tlZEFyaXRobWV0aWNPcGVyYXRpb25zLmNwcCAq LzsgfTsKQEAgLTE2Miw2ICsxNjMsNyBAQAogCQk0QkZERkZBODEzMTQ3Nzc3MDA2MUYyNEIgLyog SGl0VGVzdFJlc3VsdE5vZGVIYW5kbGUuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3Bw OyBwYXRoID0gSGl0VGVzdFJlc3VsdE5vZGVIYW5kbGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91 cD4iOyB9OwogCQk1MjBCQ0Y0QTE0MUVCMDlFMDA5MzdFQTggLyogV2ViQXJjaGl2ZV9CdW5kbGUu Y3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gV2ViQXJjaGl2ZV9CdW5k bGUuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1MjBCQ0Y0QjE0MUVCMDlFMDA5 MzdFQTggLyogV2ViQXJjaGl2ZS5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBh dGggPSBXZWJBcmNoaXZlLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNTJDQjQ3 NDAxNDQ4RkI5MzAwODczOTk1IC8qIExvYWRBbHRlcm5hdGVIVE1MU3RyaW5nV2l0aE5vbkRpcmVj dG9yeVVSTC5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBMb2FkQWx0 ZXJuYXRlSFRNTFN0cmluZ1dpdGhOb25EaXJlY3RvcnlVUkwuY3BwOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OwogCQk4MUI1MDE5MjE0MEYyMzIzMDBEOUVCNTggLyogU3RyaW5nQnVpbGRlci5j cHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IG5hbWUgPSBTdHJpbmdCdWlsZGVyLmNw cDsgcGF0aCA9IFdURi9TdHJpbmdCdWlsZGVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+Ijsg fTsKIAkJOERENzZGQTEwNDg2QUE3NjAwRDk2QjVFIC8qIFRlc3RXZWJLaXRBUEkgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZXhwbGljaXRGaWxlVHlwZSA9ICJjb21waWxlZC5tYWNoLW8u ZXhlY3V0YWJsZSI7IGluY2x1ZGVJbkluZGV4ID0gMDsgcGF0aCA9IFRlc3RXZWJLaXRBUEk7IHNv dXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTkzOUJBOTE2MTQxMDM0MTIwMDFB MDFCRCAvKiBEZXZpY2VTY2FsZUZhY3Rvck9uQmFjay5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLm9iamNwcDsgcGF0aCA9IERldmljZVNjYWxlRmFjdG9yT25CYWNrLm1tOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwpAQCAtMzYzLDYgKzM2NSw3IEBACiAJCQkJNEJGREZGQTYxMzE0Nzc2 QzAwNjFGMjRCIC8qIEhpdFRlc3RSZXN1bHROb2RlSGFuZGxlX0J1bmRsZS5jcHAgKi8sCiAJCQkJ QkM1NzVBQUMxMjZFODNCOTAwNkYwRjEyIC8qIEluamVjdGVkQnVuZGxlQmFzaWMuY3BwICovLAog CQkJCUJDNTc1QUFGMTI2RTgzQzgwMDZGMEYxMiAvKiBJbmplY3RlZEJ1bmRsZUJhc2ljX0J1bmRs ZS5jcHAgKi8sCisJCQkJNTJDQjQ3NDAxNDQ4RkI5MzAwODczOTk1IC8qIExvYWRBbHRlcm5hdGVI VE1MU3RyaW5nV2l0aE5vbkRpcmVjdG9yeVVSTC5jcHAgKi8sCiAJCQkJMzNEQzg5MTAxNDE5NTNB MzAwNzQ3RUY3IC8qIExvYWRDYW5jZWxlZE5vU2VydmVyUmVkaXJlY3RDYWxsYmFjay5jcHAgKi8s CiAJCQkJMzNEQzg5MTMxNDE5NTc5RjAwNzQ3RUY3IC8qIExvYWRDYW5jZWxlZE5vU2VydmVyUmVk aXJlY3RDYWxsYmFja19CdW5kbGUuY3BwICovLAogCQkJCTMzQkU1QUY0MTM3QjVBNkMwMDcwNTgx MyAvKiBNb3VzZU1vdmVBZnRlckNyYXNoLmNwcCAqLywKQEAgLTYyMSw2ICs2MjQsNyBAQAogCQkJ CTUyMEJDRjREMTQxRUIwOUUwMDkzN0VBOCAvKiBXZWJBcmNoaXZlLmNwcCBpbiBTb3VyY2VzICov LAogCQkJCUY2RkREREQzMTQyNDFBRDQwMDRGMTcyOSAvKiBQcml2YXRlQnJvd3NpbmdQdXNoU3Rh dGVOb0hpc3RvcnlDYWxsYmFjay5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlDMDk5MUM1MTE0M0M3 RDY4MDA3OTk4RjIgLyogUmV0YWluUHRySGFzaGluZy5jcHAgaW4gU291cmNlcyAqLywKKwkJCQk1 MkNCNDc0MTE0NDhGQjkzMDA4NzM5OTUgLyogTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmdXaXRoTm9u RGlyZWN0b3J5VVJMLmNwcCBpbiBTb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBs b3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQl9OwpJbmRleDogVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQyL0xvYWRBbHRlcm5hdGVIVE1MU3RyaW5nV2l0aE5vbkRpcmVjdG9yeVVS TC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyL0xv YWRBbHRlcm5hdGVIVE1MU3RyaW5nV2l0aE5vbkRpcmVjdG9yeVVSTC5jcHAJKHJldmlzaW9uIDAp CisrKyBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDIvTG9hZEFsdGVybmF0ZUhUTUxT dHJpbmdXaXRoTm9uRGlyZWN0b3J5VVJMLmNwcAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSw2NiBA QAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJv dmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBS ZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHly aWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxv d2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11 c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJ TkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9S IElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBU SEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1Ig QSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFM TCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NV UkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1Ig T1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJKYXZhU2NyaXB0 VGVzdC5oIgorI2luY2x1ZGUgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCisjaW5jbHVkZSAiUGxhdGZv cm1XZWJWaWV3LmgiCisKKyNpbmNsdWRlIDxXZWJLaXQyL1dLQ29udGV4dC5oPgorI2luY2x1ZGUg PFdlYktpdDIvV0tQYWdlLmg+CisjaW5jbHVkZSA8V2ViS2l0Mi9XS1JldGFpblB0ci5oPgorCitu YW1lc3BhY2UgVGVzdFdlYktpdEFQSSB7CisgICAgCitzdGF0aWMgYm9vbCBkaWRGaW5pc2hMb2Fk ID0gZmFsc2U7CisgICAgCitzdGF0aWMgdm9pZCBkaWRGaW5pc2hMb2FkRm9yRnJhbWUoV0tQYWdl UmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9p ZCogY2xpZW50SW5mbykKK3sKKyAgICBkaWRGaW5pc2hMb2FkID0gdHJ1ZTsKK30KKworVEVTVChX ZWJLaXQyLCBMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZ1dpdGhOb25EaXJlY3RvcnlVUkwpCit7Cisg ICAgV0tSZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBjb250ZXh0KEFkb3B0V0ssIFdLQ29udGV4dENy ZWF0ZSgpKTsKKyAgICBQbGF0Zm9ybVdlYlZpZXcgd2ViVmlldyhjb250ZXh0LmdldCgpKTsKKwor ICAgIFdLUGFnZUxvYWRlckNsaWVudCBsb2FkZXJDbGllbnQ7CisgICAgbWVtc2V0KCZsb2FkZXJD bGllbnQsIDAsIHNpemVvZihsb2FkZXJDbGllbnQpKTsKKyAgICAKKyAgICBsb2FkZXJDbGllbnQu dmVyc2lvbiA9IDA7CisgICAgbG9hZGVyQ2xpZW50LmRpZEZpbmlzaExvYWRGb3JGcmFtZSA9IGRp ZEZpbmlzaExvYWRGb3JGcmFtZTsKKyAgICBXS1BhZ2VTZXRQYWdlTG9hZGVyQ2xpZW50KHdlYlZp ZXcucGFnZSgpLCAmbG9hZGVyQ2xpZW50KTsKKworICAgIFdLUmV0YWluUHRyPFdLVVJMUmVmPiBm aWxlVVJMKEFkb3B0V0ssIFV0aWw6OmNyZWF0ZVVSTEZvclJlc291cmNlKCJzaW1wbGUiLCAiaHRt bCIpKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gYWx0ZXJuYXRlSFRNTFN0cmluZyhB ZG9wdFdLLCBXS1N0cmluZ0NyZWF0ZVdpdGhVVEY4Q1N0cmluZygiPGh0bWw+PGJvZHk+PGltZyBz cmM9J2ljb24ucG5nJz48L2JvZHk+PC9odG1sPiIpKTsKKyAgICAKKyAgICAvLyBDYWxsIFdLUGFn ZUxvYWRBbHRlcm5hdGVIVE1MU3RyaW5nKCkgd2l0aCBmaWxlVVJMIHdoaWNoIGRvZXMgbm90IHBv aW50IHRvIGEgZGlyZWN0b3J5CisgICAgV0tQYWdlTG9hZEFsdGVybmF0ZUhUTUxTdHJpbmcod2Vi Vmlldy5wYWdlKCksIGFsdGVybmF0ZUhUTUxTdHJpbmcuZ2V0KCksIGZpbGVVUkwuZ2V0KCksIGZp bGVVUkwuZ2V0KCkpOworICAgIAorICAgIC8vIElmIHdlIGNhbiBmaW5pc2ggbG9hZGluZyB0aGUg aHRtbCB3aXRob3V0IHJlc3VsdGluZyBpbiBhbiBpbnZhbGlkIG1lc3NhZ2UgYmVpbmcgc2VudCBm cm9tIHRoZSBXZWJQcm9jZXNzLCB0aGlzIHRlc3QgcGFzc2VzLgorICAgIFV0aWw6OnJ1bigmZGlk RmluaXNoTG9hZCk7Cit9CisKK30gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKSW5kZXg6IFRv b2xzL1Rlc3RXZWJLaXRBUEkvd2luL1Rlc3RXZWJLaXRBUEkudmNwcm9qCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFRvb2xzL1Rlc3RXZWJLaXRBUEkvd2luL1Rlc3RXZWJLaXRBUEkudmNwcm9qCShyZXZpc2lvbiA5 NzUwNykKKysrIFRvb2xzL1Rlc3RXZWJLaXRBUEkvd2luL1Rlc3RXZWJLaXRBUEkudmNwcm9qCSh3 b3JraW5nIGNvcHkpCkBAIC00OTIsNiArNDkyLDEwIEBACiAJCQkJCT4KIAkJCQk8L0ZpbGU+CiAJ CQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxUZXN0c1xXZWJLaXQyXExvYWRBbHRlcm5h dGVIVE1MU3RyaW5nV2l0aE5vbkRpcmVjdG9yeVVSTC5jcHAiCisJCQkJCT4KKwkJCQk8L0ZpbGU+ CisJCQkJPEZpbGUKIAkJCQkJUmVsYXRpdmVQYXRoPSIuLlxUZXN0c1xXZWJLaXQyXExvYWRDYW5j ZWxlZE5vU2VydmVyUmVkaXJlY3RDYWxsYmFjay5jcHAiCiAJCQkJCT4KIAkJCQk8L0ZpbGU+Cg==