38227 2010-04-27 16:08:19 -0700 [Chromium] Filter out URLs with a file scheme from text/uri-list when dragging. 2010-04-27 22:21:47 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) PC Windows 7 RESOLVED FIXED P2 Normal --- 0 dcheng webkit-unassigned commit-queue jianli oldest_to_newest 218021 0 dcheng 2010-04-27 16:08:19 -0700 Original issue at https://bugs.webkit.org/show_bug.cgi?id=25882, which fixed duplicate file paths appearing in text/uri-list on a file drop. This issue covers removing the remaining file:// URL from event.dataTransfer on a drop. 218022 1 54468 dcheng 2010-04-27 16:09:23 -0700 Created attachment 54468 Filter file:// URLs from event.dataTransfer.getData 218027 2 54470 dcheng 2010-04-27 16:21:00 -0700 Created attachment 54470 Filter file:// URLs from event.dataTransfer.getData Fix incorrect permissions on WebCore/ChangeLog 218030 3 54470 jianli 2010-04-27 16:25:00 -0700 Comment on attachment 54470 Filter file:// URLs from event.dataTransfer.getData WebCore/ChangeLog:5 + [Chromium] Filter out URLs with file:// scheme from text/uri-list when dragging. Can you update the bug title in order to be consistent with the line above. Also, I think you could simply say "file scheme". WebCore/platform/chromium/ClipboardChromium.cpp:170 + if (protocolIs(uri, "file")) Could you please add a comment for doing this? WebCore/platform/chromium/ClipboardChromium.cpp:185 + if (!m_dataObject->url.isEmpty() && !m_dataObject->url.isLocalFile()) { ditto. WebCore/platform/chromium/ClipboardChromium.cpp:321 + if (m_dataObject->url.isValid() && !m_dataObject->url.isLocalFile()) { ditto. 218093 4 54486 dcheng 2010-04-27 17:50:18 -0700 Created attachment 54486 Filter file URLs from event.dataTransfer.getData 218107 5 54486 jianli 2010-04-27 18:05:37 -0700 Comment on attachment 54486 Filter file URLs from event.dataTransfer.getData r=me 218201 6 54486 commit-queue 2010-04-27 22:21:41 -0700 Comment on attachment 54486 Filter file URLs from event.dataTransfer.getData Clearing flags on attachment: 54486 Committed r58378: <http://trac.webkit.org/changeset/58378> 218202 7 commit-queue 2010-04-27 22:21:47 -0700 All reviewed patches have been landed. Closing bug. 54468 2010-04-27 16:09:23 -0700 2010-04-27 16:21:00 -0700 Filter file:// URLs from event.dataTransfer.getData file-filter.patch text/plain 3421 dcheng ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKb2xkIG1v ZGUgMTAwNjQ0Cm5ldyBtb2RlIDEwMDc1NQppbmRleCA5YWM0NTE0Li4zMjA3YTY5Ci0tLSBhL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAK KzIwMTAtMDQtMjcgIERhbmllbCBDaGVuZyAgPGRjaGVuZ0BjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0Nocm9taXVtXSBGaWx0 ZXIgb3V0IFVSTHMgd2l0aCBmaWxlOi8vIHNjaGVtZSBmcm9tIHRleHQvdXJpLWxpc3Qgd2hlbiBk cmFnZ2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTM4MjI3CisKKyAgICAgICAgVW5mb3J0dW5hdGVseSwgdGhlIHNpbXBsZSBmaXggb2Ygbm90IHBv cHVsYXRpbmcgdGhlIGRyYWcgZGF0YSB3aXRoIGZpbGUgVVJMcyBkb2Vzbid0IHdvcmsKKyAgICAg ICAgc2luY2UgdGhlIGRlZmF1bHQgZHJvcCBoYW5kbGluZyB1c2VzIHRoZSBkcmFnIGRhdGEgVVJM IHRvIG5hdmlnYXRlIHRvIGRyb3BwZWQgZmlsZXMvVVJMcy4KKyAgICAgICAgRm9yIG5vdywgd2Ug aGFjayBhcm91bmQgdGhlIHByb2JsZW0gaW4gdGhlIENocm9taXVtIHBsYXRmb3JtLCBidXQgdGhl IHByb3BlciBsb25nIHRlcm0KKyAgICAgICAgc29sdXRpb24gaXMgdG8gY2hhbmdlIERyYWdDb250 cm9sbGVyOjpwZXJmb3JtRHJhZyB0byBjaGVjayBkcmFnRGF0YTo6YXNGaWxlbmFtZXMoKS4KKwor ICAgICAgICBObyBuZXcgdGVzdHMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9DbGlw Ym9hcmRDaHJvbWl1bS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmRDaHJvbWl1bTo6 Z2V0RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpDbGlwYm9hcmRDaHJvbWl1bTo6dHlwZXMpOgor CiAyMDEwLTA0LTI2ICBEYW5pZWwgQ2hlbmcgIDxkY2hlbmdAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0 Zm9ybS9jaHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2No cm9taXVtL0NsaXBib2FyZENocm9taXVtLmNwcAppbmRleCA3NGE5MWY5Li5iZWVjZDkwIDEwMDY0 NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENocm9taXVtLmNwcAor KysgYi9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENocm9taXVtLmNwcApAQCAt MTY3LDYgKzE2Nyw4IEBAIFN0cmluZyBDbGlwYm9hcmRDaHJvbWl1bTo6Z2V0RGF0YShjb25zdCBT dHJpbmcmIHR5cGUsIGJvb2wmIHN1Y2Nlc3MpIGNvbnN0CiAgICAgICAgICAgICBTdHJpbmcgdGV4 dDsKICAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9kYXRhT2JqZWN0LT51cmlM aXN0LnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICAgICAgY29uc3QgU3RyaW5nJiB1cmkgPSBt X2RhdGFPYmplY3QtPnVyaUxpc3RbaV07CisgICAgICAgICAgICAgICAgaWYgKHByb3RvY29sSXMo dXJpLCAiZmlsZSIpKQorICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgICAg ICAgICBBU1NFUlQoIXVyaS5pc0VtcHR5KCkpOwogICAgICAgICAgICAgICAgIGlmICghdGV4dC5p c0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgICAgIHRleHQuYXBwZW5kKHRleHRNSU1FVHlwZUxp bmVTZXBhcmF0b3IpOwpAQCAtMTgwLDcgKzE4Miw3IEBAIFN0cmluZyBDbGlwYm9hcmRDaHJvbWl1 bTo6Z2V0RGF0YShjb25zdCBTdHJpbmcmIHR5cGUsIGJvb2wmIHN1Y2Nlc3MpIGNvbnN0CiAgICAg Y2FzZSBDbGlwYm9hcmREYXRhVHlwZVVSTDoKICAgICAgICAgLy8gSW4gY2FzZSBvZiBhIHByZXZp b3VzIHNldERhdGEoJ3RleHQvdXJpLWxpc3QnKSwgc2V0RGF0YSgpIGhhcyBhbHJlYWR5CiAgICAg ICAgIC8vIHByZXBhcmVkIHRoZSAndXJsJyBtZW1iZXIsIHNvIHdlIGNhbiBqdXN0IHJldHJpZXZl IGl0IGhlcmUuCi0gICAgICAgIGlmICghbV9kYXRhT2JqZWN0LT51cmwuaXNFbXB0eSgpKSB7Cisg ICAgICAgIGlmICghbV9kYXRhT2JqZWN0LT51cmwuaXNFbXB0eSgpICYmICFtX2RhdGFPYmplY3Qt PnVybC5pc0xvY2FsRmlsZSgpKSB7CiAgICAgICAgICAgICBzdWNjZXNzID0gdHJ1ZTsKICAgICAg ICAgICAgIHJldHVybiBtX2RhdGFPYmplY3QtPnVybC5zdHJpbmcoKTsKICAgICAgICAgfQpAQCAt MzE2LDE1ICszMTgsMjIgQEAgSGFzaFNldDxTdHJpbmc+IENsaXBib2FyZENocm9taXVtOjp0eXBl cygpIGNvbnN0CiAgICAgaWYgKCFtX2RhdGFPYmplY3QtPmZpbGVuYW1lcy5pc0VtcHR5KCkpCiAg ICAgICAgIHJlc3VsdHMuYWRkKCJGaWxlcyIpOwogCi0gICAgaWYgKG1fZGF0YU9iamVjdC0+dXJs LmlzVmFsaWQoKSkgeworICAgIGlmIChtX2RhdGFPYmplY3QtPnVybC5pc1ZhbGlkKCkgJiYgIW1f ZGF0YU9iamVjdC0+dXJsLmlzTG9jYWxGaWxlKCkpIHsKICAgICAgICAgQVNTRVJUKCFtX2RhdGFP YmplY3QtPnVyaUxpc3QuaXNFbXB0eSgpKTsKICAgICAgICAgcmVzdWx0cy5hZGQoIlVSTCIpOwog ICAgIH0KIAogICAgIGlmICghbV9kYXRhT2JqZWN0LT51cmlMaXN0LmlzRW1wdHkoKSkgewotICAg ICAgICAvLyBOb3RlIHRoYXQgZXZlbiBpZiB0aGUgVVJJIGxpc3QgaXMgbm90IGVtcHR5LCBpdCBt YXkgbm90IGFjdHVhbGx5Ci0gICAgICAgIC8vIGNvbnRhaW4gYSB2YWxpZCBVUkwsIHNvIHdlIGNh bid0IHJldHVybiAiVVJMIiBoZXJlLgotICAgICAgICByZXN1bHRzLmFkZCgidGV4dC91cmktbGlz dCIpOworICAgICAgICAvLyBWZXJpZnkgdGhhdCB0aGUgVVJJIGxpc3QgY29udGFpbnMgYXQgbGVh c3Qgb25lIG5vbi1maWxlIFVSTC4KKyAgICAgICAgZm9yIChWZWN0b3I8U3RyaW5nPjo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBtX2RhdGFPYmplY3QtPnVyaUxpc3QuYmVnaW4oKTsKKyAgICAgICAgICAg ICBpdCAhPSBtX2RhdGFPYmplY3QtPnVyaUxpc3QuZW5kKCk7ICsraXQpIHsKKyAgICAgICAgICAg IGlmICghcHJvdG9jb2xJcygqaXQsICJmaWxlIikpIHsKKyAgICAgICAgICAgICAgICAvLyBOb3Rl IHRoYXQgZXZlbiBpZiB0aGUgVVJJIGxpc3QgaXMgbm90IGVtcHR5LCBpdCBtYXkgbm90IGFjdHVh bGx5CisgICAgICAgICAgICAgICAgLy8gY29udGFpbiBhIHZhbGlkIFVSTCwgc28gd2UgY2FuJ3Qg cmV0dXJuICJVUkwiIGhlcmUuCisgICAgICAgICAgICAgICAgcmVzdWx0cy5hZGQoInRleHQvdXJp LWxpc3QiKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAg fQogICAgIH0KIAogICAgIGlmICghbV9kYXRhT2JqZWN0LT5wbGFpblRleHQuaXNFbXB0eSgpKSB7 Cg== 54470 2010-04-27 16:21:00 -0700 2010-04-27 17:50:18 -0700 Filter file:// URLs from event.dataTransfer.getData file-filter.patch text/plain 3396 dcheng ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWFjNDUxNC4uMzIwN2E2OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNC0yNyAgRGFuaWVsIENoZW5n ICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIEZpbHRlciBvdXQgVVJMcyB3aXRoIGZpbGU6Ly8g c2NoZW1lIGZyb20gdGV4dC91cmktbGlzdCB3aGVuIGRyYWdnaW5nLgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzgyMjcKKworICAgICAgICBVbmZvcnR1 bmF0ZWx5LCB0aGUgc2ltcGxlIGZpeCBvZiBub3QgcG9wdWxhdGluZyB0aGUgZHJhZyBkYXRhIHdp dGggZmlsZSBVUkxzIGRvZXNuJ3Qgd29yaworICAgICAgICBzaW5jZSB0aGUgZGVmYXVsdCBkcm9w IGhhbmRsaW5nIHVzZXMgdGhlIGRyYWcgZGF0YSBVUkwgdG8gbmF2aWdhdGUgdG8gZHJvcHBlZCBm aWxlcy9VUkxzLgorICAgICAgICBGb3Igbm93LCB3ZSBoYWNrIGFyb3VuZCB0aGUgcHJvYmxlbSBp biB0aGUgQ2hyb21pdW0gcGxhdGZvcm0sIGJ1dCB0aGUgcHJvcGVyIGxvbmcgdGVybQorICAgICAg ICBzb2x1dGlvbiBpcyB0byBjaGFuZ2UgRHJhZ0NvbnRyb2xsZXI6OnBlcmZvcm1EcmFnIHRvIGNo ZWNrIGRyYWdEYXRhOjphc0ZpbGVuYW1lcygpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cy4KKwor ICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENocm9taXVtLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkNsaXBib2FyZENocm9taXVtOjpnZXREYXRhKToKKyAgICAgICAgKFdlYkNv cmU6OkNsaXBib2FyZENocm9taXVtOjp0eXBlcyk6CisKIDIwMTAtMDQtMjYgIERhbmllbCBDaGVu ZyAgPGRjaGVuZ0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL0NsaXBib2FyZENo cm9taXVtLmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2xpcGJvYXJkQ2hyb21pdW0u Y3BwCmluZGV4IDc0YTkxZjkuLmJlZWNkOTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0v Y2hyb21pdW0vQ2xpcGJvYXJkQ2hyb21pdW0uY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vY2hy b21pdW0vQ2xpcGJvYXJkQ2hyb21pdW0uY3BwCkBAIC0xNjcsNiArMTY3LDggQEAgU3RyaW5nIENs aXBib2FyZENocm9taXVtOjpnZXREYXRhKGNvbnN0IFN0cmluZyYgdHlwZSwgYm9vbCYgc3VjY2Vz cykgY29uc3QKICAgICAgICAgICAgIFN0cmluZyB0ZXh0OwogICAgICAgICAgICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBtX2RhdGFPYmplY3QtPnVyaUxpc3Quc2l6ZSgpOyArK2kpIHsKICAgICAg ICAgICAgICAgICBjb25zdCBTdHJpbmcmIHVyaSA9IG1fZGF0YU9iamVjdC0+dXJpTGlzdFtpXTsK KyAgICAgICAgICAgICAgICBpZiAocHJvdG9jb2xJcyh1cmksICJmaWxlIikpCisgICAgICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgICAgIEFTU0VSVCghdXJpLmlzRW1wdHko KSk7CiAgICAgICAgICAgICAgICAgaWYgKCF0ZXh0LmlzRW1wdHkoKSkKICAgICAgICAgICAgICAg ICAgICAgdGV4dC5hcHBlbmQodGV4dE1JTUVUeXBlTGluZVNlcGFyYXRvcik7CkBAIC0xODAsNyAr MTgyLDcgQEAgU3RyaW5nIENsaXBib2FyZENocm9taXVtOjpnZXREYXRhKGNvbnN0IFN0cmluZyYg dHlwZSwgYm9vbCYgc3VjY2VzcykgY29uc3QKICAgICBjYXNlIENsaXBib2FyZERhdGFUeXBlVVJM OgogICAgICAgICAvLyBJbiBjYXNlIG9mIGEgcHJldmlvdXMgc2V0RGF0YSgndGV4dC91cmktbGlz dCcpLCBzZXREYXRhKCkgaGFzIGFscmVhZHkKICAgICAgICAgLy8gcHJlcGFyZWQgdGhlICd1cmwn IG1lbWJlciwgc28gd2UgY2FuIGp1c3QgcmV0cmlldmUgaXQgaGVyZS4KLSAgICAgICAgaWYgKCFt X2RhdGFPYmplY3QtPnVybC5pc0VtcHR5KCkpIHsKKyAgICAgICAgaWYgKCFtX2RhdGFPYmplY3Qt PnVybC5pc0VtcHR5KCkgJiYgIW1fZGF0YU9iamVjdC0+dXJsLmlzTG9jYWxGaWxlKCkpIHsKICAg ICAgICAgICAgIHN1Y2Nlc3MgPSB0cnVlOwogICAgICAgICAgICAgcmV0dXJuIG1fZGF0YU9iamVj dC0+dXJsLnN0cmluZygpOwogICAgICAgICB9CkBAIC0zMTYsMTUgKzMxOCwyMiBAQCBIYXNoU2V0 PFN0cmluZz4gQ2xpcGJvYXJkQ2hyb21pdW06OnR5cGVzKCkgY29uc3QKICAgICBpZiAoIW1fZGF0 YU9iamVjdC0+ZmlsZW5hbWVzLmlzRW1wdHkoKSkKICAgICAgICAgcmVzdWx0cy5hZGQoIkZpbGVz Iik7CiAKLSAgICBpZiAobV9kYXRhT2JqZWN0LT51cmwuaXNWYWxpZCgpKSB7CisgICAgaWYgKG1f ZGF0YU9iamVjdC0+dXJsLmlzVmFsaWQoKSAmJiAhbV9kYXRhT2JqZWN0LT51cmwuaXNMb2NhbEZp bGUoKSkgewogICAgICAgICBBU1NFUlQoIW1fZGF0YU9iamVjdC0+dXJpTGlzdC5pc0VtcHR5KCkp OwogICAgICAgICByZXN1bHRzLmFkZCgiVVJMIik7CiAgICAgfQogCiAgICAgaWYgKCFtX2RhdGFP YmplY3QtPnVyaUxpc3QuaXNFbXB0eSgpKSB7Ci0gICAgICAgIC8vIE5vdGUgdGhhdCBldmVuIGlm IHRoZSBVUkkgbGlzdCBpcyBub3QgZW1wdHksIGl0IG1heSBub3QgYWN0dWFsbHkKLSAgICAgICAg Ly8gY29udGFpbiBhIHZhbGlkIFVSTCwgc28gd2UgY2FuJ3QgcmV0dXJuICJVUkwiIGhlcmUuCi0g ICAgICAgIHJlc3VsdHMuYWRkKCJ0ZXh0L3VyaS1saXN0Iik7CisgICAgICAgIC8vIFZlcmlmeSB0 aGF0IHRoZSBVUkkgbGlzdCBjb250YWlucyBhdCBsZWFzdCBvbmUgbm9uLWZpbGUgVVJMLgorICAg ICAgICBmb3IgKFZlY3RvcjxTdHJpbmc+Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fZGF0YU9iamVj dC0+dXJpTGlzdC5iZWdpbigpOworICAgICAgICAgICAgIGl0ICE9IG1fZGF0YU9iamVjdC0+dXJp TGlzdC5lbmQoKTsgKytpdCkgeworICAgICAgICAgICAgaWYgKCFwcm90b2NvbElzKCppdCwgImZp bGUiKSkgeworICAgICAgICAgICAgICAgIC8vIE5vdGUgdGhhdCBldmVuIGlmIHRoZSBVUkkgbGlz dCBpcyBub3QgZW1wdHksIGl0IG1heSBub3QgYWN0dWFsbHkKKyAgICAgICAgICAgICAgICAvLyBj b250YWluIGEgdmFsaWQgVVJMLCBzbyB3ZSBjYW4ndCByZXR1cm4gIlVSTCIgaGVyZS4KKyAgICAg ICAgICAgICAgICByZXN1bHRzLmFkZCgidGV4dC91cmktbGlzdCIpOworICAgICAgICAgICAgICAg IGJyZWFrOworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKCFtX2Rh dGFPYmplY3QtPnBsYWluVGV4dC5pc0VtcHR5KCkpIHsK 54486 2010-04-27 17:50:18 -0700 2010-04-27 22:21:41 -0700 Filter file URLs from event.dataTransfer.getData file-filter2.patch text/plain 3829 dcheng ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWFjNDUxNC4uNDNmZmJmNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMC0wNC0yNyAgRGFuaWVsIENoZW5n ICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBbQ2hyb21pdW1dIEZpbHRlciBvdXQgVVJMcyB3aXRoIGEgZmlsZSBz Y2hlbWUgZnJvbSB0ZXh0L3VyaS1saXN0IHdoZW4gZHJhZ2dpbmcuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zODIyNworCisgICAgICAgIFVuZm9ydHVu YXRlbHksIHRoZSBzaW1wbGUgZml4IG9mIG5vdCBwb3B1bGF0aW5nIHRoZSBkcmFnIGRhdGEgd2l0 aCBmaWxlIFVSTHMgZG9lc24ndCB3b3JrCisgICAgICAgIHNpbmNlIHRoZSBkZWZhdWx0IGRyb3Ag aGFuZGxpbmcgdXNlcyB0aGUgZHJhZyBkYXRhIFVSTCB0byBuYXZpZ2F0ZSB0byBkcm9wcGVkIGZp bGVzL1VSTHMuCisgICAgICAgIEZvciBub3csIHdlIGhhY2sgYXJvdW5kIHRoZSBwcm9ibGVtIGlu IHRoZSBDaHJvbWl1bSBwbGF0Zm9ybSwgYnV0IHRoZSBwcm9wZXIgbG9uZyB0ZXJtCisgICAgICAg IHNvbHV0aW9uIGlzIHRvIGNoYW5nZSBEcmFnQ29udHJvbGxlcjo6cGVyZm9ybURyYWcgdG8gY2hl Y2sgZHJhZ0RhdGE6OmFzRmlsZW5hbWVzKCkuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzLgorCisg ICAgICAgICogcGxhdGZvcm0vY2hyb21pdW0vQ2xpcGJvYXJkQ2hyb21pdW0uY3BwOgorICAgICAg ICAoV2ViQ29yZTo6Q2xpcGJvYXJkQ2hyb21pdW06OmdldERhdGEpOgorICAgICAgICAoV2ViQ29y ZTo6Q2xpcGJvYXJkQ2hyb21pdW06OnR5cGVzKToKKwogMjAxMC0wNC0yNiAgRGFuaWVsIENoZW5n ICA8ZGNoZW5nQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vQ2xpcGJvYXJkQ2hy b21pdW0uY3BwIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5j cHAKaW5kZXggNzRhOTFmOS4uYWI5ZjNjOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9j aHJvbWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9jaHJv bWl1bS9DbGlwYm9hcmRDaHJvbWl1bS5jcHAKQEAgLTE2MiwxMSArMTYyLDE1IEBAIFN0cmluZyBD bGlwYm9hcmRDaHJvbWl1bTo6Z2V0RGF0YShjb25zdCBTdHJpbmcmIHR5cGUsIGJvb2wmIHN1Y2Nl c3MpIGNvbnN0CiAgICAgY2FzZSBDbGlwYm9hcmREYXRhVHlwZU5vbmU6CiAgICAgICAgIHJldHVy biBTdHJpbmcoKTsKIAorICAgIC8vIEhhY2sgZm9yIFVSTHMuIGZpbGUgVVJMcyBhcmUgdXNlZCBp bnRlcm5hbGx5IGZvciBkcm9wJ3MgZGVmYXVsdCBhY3Rpb24sIGJ1dCB3ZSBkb24ndCB3YW50Cisg ICAgLy8gdG8gZXhwb3NlIHRoZW0gdG8gdGhlIHBhZ2UsIHNvIHdlIGZpbHRlciB0aGVtIG91dCBo ZXJlLgogICAgIGNhc2UgQ2xpcGJvYXJkRGF0YVR5cGVVUklMaXN0OgogICAgICAgICB7CiAgICAg ICAgICAgICBTdHJpbmcgdGV4dDsKICAgICAgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg bV9kYXRhT2JqZWN0LT51cmlMaXN0LnNpemUoKTsgKytpKSB7CiAgICAgICAgICAgICAgICAgY29u c3QgU3RyaW5nJiB1cmkgPSBtX2RhdGFPYmplY3QtPnVyaUxpc3RbaV07CisgICAgICAgICAgICAg ICAgaWYgKHByb3RvY29sSXModXJpLCAiZmlsZSIpKQorICAgICAgICAgICAgICAgICAgICBjb250 aW51ZTsKICAgICAgICAgICAgICAgICBBU1NFUlQoIXVyaS5pc0VtcHR5KCkpOwogICAgICAgICAg ICAgICAgIGlmICghdGV4dC5pc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgICAgIHRleHQuYXBw ZW5kKHRleHRNSU1FVHlwZUxpbmVTZXBhcmF0b3IpOwpAQCAtMTgwLDcgKzE4NCw3IEBAIFN0cmlu ZyBDbGlwYm9hcmRDaHJvbWl1bTo6Z2V0RGF0YShjb25zdCBTdHJpbmcmIHR5cGUsIGJvb2wmIHN1 Y2Nlc3MpIGNvbnN0CiAgICAgY2FzZSBDbGlwYm9hcmREYXRhVHlwZVVSTDoKICAgICAgICAgLy8g SW4gY2FzZSBvZiBhIHByZXZpb3VzIHNldERhdGEoJ3RleHQvdXJpLWxpc3QnKSwgc2V0RGF0YSgp IGhhcyBhbHJlYWR5CiAgICAgICAgIC8vIHByZXBhcmVkIHRoZSAndXJsJyBtZW1iZXIsIHNvIHdl IGNhbiBqdXN0IHJldHJpZXZlIGl0IGhlcmUuCi0gICAgICAgIGlmICghbV9kYXRhT2JqZWN0LT51 cmwuaXNFbXB0eSgpKSB7CisgICAgICAgIGlmICghbV9kYXRhT2JqZWN0LT51cmwuaXNFbXB0eSgp ICYmICFtX2RhdGFPYmplY3QtPnVybC5pc0xvY2FsRmlsZSgpKSB7CiAgICAgICAgICAgICBzdWNj ZXNzID0gdHJ1ZTsKICAgICAgICAgICAgIHJldHVybiBtX2RhdGFPYmplY3QtPnVybC5zdHJpbmco KTsKICAgICAgICAgfQpAQCAtMzE2LDE1ICszMjAsMjQgQEAgSGFzaFNldDxTdHJpbmc+IENsaXBi b2FyZENocm9taXVtOjp0eXBlcygpIGNvbnN0CiAgICAgaWYgKCFtX2RhdGFPYmplY3QtPmZpbGVu YW1lcy5pc0VtcHR5KCkpCiAgICAgICAgIHJlc3VsdHMuYWRkKCJGaWxlcyIpOwogCi0gICAgaWYg KG1fZGF0YU9iamVjdC0+dXJsLmlzVmFsaWQoKSkgeworICAgIC8vIEhhY2sgZm9yIFVSTHMuIGZp bGUgVVJMcyBhcmUgdXNlZCBpbnRlcm5hbGx5IGZvciBkcm9wJ3MgZGVmYXVsdCBhY3Rpb24sIGJ1 dCB3ZSBkb24ndCB3YW50CisgICAgLy8gdG8gZXhwb3NlIHRoZW0gdG8gdGhlIHBhZ2UsIHNvIHdl IGZpbHRlciB0aGVtIG91dCBoZXJlLgorICAgIGlmIChtX2RhdGFPYmplY3QtPnVybC5pc1ZhbGlk KCkgJiYgIW1fZGF0YU9iamVjdC0+dXJsLmlzTG9jYWxGaWxlKCkpIHsKICAgICAgICAgQVNTRVJU KCFtX2RhdGFPYmplY3QtPnVyaUxpc3QuaXNFbXB0eSgpKTsKICAgICAgICAgcmVzdWx0cy5hZGQo IlVSTCIpOwogICAgIH0KIAogICAgIGlmICghbV9kYXRhT2JqZWN0LT51cmlMaXN0LmlzRW1wdHko KSkgewotICAgICAgICAvLyBOb3RlIHRoYXQgZXZlbiBpZiB0aGUgVVJJIGxpc3QgaXMgbm90IGVt cHR5LCBpdCBtYXkgbm90IGFjdHVhbGx5Ci0gICAgICAgIC8vIGNvbnRhaW4gYSB2YWxpZCBVUkws IHNvIHdlIGNhbid0IHJldHVybiAiVVJMIiBoZXJlLgotICAgICAgICByZXN1bHRzLmFkZCgidGV4 dC91cmktbGlzdCIpOworICAgICAgICAvLyBWZXJpZnkgdGhhdCB0aGUgVVJJIGxpc3QgY29udGFp bnMgYXQgbGVhc3Qgb25lIG5vbi1maWxlIFVSTC4KKyAgICAgICAgZm9yIChWZWN0b3I8U3RyaW5n Pjo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX2RhdGFPYmplY3QtPnVyaUxpc3QuYmVnaW4oKTsKKyAg ICAgICAgICAgICBpdCAhPSBtX2RhdGFPYmplY3QtPnVyaUxpc3QuZW5kKCk7ICsraXQpIHsKKyAg ICAgICAgICAgIGlmICghcHJvdG9jb2xJcygqaXQsICJmaWxlIikpIHsKKyAgICAgICAgICAgICAg ICAvLyBOb3RlIHRoYXQgZXZlbiBpZiB0aGUgVVJJIGxpc3QgaXMgbm90IGVtcHR5LCBpdCBtYXkg bm90IGFjdHVhbGx5CisgICAgICAgICAgICAgICAgLy8gY29udGFpbiBhIHZhbGlkIFVSTCwgc28g d2UgY2FuJ3QgcmV0dXJuICJVUkwiIGhlcmUuCisgICAgICAgICAgICAgICAgcmVzdWx0cy5hZGQo InRleHQvdXJpLWxpc3QiKTsKKyAgICAgICAgICAgICAgICBicmVhazsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQogICAgIH0KIAogICAgIGlmICghbV9kYXRhT2JqZWN0LT5wbGFpblRleHQuaXNF bXB0eSgpKSB7Cg==