167918 2017-02-06 19:15:50 -0800 WebItemProviderPasteboard should use -registerLoadHandlersToItemProvider: when creating a new UIItemProvider 2017-02-07 18:19:06 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh commit-queue thorton webkit-bug-importer oldest_to_newest 1273818 0 wenson_hsieh 2017-02-06 19:15:50 -0800 <rdar://problem/30382347> 1273827 1 300780 wenson_hsieh 2017-02-06 20:06:11 -0800 Created attachment 300780 Patch 1274195 2 300780 thorton 2017-02-07 16:32:03 -0800 Comment on attachment 300780 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300780&action=review > Source/WebCore/platform/ios/WebItemProviderPasteboard.mm:147 > + id<UIItemProviderWriting> objectToWrite = (id<UIItemProviderWriting>)representingObject; space between id < 1274217 3 300861 wenson_hsieh 2017-02-07 17:11:02 -0800 Created attachment 300861 Patch for landing 1274228 4 300861 commit-queue 2017-02-07 17:49:03 -0800 Comment on attachment 300861 Patch for landing Clearing flags on attachment: 300861 Committed r211852: <http://trac.webkit.org/changeset/211852> 300780 2017-02-06 20:06:11 -0800 2017-02-07 16:32:03 -0800 Patch bug-167918-20170206200350.patch text/plain 7465 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWY5MDE0OGIxYjNjODUw OGRmNDkzYmVjYjNmZTE2MjdmYjVkZmY1OS4uYWZiZWZlNjQ5OWEyMzdhN2FiZmQ3YzExNDY5NzFh MmQzNjUyZjlhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE3LTAyLTA2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFdlYkl0ZW1Qcm92 aWRlclBhc3RlYm9hcmQgc2hvdWxkIHVzZSAtcmVnaXN0ZXJMb2FkSGFuZGxlcnNUb0l0ZW1Qcm92 aWRlcjogd2hlbiBjcmVhdGluZyBhIG5ldyBVSUl0ZW1Qcm92aWRlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3OTE4CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8zMDM4MjM0Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBBZG9wdHMgU1BJIGluIFdlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQgZm9yIG9i amVjdCB0eXBlcyB0aGF0IHRoZSBwbGF0Zm9ybSBrbm93cyBob3cgdG8gc2VyaWFsaXplLiBTaW5j ZSB3ZSB1c2UKKyAgICAgICAgLWNyZWF0ZU9iamVjdE9mQ2xhc3M6IHRvIGluaXRpYWxpemUgZGF0 YSB3aGVuIHJlYWRpbmcgb2ZmIG9mIHRoZSBwYXN0ZWJvYXJkLCB3ZSBuZWVkIHRvIG1hdGNoIHRo ZSBmb3JtYXQgdGhhdAorICAgICAgICBvYmplY3RzIGNvbmZvcm1pbmcgdG8gVUlJdGVtUHJvdmlk ZXJSZWFkaW5nIHdpbGwgZXhwZWN0LiBUaHVzLCBmb3IgYWxsIGdpdmVuIG9iamVjdHMgdGhhdCBj b25mb3JtIHRvCisgICAgICAgIFVJSXRlbVByb3ZpZGVyV3JpdGluZywgd2UgaGF2ZSB0aGVtIHJl Z2lzdGVyIHRoZW1zZWx2ZXMgdG8gdGhlIGl0ZW0gcHJvdmlkZXIuCisKKyAgICAgICAgV2UgcmVn aXN0ZXIgb3RoZXIgVVRJIHR5cGVzIGR1ZSB0byB0aGUgZmFjdCB0aGF0IFBsYXRmb3JtUGFzdGVi b2FyZElPUyBkb2VzIG5vdCBjYXJlIGFib3V0IHRoZSBzcGVjaWZpYworICAgICAgICBwYXN0ZWJv YXJkIHVzZWQuIFRoaXMgc2hvdWxkIG5vdCBiZSBuZWNlc3NhcnksIGhvd2V2ZXIsIHNpbmNlIGRh dGEgd3JpdHRlbiB0byB0aGUgV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZAorICAgICAgICBzaG91 bGQgbmV2ZXIgbmVlZCB0byBiZSByZWFkIGJ5IGFuIGFjdHVhbCBVSVBhc3RlYm9hcmQuIFRoaXMg d2lsbCBiZSByZWZhY3RvcmVkIGluIGEgZnV0dXJlIHBhdGNoIHRvIGFkZCBhCisgICAgICAgIHNw ZWNpYWwgdHlwZSBvZiBXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLWF3YXJlIFBsYXRmb3JtUGFz dGVib2FyZC4KKworICAgICAgICBBbHNvIGZpeGVzIHNvbWUgcmVmZXJlbmNlIGNvdW50aW5nIGlz c3VlcyBpbiBXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIGJ5IGNoYW5naW5nIHRoZSBhcnJheSBv ZiBfaXRlbVByb3ZpZGVycworICAgICAgICB0byBiZSBhIFJldGFpblB0ci4KKworICAgICAgICAq IHBsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tOgorICAgICAgICAoLVtX ZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIGluaXRdKToKKyAgICAgICAgKC1bV2ViSXRlbVByb3Zp ZGVyUGFzdGVib2FyZCBwYXN0ZWJvYXJkVHlwZXNdKToKKyAgICAgICAgKC1bV2ViSXRlbVByb3Zp ZGVyUGFzdGVib2FyZCBpdGVtUHJvdmlkZXJzXSk6CisgICAgICAgICgtW1dlYkl0ZW1Qcm92aWRl clBhc3RlYm9hcmQgc2V0SXRlbVByb3ZpZGVyczpdKToKKyAgICAgICAgKC1bV2ViSXRlbVByb3Zp ZGVyUGFzdGVib2FyZCBudW1iZXJPZkl0ZW1zXSk6CisgICAgICAgICgtW1dlYkl0ZW1Qcm92aWRl clBhc3RlYm9hcmQgc2V0SXRlbXM6XSk6CisgICAgICAgICgtW1dlYkl0ZW1Qcm92aWRlclBhc3Rl Ym9hcmQgdmFsdWVzRm9yUGFzdGVib2FyZFR5cGU6aW5JdGVtU2V0Ol0pOgorICAgICAgICAoLVtX ZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIGl0ZW1Qcm92aWRlckF0SW5kZXg6XSk6CisgICAgICAg ICgtW1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQgZGVhbGxvY10pOiBEZWxldGVkLgorCiAyMDE3 LTAyLTA1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCiAgICAgICAg IERhdGEgaW50ZXJhY3Rpb24gZmFpbHMgaW4gU2FmYXJpIHNwbGl0c2NyZWVuIG1vZGUgd2hlbiBk cm9wcGluZyBpbnRvIGEgY29udGVudGVkaXRhYmxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9pb3MvV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZC5tbSBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCmluZGV4IDgxNjAx MjA0YTY1NWUyNTc1ZmU5N2U1NzkxNGIxMzlhZGZhMDJmMTYuLjAzMmY5MTlkM2U3YzBlNGUwNTlm YzhhMzBiMjI5M2ViOTkyMTYzMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tCkBAIC0zNCw2ICszNCw4IEBA CiAjaW1wb3J0IDxNb2JpbGVDb3JlU2VydmljZXMvTW9iaWxlQ29yZVNlcnZpY2VzLmg+CiAjaW1w b3J0IDxVSUtpdC9VSUNvbG9yLmg+CiAjaW1wb3J0IDxVSUtpdC9VSUltYWdlLmg+CisjaW1wb3J0 IDxVSUtpdC9VSUl0ZW1Qcm92aWRlcldyaXRpbmcuaD4KKyNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIu aD4KIAogU09GVF9MSU5LX0ZSQU1FV09SSyhVSUtpdCkKIFNPRlRfTElOS19DTEFTUyhVSUtpdCwg VUlDb2xvcikKQEAgLTc2LDcgKzc4LDkgQEAgc3RhdGljIEJPT0wgaXNJbWFnZVR5cGUoTlNTdHJp bmcgKnR5cGUpCiAKIEBlbmQKIAotQGltcGxlbWVudGF0aW9uIFdlYkl0ZW1Qcm92aWRlclBhc3Rl Ym9hcmQKK0BpbXBsZW1lbnRhdGlvbiBXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkIHsKKyAgICBS ZXRhaW5QdHI8TlNBcnJheT4gX2l0ZW1Qcm92aWRlcnM7Cit9CiAKICsgKGluc3RhbmNldHlwZSlz aGFyZWRJbnN0YW5jZQogewpAQCAtOTEsNTIgKzk1LDY4IEBAIHN0YXRpYyBCT09MIGlzSW1hZ2VU eXBlKE5TU3RyaW5nICp0eXBlKQogLSAoaW5zdGFuY2V0eXBlKWluaXQKIHsKICAgICBpZiAoc2Vs ZiA9IFtzdXBlciBpbml0XSkgewotICAgICAgICBfaXRlbVByb3ZpZGVycyA9IFtbTlNBcnJheSBh bGxvY10gaW5pdF07CisgICAgICAgIF9pdGVtUHJvdmlkZXJzID0gYWRvcHROUyhbW05TQXJyYXkg YWxsb2NdIGluaXRdKTsKICAgICAgICAgX2NoYW5nZUNvdW50ID0gMDsKICAgICAgICAgX3BlbmRp bmdPcGVyYXRpb25Db3VudCA9IDA7CiAgICAgfQogICAgIHJldHVybiBzZWxmOwogfQogCi0tICh2 b2lkKWRlYWxsb2MKLXsKLSAgICBbc3VwZXIgZGVhbGxvY107Ci0gICAgW19pdGVtUHJvdmlkZXJz IHJlbGVhc2VdOwotfQotCiAtIChOU0FycmF5PE5TU3RyaW5nICo+ICopcGFzdGVib2FyZFR5cGVz CiB7CiAgICAgTlNNdXRhYmxlU2V0PE5TU3RyaW5nICo+ICphbGxUeXBlcyA9IFtOU011dGFibGVT ZXQgc2V0XTsKLSAgICBmb3IgKFVJSXRlbVByb3ZpZGVyICpwcm92aWRlciBpbiBfaXRlbVByb3Zp ZGVycykKKyAgICBmb3IgKFVJSXRlbVByb3ZpZGVyICpwcm92aWRlciBpbiBfaXRlbVByb3ZpZGVy cy5nZXQoKSkKICAgICAgICAgW2FsbFR5cGVzIGFkZE9iamVjdHNGcm9tQXJyYXk6cHJvdmlkZXIu cmVnaXN0ZXJlZFR5cGVJZGVudGlmaWVyc107CiAgICAgcmV0dXJuIGFsbFR5cGVzLmFsbE9iamVj dHM7CiB9CiAKKy0gKE5TQXJyYXk8VUlJdGVtUHJvdmlkZXIgKj4gKilpdGVtUHJvdmlkZXJzCit7 CisgICAgcmV0dXJuIF9pdGVtUHJvdmlkZXJzLmdldCgpOworfQorCiAtICh2b2lkKXNldEl0ZW1Q cm92aWRlcnM6KE5TQXJyYXk8VUlJdGVtUHJvdmlkZXIgKj4gKilpdGVtUHJvdmlkZXJzCiB7CiAg ICAgaXRlbVByb3ZpZGVycyA9IGl0ZW1Qcm92aWRlcnMgPzogW05TQXJyYXkgYXJyYXldOwogICAg IGlmIChfaXRlbVByb3ZpZGVycyA9PSBpdGVtUHJvdmlkZXJzIHx8IFtfaXRlbVByb3ZpZGVycyBp c0VxdWFsVG9BcnJheTppdGVtUHJvdmlkZXJzXSkKICAgICAgICAgcmV0dXJuOwotICAgIF9pdGVt UHJvdmlkZXJzID0gW2l0ZW1Qcm92aWRlcnMgY29weV07CisKKyAgICBfaXRlbVByb3ZpZGVycyA9 IGl0ZW1Qcm92aWRlcnM7CiAgICAgX2NoYW5nZUNvdW50Kys7CiB9CiAKIC0gKE5TSW50ZWdlcilu dW1iZXJPZkl0ZW1zCiB7Ci0gICAgcmV0dXJuIF9pdGVtUHJvdmlkZXJzLmNvdW50OworICAgIHJl dHVybiBbX2l0ZW1Qcm92aWRlcnMgY291bnRdOwogfQogCiAtICh2b2lkKXNldEl0ZW1zOihOU0Fy cmF5ICopaXRlbXMKIHsKLSAgICBOU011dGFibGVBcnJheSAqcHJvdmlkZXJzID0gW1tOU011dGFi bGVBcnJheSBhbGxvY10gaW5pdF07CisgICAgTlNNdXRhYmxlQXJyYXkgKnByb3ZpZGVycyA9IFtO U011dGFibGVBcnJheSBhcnJheV07CiAgICAgZm9yIChOU0RpY3Rpb25hcnkgKml0ZW0gaW4gaXRl bXMpIHsKICAgICAgICAgaWYgKCFpdGVtLmNvdW50KQogICAgICAgICAgICAgY29udGludWU7Ci0g ICAgICAgIFVJSXRlbVByb3ZpZGVyICppdGVtUHJvdmlkZXIgPSBbW2dldFVJSXRlbVByb3ZpZGVy Q2xhc3MoKSBhbGxvY10gaW5pdF07Ci0gICAgICAgIGZvciAoTlNTdHJpbmcgKnR5cGVJZGVudGlm aWVyIGluIGl0ZW0pIHsKKyAgICAgICAgVUlJdGVtUHJvdmlkZXIgKml0ZW1Qcm92aWRlciA9IFtb Z2V0VUlJdGVtUHJvdmlkZXJDbGFzcygpIG5ld10gYXV0b3JlbGVhc2VdOworICAgICAgICBOU011 dGFibGVEaWN0aW9uYXJ5ICppdGVtUmVwcmVzZW50YXRpb25zQ29weSA9IFtbaXRlbSBtdXRhYmxl Q29weV0gYXV0b3JlbGVhc2VdOworICAgICAgICAvLyBGaXJzdCwgbGV0IHRoZSBwbGF0Zm9ybSB3 cml0ZSBhbGwgdGhlIGRlZmF1bHQgb2JqZWN0IHR5cGVzIGl0IGNhbiByZWNvZ25pemUsIHN1Y2gg YXMgTlNTdHJpbmcgYW5kIE5TVVJMLgorICAgICAgICBmb3IgKE5TU3RyaW5nICp0eXBlSWRlbnRp ZmllciBpbiBbaXRlbVJlcHJlc2VudGF0aW9uc0NvcHkgYWxsS2V5c10pIHsKKyAgICAgICAgICAg IGlkIHJlcHJlc2VudGluZ09iamVjdCA9IGl0ZW1SZXByZXNlbnRhdGlvbnNDb3B5W3R5cGVJZGVu dGlmaWVyXTsKKyAgICAgICAgICAgIGlmICghW3JlcHJlc2VudGluZ09iamVjdCBjb25mb3Jtc1Rv UHJvdG9jb2w6QHByb3RvY29sKFVJSXRlbVByb3ZpZGVyV3JpdGluZyldKQorICAgICAgICAgICAg ICAgIGNvbnRpbnVlOworCisgICAgICAgICAgICBpZDxVSUl0ZW1Qcm92aWRlcldyaXRpbmc+IG9i amVjdFRvV3JpdGUgPSAoaWQ8VUlJdGVtUHJvdmlkZXJXcml0aW5nPilyZXByZXNlbnRpbmdPYmpl Y3Q7CisgICAgICAgICAgICBpZiAoIVtvYmplY3RUb1dyaXRlLndyaXRhYmxlVHlwZUlkZW50aWZp ZXJzRm9ySXRlbVByb3ZpZGVyIGNvbnRhaW5zT2JqZWN0OnR5cGVJZGVudGlmaWVyXSkKKyAgICAg ICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAgICAgW2l0ZW1SZXByZXNlbnRhdGlvbnND b3B5IHJlbW92ZU9iamVjdEZvcktleTp0eXBlSWRlbnRpZmllcl07CisgICAgICAgICAgICBbb2Jq ZWN0VG9Xcml0ZSByZWdpc3RlckxvYWRIYW5kbGVyc1RvSXRlbVByb3ZpZGVyOml0ZW1Qcm92aWRl cl07CisgICAgICAgIH0KKworICAgICAgICAvLyBTZWNvbmRseSwgV2ViS2l0IHVzZXMgc29tZSBj dXN0b20gdHlwZSByZXByZXNlbnRhdGlvbnMgYW5kL29yIHR5cGUgaWRlbnRpZmllcnMsIHNvIHdl IG5lZWQgdG8gd3JpdGUgdGhlc2UgYXMgd2VsbC4KKyAgICAgICAgZm9yIChOU1N0cmluZyAqdHlw ZUlkZW50aWZpZXIgaW4gaXRlbVJlcHJlc2VudGF0aW9uc0NvcHkpIHsKICAgICAgICAgICAgIFtp dGVtUHJvdmlkZXIgcmVnaXN0ZXJEYXRhUmVwcmVzZW50YXRpb25Gb3JUeXBlSWRlbnRpZmllcjp0 eXBlSWRlbnRpZmllciBvcHRpb25zOm5pbCBsb2FkSGFuZGxlcjpeTlNQcm9ncmVzcyAqKFVJSXRl bVByb3ZpZGVyRGF0YUxvYWRDb21wbGV0aW9uQmxvY2sgY29tcGxldGlvbkJsb2NrKQogICAgICAg ICAgICAgewotICAgICAgICAgICAgICAgIGNvbXBsZXRpb25CbG9jayhpdGVtW3R5cGVJZGVudGlm aWVyXSwgbmlsKTsKKyAgICAgICAgICAgICAgICBjb21wbGV0aW9uQmxvY2soaXRlbVJlcHJlc2Vu dGF0aW9uc0NvcHlbdHlwZUlkZW50aWZpZXJdLCBuaWwpOwogICAgICAgICAgICAgICAgIHJldHVy biBbTlNQcm9ncmVzcyBkaXNjcmV0ZVByb2dyZXNzV2l0aFRvdGFsVW5pdENvdW50OjEwMF07CiAg ICAgICAgICAgICB9XTsKICAgICAgICAgfQpAQCAtMTc0LDcgKzE5NCw3IEBAIHN0YXRpYyBCT09M IGlzSW1hZ2VUeXBlKE5TU3RyaW5nICp0eXBlKQogICAgICAgICBpZiAoaXNDb2xvclR5cGUocGFz dGVib2FyZFR5cGUpICYmIFtzZWxmIF90cnlUb0NyZWF0ZUFuZEFwcGVuZE9iamVjdE9mQ2xhc3M6 W2dldFVJQ29sb3JDbGFzcygpIGNsYXNzXSB0b0FycmF5OnZhbHVlcyB1c2luZ1Byb3ZpZGVyOnBy b3ZpZGVyXSkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBpZiAoaXNJbWFnZVR5cGUo cGFzdGVib2FyZFR5cGUpICYmIFtzZWxmIF90cnlUb0NyZWF0ZUFuZEFwcGVuZE9iamVjdE9mQ2xh c3M6W05TU3RyaW5nIGNsYXNzXSB0b0FycmF5OnZhbHVlcyB1c2luZ1Byb3ZpZGVyOnByb3ZpZGVy XSkKKyAgICAgICAgaWYgKGlzSW1hZ2VUeXBlKHBhc3RlYm9hcmRUeXBlKSAmJiBbc2VsZiBfdHJ5 VG9DcmVhdGVBbmRBcHBlbmRPYmplY3RPZkNsYXNzOltnZXRVSUltYWdlQ2xhc3MoKSBjbGFzc10g dG9BcnJheTp2YWx1ZXMgdXNpbmdQcm92aWRlcjpwcm92aWRlcl0pCiAgICAgICAgICAgICByZXR1 cm47CiAKICAgICAgICAgaWYgKGlzVVJMVHlwZShwYXN0ZWJvYXJkVHlwZSkgJiYgW3NlbGYgX3Ry eVRvQ3JlYXRlQW5kQXBwZW5kT2JqZWN0T2ZDbGFzczpbTlNVUkwgY2xhc3NdIHRvQXJyYXk6dmFs dWVzIHVzaW5nUHJvdmlkZXI6cHJvdmlkZXJdKQpAQCAtMjEwLDcgKzIzMCw3IEBAIHN0YXRpYyBC T09MIGlzSW1hZ2VUeXBlKE5TU3RyaW5nICp0eXBlKQogCiAtIChVSUl0ZW1Qcm92aWRlciAqKWl0 ZW1Qcm92aWRlckF0SW5kZXg6KE5TSW50ZWdlcilpbmRleAogewotICAgIHJldHVybiAwIDw9IGlu ZGV4ICYmIGluZGV4IDwgKE5TSW50ZWdlcilfaXRlbVByb3ZpZGVycy5jb3VudCA/IF9pdGVtUHJv dmlkZXJzW2luZGV4XSA6IG5pbDsKKyAgICByZXR1cm4gMCA8PSBpbmRleCAmJiBpbmRleCA8IChO U0ludGVnZXIpW19pdGVtUHJvdmlkZXJzIGNvdW50XSA/IFtfaXRlbVByb3ZpZGVycyBvYmplY3RB dEluZGV4OmluZGV4XSA6IG5pbDsKIH0KIAogLSAoQk9PTCloYXNQZW5kaW5nT3BlcmF0aW9uCg== 300861 2017-02-07 17:11:02 -0800 2017-02-07 17:49:03 -0800 Patch for landing bug-167918-20170207170839.patch text/plain 7679 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjExNzE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWY5MDE0OGIxYjNjODUw OGRmNDkzYmVjYjNmZTE2MjdmYjVkZmY1OS4uYzkxMjkxZjhjZTUxNDY5MjEwZWVlNjM0N2ZhZDFi Y2ZiMjQ4ZDk3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE3LTAyLTA2ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFdlYkl0ZW1Qcm92 aWRlclBhc3RlYm9hcmQgc2hvdWxkIHVzZSAtcmVnaXN0ZXJMb2FkSGFuZGxlcnNUb0l0ZW1Qcm92 aWRlcjogd2hlbiBjcmVhdGluZyBhIG5ldyBVSUl0ZW1Qcm92aWRlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY3OTE4CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8zMDM4MjM0Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisg ICAgICAgIEFkb3B0cyBTUEkgaW4gV2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZCBmb3Igb2JqZWN0 IHR5cGVzIHRoYXQgdGhlIHBsYXRmb3JtIGtub3dzIGhvdyB0byBzZXJpYWxpemUuIFNpbmNlIHdl IHVzZQorICAgICAgICAtY3JlYXRlT2JqZWN0T2ZDbGFzczogdG8gaW5pdGlhbGl6ZSBkYXRhIHdo ZW4gcmVhZGluZyBvZmYgb2YgdGhlIHBhc3RlYm9hcmQsIHdlIG5lZWQgdG8gbWF0Y2ggdGhlIGZv cm1hdCB0aGF0CisgICAgICAgIG9iamVjdHMgY29uZm9ybWluZyB0byBVSUl0ZW1Qcm92aWRlclJl YWRpbmcgd2lsbCBleHBlY3QuIFRodXMsIGZvciBhbGwgZ2l2ZW4gb2JqZWN0cyB0aGF0IGNvbmZv cm0gdG8KKyAgICAgICAgVUlJdGVtUHJvdmlkZXJXcml0aW5nLCB3ZSBoYXZlIHRoZW0gcmVnaXN0 ZXIgdGhlbXNlbHZlcyB0byB0aGUgaXRlbSBwcm92aWRlci4KKworICAgICAgICBXZSByZWdpc3Rl ciBvdGhlciBVVEkgdHlwZXMgZHVlIHRvIHRoZSBmYWN0IHRoYXQgUGxhdGZvcm1QYXN0ZWJvYXJk SU9TIGRvZXMgbm90IGNhcmUgYWJvdXQgdGhlIHNwZWNpZmljCisgICAgICAgIHBhc3RlYm9hcmQg dXNlZC4gVGhpcyBzaG91bGQgbm90IGJlIG5lY2Vzc2FyeSwgaG93ZXZlciwgc2luY2UgZGF0YSB3 cml0dGVuIHRvIHRoZSBXZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkCisgICAgICAgIHNob3VsZCBu ZXZlciBuZWVkIHRvIGJlIHJlYWQgYnkgYW4gYWN0dWFsIFVJUGFzdGVib2FyZC4gVGhpcyB3aWxs IGJlIHJlZmFjdG9yZWQgaW4gYSBmdXR1cmUgcGF0Y2ggdG8gYWRkIGEKKyAgICAgICAgc3BlY2lh bCB0eXBlIG9mIFdlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQtYXdhcmUgUGxhdGZvcm1QYXN0ZWJv YXJkLgorCisgICAgICAgIEFsc28gZml4ZXMgc29tZSByZWZlcmVuY2UgY291bnRpbmcgaXNzdWVz IGluIFdlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQgYnkgY2hhbmdpbmcgdGhlIGFycmF5IG9mIF9p dGVtUHJvdmlkZXJzCisgICAgICAgIHRvIGJlIGEgUmV0YWluUHRyLgorCisgICAgICAgICogcGxh dGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW06CisgICAgICAgICgtW1dlYkl0 ZW1Qcm92aWRlclBhc3RlYm9hcmQgaW5pdF0pOgorICAgICAgICAoLVtXZWJJdGVtUHJvdmlkZXJQ YXN0ZWJvYXJkIHBhc3RlYm9hcmRUeXBlc10pOgorICAgICAgICAoLVtXZWJJdGVtUHJvdmlkZXJQ YXN0ZWJvYXJkIGl0ZW1Qcm92aWRlcnNdKToKKyAgICAgICAgKC1bV2ViSXRlbVByb3ZpZGVyUGFz dGVib2FyZCBzZXRJdGVtUHJvdmlkZXJzOl0pOgorICAgICAgICAoLVtXZWJJdGVtUHJvdmlkZXJQ YXN0ZWJvYXJkIG51bWJlck9mSXRlbXNdKToKKyAgICAgICAgKC1bV2ViSXRlbVByb3ZpZGVyUGFz dGVib2FyZCBzZXRJdGVtczpdKToKKyAgICAgICAgKC1bV2ViSXRlbVByb3ZpZGVyUGFzdGVib2Fy ZCB2YWx1ZXNGb3JQYXN0ZWJvYXJkVHlwZTppbkl0ZW1TZXQ6XSk6CisgICAgICAgICgtW1dlYkl0 ZW1Qcm92aWRlclBhc3RlYm9hcmQgaXRlbVByb3ZpZGVyQXRJbmRleDpdKToKKyAgICAgICAgKC1b V2ViSXRlbVByb3ZpZGVyUGFzdGVib2FyZCBkZWFsbG9jXSk6IERlbGV0ZWQuCisKIDIwMTctMDIt MDUgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgRGF0 YSBpbnRlcmFjdGlvbiBmYWlscyBpbiBTYWZhcmkgc3BsaXRzY3JlZW4gbW9kZSB3aGVuIGRyb3Bw aW5nIGludG8gYSBjb250ZW50ZWRpdGFibGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2lvcy9XZWJJdGVtUHJvdmlkZXJQYXN0ZWJvYXJkLm1tIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0KaW5kZXggODE2MDEyMDRh NjU1ZTI1NzVmZTk3ZTU3OTE0YjEzOWFkZmEwMmYxNi4uYzJjZGVlY2I1NzMwNWQ3MDA2NGU5ZDQy M2VhN2Q2NDM3ZTQ1ZmE1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vaW9z L1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW9zL1dlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQubW0KQEAgLTM0LDYgKzM0LDggQEAKICNp bXBvcnQgPE1vYmlsZUNvcmVTZXJ2aWNlcy9Nb2JpbGVDb3JlU2VydmljZXMuaD4KICNpbXBvcnQg PFVJS2l0L1VJQ29sb3IuaD4KICNpbXBvcnQgPFVJS2l0L1VJSW1hZ2UuaD4KKyNpbXBvcnQgPFVJ S2l0L1VJSXRlbVByb3ZpZGVyV3JpdGluZy5oPgorI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgog CiBTT0ZUX0xJTktfRlJBTUVXT1JLKFVJS2l0KQogU09GVF9MSU5LX0NMQVNTKFVJS2l0LCBVSUNv bG9yKQpAQCAtNzYsNyArNzgsOSBAQCBzdGF0aWMgQk9PTCBpc0ltYWdlVHlwZShOU1N0cmluZyAq dHlwZSkKIAogQGVuZAogCi1AaW1wbGVtZW50YXRpb24gV2ViSXRlbVByb3ZpZGVyUGFzdGVib2Fy ZAorQGltcGxlbWVudGF0aW9uIFdlYkl0ZW1Qcm92aWRlclBhc3RlYm9hcmQgeworICAgIFJldGFp blB0cjxOU0FycmF5PiBfaXRlbVByb3ZpZGVyczsKK30KIAogKyAoaW5zdGFuY2V0eXBlKXNoYXJl ZEluc3RhbmNlCiB7CkBAIC05MSw1NiArOTUsNzIgQEAgc3RhdGljIEJPT0wgaXNJbWFnZVR5cGUo TlNTdHJpbmcgKnR5cGUpCiAtIChpbnN0YW5jZXR5cGUpaW5pdAogewogICAgIGlmIChzZWxmID0g W3N1cGVyIGluaXRdKSB7Ci0gICAgICAgIF9pdGVtUHJvdmlkZXJzID0gW1tOU0FycmF5IGFsbG9j XSBpbml0XTsKKyAgICAgICAgX2l0ZW1Qcm92aWRlcnMgPSBhZG9wdE5TKFtbTlNBcnJheSBhbGxv Y10gaW5pdF0pOwogICAgICAgICBfY2hhbmdlQ291bnQgPSAwOwogICAgICAgICBfcGVuZGluZ09w ZXJhdGlvbkNvdW50ID0gMDsKICAgICB9CiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKLS0gKHZvaWQp ZGVhbGxvYwotewotICAgIFtzdXBlciBkZWFsbG9jXTsKLSAgICBbX2l0ZW1Qcm92aWRlcnMgcmVs ZWFzZV07Ci19Ci0KIC0gKE5TQXJyYXk8TlNTdHJpbmcgKj4gKilwYXN0ZWJvYXJkVHlwZXMKIHsK ICAgICBOU011dGFibGVTZXQ8TlNTdHJpbmcgKj4gKmFsbFR5cGVzID0gW05TTXV0YWJsZVNldCBz ZXRdOwotICAgIGZvciAoVUlJdGVtUHJvdmlkZXIgKnByb3ZpZGVyIGluIF9pdGVtUHJvdmlkZXJz KQorICAgIGZvciAoVUlJdGVtUHJvdmlkZXIgKnByb3ZpZGVyIGluIF9pdGVtUHJvdmlkZXJzLmdl dCgpKQogICAgICAgICBbYWxsVHlwZXMgYWRkT2JqZWN0c0Zyb21BcnJheTpwcm92aWRlci5yZWdp c3RlcmVkVHlwZUlkZW50aWZpZXJzXTsKICAgICByZXR1cm4gYWxsVHlwZXMuYWxsT2JqZWN0czsK IH0KIAorLSAoTlNBcnJheTxVSUl0ZW1Qcm92aWRlciAqPiAqKWl0ZW1Qcm92aWRlcnMKK3sKKyAg ICByZXR1cm4gX2l0ZW1Qcm92aWRlcnMuZ2V0KCk7Cit9CisKIC0gKHZvaWQpc2V0SXRlbVByb3Zp ZGVyczooTlNBcnJheTxVSUl0ZW1Qcm92aWRlciAqPiAqKWl0ZW1Qcm92aWRlcnMKIHsKICAgICBp dGVtUHJvdmlkZXJzID0gaXRlbVByb3ZpZGVycyA/OiBbTlNBcnJheSBhcnJheV07CiAgICAgaWYg KF9pdGVtUHJvdmlkZXJzID09IGl0ZW1Qcm92aWRlcnMgfHwgW19pdGVtUHJvdmlkZXJzIGlzRXF1 YWxUb0FycmF5Oml0ZW1Qcm92aWRlcnNdKQogICAgICAgICByZXR1cm47Ci0gICAgX2l0ZW1Qcm92 aWRlcnMgPSBbaXRlbVByb3ZpZGVycyBjb3B5XTsKKworICAgIF9pdGVtUHJvdmlkZXJzID0gaXRl bVByb3ZpZGVyczsKICAgICBfY2hhbmdlQ291bnQrKzsKIH0KIAogLSAoTlNJbnRlZ2VyKW51bWJl ck9mSXRlbXMKIHsKLSAgICByZXR1cm4gX2l0ZW1Qcm92aWRlcnMuY291bnQ7CisgICAgcmV0dXJu IFtfaXRlbVByb3ZpZGVycyBjb3VudF07CiB9CiAKIC0gKHZvaWQpc2V0SXRlbXM6KE5TQXJyYXkg KilpdGVtcwogewotICAgIE5TTXV0YWJsZUFycmF5ICpwcm92aWRlcnMgPSBbW05TTXV0YWJsZUFy cmF5IGFsbG9jXSBpbml0XTsKKyAgICBOU011dGFibGVBcnJheSAqcHJvdmlkZXJzID0gW05TTXV0 YWJsZUFycmF5IGFycmF5XTsKICAgICBmb3IgKE5TRGljdGlvbmFyeSAqaXRlbSBpbiBpdGVtcykg ewogICAgICAgICBpZiAoIWl0ZW0uY291bnQpCiAgICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgVUlJdGVtUHJvdmlkZXIgKml0ZW1Qcm92aWRlciA9IFtbZ2V0VUlJdGVtUHJvdmlkZXJDbGFz cygpIGFsbG9jXSBpbml0XTsKLSAgICAgICAgZm9yIChOU1N0cmluZyAqdHlwZUlkZW50aWZpZXIg aW4gaXRlbSkgeworICAgICAgICBSZXRhaW5QdHI8VUlJdGVtUHJvdmlkZXI+IGl0ZW1Qcm92aWRl ciA9IGFkb3B0TlMoW1tnZXRVSUl0ZW1Qcm92aWRlckNsYXNzKCkgYWxsb2NdIGluaXRdKTsKKyAg ICAgICAgUmV0YWluUHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+IGl0ZW1SZXByZXNlbnRhdGlvbnND b3B5ID0gYWRvcHROUyhbaXRlbSBtdXRhYmxlQ29weV0pOworICAgICAgICAvLyBGaXJzdCwgbGV0 IHRoZSBwbGF0Zm9ybSB3cml0ZSBhbGwgdGhlIGRlZmF1bHQgb2JqZWN0IHR5cGVzIGl0IGNhbiBy ZWNvZ25pemUsIHN1Y2ggYXMgTlNTdHJpbmcgYW5kIE5TVVJMLgorICAgICAgICBmb3IgKE5TU3Ry aW5nICp0eXBlSWRlbnRpZmllciBpbiBbaXRlbVJlcHJlc2VudGF0aW9uc0NvcHkgYWxsS2V5c10p IHsKKyAgICAgICAgICAgIGlkIHJlcHJlc2VudGluZ09iamVjdCA9IFtpdGVtUmVwcmVzZW50YXRp b25zQ29weSBvYmplY3RGb3JLZXk6dHlwZUlkZW50aWZpZXJdOworICAgICAgICAgICAgaWYgKCFb cmVwcmVzZW50aW5nT2JqZWN0IGNvbmZvcm1zVG9Qcm90b2NvbDpAcHJvdG9jb2woVUlJdGVtUHJv dmlkZXJXcml0aW5nKV0pCisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgICAg IGlkIDxVSUl0ZW1Qcm92aWRlcldyaXRpbmc+IG9iamVjdFRvV3JpdGUgPSAoaWQgPFVJSXRlbVBy b3ZpZGVyV3JpdGluZz4pcmVwcmVzZW50aW5nT2JqZWN0OworICAgICAgICAgICAgaWYgKCFbb2Jq ZWN0VG9Xcml0ZS53cml0YWJsZVR5cGVJZGVudGlmaWVyc0Zvckl0ZW1Qcm92aWRlciBjb250YWlu c09iamVjdDp0eXBlSWRlbnRpZmllcl0pCisgICAgICAgICAgICAgICAgY29udGludWU7CisKKyAg ICAgICAgICAgIFtpdGVtUmVwcmVzZW50YXRpb25zQ29weSByZW1vdmVPYmplY3RGb3JLZXk6dHlw ZUlkZW50aWZpZXJdOworICAgICAgICAgICAgW29iamVjdFRvV3JpdGUgcmVnaXN0ZXJMb2FkSGFu ZGxlcnNUb0l0ZW1Qcm92aWRlcjppdGVtUHJvdmlkZXIuZ2V0KCldOworICAgICAgICB9CisKKyAg ICAgICAgLy8gU2Vjb25kbHksIFdlYktpdCB1c2VzIHNvbWUgY3VzdG9tIHR5cGUgcmVwcmVzZW50 YXRpb25zIGFuZC9vciB0eXBlIGlkZW50aWZpZXJzLCBzbyB3ZSBuZWVkIHRvIHdyaXRlIHRoZXNl IGFzIHdlbGwuCisgICAgICAgIGZvciAoTlNTdHJpbmcgKnR5cGVJZGVudGlmaWVyIGluIGl0ZW1S ZXByZXNlbnRhdGlvbnNDb3B5LmdldCgpKSB7CiAgICAgICAgICAgICBbaXRlbVByb3ZpZGVyIHJl Z2lzdGVyRGF0YVJlcHJlc2VudGF0aW9uRm9yVHlwZUlkZW50aWZpZXI6dHlwZUlkZW50aWZpZXIg b3B0aW9uczpuaWwgbG9hZEhhbmRsZXI6Xk5TUHJvZ3Jlc3MgKihVSUl0ZW1Qcm92aWRlckRhdGFM b2FkQ29tcGxldGlvbkJsb2NrIGNvbXBsZXRpb25CbG9jaykKICAgICAgICAgICAgIHsKLSAgICAg ICAgICAgICAgICBjb21wbGV0aW9uQmxvY2soaXRlbVt0eXBlSWRlbnRpZmllcl0sIG5pbCk7Cisg ICAgICAgICAgICAgICAgY29tcGxldGlvbkJsb2NrKFtpdGVtUmVwcmVzZW50YXRpb25zQ29weSBv YmplY3RGb3JLZXk6dHlwZUlkZW50aWZpZXJdLCBuaWwpOwogICAgICAgICAgICAgICAgIHJldHVy biBbTlNQcm9ncmVzcyBkaXNjcmV0ZVByb2dyZXNzV2l0aFRvdGFsVW5pdENvdW50OjEwMF07CiAg ICAgICAgICAgICB9XTsKICAgICAgICAgfQotICAgICAgICBbcHJvdmlkZXJzIGFkZE9iamVjdDpp dGVtUHJvdmlkZXJdOworICAgICAgICBbcHJvdmlkZXJzIGFkZE9iamVjdDppdGVtUHJvdmlkZXIu Z2V0KCldOwogICAgIH0KICAgICBfY2hhbmdlQ291bnQrKzsKICAgICBfaXRlbVByb3ZpZGVycyA9 IHByb3ZpZGVyczsKQEAgLTE3NCw3ICsxOTQsNyBAQCBzdGF0aWMgQk9PTCBpc0ltYWdlVHlwZShO U1N0cmluZyAqdHlwZSkKICAgICAgICAgaWYgKGlzQ29sb3JUeXBlKHBhc3RlYm9hcmRUeXBlKSAm JiBbc2VsZiBfdHJ5VG9DcmVhdGVBbmRBcHBlbmRPYmplY3RPZkNsYXNzOltnZXRVSUNvbG9yQ2xh c3MoKSBjbGFzc10gdG9BcnJheTp2YWx1ZXMgdXNpbmdQcm92aWRlcjpwcm92aWRlcl0pCiAgICAg ICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKGlzSW1hZ2VUeXBlKHBhc3RlYm9hcmRUeXBl KSAmJiBbc2VsZiBfdHJ5VG9DcmVhdGVBbmRBcHBlbmRPYmplY3RPZkNsYXNzOltOU1N0cmluZyBj bGFzc10gdG9BcnJheTp2YWx1ZXMgdXNpbmdQcm92aWRlcjpwcm92aWRlcl0pCisgICAgICAgIGlm IChpc0ltYWdlVHlwZShwYXN0ZWJvYXJkVHlwZSkgJiYgW3NlbGYgX3RyeVRvQ3JlYXRlQW5kQXBw ZW5kT2JqZWN0T2ZDbGFzczpbZ2V0VUlJbWFnZUNsYXNzKCkgY2xhc3NdIHRvQXJyYXk6dmFsdWVz IHVzaW5nUHJvdmlkZXI6cHJvdmlkZXJdKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAg IGlmIChpc1VSTFR5cGUocGFzdGVib2FyZFR5cGUpICYmIFtzZWxmIF90cnlUb0NyZWF0ZUFuZEFw cGVuZE9iamVjdE9mQ2xhc3M6W05TVVJMIGNsYXNzXSB0b0FycmF5OnZhbHVlcyB1c2luZ1Byb3Zp ZGVyOnByb3ZpZGVyXSkKQEAgLTIxMCw3ICsyMzAsNyBAQCBzdGF0aWMgQk9PTCBpc0ltYWdlVHlw ZShOU1N0cmluZyAqdHlwZSkKIAogLSAoVUlJdGVtUHJvdmlkZXIgKilpdGVtUHJvdmlkZXJBdElu ZGV4OihOU0ludGVnZXIpaW5kZXgKIHsKLSAgICByZXR1cm4gMCA8PSBpbmRleCAmJiBpbmRleCA8 IChOU0ludGVnZXIpX2l0ZW1Qcm92aWRlcnMuY291bnQgPyBfaXRlbVByb3ZpZGVyc1tpbmRleF0g OiBuaWw7CisgICAgcmV0dXJuIDAgPD0gaW5kZXggJiYgaW5kZXggPCAoTlNJbnRlZ2VyKVtfaXRl bVByb3ZpZGVycyBjb3VudF0gPyBbX2l0ZW1Qcm92aWRlcnMgb2JqZWN0QXRJbmRleDppbmRleF0g OiBuaWw7CiB9CiAKIC0gKEJPT0wpaGFzUGVuZGluZ09wZXJhdGlvbgo=