130355 2014-03-17 13:07:43 -0700 Add SPI for getting bundle parameters from the injected bundle 2014-03-17 13:38:53 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 991347 0 andersca 2014-03-17 13:07:43 -0700 Add SPI for getting bundle parameters from the injected bundle 991348 1 226947 andersca 2014-03-17 13:09:03 -0700 Created attachment 226947 Patch 991364 2 226947 mitz 2014-03-17 13:28:21 -0700 Comment on attachment 226947 Patch >+ _parameters = adoptNS([[NSMutableDictionary alloc] initWithDictionary:dictionary]); Is this better than -mutableCopy? > > #if USE(FOUNDATION) > OBJC_CLASS NSBundle; >+OBJC_CLASS NSMutableDictionary; >+OBJC_CLASS WKWebProcessBundleParameters; Shouldn’t this be only #if WK_API_ENABLED ? > >+#if PLATFORM(COCOA) >+ WKWebProcessBundleParameters *bundleParameters(); >+#endif Ditto. >+ >+#if PLATFORM(COCOA) >+ RetainPtr<WKWebProcessBundleParameters> m_bundleParameters; >+#endif Ditto. 991372 3 andersca 2014-03-17 13:38:53 -0700 Committed r165755: <http://trac.webkit.org/changeset/165755> 226947 2014-03-17 13:09:03 -0700 2014-03-17 13:28:21 -0700 Patch bug-130355-20140317130841.patch text/plain 19437 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1NzM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMGNlZDUwNzUzYzVhZjQ3 OTM1Y2MwMTU4MjgwNTEwNTZjZTRjODI5Ny4uNjkyMDg1ZDdmMWUzZjZiZjQzZjY5YjBjZWZlNWJk ZDVkNzNmZGY2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDE0LTAzLTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIFNQSSBmb3Ig Z2V0dGluZyBidW5kbGUgcGFyYW1ldGVycyBmcm9tIHRoZSBpbmplY3RlZCBidW5kbGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDM1NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL21h Yy9XZWJDb250ZXh0TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpwbGF0Zm9y bUluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9q ZWN0LnBieHByb2o6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29j b2EvV0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1ldGVycy5oOiBDb3BpZWQgZnJvbSBTb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0lu LmguCisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQ cm9jZXNzQnVuZGxlUGFyYW1ldGVycy5tbTogQ29waWVkIGZyb20gU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJbi5oLgorICAg ICAgICAoLVtXS1dlYlByb2Nlc3NCdW5kbGVQYXJhbWV0ZXJzIGluaXRXaXRoRGljdGlvbmFyeTpd KToKKyAgICAgICAgKC1bV0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1ldGVycyB2YWx1ZUZvcktleTpd KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9j ZXNzUGx1Z0luLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFj L1dLV2ViUHJvY2Vzc1BsdWdJbi5tbToKKyAgICAgICAgKC1bV0tXZWJQcm9jZXNzUGx1Z0luQ29u dHJvbGxlciBwYXJhbWV0ZXJzXSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRs ZS9JbmplY3RlZEJ1bmRsZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OkluamVjdGVkQnVuZGxlOjpJ bmplY3RlZEJ1bmRsZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9Jbmpl Y3RlZEJ1bmRsZS5oOgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6Y3JlYXRlKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1h Yy5tbToKKyAgICAgICAgKFdlYktpdDo6SW5qZWN0ZWRCdW5kbGU6OmJ1bmRsZVBhcmFtZXRlcnMp OgorICAgICAgICAoV2ViS2l0OjpJbmplY3RlZEJ1bmRsZTo6cGxhdGZvcm1Jbml0aWFsaXplKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQcm9jZXNzOjppbml0aWFsaXplV2ViUHJvY2Vzcyk6CisKIDIwMTQtMDMtMTcgIE1hcnRpbiBS b2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdW0NNYWtlXSBF bnN1cmUgdGhhdCBIQVZFX0dUS19VTklYX1BSSU5USU5HIGlzIGRlZmluZWQgd2hlbiBhcHByb3By aWF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0 TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJDb250ZXh0TWFjLm1tCmlu ZGV4IDE4NDljMDYwMzAzZjc0MzA5NTEyZDk1NzM3Y2E1MGIwMmMxYTY3Y2IuLjQzNzlkNTExNGRk ZGRiYzcxYjBlZmI0NWMyYTMyMGVhMDVhZjM2YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvV2ViQ29udGV4dE1hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvbWFjL1dlYkNvbnRleHRNYWMubW0KQEAgLTYwLDcgKzYwLDcgQEAgZXh0ZXJuICJDIiB2 b2lkIF9DRk5ldHdvcmtSZXNldEhTVFNIb3N0c1dpdGhTZXNzaW9uKENGVVJMU3RvcmFnZVNlc3Np b25SZWYgc2Vzc2kKIAogI2VuZGlmCiAKLSNpZiAhUExBVEZPUk0oSU9TKSAmJiBfX01BQ19PU19Y X1ZFUlNJT05fTUlOX1JFUVVJUkVEID09IDEwODAKKyNpZiBQTEFURk9STShNQUMpICYmIF9fTUFD X09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPT0gMTA4MAogQGludGVyZmFjZSBOU0tleWVkQXJj aGl2ZXIgKFdLRGV0YWlscykKIC0gKHZvaWQpc2V0UmVxdWlyZXNTZWN1cmVDb2Rpbmc6KEJPT0wp YjsKIEBlbmQKQEAgLTE5OCw3ICsxOTgsNyBAQCB2b2lkIFdlYkNvbnRleHQ6OnBsYXRmb3JtSW5p dGlhbGl6ZVdlYlByb2Nlc3MoV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYQogCiAg ICAgaWYgKG1fYnVuZGxlUGFyYW1ldGVycykgewogICAgICAgICBhdXRvIGRhdGEgPSBhZG9wdE5T KFtbTlNNdXRhYmxlRGF0YSBhbGxvY10gaW5pdF0pOwotICAgICAgICBhdXRvIGtleWVkQXJjaGl2 ZXIgPSBhZG9wdE5TKFtbTlNLZXllZEFyY2hpdmVyIGFsbG9jXSBpbml0XSk7CisgICAgICAgIGF1 dG8ga2V5ZWRBcmNoaXZlciA9IGFkb3B0TlMoW1tOU0tleWVkQXJjaGl2ZXIgYWxsb2NdIGluaXRG b3JXcml0aW5nV2l0aE11dGFibGVEYXRhOmRhdGEuZ2V0KCldKTsKIAogICAgICAgICBba2V5ZWRB cmNoaXZlciBzZXRSZXF1aXJlc1NlY3VyZUNvZGluZzpZRVNdOwogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggODczMTZhMzcyYjMx NzA2NWIzZDIwYThhZjRjMTlhNDFiOWExZjdjZS4uNTkzMjlhOWEzMDM4MzY2OWE5ODFlMzg5OTlj NzhjYmI4YmM3YmIxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViS2l0Mi54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYktpdDIueGNvZGVwcm9q L3Byb2plY3QucGJ4cHJvagpAQCAtMjg4LDYgKzI4OCw4IEBACiAJCTFBQTIwRDUxMThBRDUwRTAw MDVEMUVENCAvKiBXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUuaCBpbiBIZWFkZXJzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTIwRDUwMThBRDUwRTAwMDVEMUVENCAv KiBXS05hdmlnYXRpb25EZWxlZ2F0ZVByaXZhdGUuaCAqLzsgc2V0dGluZ3MgPSB7QVRUUklCVVRF UyA9IChQcml2YXRlLCApOyB9OyB9OwogCQkxQUEyRTUxRDEyRTRDMDVFMDBCQzQ5NjYgLyogQ0dV dGlsaXRpZXMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9 IDFBQTJFNTFCMTJFNEMwNUUwMEJDNDk2NiAvKiBDR1V0aWxpdGllcy5oICovOyB9OwogCQkxQUEy RTUxRTEyRTRDMDVFMDBCQzQ5NjYgLyogQ0dVdGlsaXRpZXMuY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBMkU1MUMxMkU0QzA1RTAwQkM0OTY2IC8q IENHVXRpbGl0aWVzLmNwcCAqLzsgfTsKKwkJMUFBMkU1NjYxOEQ3NzUwODAwMzgxNEJEIC8qIFdL V2ViUHJvY2Vzc0J1bmRsZVBhcmFtZXRlcnMubW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAxQUEyRTU2NDE4RDc3NTA4MDAzODE0QkQgLyogV0tXZWJQcm9j ZXNzQnVuZGxlUGFyYW1ldGVycy5tbSAqLzsgfTsKKwkJMUFBMkU1NjcxOEQ3NzUwODAwMzgxNEJE IC8qIFdLV2ViUHJvY2Vzc0J1bmRsZVBhcmFtZXRlcnMuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTJFNTY1MThENzc1MDgwMDM4MTRCRCAvKiBXS1dl YlByb2Nlc3NCdW5kbGVQYXJhbWV0ZXJzLmggKi87IH07CiAJCTFBQTNENzVCMTY1MUI0NEYwMDg3 MTNEMCAvKiBSZW1vdGVMYXllclRyZWVIb3N0Lm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJY QnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBM0Q3NTkxNjUxQjQ0RjAwODcxM0QwIC8qIFJlbW90ZUxh eWVyVHJlZUhvc3QubW0gKi87IH07CiAJCTFBQTNENzVDMTY1MUI0NEYwMDg3MTNEMCAvKiBSZW1v dGVMYXllclRyZWVIb3N0LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZp bGVSZWYgPSAxQUEzRDc1QTE2NTFCNDRGMDA4NzEzRDAgLyogUmVtb3RlTGF5ZXJUcmVlSG9zdC5o ICovOyB9OwogCQkxQUE0MTdDQjEyQzAwQ0NBMDAyQkU2N0IgLyogVGV4dENoZWNrZXIuaCBpbiBI ZWFkZXJzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTQxN0M5MTJDMDBD Q0EwMDJCRTY3QiAvKiBUZXh0Q2hlY2tlci5oICovOyB9OwpAQCAtMjAzMSw2ICsyMDMzLDggQEAK IAkJMUFBMjBENTAxOEFENTBFMDAwNUQxRUQ0IC8qIFdLTmF2aWdhdGlvbkRlbGVnYXRlUHJpdmF0 ZS5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RL bm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBXS05hdmlnYXRpb25EZWxlZ2F0 ZVByaXZhdGUuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFBMkU1MUIxMkU0QzA1 RTAwQkM0OTY2IC8qIENHVXRpbGl0aWVzLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsg ZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0 aCA9IENHVXRpbGl0aWVzLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTFBQTJFNTFD MTJFNEMwNUUwMEJDNDk2NiAvKiBDR1V0aWxpdGllcy5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5jcHA7IHBhdGggPSBDR1V0aWxpdGllcy5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7 IH07CisJCTFBQTJFNTY0MThENzc1MDgwMDM4MTRCRCAvKiBXS1dlYlByb2Nlc3NCdW5kbGVQYXJh bWV0ZXJzLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7 IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gV0tXZWJQ cm9jZXNzQnVuZGxlUGFyYW1ldGVycy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKKwkJ MUFBMkU1NjUxOEQ3NzUwODAwMzgxNEJEIC8qIFdLV2ViUHJvY2Vzc0J1bmRsZVBhcmFtZXRlcnMu aCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gV0tXZWJQcm9jZXNzQnVuZGxlUGFy YW1ldGVycy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQUEzRDc1OTE2NTFCNDRG MDA4NzEzRDAgLyogUmVtb3RlTGF5ZXJUcmVlSG9zdC5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVm ZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUu Y3BwLm9iamNwcDsgcGF0aCA9IFJlbW90ZUxheWVyVHJlZUhvc3QubW07IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CiAJCTFBQTNENzVBMTY1MUI0NEYwMDg3MTNEMCAvKiBSZW1vdGVMYXllclRy ZWVIb3N0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsg bGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFJlbW90ZUxheWVyVHJl ZUhvc3QuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJMUFBNDE3QzkxMkMwMENDQTAw MkJFNjdCIC8qIFRleHRDaGVja2VyLmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFRleHRDaGVja2VyLmg7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CkBAIC00MjU5LDYgKzQy NjMsOCBAQAogCQkxRjAxODE2ODE4NThEQzE1MDBGOTI4ODQgLyogQ29jb2EgKi8gPSB7CiAJCQlp c2EgPSBQQlhHcm91cDsKIAkJCWNoaWxkcmVuID0gKAorCQkJCTFBQTJFNTY1MThENzc1MDgwMDM4 MTRCRCAvKiBXS1dlYlByb2Nlc3NCdW5kbGVQYXJhbWV0ZXJzLmggKi8sCisJCQkJMUFBMkU1NjQx OEQ3NzUwODAwMzgxNEJEIC8qIFdLV2ViUHJvY2Vzc0J1bmRsZVBhcmFtZXRlcnMubW0gKi8sCiAJ CQkJMzc5NTc4OUIxOEFENEYxMTAwQjlFRDJFIC8qIFdLV2ViUHJvY2Vzc1BsdWdJbkZvcm1EZWxl Z2F0ZVByaXZhdGUuaCAqLywKIAkJCQkxRjAxODE2OTE4NThEQzE1MDBGOTI4ODQgLyogV0tXZWJQ cm9jZXNzUGx1Z0luRnJhbWUuaCAqLywKIAkJCQkxRjAxODE2QTE4NThEQzE1MDBGOTI4ODQgLyog V0tXZWJQcm9jZXNzUGx1Z0luRnJhbWUubW0gKi8sCkBAIC02Njg5LDYgKzY2OTUsNyBAQAogCQkJ CTFBOEVGOTZGMTI1MkFGNkIwMEY3MDY3RiAvKiBQbHVnaW5Db250cm9sbGVyUHJveHlNZXNzYWdl cy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUExNzk3ODAxMzdFRTgyQzAwRjk3RDQ1IC8qIFBsdWdp bkNyZWF0aW9uUGFyYW1ldGVycy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUE5RTMyOUIxODIyRTFD QzAwRjVEMDRDIC8qIFdLUmVtb3RlT2JqZWN0LmggaW4gSGVhZGVycyAqLywKKwkJCQkxQUEyRTU2 NzE4RDc3NTA4MDAzODE0QkQgLyogV0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1ldGVycy5oIGluIEhl YWRlcnMgKi8sCiAJCQkJN0MzRjhDOTExNzNBRjUyRDAwN0I3RjM5IC8qIFBsdWdpbkluZm9ybWF0 aW9uLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQUVGQ0MxMjExRDAxRjk2MDA4MjE5RDMgLyogUGx1 Z2luSW5mb1N0b3JlLmggaW4gSGVhZGVycyAqLywKIAkJCQkxQTNENjEwMjEzQTdDQzJBMDBGOTVE NEUgLyogUGx1Z2luTW9kdWxlSW5mby5oIGluIEhlYWRlcnMgKi8sCkBAIC03OTIzLDYgKzc5MzAs NyBAQAogCQkJCTFBMkQ5NTcwMTI4NDg1NjQwMDFFQjk2MiAvKiBDaGlsZFByb2Nlc3MuY3BwIGlu IFNvdXJjZXMgKi8sCiAJCQkJQkM4MjgzN0IxNkIzNkE0RjAwQTI3OEZFIC8qIENoaWxkUHJvY2Vz c0VudHJ5UG9pbnQubW0gaW4gU291cmNlcyAqLywKIAkJCQk5RjU0Rjg4RjE2NDg4RTg3MDA3REY4 MUEgLyogQ2hpbGRQcm9jZXNzTWFjLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJMUFBMkU1NjYxOEQ3 NzUwODAwMzgxNEJEIC8qIFdLV2ViUHJvY2Vzc0J1bmRsZVBhcmFtZXRlcnMubW0gaW4gU291cmNl cyAqLywKIAkJCQkxQTlFQTMxRTE4QkJERjRCMDA0RjdDOTUgLyogV0tXZWJWaWV3Q29uZmlndXJh dGlvblRvQmVSZW1vdmVkLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJRTE1MTNDNjYxNjZFQUJCMjAw MTQ5RkNCIC8qIENoaWxkUHJvY2Vzc1Byb3h5LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTFBMkE0 QjBFMTU4NkEyMjQwMDkwQzlFOSAvKiBDb2xvclNwYWNlRGF0YS5tbSBpbiBTb3VyY2VzICovLApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkv Q29jb2EvV0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1ldGVycy5oIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvQ29jb2EvV0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1l dGVycy5oCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLmZkYjI5MzQyOGM4NmI4ZGNkYmIwODQ2MmRhZjI2YTZhMmQxYzJl ZDcKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVk QnVuZGxlL0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NCdW5kbGVQYXJhbWV0ZXJzLmgKQEAgLTAsMCAr MSwzMCBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMg cmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJp bmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6Cisg KiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3Zl IGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhl IGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBm b3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUK KyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo IHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBB UFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBS RVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8s CisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVT UyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVO VCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1Ig QU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IK KyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8s IFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9G IFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9X RVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisg KiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VO Q0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9G IFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgorICovCisKK0BpbnRlcmZhY2UgV0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1l dGVycyA6IE5TT2JqZWN0CisKKy0gKGluc3RhbmNldHlwZSlpbml0V2l0aERpY3Rpb25hcnk6KE5T RGljdGlvbmFyeSAqKWRpY3Rpb25hcnk7CisKK0BlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL0NvY29hL1dLV2ViUHJvY2Vzc0J1bmRs ZVBhcmFtZXRlcnMubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0FQSS9Db2NvYS9XS1dlYlByb2Nlc3NCdW5kbGVQYXJhbWV0ZXJzLm1tCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjQ2 MTNlNTEzNmE0MDM0ODIwYTljYzk4OTNmOTEzMjU0MTYyY2JlOTkKLS0tIC9kZXYvbnVsbAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9Db2NvYS9XS1dl YlByb2Nlc3NCdW5kbGVQYXJhbWV0ZXJzLm1tCkBAIC0wLDAgKzEsNTAgQEAKKy8qCisgKiBDb3B5 cmlnaHQgKEMpIDIwMTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgorICoKKyAqIFJl ZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Ig d2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhl IGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogMS4gUmVkaXN0cmlidXRpb25z IG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5v dGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1l ci4KKyAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25z IGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9u IGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgor ICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENP TlRSSUJVVE9SUyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FS UkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgor ICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBP UiBJVFMgQ09OVFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNU LCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERB TUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICog U1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJ VFM7IE9SIEJVU0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBB TlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAq IEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVO IElGIEFEVklTRUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLwor CisjaW1wb3J0ICJjb25maWcuaCIKKyNpbXBvcnQgIldLV2ViUHJvY2Vzc0J1bmRsZVBhcmFtZXRl cnMuaCIKKworI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorCitAaW1wbGVtZW50YXRpb24gV0tX ZWJQcm9jZXNzQnVuZGxlUGFyYW1ldGVycyB7CisgICAgUmV0YWluUHRyPE5TTXV0YWJsZURpY3Rp b25hcnk+IF9wYXJhbWV0ZXJzOworfQorCistIChpbnN0YW5jZXR5cGUpaW5pdFdpdGhEaWN0aW9u YXJ5OihOU0RpY3Rpb25hcnkgKilkaWN0aW9uYXJ5Cit7CisgICAgaWYgKCEoc2VsZiA9IFtzdXBl ciBpbml0XSkpCisgICAgICAgIHJldHVybiBuaWw7CisKKyAgICBfcGFyYW1ldGVycyA9IGFkb3B0 TlMoW1tOU011dGFibGVEaWN0aW9uYXJ5IGFsbG9jXSBpbml0V2l0aERpY3Rpb25hcnk6ZGljdGlv bmFyeV0pOworCisgICAgcmV0dXJuIHNlbGY7Cit9CisKKy0gKE5TU3RyaW5nICopdmFsdWVGb3JL ZXk6KE5TU3RyaW5nICopa2V5Cit7CisgICAgcmV0dXJuIFtfcGFyYW1ldGVycyB2YWx1ZUZvcktl eTprZXldOworfQorCitAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luLmggYi9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0lu LmgKaW5kZXggNjJlNDFiMTU5MTc5OWY5YWRlYTVmNTQyZjgzMmQ2NmFiMmM0NjgzZi4uNDc2ZmNh ODQxZmVhZWUxNTk0OGJmN2NlY2E5MjA2NDlmZmJkMzVlMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vzc1BsdWdJ bi5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21h Yy9XS1dlYlByb2Nlc3NQbHVnSW4uaApAQCAtNDQsNyArNDQsOSBAQAogV0tfQVBJX0NMQVNTCiBA aW50ZXJmYWNlIFdLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIgOiBOU09iamVjdAogCi1AcHJv cGVydHkocmVhZG9ubHkpIFdLQ29ubmVjdGlvbiAqY29ubmVjdGlvbjsKK0Bwcm9wZXJ0eSAocmVh ZG9ubHkpIFdLQ29ubmVjdGlvbiAqY29ubmVjdGlvbjsKKworQHByb3BlcnR5IChyZWFkb25seSkg aWQgcGFyYW1ldGVyczsKIAogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luLm1tIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9BUEkvbWFjL1dLV2ViUHJvY2Vz c1BsdWdJbi5tbQppbmRleCA0N2VjMDcyZThhMmNlOWRmYTI3MjU4ZTJjMzA0OTViMzZlOGE0NzU1 Li44NGNiNTE3OTJjYWVhYTM2OWMxY2FlNGM3ZmQxMTg0NjY2ODRhZTIzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9j ZXNzUGx1Z0luLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5k bGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW4ubW0KQEAgLTk2LDYgKzk2LDExIEBAIHN0YXRp YyB2b2lkIHNldFVwQnVuZGxlQ2xpZW50KFdLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIgKnBs dWdJbkNvbnRyb2xsZXIsIEluCiAgICAgcmV0dXJuIHdyYXBwZXIoKl9idW5kbGUtPndlYkNvbm5l Y3Rpb25Ub1VJUHJvY2VzcygpKTsKIH0KIAorLSAoaWQpcGFyYW1ldGVycworeworICAgIHJldHVy biBfYnVuZGxlLT5idW5kbGVQYXJhbWV0ZXJzKCk7Cit9CisKICNwcmFnbWEgbWFyayBXS09iamVj dCBwcm90b2NvbCBpbXBsZW1lbnRhdGlvbgogCiAtIChBUEk6Ok9iamVjdCYpX2FwaU9iamVjdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9Jbmpl Y3RlZEJ1bmRsZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0luamVjdGVkQnVuZGxlLmNwcAppbmRleCA3Njg3MzBkNDE2ZGExZmNjOTM3YTQ4OTgzZDYyNTM1 NjllMTMxYzc0Li43N2ViNTM3YjU0N2I2MGIxMDE1ZDE3ZWZhYTQxZjc2NmE5MTI0N2UwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVk QnVuZGxlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxl L0luamVjdGVkQnVuZGxlLmNwcApAQCAtNDYsNiArNDYsNyBAQAogI2luY2x1ZGUgIldlYlBhZ2Uu aCIKICNpbmNsdWRlICJXZWJQcmVmZXJlbmNlc1N0b3JlLmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vz cy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMuaCIKICNpbmNsdWRl IDxKYXZhU2NyaXB0Q29yZS9BUElDYXN0Lmg+CiAjaW5jbHVkZSA8SmF2YVNjcmlwdENvcmUvSlNM b2NrLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9BcHBsaWNhdGlvbkNhY2hlLmg+CkBAIC04NCwxMSAr ODUsMTEgQEAgdXNpbmcgbmFtZXNwYWNlIEpTQzsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKLUlu amVjdGVkQnVuZGxlOjpJbmplY3RlZEJ1bmRsZShjb25zdCBTdHJpbmcmIHBhdGgpCi0gICAgOiBt X3BhdGgocGF0aCkKK0luamVjdGVkQnVuZGxlOjpJbmplY3RlZEJ1bmRsZShjb25zdCBXZWJQcm9j ZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQorICAgIDogbV9wYXRoKHBhcmFtZXRl cnMuaW5qZWN0ZWRCdW5kbGVQYXRoKQogICAgICwgbV9wbGF0Zm9ybUJ1bmRsZSgwKQogewotICAg IGluaXRpYWxpemVDbGllbnQoMCk7CisgICAgcGxhdGZvcm1Jbml0aWFsaXplKHBhcmFtZXRlcnMp OwogfQogCiBJbmplY3RlZEJ1bmRsZTo6fkluamVjdGVkQnVuZGxlKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGUu aAppbmRleCA1OTQ4YWZjOTI1MDYxNmQ5OGE3Y2FmMGU1YmExYzQ4N2FhMmIxNDE3Li4yYTVlYzcx ZjJhYTQwNWRlMzMxMWQ3ZjZlNGYyMzFhYTJlYzhkYzU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlLmgKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZS5oCkBA IC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9Vc2VyQ29udGVudFR5cGVzLmg+CiAj aW5jbHVkZSA8V2ViQ29yZS9Vc2VyU2NyaXB0VHlwZXMuaD4KICNpbmNsdWRlIDx3dGYvUGFzc1Jl ZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9SZXRhaW5QdHIuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9X VEZTdHJpbmcuaD4KIAogI2lmIFBMQVRGT1JNKEdUSykKQEAgLTQ1LDYgKzQ2LDggQEAgdHlwZWRl ZiBzdHJ1Y3QgX0dNb2R1bGUgR01vZHVsZTsKIAogI2lmIFVTRShGT1VOREFUSU9OKQogT0JKQ19D TEFTUyBOU0J1bmRsZTsKK09CSkNfQ0xBU1MgTlNNdXRhYmxlRGljdGlvbmFyeTsKK09CSkNfQ0xB U1MgV0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1ldGVyczsKICNlbmRpZgogCiBuYW1lc3BhY2UgQVBJ IHsKQEAgLTczLDEyICs3NiwxMyBAQCBjbGFzcyBXZWJDb25uZWN0aW9uOwogY2xhc3MgV2ViRnJh bWU7CiBjbGFzcyBXZWJQYWdlOwogY2xhc3MgV2ViUGFnZUdyb3VwUHJveHk7CitzdHJ1Y3QgV2Vi UHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczsKIAogY2xhc3MgSW5qZWN0ZWRCdW5kbGUgOiBwdWJs aWMgQVBJOjpPYmplY3RJbXBsPEFQSTo6T2JqZWN0OjpUeXBlOjpCdW5kbGU+IHsKIHB1YmxpYzoK LSAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbmplY3RlZEJ1bmRsZT4gY3JlYXRlKGNvbnN0IFN0cmlu ZyYgcGF0aCkKKyAgICBzdGF0aWMgUGFzc1JlZlB0cjxJbmplY3RlZEJ1bmRsZT4gY3JlYXRlKGNv bnN0IFdlYlByb2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiAgICAgewotICAg ICAgICByZXR1cm4gYWRvcHRSZWYobmV3IEluamVjdGVkQnVuZGxlKHBhdGgpKTsKKyAgICAgICAg cmV0dXJuIGFkb3B0UmVmKG5ldyBJbmplY3RlZEJ1bmRsZShwYXJhbWV0ZXJzKSk7CiAgICAgfQog ICAgIH5JbmplY3RlZEJ1bmRsZSgpOwogCkBAIC0xNjgsOCArMTcyLDE0IEBAIHB1YmxpYzoKICAg ICB2b2lkIHNldENTU0NvbXBvc2l0aW5nRW5hYmxlZChib29sKTsKICAgICB2b2lkIGRpc3BhdGNo UGVuZGluZ0xvYWRSZXF1ZXN0cygpOwogCisjaWYgUExBVEZPUk0oQ09DT0EpCisgICAgV0tXZWJQ cm9jZXNzQnVuZGxlUGFyYW1ldGVycyAqYnVuZGxlUGFyYW1ldGVycygpOworI2VuZGlmCisKIHBy aXZhdGU6Ci0gICAgZXhwbGljaXQgSW5qZWN0ZWRCdW5kbGUoY29uc3QgU3RyaW5nJik7CisgICAg ZXhwbGljaXQgSW5qZWN0ZWRCdW5kbGUoY29uc3QgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVy cyYpOworCisgICAgdm9pZCBwbGF0Zm9ybUluaXRpYWxpemUoY29uc3QgV2ViUHJvY2Vzc0NyZWF0 aW9uUGFyYW1ldGVycyYpOwogCiAgICAgU3RyaW5nIG1fcGF0aDsKICAgICBQbGF0Zm9ybUJ1bmRs ZSBtX3BsYXRmb3JtQnVuZGxlOyAvLyBUaGlzIGlzIGxlYWtlZCByaWdodCBub3csIHNpbmNlIHdl IG5ldmVyIHVubG9hZCB0aGUgYnVuZGxlL21vZHVsZS4KQEAgLTE3Nyw2ICsxODcsMTAgQEAgcHJp dmF0ZToKICAgICBSZWZQdHI8U2FuZGJveEV4dGVuc2lvbj4gbV9zYW5kYm94RXh0ZW5zaW9uOwog CiAgICAgSW5qZWN0ZWRCdW5kbGVDbGllbnQgbV9jbGllbnQ7CisKKyNpZiBQTEFURk9STShDT0NP QSkKKyAgICBSZXRhaW5QdHI8V0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1ldGVycz4gbV9idW5kbGVQ YXJhbWV0ZXJzOworI2VuZGlmCiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVk QnVuZGxlTWFjLm1tIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9t YWMvSW5qZWN0ZWRCdW5kbGVNYWMubW0KaW5kZXggNjBmNGQ0ODc0Mzc1OWEyMzdmOTFmMGQyYTM4 ZDM3NGYwMDdkYTU4Mi4uOGI1YTFiYmExZDM4YTBiYzU4MDA5M2UwM2VkOTFlYzY2YjZlZTNjZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9tYWMv SW5qZWN0ZWRCdW5kbGVNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9Jbmpl Y3RlZEJ1bmRsZS9tYWMvSW5qZWN0ZWRCdW5kbGVNYWMubW0KQEAgLTI2LDEwICsyNiwxMyBAQAog I2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJJbmplY3RlZEJ1bmRsZS5oIgogCisjaW1wb3J0 ICJBUElEYXRhLmgiCiAjaW1wb3J0ICJPYmpDT2JqZWN0R3JhcGguaCIKICNpbXBvcnQgIldLQnVu ZGxlQVBJQ2FzdC5oIgogI2ltcG9ydCAiV0tCdW5kbGVJbml0aWFsaXplLmgiCisjaW1wb3J0ICJX S1dlYlByb2Nlc3NCdW5kbGVQYXJhbWV0ZXJzLmgiCiAjaW1wb3J0ICJXS1dlYlByb2Nlc3NQbHVn SW5JbnRlcm5hbC5oIgorI2ltcG9ydCAiV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oIgog I2ltcG9ydCA8Rm91bmRhdGlvbi9OU0J1bmRsZS5oPgogI2ltcG9ydCA8c3RkaW8uaD4KICNpbXBv cnQgPHd0Zi9SZXRhaW5QdHIuaD4KQEAgLTQyLDYgKzQ1LDEyIEBAIHVzaW5nIG5hbWVzcGFjZSBX ZWJDb3JlOwogLSAoQ0ZCdW5kbGVSZWYpX2NmQnVuZGxlOwogQGVuZAogCisjaWYgUExBVEZPUk0o TUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID09IDEwODAKK0BpbnRlcmZh Y2UgTlNLZXllZFVuYXJjaGl2ZXIgKFdLRGV0YWlscykKKy0gKHZvaWQpc2V0UmVxdWlyZXNTZWN1 cmVDb2Rpbmc6KEJPT0wpYjsKK0BlbmQKKyNlbmRpZgorCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAog Ym9vbCBJbmplY3RlZEJ1bmRsZTo6bG9hZChBUEk6Ok9iamVjdCogaW5pdGlhbGl6YXRpb25Vc2Vy RGF0YSkKQEAgLTEyNCw0ICsxMzMsMzIgQEAgdm9pZCBJbmplY3RlZEJ1bmRsZTo6YWN0aXZhdGVN YWNGb250QXNjZW50SGFjaygpCiB7CiB9CiAKKworV0tXZWJQcm9jZXNzQnVuZGxlUGFyYW1ldGVy cyAqSW5qZWN0ZWRCdW5kbGU6OmJ1bmRsZVBhcmFtZXRlcnMoKQoreworICAgIEFTU0VSVChtX2J1 bmRsZVBhcmFtZXRlcnMpOworCisgICAgcmV0dXJuIG1fYnVuZGxlUGFyYW1ldGVycy5nZXQoKTsK K30KKwordm9pZCBJbmplY3RlZEJ1bmRsZTo6cGxhdGZvcm1Jbml0aWFsaXplKGNvbnN0IFdlYlBy b2Nlc3NDcmVhdGlvblBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCit7CisgICAgaWYgKCFwYXJhbWV0 ZXJzLmJ1bmRsZVBhcmFtZXRlckRhdGEpCisgICAgICAgIHJldHVybjsKKworICAgIGF1dG8gYnVu ZGxlUGFyYW1ldGVyRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEgYWxsb2NdIGluaXRXaXRoQnl0ZXNO b0NvcHk6Y29uc3RfY2FzdDx2b2lkKj4oc3RhdGljX2Nhc3Q8Y29uc3Qgdm9pZCo+KHBhcmFtZXRl cnMuYnVuZGxlUGFyYW1ldGVyRGF0YS0+Ynl0ZXMoKSkpIGxlbmd0aDpwYXJhbWV0ZXJzLmJ1bmRs ZVBhcmFtZXRlckRhdGEtPnNpemUoKSBmcmVlV2hlbkRvbmU6Tk9dKTsKKworICAgIGF1dG8gdW5h cmNoaXZlciA9IGFkb3B0TlMoW1tOU0tleWVkVW5hcmNoaXZlciBhbGxvY10gaW5pdEZvclJlYWRp bmdXaXRoRGF0YTpidW5kbGVQYXJhbWV0ZXJEYXRhLmdldCgpXSk7CisgICAgW3VuYXJjaGl2ZXIg c2V0UmVxdWlyZXNTZWN1cmVDb2Rpbmc6WUVTXTsKKworICAgIE5TRGljdGlvbmFyeSAqZGljdGlv bmFyeSA9IG5pbDsKKyAgICBAdHJ5IHsKKyAgICAgICAgZGljdGlvbmFyeSA9IFt1bmFyY2hpdmVy LmdldCgpIGRlY29kZU9iamVjdE9mQ2xhc3M6W05TRGljdGlvbmFyeSBjbGFzc10gZm9yS2V5OkAi cGFyYW1ldGVycyJdOworICAgIH0gQGNhdGNoIChOU0V4Y2VwdGlvbiAqZXhjZXB0aW9uKSB7Cisg ICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIGRlY29kZSBidW5kbGUgcGFyYW1ldGVyczogJUAi LCBleGNlcHRpb24pOworICAgIH0KKworICAgIG1fYnVuZGxlUGFyYW1ldGVycyA9IGFkb3B0TlMo W1tXS1dlYlByb2Nlc3NCdW5kbGVQYXJhbWV0ZXJzIGFsbG9jXSBpbml0V2l0aERpY3Rpb25hcnk6 ZGljdGlvbmFyeV0pOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCmluZGV4IGNiYmRlODM0OGEyYzU3ZTE4YzlmOWRkNzUx ZmUyMjQ0MGUxYzUxZTIuLjljYmY4OWIyZmIwNzlmZDAwMGE1NGQxNmFjNGU4Y2JkNzJkNGY0YWIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcApAQCAtMjc5LDcgKzI3 OSw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlhbGl6ZVdlYlByb2Nlc3MoY29uc3QgV2ViUHJv Y2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1lCiAgICAgICAgIHJldHVybjsKIAogICAgIGlm ICghcGFyYW1ldGVycy5pbmplY3RlZEJ1bmRsZVBhdGguaXNFbXB0eSgpKSB7Ci0gICAgICAgIG1f aW5qZWN0ZWRCdW5kbGUgPSBJbmplY3RlZEJ1bmRsZTo6Y3JlYXRlKHBhcmFtZXRlcnMuaW5qZWN0 ZWRCdW5kbGVQYXRoKTsKKyAgICAgICAgbV9pbmplY3RlZEJ1bmRsZSA9IEluamVjdGVkQnVuZGxl OjpjcmVhdGUocGFyYW1ldGVycyk7CiAgICAgICAgIG1faW5qZWN0ZWRCdW5kbGUtPnNldFNhbmRi b3hFeHRlbnNpb24oU2FuZGJveEV4dGVuc2lvbjo6Y3JlYXRlKHBhcmFtZXRlcnMuaW5qZWN0ZWRC dW5kbGVQYXRoRXh0ZW5zaW9uSGFuZGxlKSk7CiAKICAgICAgICAgaWYgKCFtX2luamVjdGVkQnVu ZGxlLT5sb2FkKGluamVjdGVkQnVuZGxlSW5pdGlhbGl6YXRpb25Vc2VyRGF0YS5nZXQoKSkpIHsK