189469 2018-09-10 00:06:01 -0700 Try to fix the iOSMac build 2018-09-10 13:58:32 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton commit-queue ddkilzer jlewis3 realdawei ryanhaddad tsavell webkit-bug-importer oldest_to_newest 1458087 0 thorton 2018-09-10 00:06:01 -0700 Try to fix the iOSMac build 1458089 1 349297 thorton 2018-09-10 00:06:34 -0700 Created attachment 349297 Patch 1458136 2 349297 ddkilzer 2018-09-10 09:06:08 -0700 Comment on attachment 349297 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=349297&action=review > Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm:85 > + Vector<PluginModuleInfo> plugins = WebKit::toImpl(contextRef)->pluginInfoStore().plugins(); In file included from /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebKit2/unified-sources/UnifiedSource14-mm.mm:5: /Volumes/Data/EWS/WebKit/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm:85:12: error: unknown type name 'PluginModuleInfo'; did you mean 'WebKit::PluginModuleInfo'? Vector<PluginModuleInfo> plugins = WebKit::toImpl(contextRef)->pluginInfoStore().plugins(); ^~~~~~~~~~~~~~~~ WebKit::PluginModuleInfo In file included from /Volumes/Data/EWS/WebKit/WebKitBuild/Release/DerivedSources/WebKit2/unified-sources/UnifiedSource14-mm.mm:5: In file included from /Volumes/Data/EWS/WebKit/Source/WebKit/UIProcess/API/C/mac/WKContextPrivateMac.mm:40: In file included from /Volumes/Data/EWS/WebKit/Source/WebKit/UIProcess/WebProcessPool.h:30: In file included from /Volumes/Data/EWS/WebKit/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h:30: /Volumes/Data/EWS/WebKit/Source/WebKit/UIProcess/WebsiteData/WebsiteDataStore.h:71:8: note: 'WebKit::PluginModuleInfo' declared here struct PluginModuleInfo; ^ 1 error generated. 1458170 3 349319 thorton 2018-09-10 11:54:34 -0700 Created attachment 349319 Patch 1458201 4 349319 commit-queue 2018-09-10 13:47:26 -0700 Comment on attachment 349319 Patch Rejecting attachment 349319 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 349319, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit /Volumes/Data/EWS/WebKit/Source/WebKit/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: https://webkit-queues.webkit.org/results/9163894 1458209 5 thorton 2018-09-10 13:57:13 -0700 https://trac.webkit.org/changeset/235859/webkit 1458211 6 webkit-bug-importer 2018-09-10 13:58:32 -0700 <rdar://problem/44316117> 349297 2018-09-10 00:06:34 -0700 2018-09-10 11:54:33 -0700 Patch bug-189469-20180910000634.patch text/plain 10901 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGY3YTM4NDk1Y2RkYmNkMjg4 NWY4M2ZiODQwNjE2YjA5ZTcxNGYwNDQuLmRmYTY5NDgyYWEzODgzZmI2ODE4NmZkZTNjMTg1MDRk M2M3NmI4ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMDktMTAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVHJ5IHRvIGZpeCB0aGUg aU9TTWFjIGJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xODk0NjkKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9tYWMvV0tDb250ZXh0UHJp dmF0ZU1hYy5tbToKKyAgICAgICAgKFdLQ29udGV4dFNldFBsdWdpbkxvYWRDbGllbnRQb2xpY3kp OgorICAgICAgICAoV0tDb250ZXh0Q2xlYXJQbHVnaW5DbGllbnRQb2xpY2llcyk6CisgICAgICAg IChXS0NvbnRleHRDb3B5UGx1Z0luSW5mb0ZvckJ1bmRsZUlkZW50aWZpZXIpOgorICAgICAgICAo V0tDb250ZXh0R2V0SW5mb0Zvckluc3RhbGxlZFBsdWdJbnMpOgorICAgICAgICAoV0tDb250ZXh0 UmVzZXRIU1RTSG9zdHMpOgorICAgICAgICAoV0tDb250ZXh0UmVzZXRIU1RTSG9zdHNBZGRlZEFm dGVyRGF0ZSk6CisgICAgICAgIChXS0NvbnRleHRSZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3Rv Y29sKToKKyAgICAgICAgKFdLQ29udGV4dFVucmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2Nv bCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFjLm1tOgor ICAgICAgICAoLVtXS09ic2VydmFibGVQYWdlU3RhdGUgaW5pdFdpdGhQYWdlOl0pOgorICAgICAg ICAoV0tQYWdlQ3JlYXRlT2JzZXJ2YWJsZVN0YXRlKToKKyAgICAgICAgKFdLUGFnZUdldE9iamVj dFJlZ2lzdHJ5KToKKyAgICAgICAgKFdLUGFnZUlzVVJMS25vd25IU1RTSG9zdCk6CisgICAgICAg IChXS1BhZ2VMb2FkVVJMUmVxdWVzdFJldHVybmluZ05hdmlnYXRpb24pOgorICAgICAgICAoV0tQ YWdlTG9hZEZpbGVSZXR1cm5pbmdOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdLUGFnZUlzUGxheWlu Z1ZpZGVvSW5FbmhhbmNlZEZ1bGxzY3JlZW4pOgorICAgICAgICAoV0tQYWdlU2V0RnVsbHNjcmVl bkRlbGVnYXRlKToKKyAgICAgICAgKFdLUGFnZUdldEZ1bGxzY3JlZW5EZWxlZ2F0ZSk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9DL21hYy9XS1Byb3RlY3Rpb25TcGFjZU5TLm1tOgorICAgICAg ICAoV0tQcm90ZWN0aW9uU3BhY2VDb3B5TlNVUkxQcm90ZWN0aW9uU3BhY2UpOgorCiAyMDE4LTA5 LTA5ICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAg IFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIyMzU4MzkuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQy9tYWMvV0tDb250ZXh0UHJpdmF0ZU1hYy5tbSBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9DL21hYy9XS0NvbnRleHRQcml2YXRlTWFjLm1tCmluZGV4IGFl ZGMzZDdhNTFiOTExYTdjYWUxNmRkOWQ5MDZiODdmZmE5NzhiMGMuLjJiNWY3YzI5YTNiZDkxYWEy MTM0MTA2N2IzN2M3MGYwOWY4YjkyYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9DL21hYy9XS0NvbnRleHRQcml2YXRlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL0FQSS9DL21hYy9XS0NvbnRleHRQcml2YXRlTWFjLm1tCkBAIC00Miw4ICs0Miw2 IEBACiAjaW1wb3J0IDxXZWJDb3JlL1dlYkdMQmxhY2tsaXN0Lmg+CiAjaW1wb3J0IDx3dGYvUmV0 YWluUHRyLmg+CiAKLXVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7Ci0KIGJvb2wgV0tDb250ZXh0SXNQ bHVnSW5VcGRhdGVBdmFpbGFibGUoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLU3RyaW5nUmVm IHBsdWdJbkJ1bmRsZUlkZW50aWZpZXJSZWYpCiB7CiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtNTYs MjYgKzU0LDI2IEBAIGJvb2wgV0tDb250ZXh0SXNQbHVnSW5VcGRhdGVBdmFpbGFibGUoV0tDb250 ZXh0UmVmIGNvbnRleHRSZWYsIFdLU3RyaW5nUmVmIHBsdWdJCiB2b2lkIFdLQ29udGV4dFNldFBs dWdpbkxvYWRDbGllbnRQb2xpY3koV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLUGx1Z2luTG9h ZENsaWVudFBvbGljeSBwb2xpY3ksIFdLU3RyaW5nUmVmIGhvc3QsIFdLU3RyaW5nUmVmIGJ1bmRs ZUlkZW50aWZpZXIsIFdLU3RyaW5nUmVmIHZlcnNpb25TdHJpbmcpCiB7CiAjaWYgRU5BQkxFKE5F VFNDQVBFX1BMVUdJTl9BUEkpCi0gICAgdG9JbXBsKGNvbnRleHRSZWYpLT5zZXRQbHVnaW5Mb2Fk Q2xpZW50UG9saWN5KHRvUGx1Z2luTG9hZENsaWVudFBvbGljeShwb2xpY3kpLCB0b1dURlN0cmlu Zyhob3N0KSwgdG9XVEZTdHJpbmcoYnVuZGxlSWRlbnRpZmllciksIHRvV1RGU3RyaW5nKHZlcnNp b25TdHJpbmcpKTsKKyAgICBXZWJLaXQ6OnRvSW1wbChjb250ZXh0UmVmKS0+c2V0UGx1Z2luTG9h ZENsaWVudFBvbGljeShXZWJLaXQ6OnRvUGx1Z2luTG9hZENsaWVudFBvbGljeShwb2xpY3kpLCBX ZWJLaXQ6OnRvV1RGU3RyaW5nKGhvc3QpLCBXZWJLaXQ6OnRvV1RGU3RyaW5nKGJ1bmRsZUlkZW50 aWZpZXIpLCBXZWJLaXQ6OnRvV1RGU3RyaW5nKHZlcnNpb25TdHJpbmcpKTsKICNlbmRpZgogfQog CiB2b2lkIFdLQ29udGV4dENsZWFyUGx1Z2luQ2xpZW50UG9saWNpZXMoV0tDb250ZXh0UmVmIGNv bnRleHRSZWYpCiB7CiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCi0gICAgdG9JbXBs KGNvbnRleHRSZWYpLT5jbGVhclBsdWdpbkNsaWVudFBvbGljaWVzKCk7CisgICAgV2ViS2l0Ojp0 b0ltcGwoY29udGV4dFJlZiktPmNsZWFyUGx1Z2luQ2xpZW50UG9saWNpZXMoKTsKICNlbmRpZgog fQogCiBXS0RpY3Rpb25hcnlSZWYgV0tDb250ZXh0Q29weVBsdWdJbkluZm9Gb3JCdW5kbGVJZGVu dGlmaWVyKFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS1N0cmluZ1JlZiBwbHVnSW5CdW5kbGVJ ZGVudGlmaWVyUmVmKQogewogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQotICAgIFBs dWdpbk1vZHVsZUluZm8gcGx1Z2luID0gdG9JbXBsKGNvbnRleHRSZWYpLT5wbHVnaW5JbmZvU3Rv cmUoKS5maW5kUGx1Z2luV2l0aEJ1bmRsZUlkZW50aWZpZXIodG9XVEZTdHJpbmcocGx1Z0luQnVu ZGxlSWRlbnRpZmllclJlZikpOworICAgIFdlYktpdDo6UGx1Z2luTW9kdWxlSW5mbyBwbHVnaW4g PSBXZWJLaXQ6OnRvSW1wbChjb250ZXh0UmVmKS0+cGx1Z2luSW5mb1N0b3JlKCkuZmluZFBsdWdp bldpdGhCdW5kbGVJZGVudGlmaWVyKFdlYktpdDo6dG9XVEZTdHJpbmcocGx1Z0luQnVuZGxlSWRl bnRpZmllclJlZikpOwogICAgIGlmIChwbHVnaW4ucGF0aC5pc051bGwoKSkKICAgICAgICAgcmV0 dXJuIDA7CiAKICAgICBhdXRvIGRpY3Rpb25hcnkgPSBjcmVhdGVQbHVnaW5JbmZvcm1hdGlvbkRp Y3Rpb25hcnkocGx1Z2luKTsKLSAgICByZXR1cm4gdG9BUEkoJmRpY3Rpb25hcnkubGVha1JlZigp KTsKKyAgICByZXR1cm4gV2ViS2l0Ojp0b0FQSSgmZGljdGlvbmFyeS5sZWFrUmVmKCkpOwogI2Vs c2UKICAgICByZXR1cm4gMDsKICNlbmRpZgpAQCAtODQsNyArODIsNyBAQCBXS0RpY3Rpb25hcnlS ZWYgV0tDb250ZXh0Q29weVBsdWdJbkluZm9Gb3JCdW5kbGVJZGVudGlmaWVyKFdLQ29udGV4dFJl ZiBjb250ZXh0Ugogdm9pZCBXS0NvbnRleHRHZXRJbmZvRm9ySW5zdGFsbGVkUGx1Z0lucyhXS0Nv bnRleHRSZWYgY29udGV4dFJlZiwgV0tDb250ZXh0R2V0SW5mb0Zvckluc3RhbGxlZFBsdWdJbnNC bG9jayBibG9jaykKIHsKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKLSAgICBWZWN0 b3I8UGx1Z2luTW9kdWxlSW5mbz4gcGx1Z2lucyA9IHRvSW1wbChjb250ZXh0UmVmKS0+cGx1Z2lu SW5mb1N0b3JlKCkucGx1Z2lucygpOworICAgIFZlY3RvcjxQbHVnaW5Nb2R1bGVJbmZvPiBwbHVn aW5zID0gV2ViS2l0Ojp0b0ltcGwoY29udGV4dFJlZiktPnBsdWdpbkluZm9TdG9yZSgpLnBsdWdp bnMoKTsKIAogICAgIFZlY3RvcjxSZWZQdHI8QVBJOjpPYmplY3Q+PiBwbHVnaW5JbmZvRGljdGlv bmFyaWVzOwogICAgIHBsdWdpbkluZm9EaWN0aW9uYXJpZXMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0 eShwbHVnaW5zLnNpemUoKSk7CkBAIC05NCwzMyArOTIsMzMgQEAgdm9pZCBXS0NvbnRleHRHZXRJ bmZvRm9ySW5zdGFsbGVkUGx1Z0lucyhXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tDb250ZXh0 R2V0SW4KIAogICAgIFJlZlB0cjxBUEk6OkFycmF5PiBhcnJheSA9IEFQSTo6QXJyYXk6OmNyZWF0 ZShXVEZNb3ZlKHBsdWdpbkluZm9EaWN0aW9uYXJpZXMpKTsKIAotICAgIHRvSW1wbChjb250ZXh0 UmVmKS0+cmVmKCk7CisgICAgV2ViS2l0Ojp0b0ltcGwoY29udGV4dFJlZiktPnJlZigpOwogICAg IGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIF4oKSB7Ci0gICAgICAg IGJsb2NrKHRvQVBJKGFycmF5LmdldCgpKSwgMCk7CisgICAgICAgIGJsb2NrKFdlYktpdDo6dG9B UEkoYXJyYXkuZ2V0KCkpLCAwKTsKICAgICAKLSAgICAgICAgdG9JbXBsKGNvbnRleHRSZWYpLT5k ZXJlZigpOworICAgICAgICBXZWJLaXQ6OnRvSW1wbChjb250ZXh0UmVmKS0+ZGVyZWYoKTsKICAg ICB9KTsKICNlbmRpZgogfQogCiB2b2lkIFdLQ29udGV4dFJlc2V0SFNUU0hvc3RzKFdLQ29udGV4 dFJlZiBjb250ZXh0KQogewotICAgIHJldHVybiB0b0ltcGwoY29udGV4dCktPnJlc2V0SFNUU0hv c3RzKCk7CisgICAgcmV0dXJuIFdlYktpdDo6dG9JbXBsKGNvbnRleHQpLT5yZXNldEhTVFNIb3N0 cygpOwogfQogCiB2b2lkIFdLQ29udGV4dFJlc2V0SFNUU0hvc3RzQWRkZWRBZnRlckRhdGUoV0tD b250ZXh0UmVmIGNvbnRleHQsIGRvdWJsZSBzdGFydERhdGVJbnRlcnZhbFNpbmNlMTk3MCkKIHsK LSAgICByZXR1cm4gdG9JbXBsKGNvbnRleHQpLT5yZXNldEhTVFNIb3N0c0FkZGVkQWZ0ZXJEYXRl KHN0YXJ0RGF0ZUludGVydmFsU2luY2UxOTcwKTsKKyAgICByZXR1cm4gV2ViS2l0Ojp0b0ltcGwo Y29udGV4dCktPnJlc2V0SFNUU0hvc3RzQWRkZWRBZnRlckRhdGUoc3RhcnREYXRlSW50ZXJ2YWxT aW5jZTE5NzApOwogfQogCiB2b2lkIFdLQ29udGV4dFJlZ2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJv dG9jb2woV0tDb250ZXh0UmVmIGNvbnRleHQsIFdLU3RyaW5nUmVmIHNjaGVtZSkKIHsKLSAgICBX ZWJQcm9jZXNzUG9vbDo6cmVnaXN0ZXJHbG9iYWxVUkxTY2hlbWVBc0hhdmluZ0N1c3RvbVByb3Rv Y29sSGFuZGxlcnModG9XVEZTdHJpbmcoc2NoZW1lKSk7CisgICAgV2ViS2l0OjpXZWJQcm9jZXNz UG9vbDo6cmVnaXN0ZXJHbG9iYWxVUkxTY2hlbWVBc0hhdmluZ0N1c3RvbVByb3RvY29sSGFuZGxl cnMoV2ViS2l0Ojp0b1dURlN0cmluZyhzY2hlbWUpKTsKIH0KIAogdm9pZCBXS0NvbnRleHRVbnJl Z2lzdGVyU2NoZW1lRm9yQ3VzdG9tUHJvdG9jb2woV0tDb250ZXh0UmVmIGNvbnRleHQsIFdLU3Ry aW5nUmVmIHNjaGVtZSkKIHsKLSAgICBXZWJQcm9jZXNzUG9vbDo6dW5yZWdpc3Rlckdsb2JhbFVS TFNjaGVtZUFzSGF2aW5nQ3VzdG9tUHJvdG9jb2xIYW5kbGVycyh0b1dURlN0cmluZyhzY2hlbWUp KTsKKyAgICBXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjp1bnJlZ2lzdGVyR2xvYmFsVVJMU2NoZW1l QXNIYXZpbmdDdXN0b21Qcm90b2NvbEhhbmRsZXJzKFdlYktpdDo6dG9XVEZTdHJpbmcoc2NoZW1l KSk7CiB9CiAKIC8qIERFUFJFQ0FURUQgLSAgUGxlYXNlIHVzZSBjb25zdGFudHMgZnJvbSBXS1Bs dWdpbkluZm9ybWF0aW9uIGluc3RlYWQuICovCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQy9tYWMvV0tQYWdlUHJpdmF0ZU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFjLm1tCmluZGV4IDI1Y2VjZGQwYTc4ZGEw Y2RmMTZiMjM4ZWE0ZGNlMTU5NmYzOThjZGQuLjQyODIxOWE1YjNlMjI4OGJlOTIyYTUyNjNkZWI2 ODNlZmE3MmMxYmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL21h Yy9XS1BhZ2VQcml2YXRlTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L21hYy9XS1BhZ2VQcml2YXRlTWFjLm1tCkBAIC0zNywyNCArMzcsMjIgQEAKICNpbXBvcnQgIldl YlByZWZlcmVuY2VzLmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNzUG9vbC5oIgogCi11c2luZyBuYW1l c3BhY2UgV2ViS2l0OwotCiBAaW50ZXJmYWNlIFdLT2JzZXJ2YWJsZVBhZ2VTdGF0ZSA6IE5TT2Jq ZWN0IDxfV0tPYnNlcnZhYmxlUGFnZVN0YXRlPiB7Ci0gICAgUmVmUHRyPFdlYlBhZ2VQcm94eT4g X3BhZ2U7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPFBhZ2VMb2FkU3RhdGVPYnNlcnZlcj4gX29ic2Vy dmVyOworICAgIFJlZlB0cjxXZWJLaXQ6OldlYlBhZ2VQcm94eT4gX3BhZ2U7CisgICAgc3RkOjp1 bmlxdWVfcHRyPFdlYktpdDo6UGFnZUxvYWRTdGF0ZU9ic2VydmVyPiBfb2JzZXJ2ZXI7CiB9CiAK IEBlbmQKIAogQGltcGxlbWVudGF0aW9uIFdLT2JzZXJ2YWJsZVBhZ2VTdGF0ZQogCi0tIChpZClp bml0V2l0aFBhZ2U6KFJlZlB0cjxXZWJQYWdlUHJveHk+JiYpcGFnZQorLSAoaWQpaW5pdFdpdGhQ YWdlOihSZWZQdHI8V2ViS2l0OjpXZWJQYWdlUHJveHk+JiYpcGFnZQogewogICAgIGlmICghKHNl bGYgPSBbc3VwZXIgaW5pdF0pKQogICAgICAgICByZXR1cm4gbmlsOwogCiAgICAgX3BhZ2UgPSBX VEZNb3ZlKHBhZ2UpOwotICAgIF9vYnNlcnZlciA9IHN0ZDo6bWFrZV91bmlxdWU8UGFnZUxvYWRT dGF0ZU9ic2VydmVyPihzZWxmLCBAIlVSTCIpOworICAgIF9vYnNlcnZlciA9IHN0ZDo6bWFrZV91 bmlxdWU8V2ViS2l0OjpQYWdlTG9hZFN0YXRlT2JzZXJ2ZXI+KHNlbGYsIEAiVVJMIik7CiAgICAg X3BhZ2UtPnBhZ2VMb2FkU3RhdGUoKS5hZGRPYnNlcnZlcigqX29ic2VydmVyKTsKIAogICAgIHJl dHVybiBzZWxmOwpAQCAtMTE5LDEzICsxMTcsMTMgQEAgQGVuZAogCiBpZCA8X1dLT2JzZXJ2YWJs ZVBhZ2VTdGF0ZT4gV0tQYWdlQ3JlYXRlT2JzZXJ2YWJsZVN0YXRlKFdLUGFnZVJlZiBwYWdlUmVm KQogewotICAgIHJldHVybiBbW1dLT2JzZXJ2YWJsZVBhZ2VTdGF0ZSBhbGxvY10gaW5pdFdpdGhQ YWdlOnRvSW1wbChwYWdlUmVmKV07CisgICAgcmV0dXJuIFtbV0tPYnNlcnZhYmxlUGFnZVN0YXRl IGFsbG9jXSBpbml0V2l0aFBhZ2U6V2ViS2l0Ojp0b0ltcGwocGFnZVJlZildOwogfQogCiBfV0tS ZW1vdGVPYmplY3RSZWdpc3RyeSAqV0tQYWdlR2V0T2JqZWN0UmVnaXN0cnkoV0tQYWdlUmVmIHBh Z2VSZWYpCiB7CiAjaWYgV0tfQVBJX0VOQUJMRUQgJiYgIVRBUkdFVF9PU19JUEhPTkUKLSAgICBy ZXR1cm4gdG9JbXBsKHBhZ2VSZWYpLT5yZW1vdGVPYmplY3RSZWdpc3RyeSgpOworICAgIHJldHVy biBXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKS0+cmVtb3RlT2JqZWN0UmVnaXN0cnkoKTsKICNlbHNl CiAgICAgcmV0dXJuIG5pbDsKICNlbmRpZgpAQCAtMTMzLDQzICsxMzEsNDMgQEAgX1dLUmVtb3Rl T2JqZWN0UmVnaXN0cnkgKldLUGFnZUdldE9iamVjdFJlZ2lzdHJ5KFdLUGFnZVJlZiBwYWdlUmVm KQogCiBib29sIFdLUGFnZUlzVVJMS25vd25IU1RTSG9zdChXS1BhZ2VSZWYgcGFnZSwgV0tVUkxS ZWYgdXJsKQogewotICAgIFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5ID0gdG9JbXBsKHBhZ2Up OworICAgIFdlYktpdDo6V2ViUGFnZVByb3h5KiB3ZWJQYWdlUHJveHkgPSBXZWJLaXQ6OnRvSW1w bChwYWdlKTsKICAgICBib29sIHByaXZhdGVCcm93c2luZ0VuYWJsZWQgPSB3ZWJQYWdlUHJveHkt PnBhZ2VHcm91cCgpLnByZWZlcmVuY2VzKCkucHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCgpOwogCi0g ICAgcmV0dXJuIHdlYlBhZ2VQcm94eS0+cHJvY2VzcygpLnByb2Nlc3NQb29sKCkuaXNVUkxLbm93 bkhTVFNIb3N0KHRvSW1wbCh1cmwpLT5zdHJpbmcoKSwgcHJpdmF0ZUJyb3dzaW5nRW5hYmxlZCk7 CisgICAgcmV0dXJuIHdlYlBhZ2VQcm94eS0+cHJvY2VzcygpLnByb2Nlc3NQb29sKCkuaXNVUkxL bm93bkhTVFNIb3N0KFdlYktpdDo6dG9JbXBsKHVybCktPnN0cmluZygpLCBwcml2YXRlQnJvd3Np bmdFbmFibGVkKTsKIH0KIAogI2lmICFUQVJHRVRfT1NfSVBIT05FICYmIChkZWZpbmVkKF9fY2xh bmdfXykgJiYgZGVmaW5lZChfX0FQUExFX18pICYmICFkZWZpbmVkKF9faTM4Nl9fKSkKIFdLTmF2 aWdhdGlvbiAqV0tQYWdlTG9hZFVSTFJlcXVlc3RSZXR1cm5pbmdOYXZpZ2F0aW9uKFdLUGFnZVJl ZiBwYWdlUmVmLCBXS1VSTFJlcXVlc3RSZWYgdXJsUmVxdWVzdFJlZikKIHsKLSAgICBhdXRvIHJl c291cmNlUmVxdWVzdCA9IHRvSW1wbCh1cmxSZXF1ZXN0UmVmKS0+cmVzb3VyY2VSZXF1ZXN0KCk7 Ci0gICAgcmV0dXJuIHdyYXBwZXIodG9JbXBsKHBhZ2VSZWYpLT5sb2FkUmVxdWVzdChXVEZNb3Zl KHJlc291cmNlUmVxdWVzdCkpKTsKKyAgICBhdXRvIHJlc291cmNlUmVxdWVzdCA9IFdlYktpdDo6 dG9JbXBsKHVybFJlcXVlc3RSZWYpLT5yZXNvdXJjZVJlcXVlc3QoKTsKKyAgICByZXR1cm4gV2Vi S2l0Ojp3cmFwcGVyKFdlYktpdDo6dG9JbXBsKHBhZ2VSZWYpLT5sb2FkUmVxdWVzdChXVEZNb3Zl KHJlc291cmNlUmVxdWVzdCkpKTsKIH0KIAogV0tOYXZpZ2F0aW9uICpXS1BhZ2VMb2FkRmlsZVJl dHVybmluZ05hdmlnYXRpb24oV0tQYWdlUmVmIHBhZ2VSZWYsIFdLVVJMUmVmIGZpbGVVUkwsIFdL VVJMUmVmIHJlc291cmNlRGlyZWN0b3J5VVJMKQogewotICAgIHJldHVybiB3cmFwcGVyKHRvSW1w bChwYWdlUmVmKS0+bG9hZEZpbGUodG9XVEZTdHJpbmcoZmlsZVVSTCksIHRvV1RGU3RyaW5nKHJl c291cmNlRGlyZWN0b3J5VVJMKSkpOworICAgIHJldHVybiBXZWJLaXQ6OndyYXBwZXIoV2ViS2l0 Ojp0b0ltcGwocGFnZVJlZiktPmxvYWRGaWxlKFdlYktpdDo6dG9XVEZTdHJpbmcoZmlsZVVSTCks IFdlYktpdDo6dG9XVEZTdHJpbmcocmVzb3VyY2VEaXJlY3RvcnlVUkwpKSk7CiB9CiAjZW5kaWYK IAogI2lmIFBMQVRGT1JNKE1BQykKIGJvb2wgV0tQYWdlSXNQbGF5aW5nVmlkZW9JbkVuaGFuY2Vk RnVsbHNjcmVlbihXS1BhZ2VSZWYgcGFnZVJlZikKIHsKLSAgICByZXR1cm4gdG9JbXBsKHBhZ2VS ZWYpLT5pc1BsYXlpbmdWaWRlb0luRW5oYW5jZWRGdWxsc2NyZWVuKCk7CisgICAgcmV0dXJuIFdl YktpdDo6dG9JbXBsKHBhZ2VSZWYpLT5pc1BsYXlpbmdWaWRlb0luRW5oYW5jZWRGdWxsc2NyZWVu KCk7CiB9CiAjZW5kaWYKIAogdm9pZCBXS1BhZ2VTZXRGdWxsc2NyZWVuRGVsZWdhdGUoV0tQYWdl UmVmIHBhZ2UsIGlkIDxfV0tGdWxsc2NyZWVuRGVsZWdhdGU+IGRlbGVnYXRlKQogewogI2lmIFdL X0FQSV9FTkFCTEVEICYmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKLSAgICBkb3duY2FzdDxXZWJL aXQ6OkZ1bGxzY3JlZW5DbGllbnQ+KHRvSW1wbChwYWdlKS0+ZnVsbHNjcmVlbkNsaWVudCgpKS5z ZXREZWxlZ2F0ZShkZWxlZ2F0ZSk7CisgICAgZG93bmNhc3Q8V2ViS2l0OjpGdWxsc2NyZWVuQ2xp ZW50PihXZWJLaXQ6OnRvSW1wbChwYWdlKS0+ZnVsbHNjcmVlbkNsaWVudCgpKS5zZXREZWxlZ2F0 ZShkZWxlZ2F0ZSk7CiAjZW5kaWYKIH0KIAogaWQgPF9XS0Z1bGxzY3JlZW5EZWxlZ2F0ZT4gV0tQ YWdlR2V0RnVsbHNjcmVlbkRlbGVnYXRlKFdLUGFnZVJlZiBwYWdlKQogewogI2lmIFdLX0FQSV9F TkFCTEVEICYmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKLSAgICByZXR1cm4gZG93bmNhc3Q8V2Vi S2l0OjpGdWxsc2NyZWVuQ2xpZW50Pih0b0ltcGwocGFnZSktPmZ1bGxzY3JlZW5DbGllbnQoKSku ZGVsZWdhdGUoKS5hdXRvcmVsZWFzZSgpOworICAgIHJldHVybiBkb3duY2FzdDxXZWJLaXQ6OkZ1 bGxzY3JlZW5DbGllbnQ+KFdlYktpdDo6dG9JbXBsKHBhZ2UpLT5mdWxsc2NyZWVuQ2xpZW50KCkp LmRlbGVnYXRlKCkuYXV0b3JlbGVhc2UoKTsKICNlbHNlCiAgICAgcmV0dXJuIG5pbDsKICNlbmRp ZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvbWFjL1dLUHJvdGVj dGlvblNwYWNlTlMubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9tYWMvV0tQcm90 ZWN0aW9uU3BhY2VOUy5tbQppbmRleCA3ZjdkMjUzOGJmZmRlZjkwNGUyNjk5N2JhZGRmNzU5NDlm MjNiYWU3Li5mNmY0MzFjMjkzN2QwZTQ5NDYzYjM4YmE2MzQ4NzI4NTRmMTY4NTY1IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9tYWMvV0tQcm90ZWN0aW9uU3BhY2VO Uy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9tYWMvV0tQcm90ZWN0aW9u U3BhY2VOUy5tbQpAQCAtMjksMTAgKzI5LDcgQEAKICNpbXBvcnQgIldLQVBJQ2FzdC5oIgogI2lt cG9ydCAiV2ViUHJvdGVjdGlvblNwYWNlLmgiCiAKLXVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwot dXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKLQogV0tfRVhQT1JUIE5TVVJMUHJvdGVjdGlvblNwYWNl ICpXS1Byb3RlY3Rpb25TcGFjZUNvcHlOU1VSTFByb3RlY3Rpb25TcGFjZShXS1Byb3RlY3Rpb25T cGFjZVJlZiBwcm90ZWN0aW9uU3BhY2UpCiB7Ci0gICAgcmV0dXJuIFt0b0ltcGwocHJvdGVjdGlv blNwYWNlKS0+cHJvdGVjdGlvblNwYWNlKCkubnNTcGFjZSgpIGNvcHldOworICAgIHJldHVybiBb V2ViS2l0Ojp0b0ltcGwocHJvdGVjdGlvblNwYWNlKS0+cHJvdGVjdGlvblNwYWNlKCkubnNTcGFj ZSgpIGNvcHldOwogfQo= 349319 2018-09-10 11:54:34 -0700 2018-09-10 13:47:26 -0700 Patch bug-189469-20180910115433.patch text/plain 10953 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjM1ODUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDViYTUwOWRiZjc3ZTdmYThj ZDYwYWFjZTViOGNlYmZiZDU1NjQ1M2YuLjliODQxZjI2NDFiZmU3NDRlYjcyMjkxZjljNDFmZDI5 ZDhmZTBhNjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTgtMDktMTAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgVHJ5IHRvIGZpeCB0aGUg aU9TTWFjIGJ1aWxkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xODk0NjkKKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9tYWMvV0tDb250ZXh0UHJp dmF0ZU1hYy5tbToKKyAgICAgICAgKFdLQ29udGV4dFNldFBsdWdpbkxvYWRDbGllbnRQb2xpY3kp OgorICAgICAgICAoV0tDb250ZXh0Q2xlYXJQbHVnaW5DbGllbnRQb2xpY2llcyk6CisgICAgICAg IChXS0NvbnRleHRDb3B5UGx1Z0luSW5mb0ZvckJ1bmRsZUlkZW50aWZpZXIpOgorICAgICAgICAo V0tDb250ZXh0R2V0SW5mb0Zvckluc3RhbGxlZFBsdWdJbnMpOgorICAgICAgICAoV0tDb250ZXh0 UmVzZXRIU1RTSG9zdHMpOgorICAgICAgICAoV0tDb250ZXh0UmVzZXRIU1RTSG9zdHNBZGRlZEFm dGVyRGF0ZSk6CisgICAgICAgIChXS0NvbnRleHRSZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3Rv Y29sKToKKyAgICAgICAgKFdLQ29udGV4dFVucmVnaXN0ZXJTY2hlbWVGb3JDdXN0b21Qcm90b2Nv bCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFjLm1tOgor ICAgICAgICAoLVtXS09ic2VydmFibGVQYWdlU3RhdGUgaW5pdFdpdGhQYWdlOl0pOgorICAgICAg ICAoV0tQYWdlQ3JlYXRlT2JzZXJ2YWJsZVN0YXRlKToKKyAgICAgICAgKFdLUGFnZUdldE9iamVj dFJlZ2lzdHJ5KToKKyAgICAgICAgKFdLUGFnZUlzVVJMS25vd25IU1RTSG9zdCk6CisgICAgICAg IChXS1BhZ2VMb2FkVVJMUmVxdWVzdFJldHVybmluZ05hdmlnYXRpb24pOgorICAgICAgICAoV0tQ YWdlTG9hZEZpbGVSZXR1cm5pbmdOYXZpZ2F0aW9uKToKKyAgICAgICAgKFdLUGFnZUlzUGxheWlu Z1ZpZGVvSW5FbmhhbmNlZEZ1bGxzY3JlZW4pOgorICAgICAgICAoV0tQYWdlU2V0RnVsbHNjcmVl bkRlbGVnYXRlKToKKyAgICAgICAgKFdLUGFnZUdldEZ1bGxzY3JlZW5EZWxlZ2F0ZSk6CisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9DL21hYy9XS1Byb3RlY3Rpb25TcGFjZU5TLm1tOgorICAgICAg ICAoV0tQcm90ZWN0aW9uU3BhY2VDb3B5TlNVUkxQcm90ZWN0aW9uU3BhY2UpOgorCiAyMDE4LTA5 LTA3ICBNYXR0IFJhamNhICA8bXJhamNhQGFwcGxlLmNvbT4KIAogICAgICAgICBUb3VjaCBCYXIg ZGlzcGxheXMgYW4gYWN0aXZlIFBJUCBidXR0b24gZm9yIGF1ZGlvIGVsZW1lbnRzIChhbmQgaXQg ZG9lc24ndCBkbyBhbnl0aGluZykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9DL21hYy9XS0NvbnRleHRQcml2YXRlTWFjLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0MvbWFjL1dLQ29udGV4dFByaXZhdGVNYWMubW0KaW5kZXggYWVkYzNkN2E1MWI5MTFh N2NhZTE2ZGQ5ZDkwNmI4N2ZmYTk3OGIwYy4uZWM3NzM5OTZhNjBhYWIxMjE1YjNmMzJiNjM2MDg5 NGI2MDdmZmY1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvbWFj L1dLQ29udGV4dFByaXZhdGVNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0MvbWFjL1dLQ29udGV4dFByaXZhdGVNYWMubW0KQEAgLTQyLDggKzQyLDYgQEAKICNpbXBvcnQg PFdlYkNvcmUvV2ViR0xCbGFja2xpc3QuaD4KICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAot dXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKLQogYm9vbCBXS0NvbnRleHRJc1BsdWdJblVwZGF0ZUF2 YWlsYWJsZShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tTdHJpbmdSZWYgcGx1Z0luQnVuZGxl SWRlbnRpZmllclJlZikKIHsKICNpZiBQTEFURk9STShJT1MpCkBAIC01NiwyNiArNTQsMjYgQEAg Ym9vbCBXS0NvbnRleHRJc1BsdWdJblVwZGF0ZUF2YWlsYWJsZShXS0NvbnRleHRSZWYgY29udGV4 dFJlZiwgV0tTdHJpbmdSZWYgcGx1Z0kKIHZvaWQgV0tDb250ZXh0U2V0UGx1Z2luTG9hZENsaWVu dFBvbGljeShXS0NvbnRleHRSZWYgY29udGV4dFJlZiwgV0tQbHVnaW5Mb2FkQ2xpZW50UG9saWN5 IHBvbGljeSwgV0tTdHJpbmdSZWYgaG9zdCwgV0tTdHJpbmdSZWYgYnVuZGxlSWRlbnRpZmllciwg V0tTdHJpbmdSZWYgdmVyc2lvblN0cmluZykKIHsKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lO X0FQSSkKLSAgICB0b0ltcGwoY29udGV4dFJlZiktPnNldFBsdWdpbkxvYWRDbGllbnRQb2xpY3ko dG9QbHVnaW5Mb2FkQ2xpZW50UG9saWN5KHBvbGljeSksIHRvV1RGU3RyaW5nKGhvc3QpLCB0b1dU RlN0cmluZyhidW5kbGVJZGVudGlmaWVyKSwgdG9XVEZTdHJpbmcodmVyc2lvblN0cmluZykpOwor ICAgIFdlYktpdDo6dG9JbXBsKGNvbnRleHRSZWYpLT5zZXRQbHVnaW5Mb2FkQ2xpZW50UG9saWN5 KFdlYktpdDo6dG9QbHVnaW5Mb2FkQ2xpZW50UG9saWN5KHBvbGljeSksIFdlYktpdDo6dG9XVEZT dHJpbmcoaG9zdCksIFdlYktpdDo6dG9XVEZTdHJpbmcoYnVuZGxlSWRlbnRpZmllciksIFdlYktp dDo6dG9XVEZTdHJpbmcodmVyc2lvblN0cmluZykpOwogI2VuZGlmCiB9CiAKIHZvaWQgV0tDb250 ZXh0Q2xlYXJQbHVnaW5DbGllbnRQb2xpY2llcyhXS0NvbnRleHRSZWYgY29udGV4dFJlZikKIHsK ICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQSSkKLSAgICB0b0ltcGwoY29udGV4dFJlZikt PmNsZWFyUGx1Z2luQ2xpZW50UG9saWNpZXMoKTsKKyAgICBXZWJLaXQ6OnRvSW1wbChjb250ZXh0 UmVmKS0+Y2xlYXJQbHVnaW5DbGllbnRQb2xpY2llcygpOwogI2VuZGlmCiB9CiAKIFdLRGljdGlv bmFyeVJlZiBXS0NvbnRleHRDb3B5UGx1Z0luSW5mb0ZvckJ1bmRsZUlkZW50aWZpZXIoV0tDb250 ZXh0UmVmIGNvbnRleHRSZWYsIFdLU3RyaW5nUmVmIHBsdWdJbkJ1bmRsZUlkZW50aWZpZXJSZWYp CiB7CiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCi0gICAgUGx1Z2luTW9kdWxlSW5m byBwbHVnaW4gPSB0b0ltcGwoY29udGV4dFJlZiktPnBsdWdpbkluZm9TdG9yZSgpLmZpbmRQbHVn aW5XaXRoQnVuZGxlSWRlbnRpZmllcih0b1dURlN0cmluZyhwbHVnSW5CdW5kbGVJZGVudGlmaWVy UmVmKSk7CisgICAgV2ViS2l0OjpQbHVnaW5Nb2R1bGVJbmZvIHBsdWdpbiA9IFdlYktpdDo6dG9J bXBsKGNvbnRleHRSZWYpLT5wbHVnaW5JbmZvU3RvcmUoKS5maW5kUGx1Z2luV2l0aEJ1bmRsZUlk ZW50aWZpZXIoV2ViS2l0Ojp0b1dURlN0cmluZyhwbHVnSW5CdW5kbGVJZGVudGlmaWVyUmVmKSk7 CiAgICAgaWYgKHBsdWdpbi5wYXRoLmlzTnVsbCgpKQogICAgICAgICByZXR1cm4gMDsKIAogICAg IGF1dG8gZGljdGlvbmFyeSA9IGNyZWF0ZVBsdWdpbkluZm9ybWF0aW9uRGljdGlvbmFyeShwbHVn aW4pOwotICAgIHJldHVybiB0b0FQSSgmZGljdGlvbmFyeS5sZWFrUmVmKCkpOworICAgIHJldHVy biBXZWJLaXQ6OnRvQVBJKCZkaWN0aW9uYXJ5LmxlYWtSZWYoKSk7CiAjZWxzZQogICAgIHJldHVy biAwOwogI2VuZGlmCkBAIC04NCw3ICs4Miw3IEBAIFdLRGljdGlvbmFyeVJlZiBXS0NvbnRleHRD b3B5UGx1Z0luSW5mb0ZvckJ1bmRsZUlkZW50aWZpZXIoV0tDb250ZXh0UmVmIGNvbnRleHRSCiB2 b2lkIFdLQ29udGV4dEdldEluZm9Gb3JJbnN0YWxsZWRQbHVnSW5zKFdLQ29udGV4dFJlZiBjb250 ZXh0UmVmLCBXS0NvbnRleHRHZXRJbmZvRm9ySW5zdGFsbGVkUGx1Z0luc0Jsb2NrIGJsb2NrKQog ewogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQotICAgIFZlY3RvcjxQbHVnaW5Nb2R1 bGVJbmZvPiBwbHVnaW5zID0gdG9JbXBsKGNvbnRleHRSZWYpLT5wbHVnaW5JbmZvU3RvcmUoKS5w bHVnaW5zKCk7CisgICAgVmVjdG9yPFdlYktpdDo6UGx1Z2luTW9kdWxlSW5mbz4gcGx1Z2lucyA9 IFdlYktpdDo6dG9JbXBsKGNvbnRleHRSZWYpLT5wbHVnaW5JbmZvU3RvcmUoKS5wbHVnaW5zKCk7 CiAKICAgICBWZWN0b3I8UmVmUHRyPEFQSTo6T2JqZWN0Pj4gcGx1Z2luSW5mb0RpY3Rpb25hcmll czsKICAgICBwbHVnaW5JbmZvRGljdGlvbmFyaWVzLnJlc2VydmVJbml0aWFsQ2FwYWNpdHkocGx1 Z2lucy5zaXplKCkpOwpAQCAtOTQsMzMgKzkyLDMzIEBAIHZvaWQgV0tDb250ZXh0R2V0SW5mb0Zv ckluc3RhbGxlZFBsdWdJbnMoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLQ29udGV4dEdldElu CiAKICAgICBSZWZQdHI8QVBJOjpBcnJheT4gYXJyYXkgPSBBUEk6OkFycmF5OjpjcmVhdGUoV1RG TW92ZShwbHVnaW5JbmZvRGljdGlvbmFyaWVzKSk7CiAKLSAgICB0b0ltcGwoY29udGV4dFJlZikt PnJlZigpOworICAgIFdlYktpdDo6dG9JbXBsKGNvbnRleHRSZWYpLT5yZWYoKTsKICAgICBkaXNw YXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBeKCkgewotICAgICAgICBibG9j ayh0b0FQSShhcnJheS5nZXQoKSksIDApOworICAgICAgICBibG9jayhXZWJLaXQ6OnRvQVBJKGFy cmF5LmdldCgpKSwgMCk7CiAgICAgCi0gICAgICAgIHRvSW1wbChjb250ZXh0UmVmKS0+ZGVyZWYo KTsKKyAgICAgICAgV2ViS2l0Ojp0b0ltcGwoY29udGV4dFJlZiktPmRlcmVmKCk7CiAgICAgfSk7 CiAjZW5kaWYKIH0KIAogdm9pZCBXS0NvbnRleHRSZXNldEhTVFNIb3N0cyhXS0NvbnRleHRSZWYg Y29udGV4dCkKIHsKLSAgICByZXR1cm4gdG9JbXBsKGNvbnRleHQpLT5yZXNldEhTVFNIb3N0cygp OworICAgIHJldHVybiBXZWJLaXQ6OnRvSW1wbChjb250ZXh0KS0+cmVzZXRIU1RTSG9zdHMoKTsK IH0KIAogdm9pZCBXS0NvbnRleHRSZXNldEhTVFNIb3N0c0FkZGVkQWZ0ZXJEYXRlKFdLQ29udGV4 dFJlZiBjb250ZXh0LCBkb3VibGUgc3RhcnREYXRlSW50ZXJ2YWxTaW5jZTE5NzApCiB7Ci0gICAg cmV0dXJuIHRvSW1wbChjb250ZXh0KS0+cmVzZXRIU1RTSG9zdHNBZGRlZEFmdGVyRGF0ZShzdGFy dERhdGVJbnRlcnZhbFNpbmNlMTk3MCk7CisgICAgcmV0dXJuIFdlYktpdDo6dG9JbXBsKGNvbnRl eHQpLT5yZXNldEhTVFNIb3N0c0FkZGVkQWZ0ZXJEYXRlKHN0YXJ0RGF0ZUludGVydmFsU2luY2Ux OTcwKTsKIH0KIAogdm9pZCBXS0NvbnRleHRSZWdpc3RlclNjaGVtZUZvckN1c3RvbVByb3RvY29s KFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS1N0cmluZ1JlZiBzY2hlbWUpCiB7Ci0gICAgV2ViUHJv Y2Vzc1Bvb2w6OnJlZ2lzdGVyR2xvYmFsVVJMU2NoZW1lQXNIYXZpbmdDdXN0b21Qcm90b2NvbEhh bmRsZXJzKHRvV1RGU3RyaW5nKHNjaGVtZSkpOworICAgIFdlYktpdDo6V2ViUHJvY2Vzc1Bvb2w6 OnJlZ2lzdGVyR2xvYmFsVVJMU2NoZW1lQXNIYXZpbmdDdXN0b21Qcm90b2NvbEhhbmRsZXJzKFdl YktpdDo6dG9XVEZTdHJpbmcoc2NoZW1lKSk7CiB9CiAKIHZvaWQgV0tDb250ZXh0VW5yZWdpc3Rl clNjaGVtZUZvckN1c3RvbVByb3RvY29sKFdLQ29udGV4dFJlZiBjb250ZXh0LCBXS1N0cmluZ1Jl ZiBzY2hlbWUpCiB7Ci0gICAgV2ViUHJvY2Vzc1Bvb2w6OnVucmVnaXN0ZXJHbG9iYWxVUkxTY2hl bWVBc0hhdmluZ0N1c3RvbVByb3RvY29sSGFuZGxlcnModG9XVEZTdHJpbmcoc2NoZW1lKSk7Cisg ICAgV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6dW5yZWdpc3Rlckdsb2JhbFVSTFNjaGVtZUFzSGF2 aW5nQ3VzdG9tUHJvdG9jb2xIYW5kbGVycyhXZWJLaXQ6OnRvV1RGU3RyaW5nKHNjaGVtZSkpOwog fQogCiAvKiBERVBSRUNBVEVEIC0gIFBsZWFzZSB1c2UgY29uc3RhbnRzIGZyb20gV0tQbHVnaW5J bmZvcm1hdGlvbiBpbnN0ZWFkLiAqLwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0MvbWFjL1dLUGFnZVByaXZhdGVNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQy9tYWMvV0tQYWdlUHJpdmF0ZU1hYy5tbQppbmRleCAyNWNlY2RkMGE3OGRhMGNkZjE2 YjIzOGVhNGRjZTE1OTZmMzk4Y2RkLi40MjgyMTlhNWIzZTIyODhiZTkyMmE1MjYzZGViNjgzZWZh NzJjMWJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9tYWMvV0tQ YWdlUHJpdmF0ZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9tYWMv V0tQYWdlUHJpdmF0ZU1hYy5tbQpAQCAtMzcsMjQgKzM3LDIyIEBACiAjaW1wb3J0ICJXZWJQcmVm ZXJlbmNlcy5oIgogI2ltcG9ydCAiV2ViUHJvY2Vzc1Bvb2wuaCIKIAotdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKLQogQGludGVyZmFjZSBXS09ic2VydmFibGVQYWdlU3RhdGUgOiBOU09iamVjdCA8 X1dLT2JzZXJ2YWJsZVBhZ2VTdGF0ZT4gewotICAgIFJlZlB0cjxXZWJQYWdlUHJveHk+IF9wYWdl OwotICAgIHN0ZDo6dW5pcXVlX3B0cjxQYWdlTG9hZFN0YXRlT2JzZXJ2ZXI+IF9vYnNlcnZlcjsK KyAgICBSZWZQdHI8V2ViS2l0OjpXZWJQYWdlUHJveHk+IF9wYWdlOworICAgIHN0ZDo6dW5pcXVl X3B0cjxXZWJLaXQ6OlBhZ2VMb2FkU3RhdGVPYnNlcnZlcj4gX29ic2VydmVyOwogfQogCiBAZW5k CiAKIEBpbXBsZW1lbnRhdGlvbiBXS09ic2VydmFibGVQYWdlU3RhdGUKIAotLSAoaWQpaW5pdFdp dGhQYWdlOihSZWZQdHI8V2ViUGFnZVByb3h5PiYmKXBhZ2UKKy0gKGlkKWluaXRXaXRoUGFnZToo UmVmUHRyPFdlYktpdDo6V2ViUGFnZVByb3h5PiYmKXBhZ2UKIHsKICAgICBpZiAoIShzZWxmID0g W3N1cGVyIGluaXRdKSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAogICAgIF9wYWdlID0gV1RGTW92 ZShwYWdlKTsKLSAgICBfb2JzZXJ2ZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VMb2FkU3RhdGVP YnNlcnZlcj4oc2VsZiwgQCJVUkwiKTsKKyAgICBfb2JzZXJ2ZXIgPSBzdGQ6Om1ha2VfdW5pcXVl PFdlYktpdDo6UGFnZUxvYWRTdGF0ZU9ic2VydmVyPihzZWxmLCBAIlVSTCIpOwogICAgIF9wYWdl LT5wYWdlTG9hZFN0YXRlKCkuYWRkT2JzZXJ2ZXIoKl9vYnNlcnZlcik7CiAKICAgICByZXR1cm4g c2VsZjsKQEAgLTExOSwxMyArMTE3LDEzIEBAIEBlbmQKIAogaWQgPF9XS09ic2VydmFibGVQYWdl U3RhdGU+IFdLUGFnZUNyZWF0ZU9ic2VydmFibGVTdGF0ZShXS1BhZ2VSZWYgcGFnZVJlZikKIHsK LSAgICByZXR1cm4gW1tXS09ic2VydmFibGVQYWdlU3RhdGUgYWxsb2NdIGluaXRXaXRoUGFnZTp0 b0ltcGwocGFnZVJlZildOworICAgIHJldHVybiBbW1dLT2JzZXJ2YWJsZVBhZ2VTdGF0ZSBhbGxv Y10gaW5pdFdpdGhQYWdlOldlYktpdDo6dG9JbXBsKHBhZ2VSZWYpXTsKIH0KIAogX1dLUmVtb3Rl T2JqZWN0UmVnaXN0cnkgKldLUGFnZUdldE9iamVjdFJlZ2lzdHJ5KFdLUGFnZVJlZiBwYWdlUmVm KQogewogI2lmIFdLX0FQSV9FTkFCTEVEICYmICFUQVJHRVRfT1NfSVBIT05FCi0gICAgcmV0dXJu IHRvSW1wbChwYWdlUmVmKS0+cmVtb3RlT2JqZWN0UmVnaXN0cnkoKTsKKyAgICByZXR1cm4gV2Vi S2l0Ojp0b0ltcGwocGFnZVJlZiktPnJlbW90ZU9iamVjdFJlZ2lzdHJ5KCk7CiAjZWxzZQogICAg IHJldHVybiBuaWw7CiAjZW5kaWYKQEAgLTEzMyw0MyArMTMxLDQzIEBAIF9XS1JlbW90ZU9iamVj dFJlZ2lzdHJ5ICpXS1BhZ2VHZXRPYmplY3RSZWdpc3RyeShXS1BhZ2VSZWYgcGFnZVJlZikKIAog Ym9vbCBXS1BhZ2VJc1VSTEtub3duSFNUU0hvc3QoV0tQYWdlUmVmIHBhZ2UsIFdLVVJMUmVmIHVy bCkKIHsKLSAgICBXZWJQYWdlUHJveHkqIHdlYlBhZ2VQcm94eSA9IHRvSW1wbChwYWdlKTsKKyAg ICBXZWJLaXQ6OldlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5ID0gV2ViS2l0Ojp0b0ltcGwocGFn ZSk7CiAgICAgYm9vbCBwcml2YXRlQnJvd3NpbmdFbmFibGVkID0gd2ViUGFnZVByb3h5LT5wYWdl R3JvdXAoKS5wcmVmZXJlbmNlcygpLnByaXZhdGVCcm93c2luZ0VuYWJsZWQoKTsKIAotICAgIHJl dHVybiB3ZWJQYWdlUHJveHktPnByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmlzVVJMS25vd25IU1RT SG9zdCh0b0ltcGwodXJsKS0+c3RyaW5nKCksIHByaXZhdGVCcm93c2luZ0VuYWJsZWQpOworICAg IHJldHVybiB3ZWJQYWdlUHJveHktPnByb2Nlc3MoKS5wcm9jZXNzUG9vbCgpLmlzVVJMS25vd25I U1RTSG9zdChXZWJLaXQ6OnRvSW1wbCh1cmwpLT5zdHJpbmcoKSwgcHJpdmF0ZUJyb3dzaW5nRW5h YmxlZCk7CiB9CiAKICNpZiAhVEFSR0VUX09TX0lQSE9ORSAmJiAoZGVmaW5lZChfX2NsYW5nX18p ICYmIGRlZmluZWQoX19BUFBMRV9fKSAmJiAhZGVmaW5lZChfX2kzODZfXykpCiBXS05hdmlnYXRp b24gKldLUGFnZUxvYWRVUkxSZXF1ZXN0UmV0dXJuaW5nTmF2aWdhdGlvbihXS1BhZ2VSZWYgcGFn ZVJlZiwgV0tVUkxSZXF1ZXN0UmVmIHVybFJlcXVlc3RSZWYpCiB7Ci0gICAgYXV0byByZXNvdXJj ZVJlcXVlc3QgPSB0b0ltcGwodXJsUmVxdWVzdFJlZiktPnJlc291cmNlUmVxdWVzdCgpOwotICAg IHJldHVybiB3cmFwcGVyKHRvSW1wbChwYWdlUmVmKS0+bG9hZFJlcXVlc3QoV1RGTW92ZShyZXNv dXJjZVJlcXVlc3QpKSk7CisgICAgYXV0byByZXNvdXJjZVJlcXVlc3QgPSBXZWJLaXQ6OnRvSW1w bCh1cmxSZXF1ZXN0UmVmKS0+cmVzb3VyY2VSZXF1ZXN0KCk7CisgICAgcmV0dXJuIFdlYktpdDo6 d3JhcHBlcihXZWJLaXQ6OnRvSW1wbChwYWdlUmVmKS0+bG9hZFJlcXVlc3QoV1RGTW92ZShyZXNv dXJjZVJlcXVlc3QpKSk7CiB9CiAKIFdLTmF2aWdhdGlvbiAqV0tQYWdlTG9hZEZpbGVSZXR1cm5p bmdOYXZpZ2F0aW9uKFdLUGFnZVJlZiBwYWdlUmVmLCBXS1VSTFJlZiBmaWxlVVJMLCBXS1VSTFJl ZiByZXNvdXJjZURpcmVjdG9yeVVSTCkKIHsKLSAgICByZXR1cm4gd3JhcHBlcih0b0ltcGwocGFn ZVJlZiktPmxvYWRGaWxlKHRvV1RGU3RyaW5nKGZpbGVVUkwpLCB0b1dURlN0cmluZyhyZXNvdXJj ZURpcmVjdG9yeVVSTCkpKTsKKyAgICByZXR1cm4gV2ViS2l0Ojp3cmFwcGVyKFdlYktpdDo6dG9J bXBsKHBhZ2VSZWYpLT5sb2FkRmlsZShXZWJLaXQ6OnRvV1RGU3RyaW5nKGZpbGVVUkwpLCBXZWJL aXQ6OnRvV1RGU3RyaW5nKHJlc291cmNlRGlyZWN0b3J5VVJMKSkpOwogfQogI2VuZGlmCiAKICNp ZiBQTEFURk9STShNQUMpCiBib29sIFdLUGFnZUlzUGxheWluZ1ZpZGVvSW5FbmhhbmNlZEZ1bGxz Y3JlZW4oV0tQYWdlUmVmIHBhZ2VSZWYpCiB7Ci0gICAgcmV0dXJuIHRvSW1wbChwYWdlUmVmKS0+ aXNQbGF5aW5nVmlkZW9JbkVuaGFuY2VkRnVsbHNjcmVlbigpOworICAgIHJldHVybiBXZWJLaXQ6 OnRvSW1wbChwYWdlUmVmKS0+aXNQbGF5aW5nVmlkZW9JbkVuaGFuY2VkRnVsbHNjcmVlbigpOwog fQogI2VuZGlmCiAKIHZvaWQgV0tQYWdlU2V0RnVsbHNjcmVlbkRlbGVnYXRlKFdLUGFnZVJlZiBw YWdlLCBpZCA8X1dLRnVsbHNjcmVlbkRlbGVnYXRlPiBkZWxlZ2F0ZSkKIHsKICNpZiBXS19BUElf RU5BQkxFRCAmJiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCi0gICAgZG93bmNhc3Q8V2ViS2l0OjpG dWxsc2NyZWVuQ2xpZW50Pih0b0ltcGwocGFnZSktPmZ1bGxzY3JlZW5DbGllbnQoKSkuc2V0RGVs ZWdhdGUoZGVsZWdhdGUpOworICAgIGRvd25jYXN0PFdlYktpdDo6RnVsbHNjcmVlbkNsaWVudD4o V2ViS2l0Ojp0b0ltcGwocGFnZSktPmZ1bGxzY3JlZW5DbGllbnQoKSkuc2V0RGVsZWdhdGUoZGVs ZWdhdGUpOwogI2VuZGlmCiB9CiAKIGlkIDxfV0tGdWxsc2NyZWVuRGVsZWdhdGU+IFdLUGFnZUdl dEZ1bGxzY3JlZW5EZWxlZ2F0ZShXS1BhZ2VSZWYgcGFnZSkKIHsKICNpZiBXS19BUElfRU5BQkxF RCAmJiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCi0gICAgcmV0dXJuIGRvd25jYXN0PFdlYktpdDo6 RnVsbHNjcmVlbkNsaWVudD4odG9JbXBsKHBhZ2UpLT5mdWxsc2NyZWVuQ2xpZW50KCkpLmRlbGVn YXRlKCkuYXV0b3JlbGVhc2UoKTsKKyAgICByZXR1cm4gZG93bmNhc3Q8V2ViS2l0OjpGdWxsc2Ny ZWVuQ2xpZW50PihXZWJLaXQ6OnRvSW1wbChwYWdlKS0+ZnVsbHNjcmVlbkNsaWVudCgpKS5kZWxl Z2F0ZSgpLmF1dG9yZWxlYXNlKCk7CiAjZWxzZQogICAgIHJldHVybiBuaWw7CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL21hYy9XS1Byb3RlY3Rpb25T cGFjZU5TLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvbWFjL1dLUHJvdGVjdGlv blNwYWNlTlMubW0KaW5kZXggN2Y3ZDI1MzhiZmZkZWY5MDRlMjY5OTdiYWRkZjc1OTQ5ZjIzYmFl Ny4uZjZmNDMxYzI5MzdkMGU0OTQ2M2IzOGJhNjM0ODcyODU0ZjE2ODU2NSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvbWFjL1dLUHJvdGVjdGlvblNwYWNlTlMubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvbWFjL1dLUHJvdGVjdGlvblNwYWNl TlMubW0KQEAgLTI5LDEwICsyOSw3IEBACiAjaW1wb3J0ICJXS0FQSUNhc3QuaCIKICNpbXBvcnQg IldlYlByb3RlY3Rpb25TcGFjZS5oIgogCi11c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKLXVzaW5n IG5hbWVzcGFjZSBXZWJLaXQ7Ci0KIFdLX0VYUE9SVCBOU1VSTFByb3RlY3Rpb25TcGFjZSAqV0tQ cm90ZWN0aW9uU3BhY2VDb3B5TlNVUkxQcm90ZWN0aW9uU3BhY2UoV0tQcm90ZWN0aW9uU3BhY2VS ZWYgcHJvdGVjdGlvblNwYWNlKQogewotICAgIHJldHVybiBbdG9JbXBsKHByb3RlY3Rpb25TcGFj ZSktPnByb3RlY3Rpb25TcGFjZSgpLm5zU3BhY2UoKSBjb3B5XTsKKyAgICByZXR1cm4gW1dlYktp dDo6dG9JbXBsKHByb3RlY3Rpb25TcGFjZSktPnByb3RlY3Rpb25TcGFjZSgpLm5zU3BhY2UoKSBj b3B5XTsKIH0K