40894 2010-06-20 14:50:37 -0700 Move the NSBundle ivar to WebPluginPackage 2010-06-20 18:30:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 240532 0 andersca 2010-06-20 14:50:37 -0700 Move the NSBundle ivar to WebPluginPackage 240533 1 59217 andersca 2010-06-20 14:52:31 -0700 Created attachment 59217 Patch 240534 2 59217 mitz 2010-06-20 15:02:28 -0700 Comment on attachment 59217 Patch > + cfBundle = CFBundleCreate(NULL, (CFURLRef)[NSURL fileURLWithPath:path]); Please change NULL to kCFAllocatorDefault. > + if (nsBundle == nil) { Please change this to !nsBundle. 240554 3 andersca 2010-06-20 18:30:28 -0700 Committed r61519: <http://trac.webkit.org/changeset/61519> 59217 2010-06-20 14:52:31 -0700 2010-06-20 15:02:27 -0700 Patch bug-40894-20100620145230.patch text/plain 9367 andersca SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2MTUxMykKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjYgQEAKKzIwMTAtMDYtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBNb3ZlIHRoZSBOU0J1bmRsZSBpdmFyIHRvIFdlYlBsdWdpblBhY2thZ2UKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQwODk0CisKKyAg ICAgICAgKiBQbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLmg6CisgICAgICAgICogUGx1Z2lu cy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2th Z2UgaW5pdFdpdGhQYXRoOl0pOgorICAgICAgICAoLVtXZWJCYXNlUGx1Z2luUGFja2FnZSBfb2Jq ZWN0Rm9ySW5mb0RpY3Rpb25hcnlLZXk6XSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5QYWNr YWdlIGdldFBsdWdpbkluZm9Gcm9tUExpc3RzXSk6CisgICAgICAgICgtW1dlYkJhc2VQbHVnaW5Q YWNrYWdlIGxvYWRdKToKKyAgICAgICAgKC1bV2ViQmFzZVBsdWdpblBhY2thZ2UgZGVhbGxvY10p OgorICAgICAgICAqIFBsdWdpbnMvV2ViTmV0c2NhcGVQbHVnaW5QYWNrYWdlLm1tOgorICAgICAg ICAoLVtXZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UgX2luaXRXaXRoUGF0aDpdKToKKyAgICAgICAg KiBQbHVnaW5zL1dlYlBsdWdpblBhY2thZ2UuaDoKKyAgICAgICAgKiBQbHVnaW5zL1dlYlBsdWdp blBhY2thZ2UubW06CisgICAgICAgICgtW1dlYlBsdWdpblBhY2thZ2UgaW5pdFdpdGhQYXRoOl0p OgorICAgICAgICAoLVtXZWJQbHVnaW5QYWNrYWdlIGRlYWxsb2NdKToKKyAgICAgICAgKC1bV2Vi UGx1Z2luUGFja2FnZSB2aWV3RmFjdG9yeV0pOgorICAgICAgICAoLVtXZWJQbHVnaW5QYWNrYWdl IGxvYWRdKToKKwogMjAxMC0wNi0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCkluZGV4OiBXZWJLaXQvbWFj L1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFj L1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkocmV2aXNpb24gNjE1MTApCisrKyBXZWJL aXQvbWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UuaAkod29ya2luZyBjb3B5KQpAQCAt NjAsNyArNjAsNiBAQCBAaW50ZXJmYWNlIFdlYkJhc2VQbHVnaW5QYWNrYWdlIDogTlNPYmplCiAg ICAgV2ViQ29yZTo6U3RyaW5nIHBhdGg7CiAgICAgV2ViQ29yZTo6U3RyaW5nIHBsdWdpbkRlc2Ny aXB0aW9uOwogCi0gICAgTlNCdW5kbGUgKmJ1bmRsZTsKICAgICBDRkJ1bmRsZVJlZiBjZkJ1bmRs ZTsKIAogICAgIE5TRGljdGlvbmFyeSAqTUlNRVRvRGVzY3JpcHRpb247CkluZGV4OiBXZWJLaXQv bWFjL1BsdWdpbnMvV2ViQmFzZVBsdWdpblBhY2thZ2UubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 L21hYy9QbHVnaW5zL1dlYkJhc2VQbHVnaW5QYWNrYWdlLm1tCShyZXZpc2lvbiA2MTUxMCkKKysr IFdlYktpdC9tYWMvUGx1Z2lucy9XZWJCYXNlUGx1Z2luUGFja2FnZS5tbQkod29ya2luZyBjb3B5 KQpAQCAtMTI0LDE1ICsxMjQsMTUgQEAgLSAoaWQpaW5pdFdpdGhQYXRoOihOU1N0cmluZyAqKXBs dWdpblBhdAogICAgICAgICByZXR1cm4gbmlsOwogICAgICAgICAKICAgICBwYXRoID0gcGF0aEJ5 UmVzb2x2aW5nU3ltbGlua3NBbmRBbGlhc2VzKHBsdWdpblBhdGgpOwotICAgIGJ1bmRsZSA9IFtb TlNCdW5kbGUgYWxsb2NdIGluaXRXaXRoUGF0aDpwYXRoXTsKKyAgICBjZkJ1bmRsZSA9IENGQnVu ZGxlQ3JlYXRlKE5VTEwsIChDRlVSTFJlZilbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnBhdGhdKTsK KwogI2lmbmRlZiBfX3BwY19fCiAgICAgLy8gMzItYml0IFBvd2VyUEMgaXMgdGhlIG9ubHkgcGxh dGZvcm0gd2hlcmUgbm9uLWJ1bmRsZWQgQ0ZNIHBsdWdpbnMgYXJlIHN1cHBvcnRlZAotICAgIGlm ICghYnVuZGxlKSB7CisgICAgaWYgKCFjZkJ1bmRsZSkgewogICAgICAgICBbc2VsZiByZWxlYXNl XTsKICAgICAgICAgcmV0dXJuIG5pbDsKICAgICB9CiAjZW5kaWYKLSAgICBjZkJ1bmRsZSA9IENG QnVuZGxlQ3JlYXRlKE5VTEwsIChDRlVSTFJlZilbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnBhdGhd KTsKICAgICBleHRlbnNpb25Ub01JTUUgPSBbW05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGlu aXRdOwogICAgIAogICAgIHJldHVybiBzZWxmOwpAQCAtMTY3LDEzICsxNjcsMTkgQEAgLSAoTlNE aWN0aW9uYXJ5ICopcExpc3RGb3JQYXRoOihOU1N0cmluZwogICAgIHJldHVybiBwTGlzdDsKIH0K IAorLSAoaWQpX29iamVjdEZvckluZm9EaWN0aW9uYXJ5S2V5OihOU1N0cmluZyAqKWtleQorewor ICAgIENGRGljdGlvbmFyeVJlZiBidW5kbGVJbmZvRGljdGlvbmFyeSA9IENGQnVuZGxlR2V0SW5m b0RpY3Rpb25hcnkoY2ZCdW5kbGUpOworICAgIHJldHVybiAoaWQpQ0ZEaWN0aW9uYXJ5R2V0VmFs dWUoYnVuZGxlSW5mb0RpY3Rpb25hcnksIGtleSk7Cit9CisKIC0gKEJPT0wpZ2V0UGx1Z2luSW5m b0Zyb21QTGlzdHMKIHsKLSAgICBpZiAoIWJ1bmRsZSkKKyAgICBpZiAoIWNmQnVuZGxlKQogICAg ICAgICByZXR1cm4gTk87CiAgICAgCiAgICAgTlNEaWN0aW9uYXJ5ICpNSU1FVHlwZXMgPSBuaWw7 Ci0gICAgTlNTdHJpbmcgKnBMaXN0RmlsZW5hbWUgPSBbYnVuZGxlIG9iamVjdEZvckluZm9EaWN0 aW9uYXJ5S2V5OldlYlBsdWdpbk1JTUVUeXBlc0ZpbGVuYW1lS2V5XTsKKyAgICBOU1N0cmluZyAq cExpc3RGaWxlbmFtZSA9IFtzZWxmIF9vYmplY3RGb3JJbmZvRGljdGlvbmFyeUtleTpXZWJQbHVn aW5NSU1FVHlwZXNGaWxlbmFtZUtleV07CiAgICAgCiAgICAgLy8gQ2hlY2sgaWYgdGhlIE1JTUUg dHlwZXMgYXJlIGNsYWltZWQgaW4gYSBwbGlzdCBpbiB0aGUgdXNlcidzIHByZWZlcmVuY2VzIGRp cmVjdG9yeS4KICAgICBpZiAocExpc3RGaWxlbmFtZSkgewpAQCAtMTkxLDcgKzE5Nyw3IEBAIC0g KEJPT0wpZ2V0UGx1Z2luSW5mb0Zyb21QTGlzdHMKICAgICB9CiAKICAgICBpZiAoIU1JTUVUeXBl cykgewotICAgICAgICBNSU1FVHlwZXMgPSBbYnVuZGxlIG9iamVjdEZvckluZm9EaWN0aW9uYXJ5 S2V5OldlYlBsdWdpbk1JTUVUeXBlc0tleV07CisgICAgICAgIE1JTUVUeXBlcyA9IFtzZWxmIF9v YmplY3RGb3JJbmZvRGljdGlvbmFyeUtleTpXZWJQbHVnaW5NSU1FVHlwZXNLZXldOwogICAgICAg ICBpZiAoIU1JTUVUeXBlcykKICAgICAgICAgICAgIHJldHVybiBOTzsKICAgICB9CkBAIC0yMzEs MTIgKzIzNywxMiBAQCAtIChCT09MKWdldFBsdWdpbkluZm9Gcm9tUExpc3RzCiAKICAgICBOU1N0 cmluZyAqZmlsZW5hbWUgPSBbc2VsZiBmaWxlbmFtZV07CiAKLSAgICBOU1N0cmluZyAqdGhlTmFt ZSA9IFtidW5kbGUgb2JqZWN0Rm9ySW5mb0RpY3Rpb25hcnlLZXk6V2ViUGx1Z2luTmFtZUtleV07 CisgICAgTlNTdHJpbmcgKnRoZU5hbWUgPSBbc2VsZiBfb2JqZWN0Rm9ySW5mb0RpY3Rpb25hcnlL ZXk6V2ViUGx1Z2luTmFtZUtleV07CiAgICAgaWYgKCF0aGVOYW1lKQogICAgICAgICB0aGVOYW1l ID0gZmlsZW5hbWU7CiAgICAgbmFtZSA9IHRoZU5hbWU7CiAKLSAgICBkZXNjcmlwdGlvbiA9IFti dW5kbGUgb2JqZWN0Rm9ySW5mb0RpY3Rpb25hcnlLZXk6V2ViUGx1Z2luRGVzY3JpcHRpb25LZXld OworICAgIGRlc2NyaXB0aW9uID0gW3NlbGYgX29iamVjdEZvckluZm9EaWN0aW9uYXJ5S2V5Oldl YlBsdWdpbkRlc2NyaXB0aW9uS2V5XTsKICAgICBpZiAoIWRlc2NyaXB0aW9uKQogICAgICAgICBk ZXNjcmlwdGlvbiA9IGZpbGVuYW1lOwogICAgIHBsdWdpbkRlc2NyaXB0aW9uID0gZGVzY3JpcHRp b247CkBAIC0yNDYsNyArMjUyLDcgQEAgLSAoQk9PTClnZXRQbHVnaW5JbmZvRnJvbVBMaXN0cwog CiAtIChCT09MKWxvYWQKIHsKLSAgICBpZiAoYnVuZGxlICYmICFCUF9DcmVhdGVQbHVnaW5NSU1F VHlwZXNQcmVmZXJlbmNlcykKKyAgICBpZiAoY2ZCdW5kbGUgJiYgIUJQX0NyZWF0ZVBsdWdpbk1J TUVUeXBlc1ByZWZlcmVuY2VzKQogICAgICAgICBCUF9DcmVhdGVQbHVnaW5NSU1FVHlwZXNQcmVm ZXJlbmNlcyA9IChCUF9DcmVhdGVQbHVnaW5NSU1FVHlwZXNQcmVmZXJlbmNlc0Z1bmNQdHIpQ0ZC dW5kbGVHZXRGdW5jdGlvblBvaW50ZXJGb3JOYW1lKGNmQnVuZGxlLCBDRlNUUigiQlBfQ3JlYXRl UGx1Z2luTUlNRVR5cGVzUHJlZmVyZW5jZXMiKSk7CiAgICAgCiAgICAgcmV0dXJuIFlFUzsKQEAg LTI2MSw3ICsyNjcsNiBAQCAtICh2b2lkKWRlYWxsb2MKICAgICBbTUlNRVRvRXh0ZW5zaW9ucyBy ZWxlYXNlXTsKICAgICBbZXh0ZW5zaW9uVG9NSU1FIHJlbGVhc2VdOwogCi0gICAgW2J1bmRsZSBy ZWxlYXNlXTsKICAgICBpZiAoY2ZCdW5kbGUpCiAgICAgICAgIENGUmVsZWFzZShjZkJ1bmRsZSk7 CiAgICAgCkBAIC0zMzAsMTEgKzMzNSw2IEBAIC0gKE5TQXJyYXkgKilleHRlbnNpb25zRm9yTUlN RVR5cGU6KE5TU3QKICAgICByZXR1cm4gW01JTUVUb0V4dGVuc2lvbnMgb2JqZWN0Rm9yS2V5Ok1J TUVUeXBlXTsKIH0KIAotLSAoTlNCdW5kbGUgKilidW5kbGUKLXsKLSAgICByZXR1cm4gYnVuZGxl OwotfQotCiAtICh2b2lkKXNldE1JTUVUb0Rlc2NyaXB0aW9uRGljdGlvbmFyeTooTlNEaWN0aW9u YXJ5ICopTUlNRVRvRGVzY3JpcHRpb25EaWN0aW9uYXJ5CiB7CiAgICAgW01JTUVUb0Rlc2NyaXB0 aW9uIHJlbGVhc2VdOwpJbmRleDogV2ViS2l0L21hYy9QbHVnaW5zL1dlYk5ldHNjYXBlUGx1Z2lu UGFja2FnZS5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1BsdWdpbnMvV2ViTmV0c2NhcGVQ bHVnaW5QYWNrYWdlLm1tCShyZXZpc2lvbiA2MTUxMCkKKysrIFdlYktpdC9tYWMvUGx1Z2lucy9X ZWJOZXRzY2FwZVBsdWdpblBhY2thZ2UubW0JKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDcg QEAKICNpbXBvcnQgIldlYk5TT2JqZWN0RXh0cmFzLmgiCiAjaW1wb3J0ICJXZWJOZXRzY2FwZURl cHJlY2F0ZWRGdW5jdGlvbnMuaCIKICNpbXBvcnQgPFdlYkNvcmUvbnBydW50aW1lX2ltcGwuaD4K KyNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAogI2lmIFVTRShQTFVHSU5fSE9TVF9QUk9DRVNT KQogI2ltcG9ydCAiTmV0c2NhcGVQbHVnaW5Ib3N0TWFuYWdlci5oIgpAQCAtMjA4LDcgKzIwOSw3 IEBAIC0gKEJPT0wpX2luaXRXaXRoUGF0aDooTlNTdHJpbmcgKilwbHVnaW4KICAgICAKICAgICBP U1R5cGUgdHlwZSA9IDA7CiAKLSAgICBpZiAoYnVuZGxlKSB7CisgICAgaWYgKGNmQnVuZGxlKSB7 CiAgICAgICAgIC8vIEJ1bmRsZQogICAgICAgICBDRkJ1bmRsZUdldFBhY2thZ2VJbmZvKGNmQnVu ZGxlLCAmdHlwZSwgTlVMTCk7CiAjaWZkZWYgU1VQUE9SVF9DRk0KQEAgLTIzMCw4ICsyMzEsMTEg QEAgLSAoQk9PTClfaW5pdFdpdGhQYXRoOihOU1N0cmluZyAqKXBsdWdpbgogICAgICAgICByZXR1 cm4gTk87CiAKICAgICAvLyBDaGVjayBpZiB0aGUgZXhlY3V0YWJsZSBpcyBNYWNoLU8gb3IgQ0ZN LgotICAgIGlmIChidW5kbGUpIHsKLSAgICAgICAgTlNGaWxlSGFuZGxlICpleGVjdXRhYmxlRmls ZSA9IFtOU0ZpbGVIYW5kbGUgZmlsZUhhbmRsZUZvclJlYWRpbmdBdFBhdGg6W2J1bmRsZSBleGVj dXRhYmxlUGF0aF1dOworICAgIGlmIChjZkJ1bmRsZSkgeworICAgICAgICBSZXRhaW5QdHI8Q0ZV UkxSZWY+IGV4ZWN1dGFibGVVUkwoQWRvcHRDRiwgQ0ZCdW5kbGVDb3B5RXhlY3V0YWJsZVVSTChj ZkJ1bmRsZSkpOworICAgICAgICBpZiAoIWV4ZWN1dGFibGVVUkwpCisgICAgICAgICAgICByZXR1 cm4gTk87CisgICAgICAgIE5TRmlsZUhhbmRsZSAqZXhlY3V0YWJsZUZpbGUgPSBbTlNGaWxlSGFu ZGxlIGZpbGVIYW5kbGVGb3JSZWFkaW5nQXRQYXRoOlsoTlNVUkwgKilleGVjdXRhYmxlVVJMLmdl dCgpIHBhdGhdXTsKICAgICAgICAgTlNEYXRhICpkYXRhID0gW2V4ZWN1dGFibGVGaWxlIHJlYWRE YXRhT2ZMZW5ndGg6NTEyXTsKICAgICAgICAgW2V4ZWN1dGFibGVGaWxlIGNsb3NlRmlsZV07CiAg ICAgICAgIC8vIENoZWNrIHRoZSBsZW5ndGggb2YgdGhlIGRhdGEgYmVmb3JlIGNhbGxpbmcgbWVt Y21wLiBXZSB0aGluayB0aGlzIGZpeGVzIDM3ODI1NDMuCkBAIC0yNDYsMTEgKzI1MCwxMSBAQCAt IChCT09MKV9pbml0V2l0aFBhdGg6KE5TU3RyaW5nICopcGx1Z2luCiAjZW5kaWYKIAogI2lmIFVT RShQTFVHSU5fSE9TVF9QUk9DRVNTKQotICAgICAgICBOU0FycmF5ICphcmNocyA9IFtidW5kbGUg ZXhlY3V0YWJsZUFyY2hpdGVjdHVyZXNdOworICAgICAgICBSZXRhaW5QdHI8Q0ZBcnJheVJlZj4g YXJjaHMoQWRvcHRDRiwgQ0ZCdW5kbGVDb3B5RXhlY3V0YWJsZUFyY2hpdGVjdHVyZXMoY2ZCdW5k bGUpKTsKICAgICAgICAgCi0gICAgICAgIGlmIChbYXJjaHMgY29udGFpbnNPYmplY3Q6W05TTnVt YmVyIG51bWJlcldpdGhJbnRlZ2VyOk5TQnVuZGxlRXhlY3V0YWJsZUFyY2hpdGVjdHVyZVg4Nl82 NF1dKQorICAgICAgICBpZiAoWyhOU0FycmF5ICopYXJjaHMuZ2V0KCkgY29udGFpbnNPYmplY3Q6 W05TTnVtYmVyIG51bWJlcldpdGhJbnRlZ2VyOk5TQnVuZGxlRXhlY3V0YWJsZUFyY2hpdGVjdHVy ZVg4Nl82NF1dKQogICAgICAgICAgICAgcGx1Z2luSG9zdEFyY2hpdGVjdHVyZSA9IENQVV9UWVBF X1g4Nl82NDsKLSAgICAgICAgZWxzZSBpZiAoW2FyY2hzIGNvbnRhaW5zT2JqZWN0OltOU051bWJl ciBudW1iZXJXaXRoSW50ZWdlcjpOU0J1bmRsZUV4ZWN1dGFibGVBcmNoaXRlY3R1cmVJMzg2XV0p CisgICAgICAgIGVsc2UgaWYgKFsoTlNBcnJheSAqKWFyY2hzLmdldCgpIGNvbnRhaW5zT2JqZWN0 OltOU051bWJlciBudW1iZXJXaXRoSW50ZWdlcjpOU0J1bmRsZUV4ZWN1dGFibGVBcmNoaXRlY3R1 cmVJMzg2XV0pCiAgICAgICAgICAgICBwbHVnaW5Ib3N0QXJjaGl0ZWN0dXJlID0gQ1BVX1RZUEVf WDg2OwogICAgICAgICBlbHNlCiAgICAgICAgICAgICByZXR1cm4gTk87CkluZGV4OiBXZWJLaXQv bWFjL1BsdWdpbnMvV2ViUGx1Z2luUGFja2FnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMv UGx1Z2lucy9XZWJQbHVnaW5QYWNrYWdlLmgJKHJldmlzaW9uIDYxNTA4KQorKysgV2ViS2l0L21h Yy9QbHVnaW5zL1dlYlBsdWdpblBhY2thZ2UuaAkod29ya2luZyBjb3B5KQpAQCAtMzIsNyArMzIs OSBAQAogCiBAcHJvdG9jb2wgV2ViUGx1Z2luVmlld0ZhY3Rvcnk7CiAKLUBpbnRlcmZhY2UgV2Vi UGx1Z2luUGFja2FnZSA6IFdlYkJhc2VQbHVnaW5QYWNrYWdlCitAaW50ZXJmYWNlIFdlYlBsdWdp blBhY2thZ2UgOiBXZWJCYXNlUGx1Z2luUGFja2FnZSB7CisgICAgTlNCdW5kbGUgKm5zQnVuZGxl OworfQogCiAtIChDbGFzcyl2aWV3RmFjdG9yeTsKIApJbmRleDogV2ViS2l0L21hYy9QbHVnaW5z L1dlYlBsdWdpblBhY2thZ2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21hYy9QbHVnaW5zL1dl YlBsdWdpblBhY2thZ2UubW0JKHJldmlzaW9uIDYxNTA5KQorKysgV2ViS2l0L21hYy9QbHVnaW5z L1dlYlBsdWdpblBhY2thZ2UubW0JKHdvcmtpbmcgY29weSkKQEAgLTQwLDEyICs0MCwxNCBAQCBO U1N0cmluZyAqV2ViUGx1Z0luQ29udGFpbmluZ0VsZW1lbnRLZXkgCiAKIEBpbXBsZW1lbnRhdGlv biBXZWJQbHVnaW5QYWNrYWdlCiAKLS0gaW5pdFdpdGhQYXRoOihOU1N0cmluZyAqKXBsdWdpblBh dGgKKy0gKGlkKWluaXRXaXRoUGF0aDooTlNTdHJpbmcgKilwbHVnaW5QYXRoCiB7CiAgICAgaWYg KCEoc2VsZiA9IFtzdXBlciBpbml0V2l0aFBhdGg6cGx1Z2luUGF0aF0pKQogICAgICAgICByZXR1 cm4gbmlsOwogCi0gICAgaWYgKGJ1bmRsZSA9PSBuaWwpIHsKKyAgICBuc0J1bmRsZSA9IFtbTlNC dW5kbGUgYWxsb2NdIGluaXRXaXRoUGF0aDpwYXRoXTsKKworICAgIGlmIChuc0J1bmRsZSA9PSBu aWwpIHsKICAgICAgICAgW3NlbGYgcmVsZWFzZV07CiAgICAgICAgIHJldHVybiBuaWw7CiAgICAg fQpAQCAtNTksNyArNjEsNyBAQCAtIGluaXRXaXRoUGF0aDooTlNTdHJpbmcgKilwbHVnaW5QYXRo CiAgICAgICAgIH0KICAgICB9CiAgICAgCi0gICAgTlNGaWxlSGFuZGxlICpleGVjdXRhYmxlRmls ZSA9IFtOU0ZpbGVIYW5kbGUgZmlsZUhhbmRsZUZvclJlYWRpbmdBdFBhdGg6W2J1bmRsZSBleGVj dXRhYmxlUGF0aF1dOworICAgIE5TRmlsZUhhbmRsZSAqZXhlY3V0YWJsZUZpbGUgPSBbTlNGaWxl SGFuZGxlIGZpbGVIYW5kbGVGb3JSZWFkaW5nQXRQYXRoOltuc0J1bmRsZSBleGVjdXRhYmxlUGF0 aF1dOwogICAgIE5TRGF0YSAqZGF0YSA9IFtleGVjdXRhYmxlRmlsZSByZWFkRGF0YU9mTGVuZ3Ro OjUxMl07CiAgICAgW2V4ZWN1dGFibGVGaWxlIGNsb3NlRmlsZV07CiAgICAgaWYgKCFbc2VsZiBp c05hdGl2ZUxpYnJhcnlEYXRhOmRhdGFdKSB7CkBAIC03NSw5ICs3NywxNiBAQCAtIGluaXRXaXRo UGF0aDooTlNTdHJpbmcgKilwbHVnaW5QYXRoCiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKKy0gKHZv aWQpZGVhbGxvYworeworICAgIFtuc0J1bmRsZSByZWxlYXNlXTsKKworICAgIFtzdXBlciBkZWFs bG9jXTsKK30KKwogLSAoQ2xhc3Mpdmlld0ZhY3RvcnkKIHsKLSAgICByZXR1cm4gW2J1bmRsZSBw cmluY2lwYWxDbGFzc107CisgICAgcmV0dXJuIFtuc0J1bmRsZSBwcmluY2lwYWxDbGFzc107CiB9 CiAKIC0gKEJPT0wpbG9hZApAQCAtODcsOCArOTYsOCBAQCAtIChCT09MKWxvYWQKICNlbmRpZgog ICAgIAogICAgIC8vIExvYWQgdGhlIGJ1bmRsZQotICAgIGlmICghW2J1bmRsZSBpc0xvYWRlZF0p IHsKLSAgICAgICAgaWYgKCFbYnVuZGxlIGxvYWRdKQorICAgIGlmICghW25zQnVuZGxlIGlzTG9h ZGVkXSkgeworICAgICAgICBpZiAoIVtuc0J1bmRsZSBsb2FkXSkKICAgICAgICAgICAgIHJldHVy biBOTzsKICAgICB9CiAgICAgCg==