188661 2018-08-16 09:54:13 -0700 Transition more WKWebViewConfiguration ivars to API::PageConfiguration values 2018-08-16 10:54:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen andersca dbates ews-watchlist mkwst webkit-bug-importer oldest_to_newest 1450712 0 achristensen 2018-08-16 09:54:13 -0700 Transition more WKWebViewConfiguration ivars to API::PageConfiguration values 1450713 1 347269 achristensen 2018-08-16 09:54:54 -0700 Created attachment 347269 Patch 1450720 2 347270 achristensen 2018-08-16 10:00:32 -0700 Created attachment 347270 Patch 1450738 3 achristensen 2018-08-16 10:53:46 -0700 http://trac.webkit.org/r234939 1450739 4 webkit-bug-importer 2018-08-16 10:54:18 -0700 <rdar://problem/43388080> 347269 2018-08-16 09:54:54 -0700 2018-08-16 10:00:31 -0700 Patch bug-188661-20180816095453.patch text/plain 9028 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQ5MzEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA4LTE2ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVHJhbnNpdGlvbiBt b3JlIFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gaXZhcnMgdG8gQVBJOjpQYWdlQ29uZmlndXJhdGlv biB2YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4ODY2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmll dyBfaW5pdGlhbGl6ZVdpdGhDb25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiBpbml0XSk6CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24g Y29weVdpdGhab25lOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXdDb25maWd1cmF0aW9uIF9hbHdh eXNSdW5zQXRGb3JlZ3JvdW5kUHJpb3JpdHldKToKKyAgICAgICAgKC1bV0tXZWJWaWV3Q29uZmln dXJhdGlvbiBfc2V0QWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5Ol0pOgorICAgICAgICAo LVtXS1dlYlZpZXdDb25maWd1cmF0aW9uIF9pbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVkXSk6 CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX3NldEluaXRpYWxDYXBpdGFsaXph dGlvbkVuYWJsZWQ6XSk6CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX292ZXJy aWRlQ29udGVudFNlY3VyaXR5UG9saWN5XSk6CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gX3NldE92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5Ol0pOgorCiAyMDE4LTA4LTE2 ICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0 IGRyYWctYW5kLWRyb3AgZm9yIGlucHV0W3R5cGU9Y29sb3JdCkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9uIDIzNDkwMCkK KysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtp bmcgY29weSkKQEAgLTUxNyw5ICs1MTcsNiBAQCAtICh2b2lkKV9pbml0aWFsaXplV2l0aENvbmZp Z3VyYXRpb246KFdLCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNldFZpc2l0ZWRMaW5rU3RvcmUo W19jb25maWd1cmF0aW9uIF92aXNpdGVkTGlua1N0b3JlXS0+X3Zpc2l0ZWRMaW5rU3RvcmUuZ2V0 KCkpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRXZWJzaXRlRGF0YVN0b3JlKFtfY29uZmln dXJhdGlvbiB3ZWJzaXRlRGF0YVN0b3JlXS0+X3dlYnNpdGVEYXRhU3RvcmUuZ2V0KCkpOwogCi0g ICAgaWYgKE5TU3RyaW5nICpvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGNvbmZpZ3Vy YXRpb24uX292ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5KQotICAgICAgICBwYWdlQ29uZmln dXJhdGlvbi0+c2V0T3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kob3ZlcnJpZGVDb250ZW50 U2VjdXJpdHlQb2xpY3kpOwotCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGlmIChhdXRvIHBhZ2VH cm91cCA9IFdlYktpdDo6dG9JbXBsKFtjb25maWd1cmF0aW9uIF9wYWdlR3JvdXBdKSkgewogICAg ICAgICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UGFnZUdyb3VwKHBhZ2VHcm91cCk7CkBAIC01NDEs NyArNTM4LDYgQEAgLSAodm9pZClfaW5pdGlhbGl6ZVdpdGhDb25maWd1cmF0aW9uOihXSwogICAg IHBhZ2VDb25maWd1cmF0aW9uLT5wcmVmZXJlbmNlVmFsdWVzKCkuc2V0KFdlYktpdDo6V2ViUHJl ZmVyZW5jZXNLZXk6OnNob3VsZENvbnZlcnRQb3NpdGlvblN0eWxlT25Db3B5S2V5KCksIFdlYktp dDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoISFbX2NvbmZpZ3VyYXRpb24gX2NvbnZlcnRz UG9zaXRpb25TdHlsZU9uQ29weV0pKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi0+cHJlZmVyZW5j ZVZhbHVlcygpLnNldChXZWJLaXQ6OldlYlByZWZlcmVuY2VzS2V5OjpodHRwRXF1aXZFbmFibGVk S2V5KCksIFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoISFbX2NvbmZpZ3VyYXRp b24gX2FsbG93c01ldGFSZWZyZXNoXSkpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5wcmVmZXJl bmNlVmFsdWVzKCkuc2V0KFdlYktpdDo6V2ViUHJlZmVyZW5jZXNLZXk6OmFsbG93VW5pdmVyc2Fs QWNjZXNzRnJvbUZpbGVVUkxzS2V5KCksIFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFs dWUoISFbX2NvbmZpZ3VyYXRpb24gX2FsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzXSkp OwotICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRJbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVk KFtfY29uZmlndXJhdGlvbiBfaW5pdGlhbENhcGl0YWxpemF0aW9uRW5hYmxlZF0pOwogICAgIHBh Z2VDb25maWd1cmF0aW9uLT5zZXRXYWl0c0ZvclBhaW50QWZ0ZXJWaWV3RGlkTW92ZVRvV2luZG93 KFtfY29uZmlndXJhdGlvbiBfd2FpdHNGb3JQYWludEFmdGVyVmlld0RpZE1vdmVUb1dpbmRvd10p OwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXREcmF3c0JhY2tncm91bmQoW19jb25maWd1cmF0 aW9uIF9kcmF3c0JhY2tncm91bmRdKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0Q29udHJv bGxlZEJ5QXV0b21hdGlvbihbX2NvbmZpZ3VyYXRpb24gX2lzQ29udHJvbGxlZEJ5QXV0b21hdGlv bl0pOwpAQCAtNTY3LDggKzU2Myw2IEBAICAgICAvLyBXZSBhcmUgaW4gdGhlIFZpZXcncyBpbml0 aWFsaXphdGkKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oSU9TKQotICAgIHBhZ2VDb25maWd1cmF0 aW9uLT5zZXRBbHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJpb3JpdHkoW19jb25maWd1cmF0aW9uIF9h bHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJpb3JpdHldKTsKLQogICAgIHBhZ2VDb25maWd1cmF0aW9u LT5wcmVmZXJlbmNlVmFsdWVzKCkuc2V0KFdlYktpdDo6V2ViUHJlZmVyZW5jZXNLZXk6OmFsbG93 c0lubGluZU1lZGlhUGxheWJhY2tLZXkoKSwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpW YWx1ZSghIVtfY29uZmlndXJhdGlvbiBhbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrXSkpOwogICAg IHBhZ2VDb25maWd1cmF0aW9uLT5wcmVmZXJlbmNlVmFsdWVzKCkuc2V0KFdlYktpdDo6V2ViUHJl ZmVyZW5jZXNLZXk6OmFsbG93c0lubGluZU1lZGlhUGxheWJhY2tBZnRlckZ1bGxzY3JlZW5LZXko KSwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpWYWx1ZSghIVtfY29uZmlndXJhdGlvbiBf YWxsb3dzSW5saW5lTWVkaWFQbGF5YmFja0FmdGVyRnVsbHNjcmVlbl0pKTsKICAgICBwYWdlQ29u ZmlndXJhdGlvbi0+cHJlZmVyZW5jZVZhbHVlcygpLnNldChXZWJLaXQ6OldlYlByZWZlcmVuY2Vz S2V5OjppbmxpbmVNZWRpYVBsYXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZUtleSgp LCBXZWJLaXQ6OldlYlByZWZlcmVuY2VzU3RvcmU6OlZhbHVlKCEhW19jb25maWd1cmF0aW9uIF9p bmxpbmVNZWRpYVBsYXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZV0pKTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9u Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdDb25maWd1cmF0aW9uLm1tCShyZXZpc2lvbiAyMzQ5MDApCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQkod29ya2luZyBj b3B5KQpAQCAtMTI1LDcgKzEyNSw2IEBAIHN0YXRpYyBfV0tEcmFnTGlmdERlbGF5IHRvRHJhZ0xp ZnREZWxheSgKIAogI2lmIFBMQVRGT1JNKElPUykKICAgICBMYXp5SW5pdGlhbGl6ZWQ8UmV0YWlu UHRyPFdLV2ViVmlld0NvbnRlbnRQcm92aWRlclJlZ2lzdHJ5Pj4gX2NvbnRlbnRQcm92aWRlclJl Z2lzdHJ5OwotICAgIEJPT0wgX2Fsd2F5c1J1bnNBdEZvcmVncm91bmRQcmlvcml0eTsKICAgICBC T09MIF9hbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrOwogICAgIEJPT0wgX2lubGluZU1lZGlhUGxh eWJhY2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlOwogICAgIEJPT0wgX2FsbG93c0lubGlu ZU1lZGlhUGxheWJhY2tBZnRlckZ1bGxzY3JlZW47CkBAIC0xNDgsNyArMTQ3LDYgQEAgc3RhdGlj IF9XS0RyYWdMaWZ0RGVsYXkgdG9EcmFnTGlmdERlbGF5KAogICAgIEJPT0wgX2ltYWdlQ29udHJv bHNFbmFibGVkOwogICAgIEJPT0wgX3JlcXVpcmVzVXNlckFjdGlvbkZvckVkaXRpbmdDb250cm9s c01hbmFnZXI7CiAjZW5kaWYKLSAgICBCT09MIF9pbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVk OwogICAgIEJPT0wgX3dhaXRzRm9yUGFpbnRBZnRlclZpZXdEaWRNb3ZlVG9XaW5kb3c7CiAgICAg Qk9PTCBfY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKIApAQCAtMTY3LDcgKzE2NSw2IEBAIHN0YXRp YyBfV0tEcmFnTGlmdERlbGF5IHRvRHJhZ0xpZnREZWxheSgKICAgICBCT09MIF9zaG91bGREZWZl ckFzeW5jaHJvbm91c1NjcmlwdHNVbnRpbEFmdGVyRG9jdW1lbnRMb2FkOwogICAgIEJPT0wgX2Ry YXdzQmFja2dyb3VuZDsKIAotICAgIFJldGFpblB0cjxOU1N0cmluZz4gX292ZXJyaWRlQ29udGVu dFNlY3VyaXR5UG9saWN5OwogICAgIFJldGFpblB0cjxOU1N0cmluZz4gX21lZGlhQ29udGVudFR5 cGVzUmVxdWlyaW5nSGFyZHdhcmVTdXBwb3J0OwogfQogCkBAIC0yMjAsNyArMjE3LDYgQEAgLSAo aW5zdGFuY2V0eXBlKWluaXQKICAgICBfaW1hZ2VDb250cm9sc0VuYWJsZWQgPSBOTzsKICAgICBf cmVxdWlyZXNVc2VyQWN0aW9uRm9yRWRpdGluZ0NvbnRyb2xzTWFuYWdlciA9IE5POwogI2VuZGlm Ci0gICAgX2luaXRpYWxDYXBpdGFsaXphdGlvbkVuYWJsZWQgPSBZRVM7CiAgICAgX3dhaXRzRm9y UGFpbnRBZnRlclZpZXdEaWRNb3ZlVG9XaW5kb3cgPSBZRVM7CiAKICNpZiBFTkFCTEUoV0lSRUxF U1NfUExBWUJBQ0tfVEFSR0VUKQpAQCAtMzY4LDcgKzM2NCw2IEBAIC0gKGlkKWNvcHlXaXRoWm9u ZTooTlNab25lICopem9uZQogICAgIGNvbmZpZ3VyYXRpb24tPl9hdHRhY2htZW50RWxlbWVudEVu YWJsZWQgPSBzZWxmLT5fYXR0YWNobWVudEVsZW1lbnRFbmFibGVkOwogICAgIGNvbmZpZ3VyYXRp b24tPl9tZWRpYVR5cGVzUmVxdWlyaW5nVXNlckFjdGlvbkZvclBsYXliYWNrID0gc2VsZi0+X21l ZGlhVHlwZXNSZXF1aXJpbmdVc2VyQWN0aW9uRm9yUGxheWJhY2s7CiAgICAgY29uZmlndXJhdGlv bi0+X21haW5Db250ZW50VXNlckdlc3R1cmVPdmVycmlkZUVuYWJsZWQgPSBzZWxmLT5fbWFpbkNv bnRlbnRVc2VyR2VzdHVyZU92ZXJyaWRlRW5hYmxlZDsKLSAgICBjb25maWd1cmF0aW9uLT5faW5p dGlhbENhcGl0YWxpemF0aW9uRW5hYmxlZCA9IHNlbGYtPl9pbml0aWFsQ2FwaXRhbGl6YXRpb25F bmFibGVkOwogICAgIGNvbmZpZ3VyYXRpb24tPl93YWl0c0ZvclBhaW50QWZ0ZXJWaWV3RGlkTW92 ZVRvV2luZG93ID0gc2VsZi0+X3dhaXRzRm9yUGFpbnRBZnRlclZpZXdEaWRNb3ZlVG9XaW5kb3c7 CiAgICAgY29uZmlndXJhdGlvbi0+X2NvbnRyb2xsZWRCeUF1dG9tYXRpb24gPSBzZWxmLT5fY29u dHJvbGxlZEJ5QXV0b21hdGlvbjsKIApAQCAtMzc3LDcgKzM3Miw2IEBAIC0gKGlkKWNvcHlXaXRo Wm9uZTooTlNab25lICopem9uZQogICAgIGNvbmZpZ3VyYXRpb24tPl9hbGxvd3NJbmxpbmVNZWRp YVBsYXliYWNrQWZ0ZXJGdWxsc2NyZWVuID0gc2VsZi0+X2FsbG93c0lubGluZU1lZGlhUGxheWJh Y2tBZnRlckZ1bGxzY3JlZW47CiAgICAgY29uZmlndXJhdGlvbi0+X2lubGluZU1lZGlhUGxheWJh Y2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlID0gc2VsZi0+X2lubGluZU1lZGlhUGxheWJh Y2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlOwogICAgIGNvbmZpZ3VyYXRpb24tPl9hbGxv d3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjayA9IHNlbGYtPl9hbGxvd3NQaWN0dXJlSW5Q aWN0dXJlTWVkaWFQbGF5YmFjazsKLSAgICBjb25maWd1cmF0aW9uLT5fYWx3YXlzUnVuc0F0Rm9y ZWdyb3VuZFByaW9yaXR5ID0gX2Fsd2F5c1J1bnNBdEZvcmVncm91bmRQcmlvcml0eTsKICAgICBj b25maWd1cmF0aW9uLT5fc2VsZWN0aW9uR3JhbnVsYXJpdHkgPSBzZWxmLT5fc2VsZWN0aW9uR3Jh bnVsYXJpdHk7CiAgICAgY29uZmlndXJhdGlvbi0+X2lnbm9yZXNWaWV3cG9ydFNjYWxlTGltaXRz ID0gc2VsZi0+X2lnbm9yZXNWaWV3cG9ydFNjYWxlTGltaXRzOwogICAgIGNvbmZpZ3VyYXRpb24t Pl9kcmFnTGlmdERlbGF5ID0gc2VsZi0+X2RyYWdMaWZ0RGVsYXk7CkBAIC00MDcsNyArNDAxLDYg QEAgLSAoaWQpY29weVdpdGhab25lOihOU1pvbmUgKil6b25lCiAgICAgY29uZmlndXJhdGlvbi0+ X2FwcGxpY2F0aW9uTWFuaWZlc3QgPSBzZWxmLT5fYXBwbGljYXRpb25NYW5pZmVzdDsKICNlbmRp ZgogICAgIGNvbmZpZ3VyYXRpb24tPl9uZWVkc1N0b3JhZ2VBY2Nlc3NGcm9tRmlsZVVSTHNRdWly ayA9IHNlbGYtPl9uZWVkc1N0b3JhZ2VBY2Nlc3NGcm9tRmlsZVVSTHNRdWlyazsKLSAgICBjb25m aWd1cmF0aW9uLT5fb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBhZG9wdE5TKFtzZWxm LT5fb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgY29weVdpdGhab25lOnpvbmVdKTsKIAog ICAgIGNvbmZpZ3VyYXRpb24tPl9tZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJlU3Vw cG9ydCA9IGFkb3B0TlMoW3NlbGYuX21lZGlhQ29udGVudFR5cGVzUmVxdWlyaW5nSGFyZHdhcmVT dXBwb3J0IGNvcHlXaXRoWm9uZTp6b25lXSk7CiAgICAgY29uZmlndXJhdGlvbi0+X2xlZ2FjeUVu Y3J5cHRlZE1lZGlhQVBJRW5hYmxlZCA9IHNlbGYtPl9sZWdhY3lFbmNyeXB0ZWRNZWRpYUFQSUVu YWJsZWQ7CkBAIC02NjUsMTIgKzY1OCwxMiBAQCAtICh2b2lkKV9zZXRBbGxvd3NNZXRhUmVmcmVz aDooQk9PTClhbGxvCiAjaWYgUExBVEZPUk0oSU9TKQogLSAoQk9PTClfYWx3YXlzUnVuc0F0Rm9y ZWdyb3VuZFByaW9yaXR5CiB7Ci0gICAgcmV0dXJuIF9hbHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJp b3JpdHk7CisgICAgcmV0dXJuIF9wYWdlQ29uZmlndXJhdGlvbi0+YWx3YXlzUnVuc0F0Rm9yZWdy b3VuZFByaW9yaXR5KCk7CiB9CiAKIC0gKHZvaWQpX3NldEFsd2F5c1J1bnNBdEZvcmVncm91bmRQ cmlvcml0eTooQk9PTClhbHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJpb3JpdHkKIHsKLSAgICBfYWx3 YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5ID0gYWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9y aXR5OworICAgIF9wYWdlQ29uZmlndXJhdGlvbi0+c2V0QWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFBy aW9yaXR5KGFsd2F5c1J1bnNBdEZvcmVncm91bmRQcmlvcml0eSk7CiB9CiAKIC0gKEJPT0wpX2lu bGluZU1lZGlhUGxheWJhY2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlCkBAIC04NDMsMTIg KzgzNiwxMiBAQCAtICh2b2lkKV9zZXRNYWluQ29udGVudFVzZXJHZXN0dXJlT3ZlcnJpCiAKIC0g KEJPT0wpX2luaXRpYWxDYXBpdGFsaXphdGlvbkVuYWJsZWQKIHsKLSAgICByZXR1cm4gX2luaXRp YWxDYXBpdGFsaXphdGlvbkVuYWJsZWQ7CisgICAgcmV0dXJuIF9wYWdlR3JvdXAtPmluaXRpYWxD YXBpdGFsaXphdGlvbkVuYWJsZWQoKTsKIH0KIAogLSAodm9pZClfc2V0SW5pdGlhbENhcGl0YWxp emF0aW9uRW5hYmxlZDooQk9PTClpbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVkCiB7Ci0gICAg X2luaXRpYWxDYXBpdGFsaXphdGlvbkVuYWJsZWQgPSBpbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFi bGVkOworICAgIF9wYWdlQ29uZmlndXJhdGlvbi0+c2V0SW5pdGlhbENhcGl0YWxpemF0aW9uRW5h YmxlZChpbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVkKTsKIH0KIAogLSAoQk9PTClfd2FpdHNG b3JQYWludEFmdGVyVmlld0RpZE1vdmVUb1dpbmRvdwpAQCAtOTc4LDEyICs5NzEsMTIgQEAgLSAo dm9pZClfc2V0TmVlZHNTdG9yYWdlQWNjZXNzRnJvbUZpbGVVUgogCiAtIChOU1N0cmluZyAqKV9v dmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeQogewotICAgIHJldHVybiBfb3ZlcnJpZGVDb250 ZW50U2VjdXJpdHlQb2xpY3kuZ2V0KCk7CisgICAgcmV0dXJuIF9wYWdlQ29uZmlndXJhdGlvbi0+ b3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3koKTsKIH0KIAogLSAodm9pZClfc2V0T3ZlcnJp ZGVDb250ZW50U2VjdXJpdHlQb2xpY3k6KE5TU3RyaW5nICopb3ZlcnJpZGVDb250ZW50U2VjdXJp dHlQb2xpY3kKIHsKLSAgICBfb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBhZG9wdE5T KFtvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSBjb3B5XSk7CisgICAgX3BhZ2VDb25maWd1 cmF0aW9uLT5zZXRPdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeShvdmVycmlkZUNvbnRlbnRT ZWN1cml0eVBvbGljeSk7CiB9CiAKIC0gKE5TU3RyaW5nICopX21lZGlhQ29udGVudFR5cGVzUmVx dWlyaW5nSGFyZHdhcmVTdXBwb3J0Cg== 347270 2018-08-16 10:00:32 -0700 2018-08-16 10:01:49 -0700 Patch bug-188661-20180816100031.patch text/plain 9036 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzQ5MzEpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE4LTA4LTE2ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgVHJhbnNpdGlvbiBt b3JlIFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gaXZhcnMgdG8gQVBJOjpQYWdlQ29uZmlndXJhdGlv biB2YWx1ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE4ODY2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmll dyBfaW5pdGlhbGl6ZVdpdGhDb25maWd1cmF0aW9uOl0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbToKKyAgICAgICAgKC1bV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiBpbml0XSk6CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24g Y29weVdpdGhab25lOl0pOgorICAgICAgICAoLVtXS1dlYlZpZXdDb25maWd1cmF0aW9uIF9hbHdh eXNSdW5zQXRGb3JlZ3JvdW5kUHJpb3JpdHldKToKKyAgICAgICAgKC1bV0tXZWJWaWV3Q29uZmln dXJhdGlvbiBfc2V0QWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5Ol0pOgorICAgICAgICAo LVtXS1dlYlZpZXdDb25maWd1cmF0aW9uIF9pbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVkXSk6 CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX3NldEluaXRpYWxDYXBpdGFsaXph dGlvbkVuYWJsZWQ6XSk6CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gX292ZXJy aWRlQ29udGVudFNlY3VyaXR5UG9saWN5XSk6CisgICAgICAgICgtW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gX3NldE92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5Ol0pOgorCiAyMDE4LTA4LTE2 ICBBZGl0eWEgS2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KIAogICAgICAgICBTdXBwb3J0 IGRyYWctYW5kLWRyb3AgZm9yIGlucHV0W3R5cGU9Y29sb3JdCkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHJldmlzaW9uIDIzNDkwMCkK KysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0JKHdvcmtp bmcgY29weSkKQEAgLTUxNyw5ICs1MTcsNiBAQCAtICh2b2lkKV9pbml0aWFsaXplV2l0aENvbmZp Z3VyYXRpb246KFdLCiAgICAgcGFnZUNvbmZpZ3VyYXRpb24tPnNldFZpc2l0ZWRMaW5rU3RvcmUo W19jb25maWd1cmF0aW9uIF92aXNpdGVkTGlua1N0b3JlXS0+X3Zpc2l0ZWRMaW5rU3RvcmUuZ2V0 KCkpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRXZWJzaXRlRGF0YVN0b3JlKFtfY29uZmln dXJhdGlvbiB3ZWJzaXRlRGF0YVN0b3JlXS0+X3dlYnNpdGVEYXRhU3RvcmUuZ2V0KCkpOwogCi0g ICAgaWYgKE5TU3RyaW5nICpvdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9IGNvbmZpZ3Vy YXRpb24uX292ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5KQotICAgICAgICBwYWdlQ29uZmln dXJhdGlvbi0+c2V0T3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kob3ZlcnJpZGVDb250ZW50 U2VjdXJpdHlQb2xpY3kpOwotCiAjaWYgUExBVEZPUk0oTUFDKQogICAgIGlmIChhdXRvIHBhZ2VH cm91cCA9IFdlYktpdDo6dG9JbXBsKFtjb25maWd1cmF0aW9uIF9wYWdlR3JvdXBdKSkgewogICAg ICAgICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0UGFnZUdyb3VwKHBhZ2VHcm91cCk7CkBAIC01NDEs NyArNTM4LDYgQEAgLSAodm9pZClfaW5pdGlhbGl6ZVdpdGhDb25maWd1cmF0aW9uOihXSwogICAg IHBhZ2VDb25maWd1cmF0aW9uLT5wcmVmZXJlbmNlVmFsdWVzKCkuc2V0KFdlYktpdDo6V2ViUHJl ZmVyZW5jZXNLZXk6OnNob3VsZENvbnZlcnRQb3NpdGlvblN0eWxlT25Db3B5S2V5KCksIFdlYktp dDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoISFbX2NvbmZpZ3VyYXRpb24gX2NvbnZlcnRz UG9zaXRpb25TdHlsZU9uQ29weV0pKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi0+cHJlZmVyZW5j ZVZhbHVlcygpLnNldChXZWJLaXQ6OldlYlByZWZlcmVuY2VzS2V5OjpodHRwRXF1aXZFbmFibGVk S2V5KCksIFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFsdWUoISFbX2NvbmZpZ3VyYXRp b24gX2FsbG93c01ldGFSZWZyZXNoXSkpOwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5wcmVmZXJl bmNlVmFsdWVzKCkuc2V0KFdlYktpdDo6V2ViUHJlZmVyZW5jZXNLZXk6OmFsbG93VW5pdmVyc2Fs QWNjZXNzRnJvbUZpbGVVUkxzS2V5KCksIFdlYktpdDo6V2ViUHJlZmVyZW5jZXNTdG9yZTo6VmFs dWUoISFbX2NvbmZpZ3VyYXRpb24gX2FsbG93VW5pdmVyc2FsQWNjZXNzRnJvbUZpbGVVUkxzXSkp OwotICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXRJbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVk KFtfY29uZmlndXJhdGlvbiBfaW5pdGlhbENhcGl0YWxpemF0aW9uRW5hYmxlZF0pOwogICAgIHBh Z2VDb25maWd1cmF0aW9uLT5zZXRXYWl0c0ZvclBhaW50QWZ0ZXJWaWV3RGlkTW92ZVRvV2luZG93 KFtfY29uZmlndXJhdGlvbiBfd2FpdHNGb3JQYWludEFmdGVyVmlld0RpZE1vdmVUb1dpbmRvd10p OwogICAgIHBhZ2VDb25maWd1cmF0aW9uLT5zZXREcmF3c0JhY2tncm91bmQoW19jb25maWd1cmF0 aW9uIF9kcmF3c0JhY2tncm91bmRdKTsKICAgICBwYWdlQ29uZmlndXJhdGlvbi0+c2V0Q29udHJv bGxlZEJ5QXV0b21hdGlvbihbX2NvbmZpZ3VyYXRpb24gX2lzQ29udHJvbGxlZEJ5QXV0b21hdGlv bl0pOwpAQCAtNTY3LDggKzU2Myw2IEBAICAgICAvLyBXZSBhcmUgaW4gdGhlIFZpZXcncyBpbml0 aWFsaXphdGkKICNlbmRpZgogCiAjaWYgUExBVEZPUk0oSU9TKQotICAgIHBhZ2VDb25maWd1cmF0 aW9uLT5zZXRBbHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJpb3JpdHkoW19jb25maWd1cmF0aW9uIF9h bHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJpb3JpdHldKTsKLQogICAgIHBhZ2VDb25maWd1cmF0aW9u LT5wcmVmZXJlbmNlVmFsdWVzKCkuc2V0KFdlYktpdDo6V2ViUHJlZmVyZW5jZXNLZXk6OmFsbG93 c0lubGluZU1lZGlhUGxheWJhY2tLZXkoKSwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpW YWx1ZSghIVtfY29uZmlndXJhdGlvbiBhbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrXSkpOwogICAg IHBhZ2VDb25maWd1cmF0aW9uLT5wcmVmZXJlbmNlVmFsdWVzKCkuc2V0KFdlYktpdDo6V2ViUHJl ZmVyZW5jZXNLZXk6OmFsbG93c0lubGluZU1lZGlhUGxheWJhY2tBZnRlckZ1bGxzY3JlZW5LZXko KSwgV2ViS2l0OjpXZWJQcmVmZXJlbmNlc1N0b3JlOjpWYWx1ZSghIVtfY29uZmlndXJhdGlvbiBf YWxsb3dzSW5saW5lTWVkaWFQbGF5YmFja0FmdGVyRnVsbHNjcmVlbl0pKTsKICAgICBwYWdlQ29u ZmlndXJhdGlvbi0+cHJlZmVyZW5jZVZhbHVlcygpLnNldChXZWJLaXQ6OldlYlByZWZlcmVuY2Vz S2V5OjppbmxpbmVNZWRpYVBsYXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZUtleSgp LCBXZWJLaXQ6OldlYlByZWZlcmVuY2VzU3RvcmU6OlZhbHVlKCEhW19jb25maWd1cmF0aW9uIF9p bmxpbmVNZWRpYVBsYXliYWNrUmVxdWlyZXNQbGF5c0lubGluZUF0dHJpYnV0ZV0pKTsKSW5kZXg6 IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdDb25maWd1cmF0aW9u Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dl YlZpZXdDb25maWd1cmF0aW9uLm1tCShyZXZpc2lvbiAyMzQ5MDApCisrKyBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5tbQkod29ya2luZyBj b3B5KQpAQCAtMTI1LDcgKzEyNSw2IEBAIHN0YXRpYyBfV0tEcmFnTGlmdERlbGF5IHRvRHJhZ0xp ZnREZWxheSgKIAogI2lmIFBMQVRGT1JNKElPUykKICAgICBMYXp5SW5pdGlhbGl6ZWQ8UmV0YWlu UHRyPFdLV2ViVmlld0NvbnRlbnRQcm92aWRlclJlZ2lzdHJ5Pj4gX2NvbnRlbnRQcm92aWRlclJl Z2lzdHJ5OwotICAgIEJPT0wgX2Fsd2F5c1J1bnNBdEZvcmVncm91bmRQcmlvcml0eTsKICAgICBC T09MIF9hbGxvd3NJbmxpbmVNZWRpYVBsYXliYWNrOwogICAgIEJPT0wgX2lubGluZU1lZGlhUGxh eWJhY2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlOwogICAgIEJPT0wgX2FsbG93c0lubGlu ZU1lZGlhUGxheWJhY2tBZnRlckZ1bGxzY3JlZW47CkBAIC0xNDgsNyArMTQ3LDYgQEAgc3RhdGlj IF9XS0RyYWdMaWZ0RGVsYXkgdG9EcmFnTGlmdERlbGF5KAogICAgIEJPT0wgX2ltYWdlQ29udHJv bHNFbmFibGVkOwogICAgIEJPT0wgX3JlcXVpcmVzVXNlckFjdGlvbkZvckVkaXRpbmdDb250cm9s c01hbmFnZXI7CiAjZW5kaWYKLSAgICBCT09MIF9pbml0aWFsQ2FwaXRhbGl6YXRpb25FbmFibGVk OwogICAgIEJPT0wgX3dhaXRzRm9yUGFpbnRBZnRlclZpZXdEaWRNb3ZlVG9XaW5kb3c7CiAgICAg Qk9PTCBfY29udHJvbGxlZEJ5QXV0b21hdGlvbjsKIApAQCAtMTY3LDcgKzE2NSw2IEBAIHN0YXRp YyBfV0tEcmFnTGlmdERlbGF5IHRvRHJhZ0xpZnREZWxheSgKICAgICBCT09MIF9zaG91bGREZWZl ckFzeW5jaHJvbm91c1NjcmlwdHNVbnRpbEFmdGVyRG9jdW1lbnRMb2FkOwogICAgIEJPT0wgX2Ry YXdzQmFja2dyb3VuZDsKIAotICAgIFJldGFpblB0cjxOU1N0cmluZz4gX292ZXJyaWRlQ29udGVu dFNlY3VyaXR5UG9saWN5OwogICAgIFJldGFpblB0cjxOU1N0cmluZz4gX21lZGlhQ29udGVudFR5 cGVzUmVxdWlyaW5nSGFyZHdhcmVTdXBwb3J0OwogfQogCkBAIC0yMjAsNyArMjE3LDYgQEAgLSAo aW5zdGFuY2V0eXBlKWluaXQKICAgICBfaW1hZ2VDb250cm9sc0VuYWJsZWQgPSBOTzsKICAgICBf cmVxdWlyZXNVc2VyQWN0aW9uRm9yRWRpdGluZ0NvbnRyb2xzTWFuYWdlciA9IE5POwogI2VuZGlm Ci0gICAgX2luaXRpYWxDYXBpdGFsaXphdGlvbkVuYWJsZWQgPSBZRVM7CiAgICAgX3dhaXRzRm9y UGFpbnRBZnRlclZpZXdEaWRNb3ZlVG9XaW5kb3cgPSBZRVM7CiAKICNpZiBFTkFCTEUoV0lSRUxF U1NfUExBWUJBQ0tfVEFSR0VUKQpAQCAtMzY4LDcgKzM2NCw2IEBAIC0gKGlkKWNvcHlXaXRoWm9u ZTooTlNab25lICopem9uZQogICAgIGNvbmZpZ3VyYXRpb24tPl9hdHRhY2htZW50RWxlbWVudEVu YWJsZWQgPSBzZWxmLT5fYXR0YWNobWVudEVsZW1lbnRFbmFibGVkOwogICAgIGNvbmZpZ3VyYXRp b24tPl9tZWRpYVR5cGVzUmVxdWlyaW5nVXNlckFjdGlvbkZvclBsYXliYWNrID0gc2VsZi0+X21l ZGlhVHlwZXNSZXF1aXJpbmdVc2VyQWN0aW9uRm9yUGxheWJhY2s7CiAgICAgY29uZmlndXJhdGlv bi0+X21haW5Db250ZW50VXNlckdlc3R1cmVPdmVycmlkZUVuYWJsZWQgPSBzZWxmLT5fbWFpbkNv bnRlbnRVc2VyR2VzdHVyZU92ZXJyaWRlRW5hYmxlZDsKLSAgICBjb25maWd1cmF0aW9uLT5faW5p dGlhbENhcGl0YWxpemF0aW9uRW5hYmxlZCA9IHNlbGYtPl9pbml0aWFsQ2FwaXRhbGl6YXRpb25F bmFibGVkOwogICAgIGNvbmZpZ3VyYXRpb24tPl93YWl0c0ZvclBhaW50QWZ0ZXJWaWV3RGlkTW92 ZVRvV2luZG93ID0gc2VsZi0+X3dhaXRzRm9yUGFpbnRBZnRlclZpZXdEaWRNb3ZlVG9XaW5kb3c7 CiAgICAgY29uZmlndXJhdGlvbi0+X2NvbnRyb2xsZWRCeUF1dG9tYXRpb24gPSBzZWxmLT5fY29u dHJvbGxlZEJ5QXV0b21hdGlvbjsKIApAQCAtMzc3LDcgKzM3Miw2IEBAIC0gKGlkKWNvcHlXaXRo Wm9uZTooTlNab25lICopem9uZQogICAgIGNvbmZpZ3VyYXRpb24tPl9hbGxvd3NJbmxpbmVNZWRp YVBsYXliYWNrQWZ0ZXJGdWxsc2NyZWVuID0gc2VsZi0+X2FsbG93c0lubGluZU1lZGlhUGxheWJh Y2tBZnRlckZ1bGxzY3JlZW47CiAgICAgY29uZmlndXJhdGlvbi0+X2lubGluZU1lZGlhUGxheWJh Y2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlID0gc2VsZi0+X2lubGluZU1lZGlhUGxheWJh Y2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlOwogICAgIGNvbmZpZ3VyYXRpb24tPl9hbGxv d3NQaWN0dXJlSW5QaWN0dXJlTWVkaWFQbGF5YmFjayA9IHNlbGYtPl9hbGxvd3NQaWN0dXJlSW5Q aWN0dXJlTWVkaWFQbGF5YmFjazsKLSAgICBjb25maWd1cmF0aW9uLT5fYWx3YXlzUnVuc0F0Rm9y ZWdyb3VuZFByaW9yaXR5ID0gX2Fsd2F5c1J1bnNBdEZvcmVncm91bmRQcmlvcml0eTsKICAgICBj b25maWd1cmF0aW9uLT5fc2VsZWN0aW9uR3JhbnVsYXJpdHkgPSBzZWxmLT5fc2VsZWN0aW9uR3Jh bnVsYXJpdHk7CiAgICAgY29uZmlndXJhdGlvbi0+X2lnbm9yZXNWaWV3cG9ydFNjYWxlTGltaXRz ID0gc2VsZi0+X2lnbm9yZXNWaWV3cG9ydFNjYWxlTGltaXRzOwogICAgIGNvbmZpZ3VyYXRpb24t Pl9kcmFnTGlmdERlbGF5ID0gc2VsZi0+X2RyYWdMaWZ0RGVsYXk7CkBAIC00MDcsNyArNDAxLDYg QEAgLSAoaWQpY29weVdpdGhab25lOihOU1pvbmUgKil6b25lCiAgICAgY29uZmlndXJhdGlvbi0+ X2FwcGxpY2F0aW9uTWFuaWZlc3QgPSBzZWxmLT5fYXBwbGljYXRpb25NYW5pZmVzdDsKICNlbmRp ZgogICAgIGNvbmZpZ3VyYXRpb24tPl9uZWVkc1N0b3JhZ2VBY2Nlc3NGcm9tRmlsZVVSTHNRdWly ayA9IHNlbGYtPl9uZWVkc1N0b3JhZ2VBY2Nlc3NGcm9tRmlsZVVSTHNRdWlyazsKLSAgICBjb25m aWd1cmF0aW9uLT5fb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgPSBhZG9wdE5TKFtzZWxm LT5fb3ZlcnJpZGVDb250ZW50U2VjdXJpdHlQb2xpY3kgY29weVdpdGhab25lOnpvbmVdKTsKIAog ICAgIGNvbmZpZ3VyYXRpb24tPl9tZWRpYUNvbnRlbnRUeXBlc1JlcXVpcmluZ0hhcmR3YXJlU3Vw cG9ydCA9IGFkb3B0TlMoW3NlbGYuX21lZGlhQ29udGVudFR5cGVzUmVxdWlyaW5nSGFyZHdhcmVT dXBwb3J0IGNvcHlXaXRoWm9uZTp6b25lXSk7CiAgICAgY29uZmlndXJhdGlvbi0+X2xlZ2FjeUVu Y3J5cHRlZE1lZGlhQVBJRW5hYmxlZCA9IHNlbGYtPl9sZWdhY3lFbmNyeXB0ZWRNZWRpYUFQSUVu YWJsZWQ7CkBAIC02NjUsMTIgKzY1OCwxMiBAQCAtICh2b2lkKV9zZXRBbGxvd3NNZXRhUmVmcmVz aDooQk9PTClhbGxvCiAjaWYgUExBVEZPUk0oSU9TKQogLSAoQk9PTClfYWx3YXlzUnVuc0F0Rm9y ZWdyb3VuZFByaW9yaXR5CiB7Ci0gICAgcmV0dXJuIF9hbHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJp b3JpdHk7CisgICAgcmV0dXJuIF9wYWdlQ29uZmlndXJhdGlvbi0+YWx3YXlzUnVuc0F0Rm9yZWdy b3VuZFByaW9yaXR5KCk7CiB9CiAKIC0gKHZvaWQpX3NldEFsd2F5c1J1bnNBdEZvcmVncm91bmRQ cmlvcml0eTooQk9PTClhbHdheXNSdW5zQXRGb3JlZ3JvdW5kUHJpb3JpdHkKIHsKLSAgICBfYWx3 YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9yaXR5ID0gYWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFByaW9y aXR5OworICAgIF9wYWdlQ29uZmlndXJhdGlvbi0+c2V0QWx3YXlzUnVuc0F0Rm9yZWdyb3VuZFBy aW9yaXR5KGFsd2F5c1J1bnNBdEZvcmVncm91bmRQcmlvcml0eSk7CiB9CiAKIC0gKEJPT0wpX2lu bGluZU1lZGlhUGxheWJhY2tSZXF1aXJlc1BsYXlzSW5saW5lQXR0cmlidXRlCkBAIC04NDMsMTIg KzgzNiwxMiBAQCAtICh2b2lkKV9zZXRNYWluQ29udGVudFVzZXJHZXN0dXJlT3ZlcnJpCiAKIC0g KEJPT0wpX2luaXRpYWxDYXBpdGFsaXphdGlvbkVuYWJsZWQKIHsKLSAgICByZXR1cm4gX2luaXRp YWxDYXBpdGFsaXphdGlvbkVuYWJsZWQ7CisgICAgcmV0dXJuIF9wYWdlQ29uZmlndXJhdGlvbi0+ aW5pdGlhbENhcGl0YWxpemF0aW9uRW5hYmxlZCgpOwogfQogCiAtICh2b2lkKV9zZXRJbml0aWFs Q2FwaXRhbGl6YXRpb25FbmFibGVkOihCT09MKWluaXRpYWxDYXBpdGFsaXphdGlvbkVuYWJsZWQK IHsKLSAgICBfaW5pdGlhbENhcGl0YWxpemF0aW9uRW5hYmxlZCA9IGluaXRpYWxDYXBpdGFsaXph dGlvbkVuYWJsZWQ7CisgICAgX3BhZ2VDb25maWd1cmF0aW9uLT5zZXRJbml0aWFsQ2FwaXRhbGl6 YXRpb25FbmFibGVkKGluaXRpYWxDYXBpdGFsaXphdGlvbkVuYWJsZWQpOwogfQogCiAtIChCT09M KV93YWl0c0ZvclBhaW50QWZ0ZXJWaWV3RGlkTW92ZVRvV2luZG93CkBAIC05NzgsMTIgKzk3MSwx MiBAQCAtICh2b2lkKV9zZXROZWVkc1N0b3JhZ2VBY2Nlc3NGcm9tRmlsZVVSCiAKIC0gKE5TU3Ry aW5nICopX292ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5CiB7Ci0gICAgcmV0dXJuIF9vdmVy cmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeS5nZXQoKTsKKyAgICByZXR1cm4gX3BhZ2VDb25maWd1 cmF0aW9uLT5vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSgpOwogfQogCiAtICh2b2lkKV9z ZXRPdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeTooTlNTdHJpbmcgKilvdmVycmlkZUNvbnRl bnRTZWN1cml0eVBvbGljeQogewotICAgIF9vdmVycmlkZUNvbnRlbnRTZWN1cml0eVBvbGljeSA9 IGFkb3B0TlMoW292ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5IGNvcHldKTsKKyAgICBfcGFn ZUNvbmZpZ3VyYXRpb24tPnNldE92ZXJyaWRlQ29udGVudFNlY3VyaXR5UG9saWN5KG92ZXJyaWRl Q29udGVudFNlY3VyaXR5UG9saWN5KTsKIH0KIAogLSAoTlNTdHJpbmcgKilfbWVkaWFDb250ZW50 VHlwZXNSZXF1aXJpbmdIYXJkd2FyZVN1cHBvcnQK