81910 2012-03-22 07:53:22 -0700 [Qt][WK2] Pass Origin information to the DatabaseQuotaDialogContextObject 2012-03-22 10:23:53 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ahf ahf menard webkit.review.bot zoltan oldest_to_newest 585276 0 ahf 2012-03-22 07:53:22 -0700 [Qt][WK2] Pass Origin information to the DatabaseQuotaDialogContextObject 585283 1 133264 ahf 2012-03-22 07:58:18 -0700 Created attachment 133264 Patch 585356 2 133274 ahf 2012-03-22 09:11:18 -0700 Created attachment 133274 Patch 585399 3 133274 hausmann 2012-03-22 09:50:12 -0700 Comment on attachment 133274 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133274&action=review > Source/WebKit2/UIProcess/qt/QtDialogRunner.cpp:213 > + WKRetainPtr<WKStringRef> scheme = adoptWK(WKSecurityOriginCopyProtocol(securityOrigin)); > + WKRetainPtr<WKStringRef> host = adoptWK(WKSecurityOriginCopyHost(securityOrigin)); > + > + m_securityOrigin.setScheme(WKStringCopyQString(scheme.get())); > + m_securityOrigin.setHost(WKStringCopyQString(host.get())); > + m_securityOrigin.setPort(static_cast<int>(WKSecurityOriginGetPort(securityOrigin))); Would be nice to have a constructor for this in the future. 585439 4 ahf 2012-03-22 10:23:53 -0700 Committed r111721: <http://trac.webkit.org/changeset/111721> 133264 2012-03-22 07:58:18 -0700 2012-03-22 09:11:05 -0700 Patch bug-81910-20120322155815.patch text/plain 13678 ahf U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDRiZTY0ZjJlYzVkMWRl ZWYyMjlkMTA2MTZkNjE4ZGQ3NzhiYmZmOC4uNThlMDAzNDkyYzQ4ZmM0MGMyNDMxMzJmMGM2ZjUx OTIyYTA0ZTg5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTIyICBBbGV4 YW5kZXIgRsOmcsO4eSAgPGFsZXhhbmRlci5mYWVyb3lAbm9raWEuY29tPgorCisgICAgICAgIFtR dF1bV0syXSBQYXNzIE9yaWdpbiBpbmZvcm1hdGlvbiB0byB0aGUgRGF0YWJhc2VRdW90YURpYWxv Z0NvbnRleHRPYmplY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxOTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1 aWNrV2ViVmlld1ByaXZhdGU6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oOgorICAgICAgICAoUVF1aWNrV2ViVmll d1ByaXZhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdERpYWxvZ1J1bm5lci5jcHA6Cisg ICAgICAgIChEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdCk6CisgICAgICAgIChEYXRh YmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdDo6RGF0YWJhc2VRdW90YURpYWxvZ0NvbnRleHRP YmplY3QpOgorICAgICAgICAoRGF0YWJhc2VRdW90YURpYWxvZ0NvbnRleHRPYmplY3Q6Om9yaWdp bkhvc3RuYW1lKToKKyAgICAgICAgKERhdGFiYXNlUXVvdGFEaWFsb2dDb250ZXh0T2JqZWN0Ojpv cmlnaW5Qb3J0KToKKyAgICAgICAgKERhdGFiYXNlUXVvdGFEaWFsb2dDb250ZXh0T2JqZWN0Ojpv cmlnaW5Qcm90b2NvbCk6CisgICAgICAgIChRdERpYWxvZ1J1bm5lcjo6aW5pdEZvckRhdGFiYXNl UXVvdGFEaWFsb2cpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdERpYWxvZ1J1bm5lci5oOgor ICAgICAgICAoUXREaWFsb2dSdW5uZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBh Z2VVSUNsaWVudC5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VVSUNsaWVudDo6ZXhjZWVkZWREYXRh YmFzZVF1b3RhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQYWdlVUlDbGllbnQuaDoK KwogMjAxMi0wMy0yMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGJiLXdlYmtpdC1y ZWwtNjQubG9jYWwuaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBVc2UgdGhlIGFuZ2xlLWJy YWNrZXQgZm9ybSB0byBpbmNsdWRlIHd0ZiBoZWFkZXJzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3LmNwcAppbmRleCAzZGFkYTk3ODk0NTc3MmM0 MWU2ZjUyMWVkZjBlMzgwNWJkYWFkZjc1Li45YWZhYWRmZjljZGM4YmZjMmRhNmZmMDQ1MWRlODFl N2NiZmI2MTgxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3Fx dWlja3dlYnZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1 aWNrd2Vidmlldy5jcHAKQEAgLTM5OSwxNCArMzk5LDE0IEBAIHZvaWQgUVF1aWNrV2ViVmlld1By aXZhdGU6OmNob29zZUZpbGVzKFdLT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJSZWYgbGlzdGVuZXJS ZWYsCiAKIH0KIAotcXVpbnQ2NCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6ZXhjZWVkZWREYXRhYmFz ZVF1b3RhKGNvbnN0IFFTdHJpbmcmIGRhdGFiYXNlTmFtZSwgY29uc3QgUVN0cmluZyYgZGlzcGxh eU5hbWUsIHF1aW50NjQgY3VycmVudFF1b3RhLCBxdWludDY0IGN1cnJlbnRPcmlnaW5Vc2FnZSwg cXVpbnQ2NCBjdXJyZW50RGF0YWJhc2VVc2FnZSwgcXVpbnQ2NCBleHBlY3RlZFVzYWdlKQorcXVp bnQ2NCBRUXVpY2tXZWJWaWV3UHJpdmF0ZTo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKGNvbnN0IFFT dHJpbmcmIGRhdGFiYXNlTmFtZSwgY29uc3QgUVN0cmluZyYgZGlzcGxheU5hbWUsIGNvbnN0IFFT dHJpbmcmIG9yaWdpbkhvc3RuYW1lLCBxdWludDE2IG9yaWdpblBvcnQsIGNvbnN0IFFTdHJpbmcm IG9yaWdpblByb3RvY29sLCBxdWludDY0IGN1cnJlbnRRdW90YSwgcXVpbnQ2NCBjdXJyZW50T3Jp Z2luVXNhZ2UsIHF1aW50NjQgY3VycmVudERhdGFiYXNlVXNhZ2UsIHF1aW50NjQgZXhwZWN0ZWRV c2FnZSkKIHsKICAgICBpZiAoIWRhdGFiYXNlUXVvdGFEaWFsb2cpCiAgICAgICAgIHJldHVybiAw OwogCiAgICAgUV9RKFFRdWlja1dlYlZpZXcpOwogICAgIFF0RGlhbG9nUnVubmVyIGRpYWxvZ1J1 bm5lcjsKLSAgICBpZiAoIWRpYWxvZ1J1bm5lci5pbml0Rm9yRGF0YWJhc2VRdW90YURpYWxvZyhk YXRhYmFzZVF1b3RhRGlhbG9nLCBxLCBkYXRhYmFzZU5hbWUsIGRpc3BsYXlOYW1lLCBjdXJyZW50 UXVvdGEsIGN1cnJlbnRPcmlnaW5Vc2FnZSwgY3VycmVudERhdGFiYXNlVXNhZ2UsIGV4cGVjdGVk VXNhZ2UpKQorICAgIGlmICghZGlhbG9nUnVubmVyLmluaXRGb3JEYXRhYmFzZVF1b3RhRGlhbG9n KGRhdGFiYXNlUXVvdGFEaWFsb2csIHEsIGRhdGFiYXNlTmFtZSwgZGlzcGxheU5hbWUsIG9yaWdp bkhvc3RuYW1lLCBvcmlnaW5Qb3J0LCBvcmlnaW5Qcm90b2NvbCwgY3VycmVudFF1b3RhLCBjdXJy ZW50T3JpZ2luVXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdlLCBleHBlY3RlZFVzYWdlKSkKICAg ICAgICAgcmV0dXJuIDA7CiAKICAgICBleGVjRGlhbG9nUnVubmVyKGRpYWxvZ1J1bm5lcik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdf cF9wLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9w LmgKaW5kZXggNGI5NzBkNGM5Y2YzNmNhY2VmZDFmOTRiNzYyMTIwYThmNjRjZWM2ZS4uYjdkNzU3 MDZiZTRlYjViYTZhYzc0YzQ5OTBmZTEyMTY1MzA4ZDFiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlld19wX3AuaApAQCAtOTYsNyArOTYs NyBAQCBwdWJsaWM6CiAgICAgdm9pZCBfcV9vbkljb25DaGFuZ2VkRm9yUGFnZVVSTChjb25zdCBR VXJsJiBwYWdlVVJMLCBjb25zdCBRVXJsJiBpY29uVVJMU3RyaW5nKTsKIAogICAgIHZvaWQgY2hv b3NlRmlsZXMoV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclJlZiwgY29uc3QgUVN0cmluZ0xpc3Qm IHNlbGVjdGVkRmlsZU5hbWVzLCBRdFdlYlBhZ2VVSUNsaWVudDo6RmlsZUNob29zZXJUeXBlKTsK LSAgICBxdWludDY0IGV4Y2VlZGVkRGF0YWJhc2VRdW90YShjb25zdCBRU3RyaW5nJiBkYXRhYmFz ZU5hbWUsIGNvbnN0IFFTdHJpbmcmIGRpc3BsYXlOYW1lLCBxdWludDY0IGN1cnJlbnRRdW90YSwg cXVpbnQ2NCBjdXJyZW50T3JpZ2luVXNhZ2UsIHF1aW50NjQgY3VycmVudERhdGFiYXNlVXNhZ2Us IHF1aW50NjQgZXhwZWN0ZWRVc2FnZSk7CisgICAgcXVpbnQ2NCBleGNlZWRlZERhdGFiYXNlUXVv dGEoY29uc3QgUVN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFt ZSwgY29uc3QgUVN0cmluZyYgb3JpZ2luSG9zdG5hbWUsIHF1aW50MTYgb3JpZ2luUG9ydCwgY29u c3QgUVN0cmluZyYgb3JpZ2luUHJvdG9jb2wsIHF1aW50NjQgY3VycmVudFF1b3RhLCBxdWludDY0 IGN1cnJlbnRPcmlnaW5Vc2FnZSwgcXVpbnQ2NCBjdXJyZW50RGF0YWJhc2VVc2FnZSwgcXVpbnQ2 NCBleHBlY3RlZFVzYWdlKTsKICAgICB2b2lkIHJ1bkphdmFTY3JpcHRBbGVydChjb25zdCBRU3Ry aW5nJik7CiAgICAgYm9vbCBydW5KYXZhU2NyaXB0Q29uZmlybShjb25zdCBRU3RyaW5nJik7CiAg ICAgUVN0cmluZyBydW5KYXZhU2NyaXB0UHJvbXB0KGNvbnN0IFFTdHJpbmcmLCBjb25zdCBRU3Ry aW5nJiBkZWZhdWx0VmFsdWUsIGJvb2wmIG9rKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdERpYWxvZ1J1bm5lci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXREaWFsb2dSdW5uZXIuY3BwCmluZGV4IDMzNDFkMTljZjE0MmEyMDQ4ZTA1ODcwMjBj MWUzYmM1MDM3ODVmODkuLmZlYjE1YzQyNTlmZWU3NTQ5YjFhMzZmZTI1N2U2NDJiODQ2OTM0Nzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdERpYWxvZ1J1bm5lci5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0RGlhbG9nUnVubmVyLmNwcApA QCAtMTkwLDkgKzE5MCwxMiBAQCBjbGFzcyBEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVj dCA6IHB1YmxpYyBRT2JqZWN0IHsKICAgICBRX1BST1BFUlRZKHF1aW50NjQgY3VycmVudE9yaWdp blVzYWdlIFJFQUQgY3VycmVudE9yaWdpblVzYWdlIENPTlNUQU5UKQogICAgIFFfUFJPUEVSVFko cXVpbnQ2NCBjdXJyZW50RGF0YWJhc2VVc2FnZSBSRUFEIGN1cnJlbnREYXRhYmFzZVVzYWdlIENP TlNUQU5UKQogICAgIFFfUFJPUEVSVFkocXVpbnQ2NCBleHBlY3RlZFVzYWdlIFJFQUQgZXhwZWN0 ZWRVc2FnZSBDT05TVEFOVCkKKyAgICBRX1BST1BFUlRZKFFTdHJpbmcgb3JpZ2luSG9zdG5hbWUg UkVBRCBvcmlnaW5Ib3N0bmFtZSBDT05TVEFOVCkKKyAgICBRX1BST1BFUlRZKHF1aW50MTYgb3Jp Z2luUG9ydCBSRUFEIG9yaWdpblBvcnQgQ09OU1RBTlQpCisgICAgUV9QUk9QRVJUWShRU3RyaW5n IG9yaWdpblByb3RvY29sIFJFQUQgb3JpZ2luUHJvdG9jb2wgQ09OU1RBTlQpCiAKIHB1YmxpYzoK LSAgICBEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdChjb25zdCBRU3RyaW5nJiBkYXRh YmFzZU5hbWUsIGNvbnN0IFFTdHJpbmcmIGRpc3BsYXlOYW1lLCBxdWludDY0IGN1cnJlbnRRdW90 YSwgcXVpbnQ2NCBjdXJyZW50T3JpZ2luVXNhZ2UsIHF1aW50NjQgY3VycmVudERhdGFiYXNlVXNh Z2UsIHF1aW50NjQgZXhwZWN0ZWRVc2FnZSkKKyAgICBEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4 dE9iamVjdChjb25zdCBRU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFFTdHJpbmcmIGRpc3Bs YXlOYW1lLCBjb25zdCBRU3RyaW5nJiBvcmlnaW5Ib3N0bmFtZSwgcXVpbnQxNiBvcmlnaW5Qb3J0 LCBjb25zdCBRU3RyaW5nJiBvcmlnaW5Qcm90b2NvbCwgcXVpbnQ2NCBjdXJyZW50UXVvdGEsIHF1 aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRhYmFzZVVzYWdlLCBx dWludDY0IGV4cGVjdGVkVXNhZ2UpCiAgICAgICAgIDogUU9iamVjdCgpCiAgICAgICAgICwgbV9k YXRhYmFzZU5hbWUoZGF0YWJhc2VOYW1lKQogICAgICAgICAsIG1fZGlzcGxheU5hbWUoZGlzcGxh eU5hbWUpCkBAIC0yMDAsNiArMjAzLDkgQEAgcHVibGljOgogICAgICAgICAsIG1fY3VycmVudE9y aWdpblVzYWdlKGN1cnJlbnRPcmlnaW5Vc2FnZSkKICAgICAgICAgLCBtX2N1cnJlbnREYXRhYmFz ZVVzYWdlKGN1cnJlbnREYXRhYmFzZVVzYWdlKQogICAgICAgICAsIG1fZXhwZWN0ZWRVc2FnZShl eHBlY3RlZFVzYWdlKQorICAgICAgICAsIG1fb3JpZ2luSG9zdG5hbWUob3JpZ2luSG9zdG5hbWUp CisgICAgICAgICwgbV9vcmlnaW5Qb3J0KG9yaWdpblBvcnQpCisgICAgICAgICwgbV9vcmlnaW5Q cm90b2NvbChvcmlnaW5Qcm90b2NvbCkKICAgICB7CiAgICAgfQogCkBAIC0yMDksNiArMjE1LDkg QEAgcHVibGljOgogICAgIHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlKCkgY29uc3QgeyByZXR1 cm4gbV9jdXJyZW50T3JpZ2luVXNhZ2U7IH0KICAgICBxdWludDY0IGN1cnJlbnREYXRhYmFzZVVz YWdlKCkgY29uc3QgeyByZXR1cm4gbV9jdXJyZW50RGF0YWJhc2VVc2FnZTsgfQogICAgIHF1aW50 NjQgZXhwZWN0ZWRVc2FnZSgpIGNvbnN0IHsgcmV0dXJuIG1fZXhwZWN0ZWRVc2FnZTsgfQorICAg IFFTdHJpbmcgb3JpZ2luSG9zdG5hbWUoKSBjb25zdCB7IHJldHVybiBtX29yaWdpbkhvc3RuYW1l OyB9CisgICAgcXVpbnQxNiBvcmlnaW5Qb3J0KCkgY29uc3QgeyByZXR1cm4gbV9vcmlnaW5Qb3J0 OyB9CisgICAgUVN0cmluZyBvcmlnaW5Qcm90b2NvbCgpIGNvbnN0IHsgcmV0dXJuIG1fb3JpZ2lu UHJvdG9jb2w7IH0KIAogcHVibGljIHNsb3RzOgogICAgIHZvaWQgYWNjZXB0KHF1aW50NjQgc2l6 ZSkgeyBlbWl0IGFjY2VwdGVkKHNpemUpOyB9CkBAIC0yMjUsNiArMjM0LDkgQEAgcHJpdmF0ZToK ICAgICBxdWludDY0IG1fY3VycmVudE9yaWdpblVzYWdlOwogICAgIHF1aW50NjQgbV9jdXJyZW50 RGF0YWJhc2VVc2FnZTsKICAgICBxdWludDY0IG1fZXhwZWN0ZWRVc2FnZTsKKyAgICBRU3RyaW5n IG1fb3JpZ2luSG9zdG5hbWU7CisgICAgcXVpbnQxNiBtX29yaWdpblBvcnQ7CisgICAgUVN0cmlu ZyBtX29yaWdpblByb3RvY29sOwogfTsKIAogYm9vbCBRdERpYWxvZ1J1bm5lcjo6aW5pdEZvckFs ZXJ0KFFEZWNsYXJhdGl2ZUNvbXBvbmVudCogY29tcG9uZW50LCBRUXVpY2tJdGVtKiBkaWFsb2dQ YXJlbnQsIGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpCkBAIC0zMTMsOSArMzI1LDkgQEAgYm9vbCBR dERpYWxvZ1J1bm5lcjo6aW5pdEZvckZpbGVQaWNrZXIoUURlY2xhcmF0aXZlQ29tcG9uZW50KiBj b21wb25lbnQsIFFRdWlja0kKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBRdERpYWxvZ1J1 bm5lcjo6aW5pdEZvckRhdGFiYXNlUXVvdGFEaWFsb2coUURlY2xhcmF0aXZlQ29tcG9uZW50KiBj b21wb25lbnQsIFFRdWlja0l0ZW0qIGRpYWxvZ1BhcmVudCwgY29uc3QgUVN0cmluZyYgZGF0YWJh c2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFtZSwgcXVpbnQ2NCBjdXJyZW50UXVvdGEs IHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRhYmFzZVVzYWdl LCBxdWludDY0IGV4cGVjdGVkVXNhZ2UpCitib29sIFF0RGlhbG9nUnVubmVyOjppbml0Rm9yRGF0 YWJhc2VRdW90YURpYWxvZyhRRGVjbGFyYXRpdmVDb21wb25lbnQqIGNvbXBvbmVudCwgUVF1aWNr SXRlbSogZGlhbG9nUGFyZW50LCBjb25zdCBRU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFFT dHJpbmcmIGRpc3BsYXlOYW1lLCBjb25zdCBRU3RyaW5nJiBvcmlnaW5Ib3N0bmFtZSwgcXVpbnQx NiBvcmlnaW5Qb3J0LCBjb25zdCBRU3RyaW5nJiBvcmlnaW5Qcm90b2NvbCwgcXVpbnQ2NCBjdXJy ZW50UXVvdGEsIHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRh YmFzZVVzYWdlLCBxdWludDY0IGV4cGVjdGVkVXNhZ2UpCiB7Ci0gICAgRGF0YWJhc2VRdW90YURp YWxvZ0NvbnRleHRPYmplY3QqIGNvbnRleHRPYmplY3QgPSBuZXcgRGF0YWJhc2VRdW90YURpYWxv Z0NvbnRleHRPYmplY3QoZGF0YWJhc2VOYW1lLCBkaXNwbGF5TmFtZSwgY3VycmVudFF1b3RhLCBj dXJyZW50T3JpZ2luVXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdlLCBleHBlY3RlZFVzYWdlKTsK KyAgICBEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdCogY29udGV4dE9iamVjdCA9IG5l dyBEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdChkYXRhYmFzZU5hbWUsIGRpc3BsYXlO YW1lLCBvcmlnaW5Ib3N0bmFtZSwgb3JpZ2luUG9ydCwgb3JpZ2luUHJvdG9jb2wsIGN1cnJlbnRR dW90YSwgY3VycmVudE9yaWdpblVzYWdlLCBjdXJyZW50RGF0YWJhc2VVc2FnZSwgZXhwZWN0ZWRV c2FnZSk7CiAgICAgaWYgKCFjcmVhdGVEaWFsb2coY29tcG9uZW50LCBkaWFsb2dQYXJlbnQsIGNv bnRleHRPYmplY3QpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdERpYWxvZ1J1bm5lci5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0RGlhbG9nUnVubmVyLmgKaW5kZXggMDdmMTM1ZWYyOWZlMGU1Njc4YjBi OTZkNDE0NTc1Njk3YjNlNDg0MC4uZjVjMGRlN2M0ZjRmNjBkNWJmMTQwMGQyYjVjYTgzYWRmMmQx MDU5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0RGlhbG9nUnVu bmVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0RGlhbG9nUnVubmVyLmgK QEAgLTQzLDcgKzQzLDcgQEAgcHVibGljOgogICAgIGJvb2wgaW5pdEZvckNlcnRpZmljYXRlVmVy aWZpY2F0aW9uKFFEZWNsYXJhdGl2ZUNvbXBvbmVudCosIFFRdWlja0l0ZW0qLCBjb25zdCBRU3Ry aW5nJiBob3N0bmFtZSk7CiAgICAgYm9vbCBpbml0Rm9yUHJveHlBdXRoZW50aWNhdGlvbihRRGVj bGFyYXRpdmVDb21wb25lbnQqLCBRUXVpY2tJdGVtKiwgY29uc3QgUVN0cmluZyYgaG9zdG5hbWUs IHVpbnQxNl90IHBvcnQsIGNvbnN0IFFTdHJpbmcmIHByZWZpbGxlZFVzZXJuYW1lKTsKICAgICBi b29sIGluaXRGb3JGaWxlUGlja2VyKFFEZWNsYXJhdGl2ZUNvbXBvbmVudCosIFFRdWlja0l0ZW0q LCBjb25zdCBRU3RyaW5nTGlzdCYgc2VsZWN0ZWRGaWxlcyk7Ci0gICAgYm9vbCBpbml0Rm9yRGF0 YWJhc2VRdW90YURpYWxvZyhRRGVjbGFyYXRpdmVDb21wb25lbnQqLCBRUXVpY2tJdGVtKiwgY29u c3QgUVN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFtZSwgcXVp bnQ2NCBjdXJyZW50UXVvdGEsIHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1 cnJlbnREYXRhYmFzZVVzYWdlLCBxdWludDY0IGV4cGVjdGVkVXNhZ2UpOworICAgIGJvb2wgaW5p dEZvckRhdGFiYXNlUXVvdGFEaWFsb2coUURlY2xhcmF0aXZlQ29tcG9uZW50KiwgUVF1aWNrSXRl bSosIGNvbnN0IFFTdHJpbmcmIGRhdGFiYXNlTmFtZSwgY29uc3QgUVN0cmluZyYgZGlzcGxheU5h bWUsIGNvbnN0IFFTdHJpbmcmIG9yaWdpbkhvc3RuYW1lLCBxdWludDE2IG9yaWdpblBvcnQsIGNv bnN0IFFTdHJpbmcmIG9yaWdpblByb3RvY29sLCBxdWludDY0IGN1cnJlbnRRdW90YSwgcXVpbnQ2 NCBjdXJyZW50T3JpZ2luVXNhZ2UsIHF1aW50NjQgY3VycmVudERhdGFiYXNlVXNhZ2UsIHF1aW50 NjQgZXhwZWN0ZWRVc2FnZSk7CiAKICAgICBRUXVpY2tJdGVtKiBkaWFsb2coKSBjb25zdCB7IHJl dHVybiBtX2RpYWxvZy5nZXQoKTsgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRXZWJQYWdlVUlDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViUGFnZVVJQ2xpZW50LmNwcAppbmRleCA3ZWRiZGU1NTk0N2RhYzMwODViYmE0M2E5 ZmI2YjhiNTg3ZTIyMjA4Li5hNTZkMTc4ZTg1MzRhNGY0ZmQ4NjFlM2Y5MzlkODAzNDE4NWJmM2Fl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlVUlDbGll bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VVSUNsaWVu dC5jcHAKQEAgLTQ4LDkgKzQ4LDkgQEAgUXRXZWJQYWdlVUlDbGllbnQ6OlF0V2ViUGFnZVVJQ2xp ZW50KFdLUGFnZVJlZiBwYWdlUmVmLCBRUXVpY2tXZWJWaWV3KiB3ZWJWaWV3KQogICAgIFdLUGFn ZVNldFBhZ2VVSUNsaWVudChwYWdlUmVmLCAmdWlDbGllbnQpOwogfQogCi1xdWludDY0IFF0V2Vi UGFnZVVJQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEoY29uc3QgUVN0cmluZyYgZGF0YWJh c2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFtZSwgcXVpbnQ2NCBjdXJyZW50UXVvdGEs IHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRhYmFzZVVzYWdl LCBxdWludDY0IGV4cGVjdGVkVXNhZ2UpCitxdWludDY0IFF0V2ViUGFnZVVJQ2xpZW50OjpleGNl ZWRlZERhdGFiYXNlUXVvdGEoY29uc3QgUVN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBRU3Ry aW5nJiBkaXNwbGF5TmFtZSwgY29uc3QgUVN0cmluZyYgb3JpZ2luSG9zdG5hbWUsIHF1aW50MTYg b3JpZ2luUG9ydCwgY29uc3QgUVN0cmluZyYgb3JpZ2luUHJvdG9jb2wsIHF1aW50NjQgY3VycmVu dFF1b3RhLCBxdWludDY0IGN1cnJlbnRPcmlnaW5Vc2FnZSwgcXVpbnQ2NCBjdXJyZW50RGF0YWJh c2VVc2FnZSwgcXVpbnQ2NCBleHBlY3RlZFVzYWdlKQogewotICAgIHJldHVybiBtX3dlYlZpZXct PmRfZnVuYygpLT5leGNlZWRlZERhdGFiYXNlUXVvdGEoZGF0YWJhc2VOYW1lLCBkaXNwbGF5TmFt ZSwgY3VycmVudFF1b3RhLCBjdXJyZW50T3JpZ2luVXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdl LCBleHBlY3RlZFVzYWdlKTsKKyAgICByZXR1cm4gbV93ZWJWaWV3LT5kX2Z1bmMoKS0+ZXhjZWVk ZWREYXRhYmFzZVF1b3RhKGRhdGFiYXNlTmFtZSwgZGlzcGxheU5hbWUsIG9yaWdpbkhvc3RuYW1l LCBvcmlnaW5Qb3J0LCBvcmlnaW5Qcm90b2NvbCwgY3VycmVudFF1b3RhLCBjdXJyZW50T3JpZ2lu VXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdlLCBleHBlY3RlZFVzYWdlKTsKIH0KIAogdm9pZCBR dFdlYlBhZ2VVSUNsaWVudDo6cnVuSmF2YVNjcmlwdEFsZXJ0KGNvbnN0IFFTdHJpbmcmIG1lc3Nh Z2UpCkBAIC05NCwxMSArOTQsMTcgQEAgc3RhdGljIFF0V2ViUGFnZVVJQ2xpZW50KiB0b1F0V2Vi UGFnZVVJQ2xpZW50KGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiAgICAgcmV0dXJuIHJlaW50ZXJw cmV0X2Nhc3Q8UXRXZWJQYWdlVUlDbGllbnQqPihjb25zdF9jYXN0PHZvaWQqPihjbGllbnRJbmZv KSk7CiB9CiAKLXVuc2lnbmVkIGxvbmcgbG9uZyBRdFdlYlBhZ2VVSUNsaWVudDo6ZXhjZWVkZWRE YXRhYmFzZVF1b3RhKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1NlY3VyaXR5 T3JpZ2luUmVmLCBXS1N0cmluZ1JlZiBkYXRhYmFzZU5hbWUsIFdLU3RyaW5nUmVmIGRpc3BsYXlO YW1lLCB1bnNpZ25lZCBsb25nIGxvbmcgY3VycmVudFF1b3RhLCB1bnNpZ25lZCBsb25nIGxvbmcg Y3VycmVudE9yaWdpblVzYWdlLCB1bnNpZ25lZCBsb25nIGxvbmcgY3VycmVudERhdGFiYXNlVXNh Z2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBleHBlY3RlZFVzYWdlLCBjb25zdCB2b2lkICpjbGllbnRJ bmZvKQordW5zaWduZWQgbG9uZyBsb25nIFF0V2ViUGFnZVVJQ2xpZW50OjpleGNlZWRlZERhdGFi YXNlUXVvdGEoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1NlY3VyaXR5T3JpZ2luUmVmIG9yaWdp biwgV0tTdHJpbmdSZWYgZGF0YWJhc2VOYW1lLCBXS1N0cmluZ1JlZiBkaXNwbGF5TmFtZSwgdW5z aWduZWQgbG9uZyBsb25nIGN1cnJlbnRRdW90YSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnRP cmlnaW5Vc2FnZSwgdW5zaWduZWQgbG9uZyBsb25nIGN1cnJlbnREYXRhYmFzZVVzYWdlLCB1bnNp Z25lZCBsb25nIGxvbmcgZXhwZWN0ZWRVc2FnZSwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykKIHsK KyAgICBXS1JldGFpblB0cjxXS1N0cmluZ1JlZj4gb3JpZ2luSG9zdG5hbWUgPSBhZG9wdFdLKFdL U2VjdXJpdHlPcmlnaW5Db3B5SG9zdChvcmlnaW4pKTsKKyAgICBXS1JldGFpblB0cjxXS1N0cmlu Z1JlZj4gb3JpZ2luUHJvdG9jb2wgPSBhZG9wdFdLKFdLU2VjdXJpdHlPcmlnaW5Db3B5UHJvdG9j b2wob3JpZ2luKSk7CisKICAgICBRU3RyaW5nIHFEaXNwbGF5TmFtZSA9IFdLU3RyaW5nQ29weVFT dHJpbmcoZGlzcGxheU5hbWUpOwogICAgIFFTdHJpbmcgcURhdGFiYXNlTmFtZSA9IFdLU3RyaW5n Q29weVFTdHJpbmcoZGF0YWJhc2VOYW1lKTsKLSAgICByZXR1cm4gdG9RdFdlYlBhZ2VVSUNsaWVu dChjbGllbnRJbmZvKS0+ZXhjZWVkZWREYXRhYmFzZVF1b3RhKHFEYXRhYmFzZU5hbWUsIHFEaXNw bGF5TmFtZSwgY3VycmVudFF1b3RhLCBjdXJyZW50T3JpZ2luVXNhZ2UsIGN1cnJlbnREYXRhYmFz ZVVzYWdlLCBleHBlY3RlZFVzYWdlKTsKKyAgICBRU3RyaW5nIHFPcmlnaW5Ib3N0bmFtZSA9IFdL U3RyaW5nQ29weVFTdHJpbmcob3JpZ2luSG9zdG5hbWUuZ2V0KCkpOworICAgIFFTdHJpbmcgcU9y aWdpblByb3RvY29sID0gV0tTdHJpbmdDb3B5UVN0cmluZyhvcmlnaW5Qcm90b2NvbC5nZXQoKSk7 CisgICAgcXVpbnQxNiBxT3JpZ2luUG9ydCA9IFdLU2VjdXJpdHlPcmlnaW5HZXRQb3J0KG9yaWdp bik7CisgICAgcmV0dXJuIHRvUXRXZWJQYWdlVUlDbGllbnQoY2xpZW50SW5mbyktPmV4Y2VlZGVk RGF0YWJhc2VRdW90YShxRGF0YWJhc2VOYW1lLCBxRGlzcGxheU5hbWUsIHFPcmlnaW5Ib3N0bmFt ZSwgcU9yaWdpblBvcnQsIHFPcmlnaW5Qcm90b2NvbCwgY3VycmVudFF1b3RhLCBjdXJyZW50T3Jp Z2luVXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdlLCBleHBlY3RlZFVzYWdlKTsKIH0KIAogdm9p ZCBRdFdlYlBhZ2VVSUNsaWVudDo6cnVuSmF2YVNjcmlwdEFsZXJ0KFdLUGFnZVJlZiwgV0tTdHJp bmdSZWYgYWxlcnRUZXh0LCBXS0ZyYW1lUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVVJQ2xpZW50Lmgg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlVUlDbGllbnQuaAppbmRleCA3 MzllYzgzZGJkNzhjN2RkMDNkODIwMjU4NjJiNDNmZWVkMDZjZWNlLi44M2YyZDAzZjYxMWRkOTA5 YzQ0ZTk0YzExYTUwMTY1NDcxMjMwNDQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRXZWJQYWdlVUlDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRXZWJQYWdlVUlDbGllbnQuaApAQCAtNDEsNyArNDEsNyBAQCBwdWJsaWM6CiAgICAg UXRXZWJQYWdlVUlDbGllbnQoV0tQYWdlUmVmLCBRUXVpY2tXZWJWaWV3Kik7CiAKIHByaXZhdGU6 Ci0gICAgcXVpbnQ2NCBleGNlZWRlZERhdGFiYXNlUXVvdGEoY29uc3QgUVN0cmluZyYgZGF0YWJh c2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFtZSwgcXVpbnQ2NCBjdXJyZW50UXVvdGEs IHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRhYmFzZVVzYWdl LCBxdWludDY0IGV4cGVjdGVkVXNhZ2UpOworICAgIHF1aW50NjQgZXhjZWVkZWREYXRhYmFzZVF1 b3RhKGNvbnN0IFFTdHJpbmcmIGRhdGFiYXNlTmFtZSwgY29uc3QgUVN0cmluZyYgZGlzcGxheU5h bWUsIGNvbnN0IFFTdHJpbmcmIG9yaWdpbkhvc3RuYW1lLCBxdWludDE2IG9yaWdpblBvcnQsIGNv bnN0IFFTdHJpbmcmIG9yaWdpblByb3RvY29sLCBxdWludDY0IGN1cnJlbnRRdW90YSwgcXVpbnQ2 NCBjdXJyZW50T3JpZ2luVXNhZ2UsIHF1aW50NjQgY3VycmVudERhdGFiYXNlVXNhZ2UsIHF1aW50 NjQgZXhwZWN0ZWRVc2FnZSk7CiAgICAgdm9pZCBydW5KYXZhU2NyaXB0QWxlcnQoY29uc3QgUVN0 cmluZyYgbWVzc2FnZSk7CiAgICAgYm9vbCBydW5KYXZhU2NyaXB0Q29uZmlybShjb25zdCBRU3Ry aW5nJiBtZXNzYWdlKTsKICAgICBRU3RyaW5nIHJ1bkphdmFTY3JpcHRQcm9tcHQoY29uc3QgUVN0 cmluZyYgbWVzc2FnZSwgY29uc3QgUVN0cmluZyYgZGVmYXVsdFZhbHVlLCBib29sJiBvayk7Cg== 133274 2012-03-22 09:11:18 -0700 2012-03-22 09:50:12 -0700 Patch bug-81910-20120322171116.patch text/plain 13178 ahf U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNjk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMDRiZTY0ZjJlYzVkMWRl ZWYyMjlkMTA2MTZkNjE4ZGQ3NzhiYmZmOC4uZjkyMGQzNGNhMzNlNjlkMDhkMTFiZjUyZjllM2I4 YWMyMzY1YTk2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTIyICBBbGV4 YW5kZXIgRsOmcsO4eSAgPGFsZXhhbmRlci5mYWVyb3lAbm9raWEuY29tPgorCisgICAgICAgIFtR dF1bV0syXSBQYXNzIE9yaWdpbiBpbmZvcm1hdGlvbiB0byB0aGUgRGF0YWJhc2VRdW90YURpYWxv Z0NvbnRleHRPYmplY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxOTEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwOgorICAgICAgICAoUVF1 aWNrV2ViVmlld1ByaXZhdGU6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9xdC9xcXVpY2t3ZWJ2aWV3X3BfcC5oOgorICAgICAgICAoUVF1aWNrV2ViVmll d1ByaXZhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdERpYWxvZ1J1bm5lci5jcHA6Cisg ICAgICAgIChEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdCk6CisgICAgICAgIChEYXRh YmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdDo6RGF0YWJhc2VRdW90YURpYWxvZ0NvbnRleHRP YmplY3QpOgorICAgICAgICAoRGF0YWJhc2VRdW90YURpYWxvZ0NvbnRleHRPYmplY3Q6OnNlY3Vy aXR5T3JpZ2luKToKKyAgICAgICAgKFF0RGlhbG9nUnVubmVyOjppbml0Rm9yRGF0YWJhc2VRdW90 YURpYWxvZyk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0RGlhbG9nUnVubmVyLmg6CisgICAg ICAgIChRdERpYWxvZ1J1bm5lcik6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVVJ Q2xpZW50LmNwcDoKKyAgICAgICAgKFF0V2ViUGFnZVVJQ2xpZW50OjpleGNlZWRlZERhdGFiYXNl UXVvdGEpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VVSUNsaWVudC5oOgorCiAy MDEyLTAzLTIyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAYmItd2Via2l0LXJlbC02 NC5sb2NhbC5pZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFVzZSB0aGUgYW5nbGUtYnJhY2tl dCBmb3JtIHRvIGluY2x1ZGUgd3RmIGhlYWRlcnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNrd2Vidmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXcuY3BwCmluZGV4IDNkYWRhOTc4OTQ1NzcyYzQxZTZm NTIxZWRmMGUzODA1YmRhYWRmNzUuLjE3NzEzZmViY2Q1MDMxM2Y1NjA5YTM2Mjg3ZDk2NDdiNDZi N2FhYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvcXQvcXF1aWNr d2Vidmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9xdC9xcXVpY2t3 ZWJ2aWV3LmNwcApAQCAtMzk5LDE0ICszOTksMTQgQEAgdm9pZCBRUXVpY2tXZWJWaWV3UHJpdmF0 ZTo6Y2hvb3NlRmlsZXMoV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclJlZiBsaXN0ZW5lclJlZiwK IAogfQogCi1xdWludDY0IFFRdWlja1dlYlZpZXdQcml2YXRlOjpleGNlZWRlZERhdGFiYXNlUXVv dGEoY29uc3QgUVN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFt ZSwgcXVpbnQ2NCBjdXJyZW50UXVvdGEsIHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWlu dDY0IGN1cnJlbnREYXRhYmFzZVVzYWdlLCBxdWludDY0IGV4cGVjdGVkVXNhZ2UpCitxdWludDY0 IFFRdWlja1dlYlZpZXdQcml2YXRlOjpleGNlZWRlZERhdGFiYXNlUXVvdGEoY29uc3QgUVN0cmlu ZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFtZSwgV0tTZWN1cml0eU9y aWdpblJlZiBzZWN1cml0eU9yaWdpbiwgcXVpbnQ2NCBjdXJyZW50UXVvdGEsIHF1aW50NjQgY3Vy cmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRhYmFzZVVzYWdlLCBxdWludDY0IGV4 cGVjdGVkVXNhZ2UpCiB7CiAgICAgaWYgKCFkYXRhYmFzZVF1b3RhRGlhbG9nKQogICAgICAgICBy ZXR1cm4gMDsKIAogICAgIFFfUShRUXVpY2tXZWJWaWV3KTsKICAgICBRdERpYWxvZ1J1bm5lciBk aWFsb2dSdW5uZXI7Ci0gICAgaWYgKCFkaWFsb2dSdW5uZXIuaW5pdEZvckRhdGFiYXNlUXVvdGFE aWFsb2coZGF0YWJhc2VRdW90YURpYWxvZywgcSwgZGF0YWJhc2VOYW1lLCBkaXNwbGF5TmFtZSwg Y3VycmVudFF1b3RhLCBjdXJyZW50T3JpZ2luVXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdlLCBl eHBlY3RlZFVzYWdlKSkKKyAgICBpZiAoIWRpYWxvZ1J1bm5lci5pbml0Rm9yRGF0YWJhc2VRdW90 YURpYWxvZyhkYXRhYmFzZVF1b3RhRGlhbG9nLCBxLCBkYXRhYmFzZU5hbWUsIGRpc3BsYXlOYW1l LCBzZWN1cml0eU9yaWdpbiwgY3VycmVudFF1b3RhLCBjdXJyZW50T3JpZ2luVXNhZ2UsIGN1cnJl bnREYXRhYmFzZVVzYWdlLCBleHBlY3RlZFVzYWdlKSkKICAgICAgICAgcmV0dXJuIDA7CiAKICAg ICBleGVjRGlhbG9nUnVubmVyKGRpYWxvZ1J1bm5lcik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL3F0L3FxdWlja3dlYnZpZXdfcF9wLmgKaW5kZXggNGI5NzBkNGM5Y2Yz NmNhY2VmZDFmOTRiNzYyMTIwYThmNjRjZWM2ZS4uODhiMTFjNjQ2MDBmMGFlYzhjYTViOThiZDI0 NWUxNzRjZGJmOWJlYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9x dC9xcXVpY2t3ZWJ2aWV3X3BfcC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv cXQvcXF1aWNrd2Vidmlld19wX3AuaApAQCAtOTYsNyArOTYsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBfcV9vbkljb25DaGFuZ2VkRm9yUGFnZVVSTChjb25zdCBRVXJsJiBwYWdlVVJMLCBjb25zdCBR VXJsJiBpY29uVVJMU3RyaW5nKTsKIAogICAgIHZvaWQgY2hvb3NlRmlsZXMoV0tPcGVuUGFuZWxS ZXN1bHRMaXN0ZW5lclJlZiwgY29uc3QgUVN0cmluZ0xpc3QmIHNlbGVjdGVkRmlsZU5hbWVzLCBR dFdlYlBhZ2VVSUNsaWVudDo6RmlsZUNob29zZXJUeXBlKTsKLSAgICBxdWludDY0IGV4Y2VlZGVk RGF0YWJhc2VRdW90YShjb25zdCBRU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFFTdHJpbmcm IGRpc3BsYXlOYW1lLCBxdWludDY0IGN1cnJlbnRRdW90YSwgcXVpbnQ2NCBjdXJyZW50T3JpZ2lu VXNhZ2UsIHF1aW50NjQgY3VycmVudERhdGFiYXNlVXNhZ2UsIHF1aW50NjQgZXhwZWN0ZWRVc2Fn ZSk7CisgICAgcXVpbnQ2NCBleGNlZWRlZERhdGFiYXNlUXVvdGEoY29uc3QgUVN0cmluZyYgZGF0 YWJhc2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFtZSwgV0tTZWN1cml0eU9yaWdpblJl ZiBzZWN1cml0eU9yaWdpbiwgcXVpbnQ2NCBjdXJyZW50UXVvdGEsIHF1aW50NjQgY3VycmVudE9y aWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRhYmFzZVVzYWdlLCBxdWludDY0IGV4cGVjdGVk VXNhZ2UpOwogICAgIHZvaWQgcnVuSmF2YVNjcmlwdEFsZXJ0KGNvbnN0IFFTdHJpbmcmKTsKICAg ICBib29sIHJ1bkphdmFTY3JpcHRDb25maXJtKGNvbnN0IFFTdHJpbmcmKTsKICAgICBRU3RyaW5n IHJ1bkphdmFTY3JpcHRQcm9tcHQoY29uc3QgUVN0cmluZyYsIGNvbnN0IFFTdHJpbmcmIGRlZmF1 bHRWYWx1ZSwgYm9vbCYgb2spOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0RGlhbG9nUnVubmVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdERp YWxvZ1J1bm5lci5jcHAKaW5kZXggMzM0MWQxOWNmMTQyYTIwNDhlMDU4NzAyMGMxZTNiYzUwMzc4 NWY4OS4uZDkzODVlOGU1Mzk3OTNmYTA1YjljNzliMTFiNmU1MDQ2ZjVmZDliNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0RGlhbG9nUnVubmVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXREaWFsb2dSdW5uZXIuY3BwCkBAIC0yMCw2ICsy MCw5IEBACiAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJRdERpYWxvZ1J1bm5lci5o IgorI2luY2x1ZGUgIldLUmV0YWluUHRyLmgiCisjaW5jbHVkZSAiV0tTdHJpbmdRdC5oIgorI2lu Y2x1ZGUgInF3ZWJwZXJtaXNzaW9ucmVxdWVzdF9wLmgiCiAKICNpbmNsdWRlIDxRdERlY2xhcmF0 aXZlL1FEZWNsYXJhdGl2ZUNvbXBvbmVudD4KICNpbmNsdWRlIDxRdERlY2xhcmF0aXZlL1FEZWNs YXJhdGl2ZUNvbnRleHQ+CkBAIC0xOTAsOSArMTkzLDEwIEBAIGNsYXNzIERhdGFiYXNlUXVvdGFE aWFsb2dDb250ZXh0T2JqZWN0IDogcHVibGljIFFPYmplY3QgewogICAgIFFfUFJPUEVSVFkocXVp bnQ2NCBjdXJyZW50T3JpZ2luVXNhZ2UgUkVBRCBjdXJyZW50T3JpZ2luVXNhZ2UgQ09OU1RBTlQp CiAgICAgUV9QUk9QRVJUWShxdWludDY0IGN1cnJlbnREYXRhYmFzZVVzYWdlIFJFQUQgY3VycmVu dERhdGFiYXNlVXNhZ2UgQ09OU1RBTlQpCiAgICAgUV9QUk9QRVJUWShxdWludDY0IGV4cGVjdGVk VXNhZ2UgUkVBRCBleHBlY3RlZFVzYWdlIENPTlNUQU5UKQorICAgIFFfUFJPUEVSVFkoUXRXZWJT ZWN1cml0eU9yaWdpbiogb3JpZ2luIFJFQUQgc2VjdXJpdHlPcmlnaW4gQ09OU1RBTlQpCiAKIHB1 YmxpYzoKLSAgICBEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdChjb25zdCBRU3RyaW5n JiBkYXRhYmFzZU5hbWUsIGNvbnN0IFFTdHJpbmcmIGRpc3BsYXlOYW1lLCBxdWludDY0IGN1cnJl bnRRdW90YSwgcXVpbnQ2NCBjdXJyZW50T3JpZ2luVXNhZ2UsIHF1aW50NjQgY3VycmVudERhdGFi YXNlVXNhZ2UsIHF1aW50NjQgZXhwZWN0ZWRVc2FnZSkKKyAgICBEYXRhYmFzZVF1b3RhRGlhbG9n Q29udGV4dE9iamVjdChjb25zdCBRU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFFTdHJpbmcm IGRpc3BsYXlOYW1lLCBXS1NlY3VyaXR5T3JpZ2luUmVmIHNlY3VyaXR5T3JpZ2luLCBxdWludDY0 IGN1cnJlbnRRdW90YSwgcXVpbnQ2NCBjdXJyZW50T3JpZ2luVXNhZ2UsIHF1aW50NjQgY3VycmVu dERhdGFiYXNlVXNhZ2UsIHF1aW50NjQgZXhwZWN0ZWRVc2FnZSkKICAgICAgICAgOiBRT2JqZWN0 KCkKICAgICAgICAgLCBtX2RhdGFiYXNlTmFtZShkYXRhYmFzZU5hbWUpCiAgICAgICAgICwgbV9k aXNwbGF5TmFtZShkaXNwbGF5TmFtZSkKQEAgLTIwMSw2ICsyMDUsMTIgQEAgcHVibGljOgogICAg ICAgICAsIG1fY3VycmVudERhdGFiYXNlVXNhZ2UoY3VycmVudERhdGFiYXNlVXNhZ2UpCiAgICAg ICAgICwgbV9leHBlY3RlZFVzYWdlKGV4cGVjdGVkVXNhZ2UpCiAgICAgeworICAgICAgICBXS1Jl dGFpblB0cjxXS1N0cmluZ1JlZj4gc2NoZW1lID0gYWRvcHRXSyhXS1NlY3VyaXR5T3JpZ2luQ29w eVByb3RvY29sKHNlY3VyaXR5T3JpZ2luKSk7CisgICAgICAgIFdLUmV0YWluUHRyPFdLU3RyaW5n UmVmPiBob3N0ID0gYWRvcHRXSyhXS1NlY3VyaXR5T3JpZ2luQ29weUhvc3Qoc2VjdXJpdHlPcmln aW4pKTsKKworICAgICAgICBtX3NlY3VyaXR5T3JpZ2luLnNldFNjaGVtZShXS1N0cmluZ0NvcHlR U3RyaW5nKHNjaGVtZS5nZXQoKSkpOworICAgICAgICBtX3NlY3VyaXR5T3JpZ2luLnNldEhvc3Qo V0tTdHJpbmdDb3B5UVN0cmluZyhob3N0LmdldCgpKSk7CisgICAgICAgIG1fc2VjdXJpdHlPcmln aW4uc2V0UG9ydChzdGF0aWNfY2FzdDxpbnQ+KFdLU2VjdXJpdHlPcmlnaW5HZXRQb3J0KHNlY3Vy aXR5T3JpZ2luKSkpOwogICAgIH0KIAogICAgIFFTdHJpbmcgZGF0YWJhc2VOYW1lKCkgY29uc3Qg eyByZXR1cm4gbV9kYXRhYmFzZU5hbWU7IH0KQEAgLTIwOSw2ICsyMTksNyBAQCBwdWJsaWM6CiAg ICAgcXVpbnQ2NCBjdXJyZW50T3JpZ2luVXNhZ2UoKSBjb25zdCB7IHJldHVybiBtX2N1cnJlbnRP cmlnaW5Vc2FnZTsgfQogICAgIHF1aW50NjQgY3VycmVudERhdGFiYXNlVXNhZ2UoKSBjb25zdCB7 IHJldHVybiBtX2N1cnJlbnREYXRhYmFzZVVzYWdlOyB9CiAgICAgcXVpbnQ2NCBleHBlY3RlZFVz YWdlKCkgY29uc3QgeyByZXR1cm4gbV9leHBlY3RlZFVzYWdlOyB9CisgICAgUXRXZWJTZWN1cml0 eU9yaWdpbiogc2VjdXJpdHlPcmlnaW4oKSB7IHJldHVybiAmbV9zZWN1cml0eU9yaWdpbjsgfQog CiBwdWJsaWMgc2xvdHM6CiAgICAgdm9pZCBhY2NlcHQocXVpbnQ2NCBzaXplKSB7IGVtaXQgYWNj ZXB0ZWQoc2l6ZSk7IH0KQEAgLTIyNSw2ICsyMzYsNyBAQCBwcml2YXRlOgogICAgIHF1aW50NjQg bV9jdXJyZW50T3JpZ2luVXNhZ2U7CiAgICAgcXVpbnQ2NCBtX2N1cnJlbnREYXRhYmFzZVVzYWdl OwogICAgIHF1aW50NjQgbV9leHBlY3RlZFVzYWdlOworICAgIFF0V2ViU2VjdXJpdHlPcmlnaW4g bV9zZWN1cml0eU9yaWdpbjsKIH07CiAKIGJvb2wgUXREaWFsb2dSdW5uZXI6OmluaXRGb3JBbGVy dChRRGVjbGFyYXRpdmVDb21wb25lbnQqIGNvbXBvbmVudCwgUVF1aWNrSXRlbSogZGlhbG9nUGFy ZW50LCBjb25zdCBRU3RyaW5nJiBtZXNzYWdlKQpAQCAtMzEzLDkgKzMyNSw5IEBAIGJvb2wgUXRE aWFsb2dSdW5uZXI6OmluaXRGb3JGaWxlUGlja2VyKFFEZWNsYXJhdGl2ZUNvbXBvbmVudCogY29t cG9uZW50LCBRUXVpY2tJCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLWJvb2wgUXREaWFsb2dSdW5u ZXI6OmluaXRGb3JEYXRhYmFzZVF1b3RhRGlhbG9nKFFEZWNsYXJhdGl2ZUNvbXBvbmVudCogY29t cG9uZW50LCBRUXVpY2tJdGVtKiBkaWFsb2dQYXJlbnQsIGNvbnN0IFFTdHJpbmcmIGRhdGFiYXNl TmFtZSwgY29uc3QgUVN0cmluZyYgZGlzcGxheU5hbWUsIHF1aW50NjQgY3VycmVudFF1b3RhLCBx dWludDY0IGN1cnJlbnRPcmlnaW5Vc2FnZSwgcXVpbnQ2NCBjdXJyZW50RGF0YWJhc2VVc2FnZSwg cXVpbnQ2NCBleHBlY3RlZFVzYWdlKQorYm9vbCBRdERpYWxvZ1J1bm5lcjo6aW5pdEZvckRhdGFi YXNlUXVvdGFEaWFsb2coUURlY2xhcmF0aXZlQ29tcG9uZW50KiBjb21wb25lbnQsIFFRdWlja0l0 ZW0qIGRpYWxvZ1BhcmVudCwgY29uc3QgUVN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBRU3Ry aW5nJiBkaXNwbGF5TmFtZSwgV0tTZWN1cml0eU9yaWdpblJlZiBzZWN1cml0eU9yaWdpbiwgcXVp bnQ2NCBjdXJyZW50UXVvdGEsIHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1 cnJlbnREYXRhYmFzZVVzYWdlLCBxdWludDY0IGV4cGVjdGVkVXNhZ2UpCiB7Ci0gICAgRGF0YWJh c2VRdW90YURpYWxvZ0NvbnRleHRPYmplY3QqIGNvbnRleHRPYmplY3QgPSBuZXcgRGF0YWJhc2VR dW90YURpYWxvZ0NvbnRleHRPYmplY3QoZGF0YWJhc2VOYW1lLCBkaXNwbGF5TmFtZSwgY3VycmVu dFF1b3RhLCBjdXJyZW50T3JpZ2luVXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdlLCBleHBlY3Rl ZFVzYWdlKTsKKyAgICBEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdCogY29udGV4dE9i amVjdCA9IG5ldyBEYXRhYmFzZVF1b3RhRGlhbG9nQ29udGV4dE9iamVjdChkYXRhYmFzZU5hbWUs IGRpc3BsYXlOYW1lLCBzZWN1cml0eU9yaWdpbiwgY3VycmVudFF1b3RhLCBjdXJyZW50T3JpZ2lu VXNhZ2UsIGN1cnJlbnREYXRhYmFzZVVzYWdlLCBleHBlY3RlZFVzYWdlKTsKICAgICBpZiAoIWNy ZWF0ZURpYWxvZyhjb21wb25lbnQsIGRpYWxvZ1BhcmVudCwgY29udGV4dE9iamVjdCkpCiAgICAg ICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0RGlhbG9nUnVubmVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXREaWFs b2dSdW5uZXIuaAppbmRleCAwN2YxMzVlZjI5ZmUwZTU2NzhiMGI5NmQ0MTQ1NzU2OTdiM2U0ODQw Li4wZTU4NGFhNDgwYjkyOWVmYWE5YTA1NDI2NTZkYmFhMTYyOTRkYmNjIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXREaWFsb2dSdW5uZXIuaAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXREaWFsb2dSdW5uZXIuaApAQCAtMjEsNiArMjEsNyBAQAog I2lmbmRlZiBRdERpYWxvZ1J1bm5lcl9oCiAjZGVmaW5lIFF0RGlhbG9nUnVubmVyX2gKIAorI2lu Y2x1ZGUgIldLU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlIDxRdENvcmUvUUV2ZW50TG9vcD4K ICNpbmNsdWRlIDxRdENvcmUvUVN0cmluZ0xpc3Q+CiAjaW5jbHVkZSA8d3RmL093blB0ci5oPgpA QCAtNDMsNyArNDQsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpbml0Rm9yQ2VydGlmaWNhdGVWZXJp ZmljYXRpb24oUURlY2xhcmF0aXZlQ29tcG9uZW50KiwgUVF1aWNrSXRlbSosIGNvbnN0IFFTdHJp bmcmIGhvc3RuYW1lKTsKICAgICBib29sIGluaXRGb3JQcm94eUF1dGhlbnRpY2F0aW9uKFFEZWNs YXJhdGl2ZUNvbXBvbmVudCosIFFRdWlja0l0ZW0qLCBjb25zdCBRU3RyaW5nJiBob3N0bmFtZSwg dWludDE2X3QgcG9ydCwgY29uc3QgUVN0cmluZyYgcHJlZmlsbGVkVXNlcm5hbWUpOwogICAgIGJv b2wgaW5pdEZvckZpbGVQaWNrZXIoUURlY2xhcmF0aXZlQ29tcG9uZW50KiwgUVF1aWNrSXRlbSos IGNvbnN0IFFTdHJpbmdMaXN0JiBzZWxlY3RlZEZpbGVzKTsKLSAgICBib29sIGluaXRGb3JEYXRh YmFzZVF1b3RhRGlhbG9nKFFEZWNsYXJhdGl2ZUNvbXBvbmVudCosIFFRdWlja0l0ZW0qLCBjb25z dCBRU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFFTdHJpbmcmIGRpc3BsYXlOYW1lLCBxdWlu dDY0IGN1cnJlbnRRdW90YSwgcXVpbnQ2NCBjdXJyZW50T3JpZ2luVXNhZ2UsIHF1aW50NjQgY3Vy cmVudERhdGFiYXNlVXNhZ2UsIHF1aW50NjQgZXhwZWN0ZWRVc2FnZSk7CisgICAgYm9vbCBpbml0 Rm9yRGF0YWJhc2VRdW90YURpYWxvZyhRRGVjbGFyYXRpdmVDb21wb25lbnQqLCBRUXVpY2tJdGVt KiwgY29uc3QgUVN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBRU3RyaW5nJiBkaXNwbGF5TmFt ZSwgV0tTZWN1cml0eU9yaWdpblJlZiwgcXVpbnQ2NCBjdXJyZW50UXVvdGEsIHF1aW50NjQgY3Vy cmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRhYmFzZVVzYWdlLCBxdWludDY0IGV4 cGVjdGVkVXNhZ2UpOwogCiAgICAgUVF1aWNrSXRlbSogZGlhbG9nKCkgY29uc3QgeyByZXR1cm4g bV9kaWFsb2cuZ2V0KCk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViUGFnZVVJQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFdlYlBhZ2VVSUNsaWVudC5jcHAKaW5kZXggN2VkYmRlNTU5NDdkYWMzMDg1YmJhNDNhOWZiNmI4 YjU4N2UyMjIwOC4uZjAzODA1OTE5YjcyZDkzNDdkODE4N2FlZGVkM2U3MTY3MTgxMmYxNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVVJQ2xpZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlVUlDbGllbnQuY3Bw CkBAIC00OCw5ICs0OCw5IEBAIFF0V2ViUGFnZVVJQ2xpZW50OjpRdFdlYlBhZ2VVSUNsaWVudChX S1BhZ2VSZWYgcGFnZVJlZiwgUVF1aWNrV2ViVmlldyogd2ViVmlldykKICAgICBXS1BhZ2VTZXRQ YWdlVUlDbGllbnQocGFnZVJlZiwgJnVpQ2xpZW50KTsKIH0KIAotcXVpbnQ2NCBRdFdlYlBhZ2VV SUNsaWVudDo6ZXhjZWVkZWREYXRhYmFzZVF1b3RhKGNvbnN0IFFTdHJpbmcmIGRhdGFiYXNlTmFt ZSwgY29uc3QgUVN0cmluZyYgZGlzcGxheU5hbWUsIHF1aW50NjQgY3VycmVudFF1b3RhLCBxdWlu dDY0IGN1cnJlbnRPcmlnaW5Vc2FnZSwgcXVpbnQ2NCBjdXJyZW50RGF0YWJhc2VVc2FnZSwgcXVp bnQ2NCBleHBlY3RlZFVzYWdlKQorcXVpbnQ2NCBRdFdlYlBhZ2VVSUNsaWVudDo6ZXhjZWVkZWRE YXRhYmFzZVF1b3RhKGNvbnN0IFFTdHJpbmcmIGRhdGFiYXNlTmFtZSwgY29uc3QgUVN0cmluZyYg ZGlzcGxheU5hbWUsIFdLU2VjdXJpdHlPcmlnaW5SZWYgc2VjdXJpdHlPcmlnaW4sIHF1aW50NjQg Y3VycmVudFF1b3RhLCBxdWludDY0IGN1cnJlbnRPcmlnaW5Vc2FnZSwgcXVpbnQ2NCBjdXJyZW50 RGF0YWJhc2VVc2FnZSwgcXVpbnQ2NCBleHBlY3RlZFVzYWdlKQogewotICAgIHJldHVybiBtX3dl YlZpZXctPmRfZnVuYygpLT5leGNlZWRlZERhdGFiYXNlUXVvdGEoZGF0YWJhc2VOYW1lLCBkaXNw bGF5TmFtZSwgY3VycmVudFF1b3RhLCBjdXJyZW50T3JpZ2luVXNhZ2UsIGN1cnJlbnREYXRhYmFz ZVVzYWdlLCBleHBlY3RlZFVzYWdlKTsKKyAgICByZXR1cm4gbV93ZWJWaWV3LT5kX2Z1bmMoKS0+ ZXhjZWVkZWREYXRhYmFzZVF1b3RhKGRhdGFiYXNlTmFtZSwgZGlzcGxheU5hbWUsIHNlY3VyaXR5 T3JpZ2luLCBjdXJyZW50UXVvdGEsIGN1cnJlbnRPcmlnaW5Vc2FnZSwgY3VycmVudERhdGFiYXNl VXNhZ2UsIGV4cGVjdGVkVXNhZ2UpOwogfQogCiB2b2lkIFF0V2ViUGFnZVVJQ2xpZW50OjpydW5K YXZhU2NyaXB0QWxlcnQoY29uc3QgUVN0cmluZyYgbWVzc2FnZSkKQEAgLTk0LDExICs5NCwxMSBA QCBzdGF0aWMgUXRXZWJQYWdlVUlDbGllbnQqIHRvUXRXZWJQYWdlVUlDbGllbnQoY29uc3Qgdm9p ZCogY2xpZW50SW5mbykKICAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDxRdFdlYlBhZ2VVSUNs aWVudCo+KGNvbnN0X2Nhc3Q8dm9pZCo+KGNsaWVudEluZm8pKTsKIH0KIAotdW5zaWduZWQgbG9u ZyBsb25nIFF0V2ViUGFnZVVJQ2xpZW50OjpleGNlZWRlZERhdGFiYXNlUXVvdGEoV0tQYWdlUmVm IHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLU2VjdXJpdHlPcmlnaW5SZWYsIFdLU3RyaW5nUmVm IGRhdGFiYXNlTmFtZSwgV0tTdHJpbmdSZWYgZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgbG9u ZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50T3JpZ2luVXNhZ2UsIHVu c2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2FnZSwgdW5zaWduZWQgbG9uZyBsb25n IGV4cGVjdGVkVXNhZ2UsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pCit1bnNpZ25lZCBsb25nIGxv bmcgUXRXZWJQYWdlVUlDbGllbnQ6OmV4Y2VlZGVkRGF0YWJhc2VRdW90YShXS1BhZ2VSZWYsIFdL RnJhbWVSZWYsIFdLU2VjdXJpdHlPcmlnaW5SZWYgc2VjdXJpdHlPcmlnaW4sIFdLU3RyaW5nUmVm IGRhdGFiYXNlTmFtZSwgV0tTdHJpbmdSZWYgZGlzcGxheU5hbWUsIHVuc2lnbmVkIGxvbmcgbG9u ZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50T3JpZ2luVXNhZ2UsIHVu c2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2FnZSwgdW5zaWduZWQgbG9uZyBsb25n IGV4cGVjdGVkVXNhZ2UsIGNvbnN0IHZvaWQgKmNsaWVudEluZm8pCiB7CiAgICAgUVN0cmluZyBx RGlzcGxheU5hbWUgPSBXS1N0cmluZ0NvcHlRU3RyaW5nKGRpc3BsYXlOYW1lKTsKICAgICBRU3Ry aW5nIHFEYXRhYmFzZU5hbWUgPSBXS1N0cmluZ0NvcHlRU3RyaW5nKGRhdGFiYXNlTmFtZSk7Ci0g ICAgcmV0dXJuIHRvUXRXZWJQYWdlVUlDbGllbnQoY2xpZW50SW5mbyktPmV4Y2VlZGVkRGF0YWJh c2VRdW90YShxRGF0YWJhc2VOYW1lLCBxRGlzcGxheU5hbWUsIGN1cnJlbnRRdW90YSwgY3VycmVu dE9yaWdpblVzYWdlLCBjdXJyZW50RGF0YWJhc2VVc2FnZSwgZXhwZWN0ZWRVc2FnZSk7CisgICAg cmV0dXJuIHRvUXRXZWJQYWdlVUlDbGllbnQoY2xpZW50SW5mbyktPmV4Y2VlZGVkRGF0YWJhc2VR dW90YShxRGF0YWJhc2VOYW1lLCBxRGlzcGxheU5hbWUsIHNlY3VyaXR5T3JpZ2luLCBjdXJyZW50 UXVvdGEsIGN1cnJlbnRPcmlnaW5Vc2FnZSwgY3VycmVudERhdGFiYXNlVXNhZ2UsIGV4cGVjdGVk VXNhZ2UpOwogfQogCiB2b2lkIFF0V2ViUGFnZVVJQ2xpZW50OjpydW5KYXZhU2NyaXB0QWxlcnQo V0tQYWdlUmVmLCBXS1N0cmluZ1JlZiBhbGVydFRleHQsIFdLRnJhbWVSZWYsIGNvbnN0IHZvaWQq IGNsaWVudEluZm8pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRX ZWJQYWdlVUlDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VV SUNsaWVudC5oCmluZGV4IDczOWVjODNkYmQ3OGM3ZGQwM2Q4MjAyNTg2MmI0M2ZlZWQwNmNlY2Uu LjA1Nzk0MTQxZjA0NTc3MDIzYzllYTQzMTU1NzgwY2NhNjliM2UzODAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VVSUNsaWVudC5oCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VVSUNsaWVudC5oCkBAIC00MSw3ICs0MSw3 IEBAIHB1YmxpYzoKICAgICBRdFdlYlBhZ2VVSUNsaWVudChXS1BhZ2VSZWYsIFFRdWlja1dlYlZp ZXcqKTsKIAogcHJpdmF0ZToKLSAgICBxdWludDY0IGV4Y2VlZGVkRGF0YWJhc2VRdW90YShjb25z dCBRU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFFTdHJpbmcmIGRpc3BsYXlOYW1lLCBxdWlu dDY0IGN1cnJlbnRRdW90YSwgcXVpbnQ2NCBjdXJyZW50T3JpZ2luVXNhZ2UsIHF1aW50NjQgY3Vy cmVudERhdGFiYXNlVXNhZ2UsIHF1aW50NjQgZXhwZWN0ZWRVc2FnZSk7CisgICAgcXVpbnQ2NCBl eGNlZWRlZERhdGFiYXNlUXVvdGEoY29uc3QgUVN0cmluZyYgZGF0YWJhc2VOYW1lLCBjb25zdCBR U3RyaW5nJiBkaXNwbGF5TmFtZSwgV0tTZWN1cml0eU9yaWdpblJlZiwgcXVpbnQ2NCBjdXJyZW50 UXVvdGEsIHF1aW50NjQgY3VycmVudE9yaWdpblVzYWdlLCBxdWludDY0IGN1cnJlbnREYXRhYmFz ZVVzYWdlLCBxdWludDY0IGV4cGVjdGVkVXNhZ2UpOwogICAgIHZvaWQgcnVuSmF2YVNjcmlwdEFs ZXJ0KGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UpOwogICAgIGJvb2wgcnVuSmF2YVNjcmlwdENvbmZp cm0oY29uc3QgUVN0cmluZyYgbWVzc2FnZSk7CiAgICAgUVN0cmluZyBydW5KYXZhU2NyaXB0UHJv bXB0KGNvbnN0IFFTdHJpbmcmIG1lc3NhZ2UsIGNvbnN0IFFTdHJpbmcmIGRlZmF1bHRWYWx1ZSwg Ym9vbCYgb2spOwo=