175683 2017-08-17 13:08:09 -0700 Fix the build on other platforms after r220865 2017-08-17 15:21:03 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh commit-queue mitz thorton webkit-bug-importer oldest_to_newest 1339706 0 wenson_hsieh 2017-08-17 13:08:09 -0700 Currently, NSItemProvider-related UIPasteboard APIs only exist in the iOS 11 SDK. I tried to guard iOS 10 codepaths in PlatformPasteboardIOS.mm with __IPHONE_OS_VERSION_MAX_ALLOWED < 110000 and assume that item provider APIs would be available otherwise, but this is not the case. Revert to special casing code that uses item provider APIs with __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000, instead of the inverse. 1339714 1 318409 wenson_hsieh 2017-08-17 13:25:20 -0700 Created attachment 318409 Patch 1339781 2 318409 wenson_hsieh 2017-08-17 14:50:18 -0700 Comment on attachment 318409 Patch Thanks Tim! 1339793 3 318409 commit-queue 2017-08-17 15:20:06 -0700 Comment on attachment 318409 Patch Clearing flags on attachment: 318409 Committed r220883: <http://trac.webkit.org/changeset/220883> 1339794 4 commit-queue 2017-08-17 15:20:08 -0700 All reviewed patches have been landed. Closing bug. 1339795 5 webkit-bug-importer 2017-08-17 15:21:03 -0700 <rdar://problem/33951376> 318409 2017-08-17 13:25:20 -0700 2017-08-17 15:20:06 -0700 Patch bug-175683-20170817132519.patch text/plain 12075 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwODY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMTQ2NTdkNDQ1NzIxNzAw YzBlNThiNmFkYjI1N2UyY2YzZjBjNzI4Yi4uMzlkYzE4YTlkNjUxYWI1MTMwODAyMTM2ODk3Mjhk MDYyOGUwN2JlNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDE3LTA4LTE3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgogCisgICAgICAgIEZpeCB0aGUgYnVp bGQgb24gb3RoZXIgcGxhdGZvcm1zIGFmdGVyIHIyMjA4NjUKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTY4MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEluc3RlYWQgb2Ygc3BlY2lhbCBjYXNpbmcgaU9T IDEwIGJlaGF2aW9yIHdpdGggX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCA8IDExMDAw MCwgcmV2ZXJ0IHRvIHNwZWNpYWwKKyAgICAgICAgY2FzaW5nIGlPUyAxMSBiZWhhdmlvciB3aXRo IF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQgPj0gMTEwMDAwLiBUaGlzIGlzIGJlY2F1 c2Ugb3RoZXIgdGFyZ2V0cyB0aGF0IGFyZQorICAgICAgICBuZWl0aGVyIGlPUyAxMCBub3IgMTEg d2lsbCBmYWlsIHRoZSAiYmVmb3JlIGlPUyAxMSIgY29tcGlsZS10aW1lIGNoZWNrLCBhbmQgc3Vi c2VxdWVudGx5IGFzc3VtZSB0aGF0IGl0ZW0KKyAgICAgICAgcHJvdmlkZXJzIGV4aXN0LiBUbyBm aXggdGhpcywgZmxpcCB0aGUgY29tcGlsZXItdGltZSBjaGVja3MgYW5kIHRoZSBvcmRlciBvZiBj b2RlYmxvY2tzIGluIHRoZQorICAgICAgICBQbGF0Zm9ybVBhc3RlYm9hcmQ6OndyaXRlIG1ldGhv ZHMuCisKKyAgICAgICAgVGhlcmUgaXMgbm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisgICAgICAg ICogcGxhdGZvcm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbToKKyAgICAgICAgKFdlYkNv cmU6OnJlZ2lzdGVySXRlbVRvUGFzdGVib2FyZCk6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9y bVBhc3RlYm9hcmQ6OndyaXRlKToKKworMjAxNy0wOC0xNyAgV2Vuc29uIEhzaWVoICA8d2Vuc29u X2hzaWVoQGFwcGxlLmNvbT4KKwogICAgICAgICBbaU9TXSBSZXNwZWN0IHR5cGUgZmlkZWxpdGll cyB3aGVuIGNvcHlpbmcgaW1hZ2UgZWxlbWVudHMgdG8gdGhlIHBhc3RlYm9hcmQKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTYzOAogICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMjY1NTYwNDM+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9pb3MvUGxhdGZvcm1QYXN0ZWJvYXJkSU9TLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vaW9zL1BsYXRmb3JtUGFzdGVib2FyZElPUy5tbQppbmRleCA5MzY3MDFhZTk5ZDcxMzYzMjJh MzU1ODhhY2QwNzdmNTEwMGQ3N2E1Li4yNWJmYjdhNzg3YjQ3MTE5YTM5MjdjMmVhMWM2NzYyMTBl YjQ1YzFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9pb3MvUGxhdGZvcm1Q YXN0ZWJvYXJkSU9TLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2lvcy9QbGF0Zm9y bVBhc3RlYm9hcmRJT1MubW0KQEAgLTE3NSw3ICsxNzUsMjIgQEAgU3RyaW5nIFBsYXRmb3JtUGFz dGVib2FyZDo6dW5pcXVlTmFtZSgpCiAKIHN0YXRpYyBOU1N0cmluZyAqd2ViSU9TUGFzdGVQYm9h cmRUeXBlID0gQCJpT1MgcmljaCBjb250ZW50IHBhc3RlIHBhc3RlYm9hcmQgdHlwZSI7CiAKLSNp ZiBfX0lQSE9ORV9PU19WRVJTSU9OX01BWF9BTExPV0VEIDwgMTEwMDAwCisjaWYgX19JUEhPTkVf T1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCisKK3N0YXRpYyB2b2lkIHJlZ2lzdGVy SXRlbVRvUGFzdGVib2FyZChXZWJJdGVtUHJvdmlkZXJSZWdpc3RyYXRpb25JbmZvTGlzdCAqcmVw cmVzZW50YXRpb25zVG9SZWdpc3RlciwgaWQgPEFic3RyYWN0UGFzdGVib2FyZD4gcGFzdGVib2Fy ZCkKK3sKKyAgICBVSUl0ZW1Qcm92aWRlciAqaXRlbVByb3ZpZGVyID0gW3JlcHJlc2VudGF0aW9u c1RvUmVnaXN0ZXIgaXRlbVByb3ZpZGVyXTsKKyAgICBpZiAoIWl0ZW1Qcm92aWRlcikgeworICAg ICAgICBbcGFzdGVib2FyZCBzZXRJdGVtUHJvdmlkZXJzOkBbIF1dOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgW3Bhc3RlYm9hcmQgc2V0SXRlbVByb3ZpZGVyczpAWyBpdGVtUHJvdmlk ZXIgXV07CisgICAgaWYgKFtwYXN0ZWJvYXJkIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io c2V0UmVnaXN0cmF0aW9uSW5mb0xpc3RzOildKQorICAgICAgICBbcGFzdGVib2FyZCBzZXRSZWdp c3RyYXRpb25JbmZvTGlzdHM6QFsgcmVwcmVzZW50YXRpb25zVG9SZWdpc3RlciBdXTsKK30KKwor I2Vsc2UKIAogc3RhdGljIFJldGFpblB0cjxOU0RpY3Rpb25hcnk+IHJpY2hUZXh0UmVwcmVzZW50 YXRpb25zRm9yUGFzdGVib2FyZFdlYkNvbnRlbnQoY29uc3QgUGFzdGVib2FyZFdlYkNvbnRlbnQm IGNvbnRlbnQpCiB7CkBAIC0xOTksMjEgKzIxNCw2IEBAIHN0YXRpYyBSZXRhaW5QdHI8TlNEaWN0 aW9uYXJ5PiByaWNoVGV4dFJlcHJlc2VudGF0aW9uc0ZvclBhc3RlYm9hcmRXZWJDb250ZW50KGNv CiAgICAgcmV0dXJuIHJlcHJlc2VudGF0aW9uczsKIH0KIAotI2Vsc2UKLQotc3RhdGljIHZvaWQg cmVnaXN0ZXJJdGVtVG9QYXN0ZWJvYXJkKFdlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhdGlvbkluZm9M aXN0ICpyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyLCBpZCA8QWJzdHJhY3RQYXN0ZWJvYXJkPiBw YXN0ZWJvYXJkKQotewotICAgIFVJSXRlbVByb3ZpZGVyICppdGVtUHJvdmlkZXIgPSBbcmVwcmVz ZW50YXRpb25zVG9SZWdpc3RlciBpdGVtUHJvdmlkZXJdOwotICAgIGlmICghaXRlbVByb3ZpZGVy KSB7Ci0gICAgICAgIFtwYXN0ZWJvYXJkIHNldEl0ZW1Qcm92aWRlcnM6QFsgXV07Ci0gICAgICAg IHJldHVybjsKLSAgICB9Ci0KLSAgICBbcGFzdGVib2FyZCBzZXRJdGVtUHJvdmlkZXJzOkBbIGl0 ZW1Qcm92aWRlciBdXTsKLSAgICBpZiAoW3Bhc3RlYm9hcmQgcmVzcG9uZHNUb1NlbGVjdG9yOkBz ZWxlY3RvcihzZXRSZWdpc3RyYXRpb25JbmZvTGlzdHM6KV0pCi0gICAgICAgIFtwYXN0ZWJvYXJk IHNldFJlZ2lzdHJhdGlvbkluZm9MaXN0czpAWyByZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyIF1d OwotfQotCiAjZW5kaWYKIAogI2lmIEVOQUJMRShEQVRBX0lOVEVSQUNUSU9OKQpAQCAtMjUyLDIx ICsyNTIsNyBAQCBib29sIFBsYXRmb3JtUGFzdGVib2FyZDo6YWxsb3dSZWFkaW5nVVJMQXRJbmRl eChjb25zdCBVUkwmLCBpbnQpIGNvbnN0CiAKIHZvaWQgUGxhdGZvcm1QYXN0ZWJvYXJkOjp3cml0 ZShjb25zdCBQYXN0ZWJvYXJkV2ViQ29udGVudCYgY29udGVudCkKIHsKLSNpZiBfX0lQSE9ORV9P U19WRVJTSU9OX01BWF9BTExPV0VEIDwgMTEwMDAwCi0gICAgUmV0YWluUHRyPE5TTXV0YWJsZURp Y3Rpb25hcnk+IHJlcHJlc2VudGF0aW9ucyA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5 IGFsbG9jXSBpbml0XSk7Ci0gICAgW3JlcHJlc2VudGF0aW9ucyBhZGRFbnRyaWVzRnJvbURpY3Rp b25hcnk6cmljaFRleHRSZXByZXNlbnRhdGlvbnNGb3JQYXN0ZWJvYXJkV2ViQ29udGVudChjb250 ZW50KS5hdXRvcmVsZWFzZSgpXTsKLQotICAgIE5TU3RyaW5nICp0ZXh0QXNTdHJpbmcgPSBjb250 ZW50LmRhdGFJblN0cmluZ0Zvcm1hdDsKLSAgICBbcmVwcmVzZW50YXRpb25zIHNldFZhbHVlOlt0 ZXh0QXNTdHJpbmcgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddIGZvcktl eTooTlNTdHJpbmcgKilrVVRUeXBlVVRGOFBsYWluVGV4dF07Ci0gICAgW3JlcHJlc2VudGF0aW9u cyBzZXRWYWx1ZTpbdGV4dEFzU3RyaW5nIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGMTZTdHJpbmdF bmNvZGluZ10gZm9yS2V5OihOU1N0cmluZyAqKWtVVFR5cGVVVEYxNlBsYWluVGV4dF07Ci0gICAg Ly8gRklYTUU6IFdlIHZlbmQgInB1YmxpYy50ZXh0IiBoZXJlIGZvciBiYWNrd2FyZHMgY29tcGF0 aWJpbGl0eSB3aXRoIHByZS1pT1MgMTEgYXBwcy4gSW4gdGhlIGZ1dHVyZSwgd2Ugc2hvdWxkIHN0 b3AgdmVuZGluZyB0aGlzIFVUSSwKLSAgICAvLyBhbmQgaW5zdGVhZCBzZXQgZGF0YSBmb3IgY29u Y3JldGUgcGxhaW4gdGV4dCB0eXBlcy4gU2VlIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTczMzE3Pi4KLSAgICBbcmVwcmVzZW50YXRpb25zIHNldFZhbHVlOnRleHRB c1N0cmluZyBmb3JLZXk6KE5TU3RyaW5nICopa1VUVHlwZVRleHRdOwotCi0gICAgLy8gRXhwbGlj aXRseSBjYXN0IG1fcGFzdGVib2FyZCB0byBVSVBhc3RlYm9hcmQgKiB0byB3b3JrIGFyb3VuZCBy ZGFyOi8vcHJvYmxlbS8zMzM4MzM1NC4KLSAgICBBU1NFUlQoW21fcGFzdGVib2FyZCBpc0tpbmRP ZkNsYXNzOmdldFVJUGFzdGVib2FyZENsYXNzKCldKTsKLSAgICBbKFVJUGFzdGVib2FyZCAqKW1f cGFzdGVib2FyZCBzZXRJdGVtczpAW3JlcHJlc2VudGF0aW9ucy5nZXQoKV1dOwotI2Vsc2UKKyNp ZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMTAwMDAKICAgICBhdXRvIHJl cHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgPSBhZG9wdE5TKFtbV2ViSXRlbVByb3ZpZGVyUmVnaXN0 cmF0aW9uSW5mb0xpc3QgYWxsb2NdIGluaXRdKTsKIAogICAgIFtyZXByZXNlbnRhdGlvbnNUb1Jl Z2lzdGVyIGFkZERhdGE6W3dlYklPU1Bhc3RlUGJvYXJkVHlwZSBkYXRhVXNpbmdFbmNvZGluZzpO U1VURjhTdHJpbmdFbmNvZGluZ10gZm9yVHlwZTp3ZWJJT1NQYXN0ZVBib2FyZFR5cGVdOwpAQCAt Mjk0LDIzICsyODAsMjYgQEAgdm9pZCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OndyaXRlKGNvbnN0IFBh c3RlYm9hcmRXZWJDb250ZW50JiBjb250ZW50KQogICAgICAgICBhZGRSZXByZXNlbnRhdGlvbnNG b3JQbGFpblRleHQocmVwcmVzZW50YXRpb25zVG9SZWdpc3Rlci5nZXQoKSwgY29udGVudC5kYXRh SW5TdHJpbmdGb3JtYXQpOwogCiAgICAgcmVnaXN0ZXJJdGVtVG9QYXN0ZWJvYXJkKHJlcHJlc2Vu dGF0aW9uc1RvUmVnaXN0ZXIuZ2V0KCksIG1fcGFzdGVib2FyZC5nZXQoKSk7Ci0jZW5kaWYKLX0K LQotdm9pZCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OndyaXRlKGNvbnN0IFBhc3RlYm9hcmRJbWFnZSYg cGFzdGVib2FyZEltYWdlKQotewotI2lmIF9fSVBIT05FX09TX1ZFUlNJT05fTUFYX0FMTE9XRUQg PCAxMTAwMDAKKyNlbHNlCiAgICAgUmV0YWluUHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+IHJlcHJl c2VudGF0aW9ucyA9IGFkb3B0TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0XSk7 Ci0gICAgaWYgKCFwYXN0ZWJvYXJkSW1hZ2UucmVzb3VyY2VNSU1FVHlwZS5pc051bGwoKSkgewot ICAgICAgICBbcmVwcmVzZW50YXRpb25zIHNldE9iamVjdDpwYXN0ZWJvYXJkSW1hZ2UucmVzb3Vy Y2VEYXRhLT5jcmVhdGVOU0RhdGEoKS5nZXQoKSBmb3JLZXk6cGFzdGVib2FyZEltYWdlLnJlc291 cmNlTUlNRVR5cGVdOwotICAgICAgICBpZiAoIXBhc3RlYm9hcmRJbWFnZS51cmwudXJsLmlzTnVs bCgpKQotICAgICAgICAgICAgW3JlcHJlc2VudGF0aW9ucyBzZXRPYmplY3Q6KE5TVVJMICopcGFz dGVib2FyZEltYWdlLnVybC51cmwgZm9yS2V5OihOU1N0cmluZyAqKWtVVFR5cGVVUkxdOwotICAg IH0KKyAgICBbcmVwcmVzZW50YXRpb25zIGFkZEVudHJpZXNGcm9tRGljdGlvbmFyeTpyaWNoVGV4 dFJlcHJlc2VudGF0aW9uc0ZvclBhc3RlYm9hcmRXZWJDb250ZW50KGNvbnRlbnQpLmF1dG9yZWxl YXNlKCldOworCisgICAgTlNTdHJpbmcgKnRleHRBc1N0cmluZyA9IGNvbnRlbnQuZGF0YUluU3Ry aW5nRm9ybWF0OworICAgIFtyZXByZXNlbnRhdGlvbnMgc2V0VmFsdWU6W3RleHRBc1N0cmluZyBk YXRhVXNpbmdFbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZ10gZm9yS2V5OihOU1N0cmluZyAq KWtVVFR5cGVVVEY4UGxhaW5UZXh0XTsKKyAgICBbcmVwcmVzZW50YXRpb25zIHNldFZhbHVlOlt0 ZXh0QXNTdHJpbmcgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEYxNlN0cmluZ0VuY29kaW5nXSBmb3JL ZXk6KE5TU3RyaW5nICopa1VUVHlwZVVURjE2UGxhaW5UZXh0XTsKKyAgICAvLyBGSVhNRTogV2Ug dmVuZCAicHVibGljLnRleHQiIGhlcmUgZm9yIGJhY2t3YXJkcyBjb21wYXRpYmlsaXR5IHdpdGgg cHJlLWlPUyAxMSBhcHBzLiBJbiB0aGUgZnV0dXJlLCB3ZSBzaG91bGQgc3RvcCB2ZW5kaW5nIHRo aXMgVVRJLAorICAgIC8vIGFuZCBpbnN0ZWFkIHNldCBkYXRhIGZvciBjb25jcmV0ZSBwbGFpbiB0 ZXh0IHR5cGVzLiBTZWUgPGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x NzMzMTc+LgorICAgIFtyZXByZXNlbnRhdGlvbnMgc2V0VmFsdWU6dGV4dEFzU3RyaW5nIGZvcktl eTooTlNTdHJpbmcgKilrVVRUeXBlVGV4dF07CiAKICAgICAvLyBFeHBsaWNpdGx5IGNhc3QgbV9w YXN0ZWJvYXJkIHRvIFVJUGFzdGVib2FyZCAqIHRvIHdvcmsgYXJvdW5kIHJkYXI6Ly9wcm9ibGVt LzMzMzgzMzU0LgogICAgIEFTU0VSVChbbV9wYXN0ZWJvYXJkIGlzS2luZE9mQ2xhc3M6Z2V0VUlQ YXN0ZWJvYXJkQ2xhc3MoKV0pOwogICAgIFsoVUlQYXN0ZWJvYXJkICopbV9wYXN0ZWJvYXJkIHNl dEl0ZW1zOkBbcmVwcmVzZW50YXRpb25zLmdldCgpXV07Ci0jZWxzZQorI2VuZGlmCit9CisKK3Zv aWQgUGxhdGZvcm1QYXN0ZWJvYXJkOjp3cml0ZShjb25zdCBQYXN0ZWJvYXJkSW1hZ2UmIHBhc3Rl Ym9hcmRJbWFnZSkKK3sKKyNpZiBfX0lQSE9ORV9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MTAwMDAKICAgICBhdXRvIHJlcHJlc2VudGF0aW9uc1RvUmVnaXN0ZXIgPSBhZG9wdE5TKFtbV2Vi SXRlbVByb3ZpZGVyUmVnaXN0cmF0aW9uSW5mb0xpc3QgYWxsb2NdIGluaXRdKTsKIAogICAgIGF1 dG8mIHR5cGVzID0gcGFzdGVib2FyZEltYWdlLmNsaWVudFR5cGVzOwpAQCAtMzM5LDEyICszMjgs MzYgQEAgdm9pZCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OndyaXRlKGNvbnN0IFBhc3RlYm9hcmRJbWFn ZSYgcGFzdGVib2FyZEltYWdlKQogICAgIH0KIAogICAgIHJlZ2lzdGVySXRlbVRvUGFzdGVib2Fy ZChyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyLmdldCgpLCBtX3Bhc3RlYm9hcmQuZ2V0KCkpOwor I2Vsc2UKKyAgICBSZXRhaW5QdHI8TlNNdXRhYmxlRGljdGlvbmFyeT4gcmVwcmVzZW50YXRpb25z ID0gYWRvcHROUyhbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKKyAgICBpZiAo IXBhc3RlYm9hcmRJbWFnZS5yZXNvdXJjZU1JTUVUeXBlLmlzTnVsbCgpKSB7CisgICAgICAgIFty ZXByZXNlbnRhdGlvbnMgc2V0T2JqZWN0OnBhc3RlYm9hcmRJbWFnZS5yZXNvdXJjZURhdGEtPmNy ZWF0ZU5TRGF0YSgpLmdldCgpIGZvcktleTpwYXN0ZWJvYXJkSW1hZ2UucmVzb3VyY2VNSU1FVHlw ZV07CisgICAgICAgIGlmICghcGFzdGVib2FyZEltYWdlLnVybC51cmwuaXNOdWxsKCkpCisgICAg ICAgICAgICBbcmVwcmVzZW50YXRpb25zIHNldE9iamVjdDooTlNVUkwgKilwYXN0ZWJvYXJkSW1h Z2UudXJsLnVybCBmb3JLZXk6KE5TU3RyaW5nICopa1VUVHlwZVVSTF07CisgICAgfQorCisgICAg Ly8gRXhwbGljaXRseSBjYXN0IG1fcGFzdGVib2FyZCB0byBVSVBhc3RlYm9hcmQgKiB0byB3b3Jr IGFyb3VuZCByZGFyOi8vcHJvYmxlbS8zMzM4MzM1NC4KKyAgICBBU1NFUlQoW21fcGFzdGVib2Fy ZCBpc0tpbmRPZkNsYXNzOmdldFVJUGFzdGVib2FyZENsYXNzKCldKTsKKyAgICBbKFVJUGFzdGVi b2FyZCAqKW1fcGFzdGVib2FyZCBzZXRJdGVtczpAW3JlcHJlc2VudGF0aW9ucy5nZXQoKV1dOwog I2VuZGlmCiB9CiAKIHZvaWQgUGxhdGZvcm1QYXN0ZWJvYXJkOjp3cml0ZShjb25zdCBTdHJpbmcm IHBhc3RlYm9hcmRUeXBlLCBjb25zdCBTdHJpbmcmIHRleHQpCiB7Ci0jaWYgX19JUEhPTkVfT1Nf VkVSU0lPTl9NQVhfQUxMT1dFRCA8IDExMDAwMAorI2lmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlO X1JFUVVJUkVEID49IDExMDAwMAorICAgIGF1dG8gcmVwcmVzZW50YXRpb25zVG9SZWdpc3RlciA9 IGFkb3B0TlMoW1tXZWJJdGVtUHJvdmlkZXJSZWdpc3RyYXRpb25JbmZvTGlzdCBhbGxvY10gaW5p dF0pOworCisgICAgTlNTdHJpbmcgKnBhc3RlYm9hcmRUeXBlQXNOU1N0cmluZyA9IHBhc3RlYm9h cmRUeXBlOworICAgIGlmICghdGV4dC5pc0VtcHR5KCkgJiYgcGFzdGVib2FyZFR5cGVBc05TU3Ry aW5nLmxlbmd0aCkgeworICAgICAgICBhdXRvIHBhc3RlYm9hcmRUeXBlQXNDRlN0cmluZyA9IChD RlN0cmluZ1JlZilwYXN0ZWJvYXJkVHlwZUFzTlNTdHJpbmc7CisgICAgICAgIGlmIChVVFR5cGVD b25mb3Jtc1RvKHBhc3RlYm9hcmRUeXBlQXNDRlN0cmluZywga1VUVHlwZVVSTCkgfHwgVVRUeXBl Q29uZm9ybXNUbyhwYXN0ZWJvYXJkVHlwZUFzQ0ZTdHJpbmcsIGtVVFR5cGVUZXh0KSkKKyAgICAg ICAgICAgIGFkZFJlcHJlc2VudGF0aW9uc0ZvclBsYWluVGV4dChyZXByZXNlbnRhdGlvbnNUb1Jl Z2lzdGVyLmdldCgpLCB0ZXh0KTsKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgW3JlcHJlc2Vu dGF0aW9uc1RvUmVnaXN0ZXIgYWRkRGF0YTpbcGFzdGVib2FyZFR5cGVBc05TU3RyaW5nIGRhdGFV c2luZ0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXSBmb3JUeXBlOnBhc3RlYm9hcmRUeXBl XTsKKyAgICB9CisKKyAgICByZWdpc3Rlckl0ZW1Ub1Bhc3RlYm9hcmQocmVwcmVzZW50YXRpb25z VG9SZWdpc3Rlci5nZXQoKSwgbV9wYXN0ZWJvYXJkLmdldCgpKTsKKyNlbHNlCiAgICAgUmV0YWlu UHRyPE5TRGljdGlvbmFyeT4gcmVwcmVzZW50YXRpb25zID0gYWRvcHROUyhbW05TTXV0YWJsZURp Y3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKIAogICAgIE5TU3RyaW5nICp0ZXh0QXNTdHJpbmcgPSB0 ZXh0OwpAQCAtMzYzLDI3ICszNzYsMTIgQEAgdm9pZCBQbGF0Zm9ybVBhc3RlYm9hcmQ6OndyaXRl KGNvbnN0IFN0cmluZyYgcGFzdGVib2FyZFR5cGUsIGNvbnN0IFN0cmluZyYgdGV4dCkKICAgICAv LyBFeHBsaWNpdGx5IGNhc3QgbV9wYXN0ZWJvYXJkIHRvIFVJUGFzdGVib2FyZCAqIHRvIHdvcmsg YXJvdW5kIHJkYXI6Ly9wcm9ibGVtLzMzMzgzMzU0LgogICAgIEFTU0VSVChbbV9wYXN0ZWJvYXJk IGlzS2luZE9mQ2xhc3M6Z2V0VUlQYXN0ZWJvYXJkQ2xhc3MoKV0pOwogICAgIFsoVUlQYXN0ZWJv YXJkICopbV9wYXN0ZWJvYXJkIHNldEl0ZW1zOkBbcmVwcmVzZW50YXRpb25zLmdldCgpXV07Ci0j ZWxzZQotICAgIGF1dG8gcmVwcmVzZW50YXRpb25zVG9SZWdpc3RlciA9IGFkb3B0TlMoW1tXZWJJ dGVtUHJvdmlkZXJSZWdpc3RyYXRpb25JbmZvTGlzdCBhbGxvY10gaW5pdF0pOwotCi0gICAgTlNT dHJpbmcgKnBhc3RlYm9hcmRUeXBlQXNOU1N0cmluZyA9IHBhc3RlYm9hcmRUeXBlOwotICAgIGlm ICghdGV4dC5pc0VtcHR5KCkgJiYgcGFzdGVib2FyZFR5cGVBc05TU3RyaW5nLmxlbmd0aCkgewot ICAgICAgICBhdXRvIHBhc3RlYm9hcmRUeXBlQXNDRlN0cmluZyA9IChDRlN0cmluZ1JlZilwYXN0 ZWJvYXJkVHlwZUFzTlNTdHJpbmc7Ci0gICAgICAgIGlmIChVVFR5cGVDb25mb3Jtc1RvKHBhc3Rl Ym9hcmRUeXBlQXNDRlN0cmluZywga1VUVHlwZVVSTCkgfHwgVVRUeXBlQ29uZm9ybXNUbyhwYXN0 ZWJvYXJkVHlwZUFzQ0ZTdHJpbmcsIGtVVFR5cGVUZXh0KSkKLSAgICAgICAgICAgIGFkZFJlcHJl c2VudGF0aW9uc0ZvclBsYWluVGV4dChyZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyLmdldCgpLCB0 ZXh0KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAgW3JlcHJlc2VudGF0aW9uc1RvUmVnaXN0 ZXIgYWRkRGF0YTpbcGFzdGVib2FyZFR5cGVBc05TU3RyaW5nIGRhdGFVc2luZ0VuY29kaW5nOk5T VVRGOFN0cmluZ0VuY29kaW5nXSBmb3JUeXBlOnBhc3RlYm9hcmRUeXBlXTsKLSAgICB9Ci0KLSAg ICByZWdpc3Rlckl0ZW1Ub1Bhc3RlYm9hcmQocmVwcmVzZW50YXRpb25zVG9SZWdpc3Rlci5nZXQo KSwgbV9wYXN0ZWJvYXJkLmdldCgpKTsKICNlbmRpZgogfQogCiB2b2lkIFBsYXRmb3JtUGFzdGVi b2FyZDo6d3JpdGUoY29uc3QgUGFzdGVib2FyZFVSTCYgdXJsKQogewotI2lmIF9fSVBIT05FX09T X1ZFUlNJT05fTUFYX0FMTE9XRUQgPCAxMTAwMDAKLSAgICB3cml0ZShrVVRUeXBlVVJMLCB1cmwu dXJsLnN0cmluZygpKTsKLSNlbHNlCisjaWYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTEwMDAwCiAgICAgYXV0byByZXByZXNlbnRhdGlvbnNUb1JlZ2lzdGVyID0gYWRvcHRO UyhbW1dlYkl0ZW1Qcm92aWRlclJlZ2lzdHJhdGlvbkluZm9MaXN0IGFsbG9jXSBpbml0XSk7CiAK ICAgICBpZiAoTlNVUkwgKm5zVVJMID0gdXJsLnVybCkgewpAQCAtMzkzLDYgKzM5MSw4IEBAIHZv aWQgUGxhdGZvcm1QYXN0ZWJvYXJkOjp3cml0ZShjb25zdCBQYXN0ZWJvYXJkVVJMJiB1cmwpCiAg ICAgfQogCiAgICAgcmVnaXN0ZXJJdGVtVG9QYXN0ZWJvYXJkKHJlcHJlc2VudGF0aW9uc1RvUmVn aXN0ZXIuZ2V0KCksIG1fcGFzdGVib2FyZC5nZXQoKSk7CisjZWxzZQorICAgIHdyaXRlKGtVVFR5 cGVVUkwsIHVybC51cmwuc3RyaW5nKCkpOwogI2VuZGlmCiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xz L0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1MjM5NjI0ZjU0MThlZGMxMTM1Yjhl ODVjNjQ1ZTlmNWJhODU4ZjdiLi40NDhhYTU4MDkwNmI3YjhmNjU2NGI4ZDI2MDkzMDcyMDYwNjAw NTFkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMTcgQEAKIDIwMTctMDgtMTcgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2llaEBh cHBsZS5jb20+CiAKKyAgICAgICAgRml4IHRoZSBidWlsZCBvbiBvdGhlciBwbGF0Zm9ybXMgYWZ0 ZXIgcjIyMDg2NQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTc1NjgzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQ2hlY2sgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCBpbnN0ZWFkIG9mIF9fSVBI T05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEIGluIGFuIFNQSSBoZWFkZXIuIFNQSQorICAgICAg ICBhdmFpbGFiaWxpdHkgaXMgZGV0ZXJtaW5lZCBieSBTREsgdmVyc2lvbiByYXRoZXIgdGhhbiBk ZXBsb3ltZW50IHZlcnNpb24uCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2lvcy9VSUtpdFNQ SS5oOgorCisyMDE3LTA4LTE3ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29t PgorCiAgICAgICAgIFVucmV2aWV3ZWQsIHRyeSB0byBmaXggdGhlIGludGVybmFsIGlPUyAxMCBi dWlsZCBhZnRlciByMjIwODY1LgogCiAgICAgICAgICogVGVzdFdlYktpdEFQSS9pb3MvVUlLaXRT UEkuaDoKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL1VJS2l0U1BJLmggYi9U b29scy9UZXN0V2ViS2l0QVBJL2lvcy9VSUtpdFNQSS5oCmluZGV4IGRlNmY5NTIwMjQ0Y2Q3Njhm NWQ5MzNkMTE5ZTA2MjhlYjFjMDNhYzAuLjlkY2IyMjMxMWJjMzFkZTE1ZDU1NWM2ZDExYjJlZjQ2 ZWVjZjFjOTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvaW9zL1VJS2l0U1BJLmgK KysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9pb3MvVUlLaXRTUEkuaApAQCAtMjUsNyArMjUsNyBA QAogCiAjaWYgUExBVEZPUk0oSU9TKQogCi0jaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykgJiYg X19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTEwMDAwCisjaWYgVVNFKEFQUExF X0lOVEVSTkFMX1NESykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NQVhfQUxMT1dFRCA+PSAxMTAw MDAKIAogI2ltcG9ydCA8VUlLaXQvVUlBcHBsaWNhdGlvbl9Qcml2YXRlLmg+CiAK