192598 2018-12-11 10:57:50 -0800 [iOS] Send the full list of file upload URLs and types in PasteboardItemInfo 2018-12-11 13:13:43 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes bdakin commit-queue megan_gardner thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1486977 0 wenson_hsieh 2018-12-11 10:57:50 -0800 Work towards <rdar://problem/35626913> by refactoring some drop handling logic. 1486998 1 357067 wenson_hsieh 2018-12-11 11:50:31 -0800 Created attachment 357067 Patch 1487018 2 357067 wenson_hsieh 2018-12-11 12:46:58 -0800 Comment on attachment 357067 Patch Thanks for the review! 1487023 3 357067 commit-queue 2018-12-11 13:13:41 -0800 Comment on attachment 357067 Patch Clearing flags on attachment: 357067 Committed r239086: <https://trac.webkit.org/changeset/239086> 1487024 4 commit-queue 2018-12-11 13:13:43 -0800 All reviewed patches have been landed. Closing bug. 357067 2018-12-11 11:50:31 -0800 2018-12-11 13:13:41 -0800 Patch bug-192598-20181211115030.patch text/plain 14887 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjM5MDYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDc3YzY5ZGY4NDE3NWVi YmEzMDU5Yjg5YTkyYWVjOTZhZTYzZWVlMi4uY2U0MGJlMzk1MmRmZWNhNzY0ZGFkY2UxOTRmYzFi ZDhkNjEyODI5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDE4LTEyLTExICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIFNlbmQg dGhlIGZ1bGwgbGlzdCBvZiBmaWxlIHVwbG9hZCBVUkxzIGFuZCB0eXBlcyBpbiBQYXN0ZWJvYXJk SXRlbUluZm8KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE5MjU5OAorICAgICAgICBXb3JrIHRvd2FyZHMgPHJkYXI6Ly9wcm9ibGVtLzM1NjI2OTEzPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlZmFjdG9y cyBQYXN0ZWJvYXJkSXRlbUluZm8gdG8gY29udGFpbiBsaXN0cyBvZiBmaWxlIFVSTHMgYW5kIGNv cnJlc3BvbmRpbmcgcGFzdGVib2FyZCB0eXBlcywgaW5zdGVhZCBvZiBqdXN0CisgICAgICAgIGEg InByZWZlcnJlZCIgZmlsZSB1cGxvYWQgVVJMIGFuZCB0eXBlLiBTZWUgYmVsb3cgZm9yIG1vcmUg ZGV0YWlscy4KKworICAgICAgICAqIHBsYXRmb3JtL1Bhc3RlYm9hcmRJdGVtSW5mby5oOgorICAg ICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZEl0ZW1JbmZvOjpwYXRoRm9yQ29udGVudFR5cGUgY29u c3QpOgorCisgICAgICAgIEFkZCBhIGhlbHBlciBtZXRob2QgdG8gZmluZCBhIGZpbGUgdXBsb2Fk IFVSTCBjb3JyZXNwb25kaW5nIHRvIGEgZ2l2ZW4gdHlwZS4KKworICAgICAgICAoV2ViQ29yZTo6 UGFzdGVib2FyZEl0ZW1JbmZvOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6UGFz dGVib2FyZEl0ZW1JbmZvOjpkZWNvZGUpOgorCisgICAgICAgIENoYW5nZSBgcGF0aEZvckZpbGVV cGxvYWRgIHRvIGBwYXRoc0ZvckZpbGVVcGxvYWRgLCBhbmQgYGNvbnRlbnRUeXBlRm9yRmlsZVVw bG9hZGAgdG8gYGNvbnRlbnRUeXBlc0ZvckZpbGVVcGxvYWRgLgorCisgICAgICAgICogcGxhdGZv cm0vaW9zL0Fic3RyYWN0UGFzdGVib2FyZC5oOgorICAgICAgICAqIHBsYXRmb3JtL2lvcy9QYXN0 ZWJvYXJkSU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6cmVhZFJlc3BlY3Rp bmdVVElGaWRlbGl0aWVzKToKKworICAgICAgICBBZGp1c3QgdGhpcyB0byB0YWtlIHRoZSBmaWxl IHBhdGggZm9yIHRoZSBoaWdoZXN0IGZpZGVsaXR5IHJlcHJlc2VudGF0aW9uIGluIGBwYXRoc0Zv ckNvbnRlbnRUeXBlYC4KKworICAgICAgICAoV2ViQ29yZTo6UGFzdGVib2FyZDo6cmVhZEZpbGVQ YXRocyk6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbToK KyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtUGFzdGVib2FyZDo6aW5mb3JtYXRpb25Gb3JJdGVt QXRJbmRleCk6CisgICAgICAgICogcGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9h cmQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5t bToKKyAgICAgICAgKC1bTlNJdGVtUHJvdmlkZXIgd2ViX2NvbnRhaW5zRmlsZVVSTEFuZEZpbGVV cGxvYWRDb250ZW50XSk6CisgICAgICAgICgtW05TSXRlbVByb3ZpZGVyIHdlYl9maWxlVXBsb2Fk Q29udGVudFR5cGVzXSk6CisKKyAgICAgICAgUmVwbGFjZSBgd2ViX2NvbnRhaW5zRmlsZVVwbG9h ZENvbnRlbnRgIHdpdGggYHdlYl9maWxlVXBsb2FkQ29udGVudFR5cGVzYCwgd2hpY2ggcmV0dXJu cyB0aGUgZnVsbCBsaXN0IG9mIGZpbGUKKyAgICAgICAgdXBsb2FkIGNvbnRlbnQgdHlwZXMgKHJh dGhlciB0aGFuIGp1c3QgYSBgQk9PTGAgaW5kaWNhdGluZyB3aGV0aGVyIG9uZSBvciBtb3JlIG9m IHRoZXNlIHR5cGVzIGV4aXN0KS4KKworICAgICAgICAoLVtXZWJJdGVtUHJvdmlkZXJQYXN0ZWJv YXJkIGZpbGVVcGxvYWRVUkxzQXRJbmRleDpmaWxlVHlwZXM6XSk6CisgICAgICAgICgtW1dlYkl0 ZW1Qcm92aWRlclBhc3RlYm9hcmQgbnVtYmVyT2ZGaWxlc10pOgorICAgICAgICAoLVtOU0l0ZW1Q cm92aWRlciB3ZWJfY29udGFpbnNGaWxlVXBsb2FkQ29udGVudF0pOiBEZWxldGVkLgorICAgICAg ICAoLVtXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIHByZWZlcnJlZEZpbGVVcGxvYWRVUkxBdElu ZGV4OmZpbGVUeXBlOl0pOiBEZWxldGVkLgorCisgICAgICAgIFJlcGxhY2VkIHdpdGggYC1maWxl VXBsb2FkVVJMc0F0SW5kZXg6ZmlsZVR5cGVzOmAuIFRoaXMgaW1wbGVtZW50YXRpb24gY3VycmVu dGx5IGp1c3QgcmV0dXJucyB0aGUgaGlnaGVzdAorICAgICAgICBmaWRlbGl0eSBsb2FkZWQgdHlw ZSBpZGVudGlmaWVyLCBidXQgdGhpcyBpcyB3cm9uZyBiZWNhdXNlIGl0IGRvZXNuJ3QgdGFrZSBp bnRvIGFjY291bnQgaW5saW5lIGRhdGEgdHlwZXMgdGhhdAorICAgICAgICBzaG91bGRuJ3QgYmUg cmVwcmVzZW50ZWQgYXMgZGF0YSBmb3IgZmlsZSB1cGxvYWRzIChmb3IgaW5zdGFuY2UsIGl0IG5l dmVyIG1ha2VzIHNlbnNlIHRvIHVwbG9hZCB0aGUgaW50ZXJuYWwKKyAgICAgICAgZGF0YSBzZXJp YWxpemF0aW9uIGZvciBhbiBgTlNVUkxgIGFzIGEgZmlsZSBvbiB0aGUgd2ViKS4KKworICAgICAg ICBJbnN0ZWFkLCB1c2UgZXhpc3RpbmcgbG9naWMgaW4gYHdlYl9maWxlVXBsb2FkQ29udGVudFR5 cGVzYCB0byBkZXRlcm1pbmUgd2hpY2ggZmlsZSB0eXBlcyBjYW4gYmUgdHJlYXRlZCBhcyBmaWxl CisgICAgICAgIHVwbG9hZHMsIGFuZCByZXR1cm4gYWxsIG9mIHRoZXNlIGZpbGUgdHlwZXMgdGhh dCB3ZSd2ZSBsb2FkZWQuCisKIDIwMTgtMTItMTAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBw bGUuY29tPgogCiAgICAgICAgIFJlbmFtZSAiZm9yY2VkIHN0eWxlIHJlY2FsYyIgdG8gImZ1bGwg c3R5bGUgcmVidWlsZCIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Bhc3Rl Ym9hcmRJdGVtSW5mby5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZEl0ZW1J bmZvLmgKaW5kZXggYmQ1OTk2Mjk2NTQxMDYxYmE3NjZjYzE0NGFlNmMyNDY4NzVkMTA4Ny4uM2Jj NTY4NDg0MzBjNTM1NDFlMzY3NGVkMWRkZWExMjYxMDFlYjlhNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vUGFzdGVib2FyZEl0ZW1JbmZvLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vUGFzdGVib2FyZEl0ZW1JbmZvLmgKQEAgLTI2LDYgKzI2LDcgQEAKICNwcmFn bWEgb25jZQogCiAjaW5jbHVkZSA8d3RmL09wdGlvbmFsLmg+CisjaW5jbHVkZSA8d3RmL1ZlY3Rv ci5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1dURlN0cmluZy5oPgogCiBuYW1lc3BhY2UgV2ViQ29y ZSB7CkBAIC0zNywxMyArMzgsMjMgQEAgZW51bSBjbGFzcyBQYXN0ZWJvYXJkSXRlbVByZXNlbnRh dGlvblN0eWxlIHsKIH07CiAKIHN0cnVjdCBQYXN0ZWJvYXJkSXRlbUluZm8gewotICAgIFN0cmlu ZyBwYXRoRm9yRmlsZVVwbG9hZDsKLSAgICBTdHJpbmcgY29udGVudFR5cGVGb3JGaWxlVXBsb2Fk OworICAgIFZlY3RvcjxTdHJpbmc+IHBhdGhzRm9yRmlsZVVwbG9hZDsKKyAgICBWZWN0b3I8U3Ry aW5nPiBjb250ZW50VHlwZXNGb3JGaWxlVXBsb2FkOwogICAgIFN0cmluZyBzdWdnZXN0ZWRGaWxl TmFtZTsKICAgICBib29sIGlzTm9uVGV4dFR5cGUgeyBmYWxzZSB9OwogICAgIGJvb2wgY29udGFp bnNGaWxlVVJMQW5kRmlsZVVwbG9hZENvbnRlbnQgeyBmYWxzZSB9OwogICAgIFBhc3RlYm9hcmRJ dGVtUHJlc2VudGF0aW9uU3R5bGUgcHJlZmVycmVkUHJlc2VudGF0aW9uU3R5bGUgeyBQYXN0ZWJv YXJkSXRlbVByZXNlbnRhdGlvblN0eWxlOjpVbnNwZWNpZmllZCB9OwogCisgICAgU3RyaW5nIHBh dGhGb3JDb250ZW50VHlwZShjb25zdCBTdHJpbmcmIHR5cGUpIGNvbnN0CisgICAgeworICAgICAg ICBBU1NFUlQocGF0aHNGb3JGaWxlVXBsb2FkLnNpemUoKSA9PSBjb250ZW50VHlwZXNGb3JGaWxl VXBsb2FkLnNpemUoKSk7CisgICAgICAgIGF1dG8gaW5kZXggPSBjb250ZW50VHlwZXNGb3JGaWxl VXBsb2FkLmZpbmQodHlwZSk7CisgICAgICAgIGlmIChpbmRleCA9PSBub3RGb3VuZCkKKyAgICAg ICAgICAgIHJldHVybiB7IH07CisKKyAgICAgICAgcmV0dXJuIHBhdGhzRm9yRmlsZVVwbG9hZFtp bmRleF07CisgICAgfQorCiAgICAgdGVtcGxhdGU8Y2xhc3MgRW5jb2Rlcj4gdm9pZCBlbmNvZGUo RW5jb2RlciYpIGNvbnN0OwogICAgIHRlbXBsYXRlPGNsYXNzIERlY29kZXI+IHN0YXRpYyBzdGQ6 Om9wdGlvbmFsPFBhc3RlYm9hcmRJdGVtSW5mbz4gZGVjb2RlKERlY29kZXImKTsKIH07CkBAIC01 MSw3ICs2Miw3IEBAIHN0cnVjdCBQYXN0ZWJvYXJkSXRlbUluZm8gewogdGVtcGxhdGU8Y2xhc3Mg RW5jb2Rlcj4KIHZvaWQgUGFzdGVib2FyZEl0ZW1JbmZvOjplbmNvZGUoRW5jb2RlciYgZW5jb2Rl cikgY29uc3QKIHsKLSAgICBlbmNvZGVyIDw8IHBhdGhGb3JGaWxlVXBsb2FkIDw8IGNvbnRlbnRU eXBlRm9yRmlsZVVwbG9hZCA8PCBzdWdnZXN0ZWRGaWxlTmFtZSA8PCBpc05vblRleHRUeXBlIDw8 IGNvbnRhaW5zRmlsZVVSTEFuZEZpbGVVcGxvYWRDb250ZW50OworICAgIGVuY29kZXIgPDwgcGF0 aHNGb3JGaWxlVXBsb2FkIDw8IGNvbnRlbnRUeXBlc0ZvckZpbGVVcGxvYWQgPDwgc3VnZ2VzdGVk RmlsZU5hbWUgPDwgaXNOb25UZXh0VHlwZSA8PCBjb250YWluc0ZpbGVVUkxBbmRGaWxlVXBsb2Fk Q29udGVudDsKICAgICBlbmNvZGVyLmVuY29kZUVudW0ocHJlZmVycmVkUHJlc2VudGF0aW9uU3R5 bGUpOwogfQogCkBAIC01OSwxMCArNzAsMTAgQEAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4KIHN0 ZDo6b3B0aW9uYWw8UGFzdGVib2FyZEl0ZW1JbmZvPiBQYXN0ZWJvYXJkSXRlbUluZm86OmRlY29k ZShEZWNvZGVyJiBkZWNvZGVyKQogewogICAgIFBhc3RlYm9hcmRJdGVtSW5mbyByZXN1bHQ7Ci0g ICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQucGF0aEZvckZpbGVVcGxvYWQpKQorICAgIGlm ICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnBhdGhzRm9yRmlsZVVwbG9hZCkpCiAgICAgICAgIHJl dHVybiBzdGQ6Om51bGxvcHQ7CiAKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5jb250 ZW50VHlwZUZvckZpbGVVcGxvYWQpKQorICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LmNv bnRlbnRUeXBlc0ZvckZpbGVVcGxvYWQpKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0Owog CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuc3VnZ2VzdGVkRmlsZU5hbWUpKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0Fic3RyYWN0UGFzdGVib2FyZC5o IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL0Fic3RyYWN0UGFzdGVib2FyZC5oCmluZGV4 IDQyMTAxODY5OGUxMjU1ODYyNDc4ODhmYmFmN2E0YmQ2OWM2YjJmODkuLjhmMmRkMGE2ZTM5OWFh MzFiYzZlYmI3NWJiYWUxMTMzNDAxY2U1NGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9BYnN0cmFjdFBhc3RlYm9hcmQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvQWJzdHJhY3RQYXN0ZWJvYXJkLmgKQEAgLTU3LDcgKzU3LDEwIEBAIE5TX0FTU1VN RV9OT05OVUxMX0JFR0lOCiAtIChOU0FycmF5PE5TU3RyaW5nICo+ICopcGFzdGVib2FyZFR5cGVz QnlGaWRlbGl0eUZvckl0ZW1BdEluZGV4OihOU1VJbnRlZ2VyKWluZGV4OwogQHByb3BlcnR5IChy ZWFkb25seSwgbm9uYXRvbWljKSBOU0ludGVnZXIgbnVtYmVyT2ZGaWxlczsKIEBwcm9wZXJ0eSAo cmVhZG9ubHksIG5vbmF0b21pYykgTlNBcnJheTxOU1VSTCAqPiAqYWxsRHJvcHBlZEZpbGVVUkxz OwotLSAobnVsbGFibGUgTlNVUkwgKilwcmVmZXJyZWRGaWxlVXBsb2FkVVJMQXRJbmRleDooTlNV SW50ZWdlcilpbmRleCBmaWxlVHlwZTooTlNTdHJpbmcgKl9OdWxsYWJsZSAqX051bGxhYmxlKW91 dEZpbGVUeXBlOworCisvLyBDb21wdXRlcyBsaXN0cyBvZiBmaWxlIFVSTHMgYW5kIHR5cGVzLiBF YWNoIGZpbGUgVVJMIGFuZCB0eXBlIGNvcnJlc3BvbmRzIHRvIGEgcmVwcmVzZW50YXRpb24gb2Yg dGhlIGl0ZW0gcHJvdmlkZXIgYXQgdGhlIGdpdmVuIGluZGV4LgorLy8gSW4gb3JkZXIgZnJvbSBo aWdoZXN0IGZpZGVsaXR5IHRvIGxvd2VzdCBmaWRlbGl0eS4KKy0gKE5TQXJyYXk8TlNVUkwgKj4g KilmaWxlVXBsb2FkVVJMc0F0SW5kZXg6KE5TVUludGVnZXIpaW5kZXggZmlsZVR5cGVzOihOU0Fy cmF5PE5TU3RyaW5nICo+ICpfTnVsbGFibGUgKl9Ob25udWxsKW91dEZpbGVUeXBlczsKIC0gKHZv aWQpdXBkYXRlU3VwcG9ydGVkVHlwZUlkZW50aWZpZXJzOihOU0FycmF5PE5TU3RyaW5nICo+ICop dHlwZXM7CiAKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9Q YXN0ZWJvYXJkSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJ T1MubW0KaW5kZXggMDVmMGRlNDljNDVkZGYxMWU1ZGZmZjJjMmQ5Y2I0NGFiZjJjYTUxMC4uMWQ5 YjA1Nzg4YzZjNjA4NGIzNmU3NmU1NTAyNmM3NTFmZTIzZTI0MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vaW9zL1Bhc3RlYm9hcmRJT1MubW0KQEAgLTI5NCw5ICsyOTQsOSBAQCB2b2lk IFBhc3RlYm9hcmQ6OnJlYWRSZXNwZWN0aW5nVVRJRmlkZWxpdGllcyhQYXN0ZWJvYXJkV2ViQ29u dGVudFJlYWRlciYgcmVhZGVyLAogICAgIGZvciAoTlNVSW50ZWdlciBpbmRleCA9IDAsIG51bWJl ck9mSXRlbXMgPSBzdHJhdGVneS5nZXRQYXN0ZWJvYXJkSXRlbXNDb3VudChtX3Bhc3RlYm9hcmRO YW1lKTsgaW5kZXggPCBudW1iZXJPZkl0ZW1zOyArK2luZGV4KSB7CiAjaWYgRU5BQkxFKEFUVEFD SE1FTlRfRUxFTUVOVCkKICAgICAgICAgYXV0byBpbmZvID0gc3RyYXRlZ3kuaW5mb3JtYXRpb25G b3JJdGVtQXRJbmRleChpbmRleCwgbV9wYXN0ZWJvYXJkTmFtZSk7Ci0gICAgICAgIGJvb2wgY2Fu UmVhZEF0dGFjaG1lbnQgPSBwb2xpY3kgPT0gV2ViQ29udGVudFJlYWRpbmdQb2xpY3k6OkFueVR5 cGUgJiYgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5hdHRhY2htZW50 RWxlbWVudEVuYWJsZWQoKSAmJiAhaW5mby5wYXRoRm9yRmlsZVVwbG9hZC5pc0VtcHR5KCk7Cisg ICAgICAgIGJvb2wgY2FuUmVhZEF0dGFjaG1lbnQgPSBwb2xpY3kgPT0gV2ViQ29udGVudFJlYWRp bmdQb2xpY3k6OkFueVR5cGUgJiYgUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVy ZXMoKS5hdHRhY2htZW50RWxlbWVudEVuYWJsZWQoKSAmJiAhaW5mby5wYXRoc0ZvckZpbGVVcGxv YWQuaXNFbXB0eSgpOwogICAgICAgICBpZiAoY2FuUmVhZEF0dGFjaG1lbnQgJiYgaW5mby5wcmVm ZXJyZWRQcmVzZW50YXRpb25TdHlsZSA9PSBQYXN0ZWJvYXJkSXRlbVByZXNlbnRhdGlvblN0eWxl OjpBdHRhY2htZW50KSB7Ci0gICAgICAgICAgICByZWFkZXIucmVhZEZpbGVQYXRocyh7IGluZm8u cGF0aEZvckZpbGVVcGxvYWQgfSk7CisgICAgICAgICAgICByZWFkZXIucmVhZEZpbGVQYXRocyh7 IGluZm8ucGF0aHNGb3JGaWxlVXBsb2FkLmZpcnN0KCkgfSk7CiAgICAgICAgICAgICBjb250aW51 ZTsKICAgICAgICAgfQogI2VuZGlmCkBAIC0zMTcsNyArMzE3LDcgQEAgdm9pZCBQYXN0ZWJvYXJk OjpyZWFkUmVzcGVjdGluZ1VUSUZpZGVsaXRpZXMoUGFzdGVib2FyZFdlYkNvbnRlbnRSZWFkZXIm IHJlYWRlciwKICAgICAgICAgfQogI2lmIEVOQUJMRShBVFRBQ0hNRU5UX0VMRU1FTlQpCiAgICAg ICAgIGlmIChjYW5SZWFkQXR0YWNobWVudCAmJiByZXN1bHQgPT0gUmVhZGVyUmVzdWx0OjpEaWRO b3RSZWFkVHlwZSkKLSAgICAgICAgICAgIHJlYWRlci5yZWFkRmlsZVBhdGhzKHsgaW5mby5wYXRo Rm9yRmlsZVVwbG9hZCB9KTsKKyAgICAgICAgICAgIHJlYWRlci5yZWFkRmlsZVBhdGhzKHsgaW5m by5wYXRoc0ZvckZpbGVVcGxvYWQuZmlyc3QoKSB9KTsKICNlbmRpZgogICAgIH0KIH0KQEAgLTQ1 OSw3ICs0NTksNyBAQCBWZWN0b3I8U3RyaW5nPiBQYXN0ZWJvYXJkOjpyZWFkRmlsZVBhdGhzKCkK ICAgICBhdXRvJiBzdHJhdGVneSA9ICpwbGF0Zm9ybVN0cmF0ZWdpZXMoKS0+cGFzdGVib2FyZFN0 cmF0ZWd5KCk7CiAgICAgZm9yIChOU1VJbnRlZ2VyIGluZGV4ID0gMCwgbnVtYmVyT2ZJdGVtcyA9 IHN0cmF0ZWd5LmdldFBhc3RlYm9hcmRJdGVtc0NvdW50KG1fcGFzdGVib2FyZE5hbWUpOyBpbmRl eCA8IG51bWJlck9mSXRlbXM7ICsraW5kZXgpIHsKICAgICAgICAgLy8gQ3VycmVudGx5LCBkcmFn IGFuZCBkcm9wIGlzIHRoZSBvbmx5IGNhc2Ugb24gaU9TIHdoZXJlIHRoZSAicGFzdGVib2FyZCIg bWF5IGNvbnRhaW4gZmlsZSBwYXRocy4KLSAgICAgICAgYXV0byBmaWxlUGF0aCA9IHN0cmF0ZWd5 LmluZm9ybWF0aW9uRm9ySXRlbUF0SW5kZXgoaW5kZXgsIG1fcGFzdGVib2FyZE5hbWUpLnBhdGhG b3JGaWxlVXBsb2FkOworICAgICAgICBhdXRvIGZpbGVQYXRoID0gc3RyYXRlZ3kuaW5mb3JtYXRp b25Gb3JJdGVtQXRJbmRleChpbmRleCwgbV9wYXN0ZWJvYXJkTmFtZSkucGF0aHNGb3JGaWxlVXBs b2FkLmZpcnN0KCk7CiAgICAgICAgIGlmICghZmlsZVBhdGguaXNFbXB0eSgpKQogICAgICAgICAg ICAgZmlsZVBhdGhzLmFwcGVuZChXVEZNb3ZlKGZpbGVQYXRoKSk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9ybVBhc3RlYm9hcmRJT1MubW0KaW5k ZXggNThmMDUzNGFiZDRjYmZhZTExNWViMTI5YzUzZWQ4MGQ3YWYzZjAzMy4uOGQ4OWJiM2E4ZGQ4 N2Y1MTNkOWVhMGVhYWRmOWYyODQ1OWM2ZDk3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1tCkBAIC0xNDQsMTAgKzE0NCwx OCBAQCBQYXN0ZWJvYXJkSXRlbUluZm8gUGxhdGZvcm1QYXN0ZWJvYXJkOjppbmZvcm1hdGlvbkZv ckl0ZW1BdEluZGV4KGludCBpbmRleCkKICAgICAgICAgcmV0dXJuIHsgfTsKIAogICAgIFBhc3Rl Ym9hcmRJdGVtSW5mbyBpbmZvOwotICAgIGlmIChbbV9wYXN0ZWJvYXJkIHJlc3BvbmRzVG9TZWxl Y3RvcjpAc2VsZWN0b3IocHJlZmVycmVkRmlsZVVwbG9hZFVSTEF0SW5kZXg6ZmlsZVR5cGU6KV0p IHsKLSAgICAgICAgTlNTdHJpbmcgKmZpbGVUeXBlID0gbmlsOwotICAgICAgICBpbmZvLnBhdGhG b3JGaWxlVXBsb2FkID0gW21fcGFzdGVib2FyZCBwcmVmZXJyZWRGaWxlVXBsb2FkVVJMQXRJbmRl eDppbmRleCBmaWxlVHlwZTomZmlsZVR5cGVdLnBhdGg7Ci0gICAgICAgIGluZm8uY29udGVudFR5 cGVGb3JGaWxlVXBsb2FkID0gZmlsZVR5cGU7CisgICAgaWYgKFttX3Bhc3RlYm9hcmQgcmVzcG9u ZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihmaWxlVXBsb2FkVVJMc0F0SW5kZXg6ZmlsZVR5cGVzOild KSB7CisgICAgICAgIE5TQXJyYXk8TlNTdHJpbmcgKj4gKmZpbGVUeXBlcyA9IG5pbDsKKyAgICAg ICAgTlNBcnJheSAqdXJscyA9IFttX3Bhc3RlYm9hcmQgZmlsZVVwbG9hZFVSTHNBdEluZGV4Omlu ZGV4IGZpbGVUeXBlczomZmlsZVR5cGVzXTsKKyAgICAgICAgQVNTRVJUKGZpbGVUeXBlcy5jb3Vu dCA9PSB1cmxzLmNvdW50KTsKKworICAgICAgICBpbmZvLnBhdGhzRm9yRmlsZVVwbG9hZC5yZXNl cnZlSW5pdGlhbENhcGFjaXR5KHVybHMuY291bnQpOworICAgICAgICBmb3IgKE5TVVJMICp1cmwg aW4gdXJscykKKyAgICAgICAgICAgIGluZm8ucGF0aHNGb3JGaWxlVXBsb2FkLnVuY2hlY2tlZEFw cGVuZCh1cmwucGF0aCk7CisKKyAgICAgICAgaW5mby5jb250ZW50VHlwZXNGb3JGaWxlVXBsb2Fk LnJlc2VydmVJbml0aWFsQ2FwYWNpdHkoZmlsZVR5cGVzLmNvdW50KTsKKyAgICAgICAgZm9yIChO U1N0cmluZyAqZmlsZVR5cGUgOiBmaWxlVHlwZXMpCisgICAgICAgICAgICBpbmZvLmNvbnRlbnRU eXBlc0ZvckZpbGVVcGxvYWQudW5jaGVja2VkQXBwZW5kKGZpbGVUeXBlKTsKICAgICB9CiAKICAg ICBOU0l0ZW1Qcm92aWRlciAqaXRlbVByb3ZpZGVyID0gW1ttX3Bhc3RlYm9hcmQgaXRlbVByb3Zp ZGVyc10gb2JqZWN0QXRJbmRleDppbmRleF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQuaAppbmRleCBlMmE2YzlhNDll YmE2MDYwZDc1MzQzMGZkNzdjOWFiZWJmM2U3YTg4Li4yOWY5YTcxZDcwZjZhYzQ4N2M2NDA5NDFi ZWI2ZDQxYWYxOWUxODExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3Mv V2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLmgKQEAgLTk3LDkgKzk3LDYgQEAgV0VCQ09S RV9FWFBPUlQgQGludGVyZmFjZSBXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIDogTlNPYmplY3Q8 QWJzdHJhY3RQYXN0ZWJvYXIKIC8vIFRoaXMgd2lsbCBvbmx5IGJlIG5vbi1lbXB0eSB3aGVuIGFu IG9wZXJhdGlvbiBpcyBiZWluZyBwZXJmb3JtZWQuCiBAcHJvcGVydHkgKHJlYWRvbmx5LCBub25h dG9taWMpIE5TQXJyYXk8TlNVUkwgKj4gKmFsbERyb3BwZWRGaWxlVVJMczsKIAotLy8gVGhlIHBy ZWZlcnJlZCBmaWxlIFVSTCBjb3JyZXNwb25kcyB0byB0aGUgaGlnaGVzdCBmaWRlbGl0eSBub24t cHJpdmF0ZSBVVEkgdGhhdCB3YXMgbG9hZGVkLgotLSAobnVsbGFibGUgTlNVUkwgKilwcmVmZXJy ZWRGaWxlVXBsb2FkVVJMQXRJbmRleDooTlNVSW50ZWdlcilpbmRleCBmaWxlVHlwZTooTlNTdHJp bmcgKl9OdWxsYWJsZSAqX051bGxhYmxlKW91dEZpbGVUeXBlOwotCiBAcHJvcGVydHkgKHJlYWRv bmx5LCBub25hdG9taWMpIEJPT0wgaGFzUGVuZGluZ09wZXJhdGlvbjsKIC0gKHZvaWQpaW5jcmVt ZW50UGVuZGluZ09wZXJhdGlvbkNvdW50OwogLSAodm9pZClkZWNyZW1lbnRQZW5kaW5nT3BlcmF0 aW9uQ291bnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvV2ViSXRl bVByb3ZpZGVyUGFzdGVib2FyZC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJ dGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCmluZGV4IGMzMjc1MzU5ZWZmODU0OGE0MjEyOGNmZjFl MGNiZjg5ZjBmNjFmNTguLmE4Y2VjZjZmODk3MmMxZDYxNGY2MTA3Yzg3OTg5MmE1NGM5MDcxMWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQ YXN0ZWJvYXJkLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJv dmlkZXJQYXN0ZWJvYXJkLm1tCkBAIC02OCwyMSArNjgsMjMgQEAgLSAoQk9PTCl3ZWJfY29udGFp bnNGaWxlVVJMQW5kRmlsZVVwbG9hZENvbnRlbnQKIHsKICAgICBmb3IgKE5TU3RyaW5nICppZGVu dGlmaWVyIGluIHNlbGYucmVnaXN0ZXJlZFR5cGVJZGVudGlmaWVycykgewogICAgICAgICBpZiAo VVRUeXBlQ29uZm9ybXNUbygoX19icmlkZ2UgQ0ZTdHJpbmdSZWYpaWRlbnRpZmllciwga1VUVHlw ZUZpbGVVUkwpKQotICAgICAgICAgICAgcmV0dXJuIHNlbGYud2ViX2NvbnRhaW5zRmlsZVVwbG9h ZENvbnRlbnQ7CisgICAgICAgICAgICByZXR1cm4gc2VsZi53ZWJfZmlsZVVwbG9hZENvbnRlbnRU eXBlcy5jb3VudDsKICAgICB9CiAgICAgcmV0dXJuIE5POwogfQogCi0tIChCT09MKXdlYl9jb250 YWluc0ZpbGVVcGxvYWRDb250ZW50CistIChOU0FycmF5PE5TU3RyaW5nICo+ICopd2ViX2ZpbGVV cGxvYWRDb250ZW50VHlwZXMKIHsKKyAgICBhdXRvIHR5cGVzID0gYWRvcHROUyhbTlNNdXRhYmxl QXJyYXkgbmV3XSk7CiAgICAgZm9yIChOU1N0cmluZyAqaWRlbnRpZmllciBpbiBzZWxmLnJlZ2lz dGVyZWRUeXBlSWRlbnRpZmllcnMpIHsKICAgICAgICAgaWYgKFVUVHlwZUNvbmZvcm1zVG8oKF9f YnJpZGdlIENGU3RyaW5nUmVmKWlkZW50aWZpZXIsIGtVVFR5cGVVUkwpKQogICAgICAgICAgICAg Y29udGludWU7CiAKICAgICAgICAgaWYgKHR5cGVDb25mb3Jtc1RvVHlwZXMoaWRlbnRpZmllciwg UGFzdGVib2FyZDo6c3VwcG9ydGVkRmlsZVVwbG9hZFBhc3RlYm9hcmRUeXBlcygpKSkKLSAgICAg ICAgICAgIHJldHVybiBZRVM7CisgICAgICAgICAgICBbdHlwZXMgYWRkT2JqZWN0OmlkZW50aWZp ZXJdOwogICAgIH0KLSAgICByZXR1cm4gTk87CisKKyAgICByZXR1cm4gdHlwZXMuYXV0b3JlbGVh c2UoKTsKIH0KIAogQGVuZApAQCAtNjI4LDM1ICs2MzAsMjcgQEAgLSAoTlNJbnRlZ2VyKWNoYW5n ZUNvdW50CiAgICAgcmV0dXJuIF9jaGFuZ2VDb3VudDsKIH0KIAotLSAoTlNVUkwgKilwcmVmZXJy ZWRGaWxlVXBsb2FkVVJMQXRJbmRleDooTlNVSW50ZWdlcilpbmRleCBmaWxlVHlwZTooTlNTdHJp bmcgKiopb3V0RmlsZVR5cGUKKy0gKE5TQXJyYXk8TlNVUkwgKj4gKilmaWxlVXBsb2FkVVJMc0F0 SW5kZXg6KE5TVUludGVnZXIpaW5kZXggZmlsZVR5cGVzOihOU0FycmF5PE5TU3RyaW5nICo+ICoq KW91dEZpbGVUeXBlcwogewotICAgIGlmIChvdXRGaWxlVHlwZSkKLSAgICAgICAgKm91dEZpbGVU eXBlID0gbmlsOworICAgIGF1dG8gZmlsZVR5cGVzID0gYWRvcHROUyhbTlNNdXRhYmxlQXJyYXkg bmV3XSk7CisgICAgYXV0byBmaWxlVVJMcyA9IGFkb3B0TlMoW05TTXV0YWJsZUFycmF5IG5ld10p OwogCiAgICAgaWYgKGluZGV4ID49IF9sb2FkUmVzdWx0cy5zaXplKCkpCi0gICAgICAgIHJldHVy biBuaWw7CisgICAgICAgIHJldHVybiBAWyBdOwogCiAgICAgYXV0byByZXN1bHQgPSBfbG9hZFJl c3VsdHNbaW5kZXhdOwogICAgIGlmICghW3Jlc3VsdCBjYW5CZVJlcHJlc2VudGVkQXNGaWxlVXBs b2FkXSkKLSAgICAgICAgcmV0dXJuIG5pbDsKLQotICAgIE5TSXRlbVByb3ZpZGVyICppdGVtUHJv dmlkZXIgPSBbcmVzdWx0IGl0ZW1Qcm92aWRlcl07Ci0gICAgZm9yIChOU1N0cmluZyAqcmVnaXN0 ZXJlZFR5cGVJZGVudGlmaWVyIGluIGl0ZW1Qcm92aWRlci5yZWdpc3RlcmVkVHlwZUlkZW50aWZp ZXJzKSB7Ci0gICAgICAgIC8vIFNlYXJjaCBmb3IgdGhlIGhpZ2hlc3QgZmlkZWxpdHkgbm9uLXBy aXZhdGUgdHlwZSBpZGVudGlmaWVyIHdlIGxvYWRlZCBmcm9tIHRoZSBpdGVtIHByb3ZpZGVyLgot ICAgICAgICBpZiAoIVVUVHlwZUlzRGVjbGFyZWQoKF9fYnJpZGdlIENGU3RyaW5nUmVmKXJlZ2lz dGVyZWRUeXBlSWRlbnRpZmllcikgJiYgIVVUVHlwZUlzRHluYW1pYygoX19icmlkZ2UgQ0ZTdHJp bmdSZWYpcmVnaXN0ZXJlZFR5cGVJZGVudGlmaWVyKSkKLSAgICAgICAgICAgIGNvbnRpbnVlOwot Ci0gICAgICAgIGZvciAoTlNTdHJpbmcgKmxvYWRlZFR5cGVJZGVudGlmaWVyIGluIFtyZXN1bHQg bG9hZGVkVHlwZUlkZW50aWZpZXJzXSkgewotICAgICAgICAgICAgaWYgKCFVVFR5cGVDb25mb3Jt c1RvKChfX2JyaWRnZSBDRlN0cmluZ1JlZilyZWdpc3RlcmVkVHlwZUlkZW50aWZpZXIsIChfX2Jy aWRnZSBDRlN0cmluZ1JlZilsb2FkZWRUeXBlSWRlbnRpZmllcikpCi0gICAgICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgIHJldHVybiBAWyBdOwogCi0gICAgICAgICAgICBpZiAob3V0Rmls ZVR5cGUpCi0gICAgICAgICAgICAgICAgKm91dEZpbGVUeXBlID0gbG9hZGVkVHlwZUlkZW50aWZp ZXI7Ci0gICAgICAgICAgICByZXR1cm4gW3Jlc3VsdCBmaWxlVVJMRm9yVHlwZTpsb2FkZWRUeXBl SWRlbnRpZmllcl07CisgICAgZm9yIChOU1N0cmluZyAqY29udGVudFR5cGUgaW4gW3Jlc3VsdCBp dGVtUHJvdmlkZXJdLndlYl9maWxlVXBsb2FkQ29udGVudFR5cGVzKSB7CisgICAgICAgIGlmIChO U1VSTCAqdXJsID0gW3Jlc3VsdCBmaWxlVVJMRm9yVHlwZTpjb250ZW50VHlwZV0pIHsKKyAgICAg ICAgICAgIFtmaWxlVHlwZXMgYWRkT2JqZWN0OmNvbnRlbnRUeXBlXTsKKyAgICAgICAgICAgIFtm aWxlVVJMcyBhZGRPYmplY3Q6dXJsXTsKICAgICAgICAgfQogICAgIH0KIAotICAgIHJldHVybiBu aWw7CisgICAgKm91dEZpbGVUeXBlcyA9IGZpbGVUeXBlcy5hdXRvcmVsZWFzZSgpOworICAgIHJl dHVybiBmaWxlVVJMcy5hdXRvcmVsZWFzZSgpOwogfQogCiAtIChOU0FycmF5PE5TVVJMICo+ICop YWxsRHJvcHBlZEZpbGVVUkxzCkBAIC02ODQsNyArNjc4LDcgQEAgLSAoTlNJbnRlZ2VyKW51bWJl ck9mRmlsZXMKICAgICAgICAgfQogI2VuZGlmCiAgICAgICAgIC8vIE90aGVyd2lzZSwgZmFsbCBi YWNrIHRvIGV4YW1pbmluZyB0aGUgaXRlbSdzIHJlZ2lzdGVyZWQgdHlwZSBpZGVudGlmaWVycy4K LSAgICAgICAgaWYgKGl0ZW1Qcm92aWRlci53ZWJfY29udGFpbnNGaWxlVXBsb2FkQ29udGVudCkK KyAgICAgICAgaWYgKGl0ZW1Qcm92aWRlci53ZWJfZmlsZVVwbG9hZENvbnRlbnRUeXBlcy5jb3Vu dCkKICAgICAgICAgICAgICsrbnVtYmVyT2ZGaWxlczsKICAgICB9CiAgICAgcmV0dXJuIG51bWJl ck9mRmlsZXM7Cg==