70965 2011-10-26 13:43:14 -0700 [Qt][WK2] Move the C API callback setup out of QtWebPageProxy 2011-10-27 07:37:46 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 menard menard webkit.review.bot oldest_to_newest 491159 0 menard 2011-10-26 13:43:14 -0700 [Qt][WK2] Move the setup C API callback out of QtWebPageProxy 491160 1 112589 menard 2011-10-26 13:44:35 -0700 Created attachment 112589 Patch 491162 2 112589 kling 2011-10-26 13:47:41 -0700 Comment on attachment 112589 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=112589&action=review > Source/WebKit2/ChangeLog:3 > + [Qt][WK2] Move the setup C API callback out of QtWebPageProxy Move the C API callback setup out of QtWebPageProxy > Source/WebKit2/UIProcess/qt/ClientImpl.h:34 > #endif /* DefaultClientCallbacksQt_h */ Just noticed this name is wrong. > Source/WebKit2/UIProcess/qt/QtWebPageProxy.h:173 > + WebKit::QtViewInterface* viewInterface() const { return m_viewInterface; } Is the WebKit:: really needed here? 491168 3 112591 menard 2011-10-26 13:57:45 -0700 Created attachment 112591 Patch 491169 4 112591 kling 2011-10-26 13:58:43 -0700 Comment on attachment 112591 Patch r=kenneth 491561 5 112591 webkit.review.bot 2011-10-27 07:37:15 -0700 Comment on attachment 112591 Patch Clearing flags on attachment: 112591 Committed r98570: <http://trac.webkit.org/changeset/98570> 491562 6 webkit.review.bot 2011-10-27 07:37:46 -0700 All reviewed patches have been landed. Closing bug. 112589 2011-10-26 13:44:35 -0700 2011-10-26 13:57:31 -0700 Patch bug-70965-20111026144251.patch text/plain 18939 menard U3VidmVyc2lvbiBSZXZpc2lvbjogOTg0OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBlNWY3MDQxNDVjOTZkYzA5 MTgzZGEzOGQ0ZWNiOTIwNTUyMjQwZDcyLi45NzcwNTkzZmU2Zjg2ZTQwNTg0YTM0ZTZmYWM2MGI5 MWFmZmI2YTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTEtMTAtMjYgIEFsZXhp cyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtX SzJdIE1vdmUgdGhlIHNldHVwIEMgQVBJIGNhbGxiYWNrIG91dCBvZiBRdFdlYlBhZ2VQcm94eQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA5NjUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIG91dCB0 aGUgc2V0dXAgb2YgQyBBUEkgY2FsbGJhY2sgaW50byBDbGllbnRJbXBsIGZpbGUKKyAgICAgICAg c28gdGhhdCBRdFdlYlBhZ2VQcm94eSB3aWxsIGJlIGxlc3MgcG9sbHV0ZWQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChxdF93a19kaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKHF0X3drX2RpZEZhaWxQcm92aXNpb25h bExvYWRXaXRoRXJyb3JGb3JGcmFtZSk6CisgICAgICAgIChxdF93a19kaWRDb21taXRMb2FkRm9y RnJhbWUpOgorICAgICAgICAocXRfd2tfZGlkRmluaXNoTG9hZEZvckZyYW1lKToKKyAgICAgICAg KHF0X3drX2RpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpOgorICAgICAgICAocXRfd2tfZGlk U2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKToKKyAgICAgICAgKHF0X3drX2RpZFJlY2Vp dmVUaXRsZUZvckZyYW1lKToKKyAgICAgICAgKHF0X3drX2RpZFN0YXJ0UHJvZ3Jlc3MpOgorICAg ICAgICAocXRfd2tfZGlkQ2hhbmdlUHJvZ3Jlc3MpOgorICAgICAgICAocXRfd2tfZGlkRmluaXNo UHJvZ3Jlc3MpOgorICAgICAgICAocXRfd2tfcnVuSmF2YVNjcmlwdEFsZXJ0KToKKyAgICAgICAg KHF0X3drX3J1bkphdmFTY3JpcHRDb25maXJtKToKKyAgICAgICAgKHF0X3drX3J1bkphdmFTY3Jp cHRQcm9tcHQpOgorICAgICAgICAocXRfd2tfc2V0U3RhdHVzVGV4dCk6CisgICAgICAgIChxdF93 a19ydW5PcGVuUGFuZWwpOgorICAgICAgICAocXRfd2tfbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQp OgorICAgICAgICAocXRfd2tfZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAg ICAgIChxdF93a19kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSk6CisgICAgICAgIChzZXR1cFBhZ2VM b2FkZXJDbGllbnQpOgorICAgICAgICAoc2V0dXBQYWdlVWlDbGllbnQpOgorICAgICAgICAoc2V0 dXBQb2xpY3lJbnRlcmZhY2VDbGllbnQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9DbGllbnRJ bXBsLmg6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcDoKKyAgICAg ICAgKFF0V2ViUGFnZVByb3h5Ojppbml0KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRXZWJQ YWdlUHJveHkuaDoKKyAgICAgICAgKFF0V2ViUGFnZVByb3h5Ojp2aWV3SW50ZXJmYWNlKToKKwog MjAxMS0xMC0yNiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgW0dUS10gQWRkIG1pc3Npbmcgc3ltYm9scyB0byBXZWJLaXQyIGd0ay1kb2MgZmls ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmNwcAppbmRleCA5YTNh OTk5ZmIyYjQ2OWYyOWE4MWVmZmQ0NDZkNTczZjI3NDcwOWVkLi5jNWZhMDE1OWNlM2MwYjIzZTEy MGRmYTQ3MWRkNTMxOGQyODY1YzA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvQ2xpZW50SW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L0Ns aWVudEltcGwuY3BwCkBAIC04MSw3ICs4MSw3IEBAIHN0YXRpYyB2b2lkIGRpc3BhdGNoTG9hZEZh aWxlZChXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvLCBXS0Vycm9yCiAg ICAgdG9RdFdlYlBhZ2VQcm94eShjbGllbnRJbmZvKS0+bG9hZERpZEZhaWwoUXRXZWJFcnJvcihl cnJvcikpOwogfQogCi12b2lkIHF0X3drX2RpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUo V0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29u c3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIHF0X3drX2RpZFN0YXJ0UHJvdmlzaW9u YWxMb2FkRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJl ZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBpZiAoIVdLRnJhbWVJ c01haW5GcmFtZShmcmFtZSkpCiAgICAgICAgIHJldHVybjsKQEAgLTkwLDEyICs5MCwxMiBAQCB2 b2lkIHF0X3drX2RpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2Us IFdLRnJhbWVSZWYgZnJhbWUsIFdLVAogICAgIHRvUXRXZWJQYWdlUHJveHkoY2xpZW50SW5mbykt PmxvYWREaWRCZWdpbigpOwogfQogCi12b2lkIHF0X3drX2RpZEZhaWxQcm92aXNpb25hbExvYWRX aXRoRXJyb3JGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tFcnJv clJlZiBlcnJvciwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQor c3RhdGljIHZvaWQgcXRfd2tfZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1l KFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0Vycm9yUmVmIGVycm9yLCBXS1R5 cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgZGlzcGF0Y2hM b2FkRmFpbGVkKGZyYW1lLCBjbGllbnRJbmZvLCBlcnJvcik7CiB9CiAKLXZvaWQgcXRfd2tfZGlk Q29tbWl0TG9hZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5 cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBxdF93 a19kaWRDb21taXRMb2FkRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUs IFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBpZiAo IVdLRnJhbWVJc01haW5GcmFtZShmcmFtZSkpCiAgICAgICAgIHJldHVybjsKQEAgLTEwNywxNyAr MTA3LDE3IEBAIHZvaWQgcXRfd2tfZGlkQ29tbWl0TG9hZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdl LCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYgdXNlCiAgICAgdG9RdFdlYlBhZ2VQcm94eShj bGllbnRJbmZvKS0+bG9hZERpZENvbW1pdCgpOwogfQogCi12b2lkIHF0X3drX2RpZEZpbmlzaExv YWRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmIHVz ZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorc3RhdGljIHZvaWQgcXRfd2tfZGlkRmlu aXNoTG9hZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5cGVS ZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgZGlzcGF0Y2hMb2Fk U3VjY2VlZGVkKGZyYW1lLCBjbGllbnRJbmZvKTsKIH0KIAotdm9pZCBxdF93a19kaWRGYWlsTG9h ZFdpdGhFcnJvckZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0Vy cm9yUmVmIGVycm9yLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8p CitzdGF0aWMgdm9pZCBxdF93a19kaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lKFdLUGFnZVJl ZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0Vycm9yUmVmIGVycm9yLCBXS1R5cGVSZWYgdXNl ckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgZGlzcGF0Y2hMb2FkRmFpbGVk KGZyYW1lLCBjbGllbnRJbmZvLCBlcnJvcik7CiB9CiAKLXZvaWQgcXRfd2tfZGlkU2FtZURvY3Vt ZW50TmF2aWdhdGlvbkZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBX S1NhbWVEb2N1bWVudE5hdmlnYXRpb25UeXBlIHR5cGUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29u c3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIHF0X3drX2RpZFNhbWVEb2N1bWVudE5h dmlnYXRpb25Gb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tTYW1l RG9jdW1lbnROYXZpZ2F0aW9uVHlwZSB0eXBlLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pCiB7CiAgICAgV2ViRnJhbWVQcm94eSogd2tmcmFtZSA9IHRvSW1wbChm cmFtZSk7CiAgICAgUVN0cmluZyB1cmxTdHIod2tmcmFtZS0+dXJsKCkpOwpAQCAtMTI2LDcgKzEy Niw3IEBAIHZvaWQgcXRfd2tfZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKFdLUGFn ZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXCiAgICAgdG9RdFdlYlBhZ2VQcm94eShjbGll bnRJbmZvKS0+ZGlkQ2hhbmdlVXJsKHFVcmwpOwogfQogCi12b2lkIHF0X3drX2RpZFJlY2VpdmVU aXRsZUZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiB0aXRsZSwgV0tGcmFtZVJl ZiBmcmFtZSwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorc3Rh dGljIHZvaWQgcXRfd2tfZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdL U3RyaW5nUmVmIHRpdGxlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgaWYgKCFXS0ZyYW1lSXNNYWluRnJhbWUoZnJh bWUpKQogICAgICAgICByZXR1cm47CkBAIC0xMzQsMjggKzEzNCwyOCBAQCB2b2lkIHF0X3drX2Rp ZFJlY2VpdmVUaXRsZUZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiB0aXRsZSwg V0tGcmFtZVJlZgogICAgIHRvUXRXZWJQYWdlUHJveHkoY2xpZW50SW5mbyktPmRpZENoYW5nZVRp dGxlKHFUaXRsZSk7CiB9CiAKLXZvaWQgcXRfd2tfZGlkU3RhcnRQcm9ncmVzcyhXS1BhZ2VSZWYg cGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIHF0X3drX2RpZFN0YXJ0 UHJvZ3Jlc3MoV0tQYWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAg dG9RdFdlYlBhZ2VQcm94eShjbGllbnRJbmZvKS0+ZGlkQ2hhbmdlTG9hZFByb2dyZXNzKDApOwog fQogCi12b2lkIHF0X3drX2RpZENoYW5nZVByb2dyZXNzKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2 b2lkKiBjbGllbnRJbmZvKQorc3RhdGljIHZvaWQgcXRfd2tfZGlkQ2hhbmdlUHJvZ3Jlc3MoV0tQ YWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgdG9RdFdlYlBhZ2VQ cm94eShjbGllbnRJbmZvKS0+ZGlkQ2hhbmdlTG9hZFByb2dyZXNzKFdLUGFnZUdldEVzdGltYXRl ZFByb2dyZXNzKHBhZ2UpICogMTAwKTsKIH0KIAotdm9pZCBxdF93a19kaWRGaW5pc2hQcm9ncmVz cyhXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIHF0 X3drX2RpZEZpbmlzaFByb2dyZXNzKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKiBjbGllbnRJ bmZvKQogewogICAgIHRvUXRXZWJQYWdlUHJveHkoY2xpZW50SW5mbyktPmRpZENoYW5nZUxvYWRQ cm9ncmVzcygxMDApOwogfQogCi12b2lkIHF0X3drX3J1bkphdmFTY3JpcHRBbGVydChXS1BhZ2VS ZWYgcGFnZSwgV0tTdHJpbmdSZWYgYWxlcnRUZXh0LCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2 b2lkKiBjbGllbnRJbmZvKQorc3RhdGljIHZvaWQgcXRfd2tfcnVuSmF2YVNjcmlwdEFsZXJ0KFdL UGFnZVJlZiBwYWdlLCBXS1N0cmluZ1JlZiBhbGVydFRleHQsIFdLRnJhbWVSZWYgZnJhbWUsIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgUVN0cmluZyBxQWxlcnRUZXh0ID0gV0tTdHJp bmdDb3B5UVN0cmluZyhhbGVydFRleHQpOwogICAgIHRvUXRWaWV3SW50ZXJmYWNlKGNsaWVudElu Zm8pLT5ydW5KYXZhU2NyaXB0QWxlcnQocUFsZXJ0VGV4dCk7CiB9CiAKLWJvb2wgcXRfd2tfcnVu SmF2YVNjcmlwdENvbmZpcm0oV0tQYWdlUmVmLCBXS1N0cmluZ1JlZiBtZXNzYWdlLCBXS0ZyYW1l UmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorc3RhdGljIGJvb2wgcXRfd2tfcnVuSmF2YVNj cmlwdENvbmZpcm0oV0tQYWdlUmVmLCBXS1N0cmluZ1JlZiBtZXNzYWdlLCBXS0ZyYW1lUmVmLCBj b25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIFFTdHJpbmcgcU1lc3NhZ2UgPSBXS1N0cmlu Z0NvcHlRU3RyaW5nKG1lc3NhZ2UpOwogICAgIHJldHVybiB0b1F0Vmlld0ludGVyZmFjZShjbGll bnRJbmZvKS0+cnVuSmF2YVNjcmlwdENvbmZpcm0ocU1lc3NhZ2UpOwpAQCAtMTY3LDcgKzE2Nyw3 IEBAIHN0YXRpYyBpbmxpbmUgV0tTdHJpbmdSZWYgY3JlYXRlTnVsbFdLU3RyaW5nKCkKICAgICBy ZXR1cm4gdG9BUEkod2ViU3RyaW5nLnJlbGVhc2UoKS5sZWFrUmVmKCkpOwogfQogCi1XS1N0cmlu Z1JlZiBxdF93a19ydW5KYXZhU2NyaXB0UHJvbXB0KFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgbWVz c2FnZSwgV0tTdHJpbmdSZWYgZGVmYXVsdFZhbHVlLCBXS0ZyYW1lUmVmLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKQorc3RhdGljIFdLU3RyaW5nUmVmIHF0X3drX3J1bkphdmFTY3JpcHRQcm9tcHQo V0tQYWdlUmVmLCBXS1N0cmluZ1JlZiBtZXNzYWdlLCBXS1N0cmluZ1JlZiBkZWZhdWx0VmFsdWUs IFdLRnJhbWVSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgUVN0cmluZyBxTWVz c2FnZSA9IFdLU3RyaW5nQ29weVFTdHJpbmcobWVzc2FnZSk7CiAgICAgUVN0cmluZyBxRGVmYXVs dFZhbHVlID0gV0tTdHJpbmdDb3B5UVN0cmluZyhkZWZhdWx0VmFsdWUpOwpAQCAtMTc4LDEzICsx NzgsMTMgQEAgV0tTdHJpbmdSZWYgcXRfd2tfcnVuSmF2YVNjcmlwdFByb21wdChXS1BhZ2VSZWYs IFdLU3RyaW5nUmVmIG1lc3NhZ2UsIFdLU3RyaW5nUmUKICAgICByZXR1cm4gV0tTdHJpbmdDcmVh dGVXaXRoUVN0cmluZyhyZXN1bHQpOwogfQogCi12b2lkIHF0X3drX3NldFN0YXR1c1RleHQoV0tQ YWdlUmVmLCBXS1N0cmluZ1JlZiB0ZXh0LCBjb25zdCB2b2lkICpjbGllbnRJbmZvKQorc3RhdGlj IHZvaWQgcXRfd2tfc2V0U3RhdHVzVGV4dChXS1BhZ2VSZWYsIFdLU3RyaW5nUmVmIHRleHQsIGNv bnN0IHZvaWQgKmNsaWVudEluZm8pCiB7CiAgICAgUVN0cmluZyBxVGV4dCA9IFdLU3RyaW5nQ29w eVFTdHJpbmcodGV4dCk7CiAgICAgdG9RdFZpZXdJbnRlcmZhY2UoY2xpZW50SW5mbyktPmRpZENo YW5nZVN0YXR1c1RleHQocVRleHQpOwogfQogCi12b2lkIHF0X3drX3J1bk9wZW5QYW5lbChXS1Bh Z2VSZWYsIFdLRnJhbWVSZWYsIFdLT3BlblBhbmVsUGFyYW1ldGVyc1JlZiBwYXJhbWV0ZXJzLCBX S09wZW5QYW5lbFJlc3VsdExpc3RlbmVyUmVmIGxpc3RlbmVyLCBjb25zdCB2b2lkKiBjbGllbnRJ bmZvKQorc3RhdGljIHZvaWQgcXRfd2tfcnVuT3BlblBhbmVsKFdLUGFnZVJlZiwgV0tGcmFtZVJl ZiwgV0tPcGVuUGFuZWxQYXJhbWV0ZXJzUmVmIHBhcmFtZXRlcnMsIFdLT3BlblBhbmVsUmVzdWx0 TGlzdGVuZXJSZWYgbGlzdGVuZXIsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgVmVj dG9yPFN0cmluZz4gd2tTZWxlY3RlZEZpbGVOYW1lcyA9IHRvSW1wbChwYXJhbWV0ZXJzKS0+c2Vs ZWN0ZWRGaWxlTmFtZXMoKTsKIApAQCAtMTk3LDcgKzE5Nyw3IEBAIHZvaWQgcXRfd2tfcnVuT3Bl blBhbmVsKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tPcGVuUGFuZWxQYXJhbWV0ZXJzUmVmIHBh cmFtZXRlCiAgICAgdG9RdFZpZXdJbnRlcmZhY2UoY2xpZW50SW5mbyktPmNob29zZUZpbGVzKGxp c3RlbmVyLCBzZWxlY3RlZEZpbGVOYW1lcywgYWxsb3dNdWx0aXBsZUZpbGVzKTsKIH0KIAotdm9p ZCBxdF93a19tb3VzZURpZE1vdmVPdmVyRWxlbWVudChXS1BhZ2VSZWYgcGFnZSwgV0tIaXRUZXN0 UmVzdWx0UmVmIGhpdFRlc3RSZXN1bHQsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS1R5 cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBxdF93 a19tb3VzZURpZE1vdmVPdmVyRWxlbWVudChXS1BhZ2VSZWYgcGFnZSwgV0tIaXRUZXN0UmVzdWx0 UmVmIGhpdFRlc3RSZXN1bHQsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS1R5cGVSZWYg dXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgY29uc3QgUVVybCBhYnNv bHV0ZUxpbmtVcmwgPSBXS1VSTENvcHlRVXJsKFdLSGl0VGVzdFJlc3VsdENvcHlBYnNvbHV0ZUxp bmtVUkwoaGl0VGVzdFJlc3VsdCkpOwogICAgIGNvbnN0IFFTdHJpbmcgbGlua1RpdGxlID0gV0tT dHJpbmdDb3B5UVN0cmluZyhXS0hpdFRlc3RSZXN1bHRDb3B5TGlua1RpdGxlKGhpdFRlc3RSZXN1 bHQpKTsKQEAgLTIzMSw3ICsyMzEsNyBAQCBzdGF0aWMgUXQ6OktleWJvYXJkTW9kaWZpZXJzIHRv UXRLZXlib2FyZE1vZGlmaWVycyhXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycykKICAgICByZXR1 cm4gcXRNb2RpZmllcnM7CiB9CiAKLXZvaWQgcXRfd2tfZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlv bkFjdGlvbihXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tGcmFtZU5hdmlnYXRp b25UeXBlIG5hdmlnYXRpb25UeXBlLCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tFdmVu dE1vdXNlQnV0dG9uIG1vdXNlQnV0dG9uLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tGcmFt ZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0 aW9uQWN0aW9uKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS0ZyYW1lTmF2aWdh dGlvblR5cGUgbmF2aWdhdGlvblR5cGUsIFdLRXZlbnRNb2RpZmllcnMgbW9kaWZpZXJzLCBXS0V2 ZW50TW91c2VCdXR0b24gbW91c2VCdXR0b24sIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBXS0Zy YW1lUG9saWN5TGlzdGVuZXJSZWYgbGlzdGVuZXIsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qg dm9pZCogY2xpZW50SW5mbykKIHsKICAgICBRdFBvbGljeUludGVyZmFjZSogcG9saWN5SW50ZXJm YWNlID0gdG9RdFBvbGljeUludGVyZmFjZShjbGllbnRJbmZvKTsKICAgICBXS1VSTFJlZiByZXF1 ZXN0VVJMID0gV0tVUkxSZXF1ZXN0Q29weVVSTChyZXF1ZXN0KTsKQEAgLTI1Miw3ICsyNTIsNyBA QCB2b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oV0tQYWdlUmVmIHBh Z2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLRgogICAgIH0KIH0KIAotdm9pZCBxdF93a19kZWNpZGVQ b2xpY3lGb3JSZXNwb25zZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tVUkxS ZXNwb25zZVJlZiByZXNwb25zZSwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLRnJhbWVQb2xp Y3lMaXN0ZW5lclJlZiBsaXN0ZW5lciwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKQorc3RhdGljIHZvaWQgcXRfd2tfZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV0tQ YWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVVJMUmVzcG9uc2VSZWYgcmVzcG9uc2Us IFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBXS0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYgbGlzdGVu ZXIsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBT dHJpbmcgdHlwZSA9IHRvSW1wbChyZXNwb25zZSktPnJlc291cmNlUmVzcG9uc2UoKS5taW1lVHlw ZSgpOwogICAgIHR5cGUubWFrZUxvd2VyKCk7CkBAIC0yNzgsMyArMjc4LDQ4IEBAIHZvaWQgcXRf d2tfZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2UoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJh bWUsIFdLVVJMUmVzcG9uCiAKICAgICBXS0ZyYW1lUG9saWN5TGlzdGVuZXJVc2UobGlzdGVuZXIp OwogfQorCit2b2lkIHNldHVwUGFnZUxvYWRlckNsaWVudChRdFdlYlBhZ2VQcm94eSogcXRXZWJQ YWdlUHJveHksIFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5KQoreworICAgIFdLUGFnZUxvYWRl ckNsaWVudCBsb2FkQ2xpZW50OworICAgIG1lbXNldCgmbG9hZENsaWVudCwgMCwgc2l6ZW9mKFdL UGFnZUxvYWRlckNsaWVudCkpOworICAgIGxvYWRDbGllbnQudmVyc2lvbiA9IGtXS1BhZ2VMb2Fk ZXJDbGllbnRDdXJyZW50VmVyc2lvbjsKKyAgICBsb2FkQ2xpZW50LmNsaWVudEluZm8gPSBxdFdl YlBhZ2VQcm94eTsKKyAgICBsb2FkQ2xpZW50LmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJh bWUgPSBxdF93a19kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOworICAgIGxvYWRDbGll bnQuZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lID0gcXRfd2tfZGlkRmFp bFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lOworICAgIGxvYWRDbGllbnQuZGlkQ29t bWl0TG9hZEZvckZyYW1lID0gcXRfd2tfZGlkQ29tbWl0TG9hZEZvckZyYW1lOworICAgIGxvYWRD bGllbnQuZGlkRmluaXNoTG9hZEZvckZyYW1lID0gcXRfd2tfZGlkRmluaXNoTG9hZEZvckZyYW1l OworICAgIGxvYWRDbGllbnQuZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZSA9IHF0X3drX2Rp ZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7CisgICAgbG9hZENsaWVudC5kaWRTYW1lRG9jdW1l bnROYXZpZ2F0aW9uRm9yRnJhbWUgPSBxdF93a19kaWRTYW1lRG9jdW1lbnROYXZpZ2F0aW9uRm9y RnJhbWU7CisgICAgbG9hZENsaWVudC5kaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSA9IHF0X3drX2Rp ZFJlY2VpdmVUaXRsZUZvckZyYW1lOworICAgIGxvYWRDbGllbnQuZGlkU3RhcnRQcm9ncmVzcyA9 IHF0X3drX2RpZFN0YXJ0UHJvZ3Jlc3M7CisgICAgbG9hZENsaWVudC5kaWRDaGFuZ2VQcm9ncmVz cyA9IHF0X3drX2RpZENoYW5nZVByb2dyZXNzOworICAgIGxvYWRDbGllbnQuZGlkRmluaXNoUHJv Z3Jlc3MgPSBxdF93a19kaWRGaW5pc2hQcm9ncmVzczsKKyAgICBXS1BhZ2VTZXRQYWdlTG9hZGVy Q2xpZW50KHF0V2ViUGFnZVByb3h5LT5wYWdlUmVmKCksICZsb2FkQ2xpZW50KTsKK30KKwordm9p ZCBzZXR1cFBhZ2VVaUNsaWVudChRdFdlYlBhZ2VQcm94eSogcXRXZWJQYWdlUHJveHksIFdlYlBh Z2VQcm94eSogd2ViUGFnZVByb3h5KQoreworICAgIFdLUGFnZVVJQ2xpZW50IHVpQ2xpZW50Owor ICAgIG1lbXNldCgmdWlDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VVSUNsaWVudCkpOworICAgIHVp Q2xpZW50LnZlcnNpb24gPSBrV0tQYWdlVUlDbGllbnRDdXJyZW50VmVyc2lvbjsKKyAgICB1aUNs aWVudC5jbGllbnRJbmZvID0gcXRXZWJQYWdlUHJveHktPnZpZXdJbnRlcmZhY2UoKTsKKyAgICB1 aUNsaWVudC5ydW5KYXZhU2NyaXB0QWxlcnQgPSBxdF93a19ydW5KYXZhU2NyaXB0QWxlcnQ7Cisg ICAgdWlDbGllbnQucnVuSmF2YVNjcmlwdENvbmZpcm0gPSBxdF93a19ydW5KYXZhU2NyaXB0Q29u ZmlybTsKKyAgICB1aUNsaWVudC5ydW5KYXZhU2NyaXB0UHJvbXB0ID0gcXRfd2tfcnVuSmF2YVNj cmlwdFByb21wdDsKKyAgICB1aUNsaWVudC5zZXRTdGF0dXNUZXh0ID0gcXRfd2tfc2V0U3RhdHVz VGV4dDsKKyAgICB1aUNsaWVudC5ydW5PcGVuUGFuZWwgPSBxdF93a19ydW5PcGVuUGFuZWw7Cisg ICAgdWlDbGllbnQubW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQgPSBxdF93a19tb3VzZURpZE1vdmVP dmVyRWxlbWVudDsKKyAgICBXS1BhZ2VTZXRQYWdlVUlDbGllbnQodG9BUEkod2ViUGFnZVByb3h5 KSwgJnVpQ2xpZW50KTsKK30KKwordm9pZCBzZXR1cFBvbGljeUludGVyZmFjZUNsaWVudChRdFBv bGljeUludGVyZmFjZSogcG9saWN5SW50ZXJmYWNlLCBXZWJQYWdlUHJveHkqIHdlYlBhZ2VQcm94 eSkKK3sKKyAgICBXS1BhZ2VQb2xpY3lDbGllbnQgcG9saWN5Q2xpZW50OworICAgIG1lbXNldCgm cG9saWN5Q2xpZW50LCAwLCBzaXplb2YoV0tQYWdlUG9saWN5Q2xpZW50KSk7CisgICAgcG9saWN5 Q2xpZW50LnZlcnNpb24gPSBrV0tQYWdlUG9saWN5Q2xpZW50Q3VycmVudFZlcnNpb247CisgICAg cG9saWN5Q2xpZW50LmNsaWVudEluZm8gPSBwb2xpY3lJbnRlcmZhY2U7CisgICAgcG9saWN5Q2xp ZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gPSBxdF93a19kZWNpZGVQb2xpY3lG b3JOYXZpZ2F0aW9uQWN0aW9uOworICAgIHBvbGljeUNsaWVudC5kZWNpZGVQb2xpY3lGb3JSZXNw b25zZSA9IHF0X3drX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlOworICAgIFdLUGFnZVNldFBhZ2VQ b2xpY3lDbGllbnQodG9BUEkod2ViUGFnZVByb3h5KSwgJnBvbGljeUNsaWVudCk7Cit9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5oIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwuaAppbmRleCBiYjMyMDlmZmFkMTYxNTE0 NjA0MWIwZDlhNDliMjBmNzY0Njc2Nzk4Li5lZjdhMmVmMjcwZTY0OGQ0OTZkOGVjYTkzNzYwZTdj ZTA3MTE3MDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50 SW1wbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmgKQEAg LTIyLDM3ICsyMiwxNCBAQAogCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS1BhZ2UuaD4KIAotI2lmZGVm IF9fY3BsdXNwbHVzCi1leHRlcm4gIkMiIHsKLSNlbmRpZgotCi0vLyBsb2FkZXIgY2xpZW50Ci12 b2lkIHF0X3drX2RpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUoV0tQYWdlUmVmLCBXS0Zy YW1lUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdm9pZCBxdF93a19k aWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVycm9yRm9yRnJhbWUoV0tQYWdlUmVmLCBXS0ZyYW1l UmVmLCBXS0Vycm9yUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdm9p ZCBxdF93a19kaWRDb21taXRMb2FkRm9yRnJhbWUoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1R5 cGVSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdm9pZCBxdF93a19kaWRGaW5pc2hMb2Fk Rm9yRnJhbWUoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pOwotdm9pZCBxdF93a19kaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lKFdLUGFn ZVJlZiwgV0tGcmFtZVJlZiwgV0tFcnJvclJlZiwgV0tUeXBlUmVmLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKTsKLXZvaWQgcXRfd2tfZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUoV0tQYWdlUmVmLCBX S1N0cmluZ1JlZiB0aXRsZSwgV0tGcmFtZVJlZiwgV0tUeXBlUmVmLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKTsKLXZvaWQgcXRfd2tfZGlkU3RhcnRQcm9ncmVzcyhXS1BhZ2VSZWYsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pOwotdm9pZCBxdF93a19kaWRDaGFuZ2VQcm9ncmVzcyhXS1BhZ2VSZWYs IGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdm9pZCBxdF93a19kaWRGaW5pc2hQcm9ncmVzcyhX S1BhZ2VSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdm9pZCBxdF93a19kaWRTYW1lRG9j dW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUoV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS1NhbWVEb2N1 bWVudE5hdmlnYXRpb25UeXBlLCBXS1R5cGVSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwot Ci0vLyB1aSBjbGllbnQKLXZvaWQgcXRfd2tfcnVuSmF2YVNjcmlwdEFsZXJ0KFdLUGFnZVJlZiwg V0tTdHJpbmdSZWYgYWxlcnRUZXh0LCBXS0ZyYW1lUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZv KTsKLWJvb2wgcXRfd2tfcnVuSmF2YVNjcmlwdENvbmZpcm0oV0tQYWdlUmVmLCBXS1N0cmluZ1Jl ZiBtZXNzYWdlLCBXS0ZyYW1lUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLVdLU3RyaW5n UmVmIHF0X3drX3J1bkphdmFTY3JpcHRQcm9tcHQoV0tQYWdlUmVmLCBXS1N0cmluZ1JlZiBtZXNz YWdlLCBXS1N0cmluZ1JlZiBkZWZhdWx0VmFsdWUsIFdLRnJhbWVSZWYsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pOwotdm9pZCBxdF93a19zZXRTdGF0dXNUZXh0KFdLUGFnZVJlZiBwYWdlLCBXS1N0 cmluZ1JlZiB0ZXh0LCBjb25zdCB2b2lkICpjbGllbnRJbmZvKTsKLXZvaWQgcXRfd2tfcnVuT3Bl blBhbmVsKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tPcGVuUGFuZWxQYXJhbWV0ZXJzUmVmLCBX S09wZW5QYW5lbFJlc3VsdExpc3RlbmVyUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLXZv aWQgcXRfd2tfbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQoV0tQYWdlUmVmLCBXS0hpdFRlc3RSZXN1 bHRSZWYsIFdLRXZlbnRNb2RpZmllcnMsIFdLVHlwZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5m byk7Ci0KLS8vIFBvbGljeSBjbGllbnQuCi12b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvck5hdmln YXRpb25BY3Rpb24oV0tQYWdlUmVmLCBXS0ZyYW1lUmVmLCBXS0ZyYW1lTmF2aWdhdGlvblR5cGUs IFdLRXZlbnRNb2RpZmllcnMsIFdLRXZlbnRNb3VzZUJ1dHRvbiwgV0tVUkxSZXF1ZXN0UmVmLCBX S0ZyYW1lUG9saWN5TGlzdGVuZXJSZWYsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCog Y2xpZW50SW5mbyk7Ci12b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdLUGFnZVJl ZiwgV0tGcmFtZVJlZiwgV0tVUkxSZXNwb25zZVJlZiwgV0tVUkxSZXF1ZXN0UmVmLCBXS0ZyYW1l UG9saWN5TGlzdGVuZXJSZWYsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbyk7Ci0KLSNpZmRlZiBfX2NwbHVzcGx1cworY2xhc3MgUXRXZWJQYWdlUHJveHk7CituYW1l c3BhY2UgV2ViS2l0IHsKK2NsYXNzIFF0UG9saWN5SW50ZXJmYWNlOworY2xhc3MgV2ViUGFnZVBy b3h5OwogfQotI2VuZGlmCit2b2lkIHNldHVwUGFnZUxvYWRlckNsaWVudChRdFdlYlBhZ2VQcm94 eSosIFdlYktpdDo6V2ViUGFnZVByb3h5Kik7Cit2b2lkIHNldHVwUGFnZVVpQ2xpZW50KFF0V2Vi UGFnZVByb3h5KiwgV2ViS2l0OjpXZWJQYWdlUHJveHkqKTsKK3ZvaWQgc2V0dXBQb2xpY3lJbnRl cmZhY2VDbGllbnQoV2ViS2l0OjpRdFBvbGljeUludGVyZmFjZSosIFdlYktpdDo6V2ViUGFnZVBy b3h5Kik7CiAKICNlbmRpZiAvKiBEZWZhdWx0Q2xpZW50Q2FsbGJhY2tzUXRfaCAqLwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmNwcAppbmRleCBiNGIw NzcxNjU3NzQ3MDU3OTk5YjE5NGE4NWM0NDAyMDJhZDk1MGYyLi45M2I2MjJlODBlZDNiMDJlNThm NmMzNDJjYTNkYjIwNWYyZmFmYTg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFdlYlBhZ2VQcm94eS5jcHAKQEAgLTExOSw0MyArMTE5LDExIEBAIHZvaWQgUXRXZWJQYWdl UHJveHk6OmluaXQoKQogewogICAgIG1fd2ViUGFnZVByb3h5LT5pbml0aWFsaXplV2ViUGFnZSgp OwogCi0gICAgV0tQYWdlTG9hZGVyQ2xpZW50IGxvYWRDbGllbnQ7Ci0gICAgbWVtc2V0KCZsb2Fk Q2xpZW50LCAwLCBzaXplb2YoV0tQYWdlTG9hZGVyQ2xpZW50KSk7Ci0gICAgbG9hZENsaWVudC52 ZXJzaW9uID0ga1dLUGFnZUxvYWRlckNsaWVudEN1cnJlbnRWZXJzaW9uOwotICAgIGxvYWRDbGll bnQuY2xpZW50SW5mbyA9IHRoaXM7Ci0gICAgbG9hZENsaWVudC5kaWRTdGFydFByb3Zpc2lvbmFs TG9hZEZvckZyYW1lID0gcXRfd2tfZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTsKLSAg ICBsb2FkQ2xpZW50LmRpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZSA9IHF0 X3drX2RpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKLSAgICBsb2FkQ2xp ZW50LmRpZENvbW1pdExvYWRGb3JGcmFtZSA9IHF0X3drX2RpZENvbW1pdExvYWRGb3JGcmFtZTsK LSAgICBsb2FkQ2xpZW50LmRpZEZpbmlzaExvYWRGb3JGcmFtZSA9IHF0X3drX2RpZEZpbmlzaExv YWRGb3JGcmFtZTsKLSAgICBsb2FkQ2xpZW50LmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUg PSBxdF93a19kaWRGYWlsTG9hZFdpdGhFcnJvckZvckZyYW1lOwotICAgIGxvYWRDbGllbnQuZGlk U2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lID0gcXRfd2tfZGlkU2FtZURvY3VtZW50TmF2 aWdhdGlvbkZvckZyYW1lOwotICAgIGxvYWRDbGllbnQuZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUg PSBxdF93a19kaWRSZWNlaXZlVGl0bGVGb3JGcmFtZTsKLSAgICBsb2FkQ2xpZW50LmRpZFN0YXJ0 UHJvZ3Jlc3MgPSBxdF93a19kaWRTdGFydFByb2dyZXNzOwotICAgIGxvYWRDbGllbnQuZGlkQ2hh bmdlUHJvZ3Jlc3MgPSBxdF93a19kaWRDaGFuZ2VQcm9ncmVzczsKLSAgICBsb2FkQ2xpZW50LmRp ZEZpbmlzaFByb2dyZXNzID0gcXRfd2tfZGlkRmluaXNoUHJvZ3Jlc3M7Ci0gICAgV0tQYWdlU2V0 UGFnZUxvYWRlckNsaWVudChwYWdlUmVmKCksICZsb2FkQ2xpZW50KTsKLQotICAgIFdLUGFnZVVJ Q2xpZW50IHVpQ2xpZW50OwotICAgIG1lbXNldCgmdWlDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VV SUNsaWVudCkpOwotICAgIHVpQ2xpZW50LnZlcnNpb24gPSBrV0tQYWdlVUlDbGllbnRDdXJyZW50 VmVyc2lvbjsKLSAgICB1aUNsaWVudC5jbGllbnRJbmZvID0gbV92aWV3SW50ZXJmYWNlOwotICAg IHVpQ2xpZW50LnJ1bkphdmFTY3JpcHRBbGVydCA9IHF0X3drX3J1bkphdmFTY3JpcHRBbGVydDsK LSAgICB1aUNsaWVudC5ydW5KYXZhU2NyaXB0Q29uZmlybSA9IHF0X3drX3J1bkphdmFTY3JpcHRD b25maXJtOwotICAgIHVpQ2xpZW50LnJ1bkphdmFTY3JpcHRQcm9tcHQgPSBxdF93a19ydW5KYXZh U2NyaXB0UHJvbXB0OwotICAgIHVpQ2xpZW50LnNldFN0YXR1c1RleHQgPSBxdF93a19zZXRTdGF0 dXNUZXh0OwotICAgIHVpQ2xpZW50LnJ1bk9wZW5QYW5lbCA9IHF0X3drX3J1bk9wZW5QYW5lbDsK LSAgICB1aUNsaWVudC5tb3VzZURpZE1vdmVPdmVyRWxlbWVudCA9IHF0X3drX21vdXNlRGlkTW92 ZU92ZXJFbGVtZW50OwotICAgIFdLUGFnZVNldFBhZ2VVSUNsaWVudCh0b0FQSShtX3dlYlBhZ2VQ cm94eS5nZXQoKSksICZ1aUNsaWVudCk7Ci0KLSAgICBpZiAobV9wb2xpY3lJbnRlcmZhY2UpIHsK LSAgICAgICAgV0tQYWdlUG9saWN5Q2xpZW50IHBvbGljeUNsaWVudDsKLSAgICAgICAgbWVtc2V0 KCZwb2xpY3lDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VQb2xpY3lDbGllbnQpKTsKLSAgICAgICAg cG9saWN5Q2xpZW50LnZlcnNpb24gPSBrV0tQYWdlUG9saWN5Q2xpZW50Q3VycmVudFZlcnNpb247 Ci0gICAgICAgIHBvbGljeUNsaWVudC5jbGllbnRJbmZvID0gbV9wb2xpY3lJbnRlcmZhY2U7Ci0g ICAgICAgIHBvbGljeUNsaWVudC5kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uID0gcXRf d2tfZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbjsKLSAgICAgICAgcG9saWN5Q2xpZW50 LmRlY2lkZVBvbGljeUZvclJlc3BvbnNlID0gcXRfd2tfZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2U7 Ci0gICAgICAgIFdLUGFnZVNldFBhZ2VQb2xpY3lDbGllbnQodG9BUEkobV93ZWJQYWdlUHJveHku Z2V0KCkpLCAmcG9saWN5Q2xpZW50KTsKLSAgICB9CisgICAgc2V0dXBQYWdlTG9hZGVyQ2xpZW50 KHRoaXMsIG1fd2ViUGFnZVByb3h5LmdldCgpKTsKKyAgICBzZXR1cFBhZ2VVaUNsaWVudCh0aGlz LCBtX3dlYlBhZ2VQcm94eS5nZXQoKSk7CisKKyAgICBpZiAobV9wb2xpY3lJbnRlcmZhY2UpCisg ICAgICAgIHNldHVwUG9saWN5SW50ZXJmYWNlQ2xpZW50KG1fcG9saWN5SW50ZXJmYWNlLCBtX3dl YlBhZ2VQcm94eS5nZXQoKSk7CiB9CiAKIFF0V2ViUGFnZVByb3h5Ojp+UXRXZWJQYWdlUHJveHko KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAppbmRleCAx MmIwYTk1NWNkZGZkZmUwZTFmZmQ4NTc2NmQ1YjM1NWIyYzI1YjVlLi5lNjBkMDcxNTBjZjE1ZTk4 MmZkMWI5OTE0ODVhZDBjN2UxZmYxNWU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv cXQvUXRXZWJQYWdlUHJveHkuaApAQCAtMTcwLDYgKzE3MCw3IEBAIHB1YmxpYzoKICAgICB2b2lk IHNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMocXJlYWwgcGFnZVpvb21GYWN0b3IsIHFyZWFsIHRl eHRab29tRmFjdG9yKTsKIAogICAgIFFXS0hpc3RvcnkqIGhpc3RvcnkoKSBjb25zdDsKKyAgICBX ZWJLaXQ6OlF0Vmlld0ludGVyZmFjZSogdmlld0ludGVyZmFjZSgpIGNvbnN0IHsgcmV0dXJuIG1f dmlld0ludGVyZmFjZTsgfQogCiBwdWJsaWMgUV9TTE9UUzoKICAgICB2b2lkIG5hdmlnYXRpb25T dGF0ZUNoYW5nZWQoKTsK 112591 2011-10-26 13:57:45 -0700 2011-10-27 07:37:15 -0700 Patch bug-70965-20111026145556.patch text/plain 19093 menard U3VidmVyc2lvbiBSZXZpc2lvbjogOTg0OTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBlNWY3MDQxNDVjOTZkYzA5 MTgzZGEzOGQ0ZWNiOTIwNTUyMjQwZDcyLi5jYTYzM2RjMWEwMjJkMWRkMDJhODdiMzc1Nzg5NGNi ZDI2MGZjNTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDEgQEAKKzIwMTEtMTAtMjYgIEFsZXhp cyBNZW5hcmQgIDxhbGV4aXMubWVuYXJkQG9wZW5ib3NzYS5vcmc+CisKKyAgICAgICAgW1F0XVtX SzJdIE1vdmUgdGhlIEMgQVBJIGNhbGxiYWNrIHNldHVwIG91dCBvZiBRdFdlYlBhZ2VQcm94eQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzA5NjUKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBNb3ZlIG91dCB0 aGUgc2V0dXAgb2YgQyBBUEkgY2FsbGJhY2sgaW50byBDbGllbnRJbXBsIGZpbGUKKyAgICAgICAg c28gdGhhdCBRdFdlYlBhZ2VQcm94eSB3aWxsIGJlIGxlc3MgcG9sbHV0ZWQuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5jcHA6CisgICAgICAgIChxdF93a19kaWRTdGFydFBy b3Zpc2lvbmFsTG9hZEZvckZyYW1lKToKKyAgICAgICAgKHF0X3drX2RpZEZhaWxQcm92aXNpb25h bExvYWRXaXRoRXJyb3JGb3JGcmFtZSk6CisgICAgICAgIChxdF93a19kaWRDb21taXRMb2FkRm9y RnJhbWUpOgorICAgICAgICAocXRfd2tfZGlkRmluaXNoTG9hZEZvckZyYW1lKToKKyAgICAgICAg KHF0X3drX2RpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUpOgorICAgICAgICAocXRfd2tfZGlk U2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKToKKyAgICAgICAgKHF0X3drX2RpZFJlY2Vp dmVUaXRsZUZvckZyYW1lKToKKyAgICAgICAgKHF0X3drX2RpZFN0YXJ0UHJvZ3Jlc3MpOgorICAg ICAgICAocXRfd2tfZGlkQ2hhbmdlUHJvZ3Jlc3MpOgorICAgICAgICAocXRfd2tfZGlkRmluaXNo UHJvZ3Jlc3MpOgorICAgICAgICAocXRfd2tfcnVuSmF2YVNjcmlwdEFsZXJ0KToKKyAgICAgICAg KHF0X3drX3J1bkphdmFTY3JpcHRDb25maXJtKToKKyAgICAgICAgKHF0X3drX3J1bkphdmFTY3Jp cHRQcm9tcHQpOgorICAgICAgICAocXRfd2tfc2V0U3RhdHVzVGV4dCk6CisgICAgICAgIChxdF93 a19ydW5PcGVuUGFuZWwpOgorICAgICAgICAocXRfd2tfbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQp OgorICAgICAgICAocXRfd2tfZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbik6CisgICAg ICAgIChxdF93a19kZWNpZGVQb2xpY3lGb3JSZXNwb25zZSk6CisgICAgICAgIChzZXR1cFBhZ2VM b2FkZXJDbGllbnQpOgorICAgICAgICAoc2V0dXBQYWdlVWlDbGllbnQpOgorICAgICAgICAoc2V0 dXBQYWdlUG9saWN5Q2xpZW50KToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5o OgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChR dFdlYlBhZ2VQcm94eTo6aW5pdCk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVBy b3h5Lmg6CisgICAgICAgIChRdFdlYlBhZ2VQcm94eTo6dmlld0ludGVyZmFjZSk6CisKIDIwMTEt MTAtMjYgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtHVEtdIEFkZCBtaXNzaW5nIHN5bWJvbHMgdG8gV2ViS2l0MiBndGstZG9jIGZpbGVzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5jcHAKaW5kZXggOWEzYTk5OWZi MmI0NjlmMjlhODFlZmZkNDQ2ZDU3M2YyNzQ3MDllZC4uZWFlNWYyMTgzNmI0ZGNiYWVlMWE2NGY2 OTRmYzc5Y2QwMDg5OWU2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L0NsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJ bXBsLmNwcApAQCAtODEsNyArODEsNyBAQCBzdGF0aWMgdm9pZCBkaXNwYXRjaExvYWRGYWlsZWQo V0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbywgV0tFcnJvcgogICAgIHRv UXRXZWJQYWdlUHJveHkoY2xpZW50SW5mbyktPmxvYWREaWRGYWlsKFF0V2ViRXJyb3IoZXJyb3Ip KTsKIH0KIAotdm9pZCBxdF93a19kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdLUGFn ZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBxdF93a19kaWRTdGFydFByb3Zpc2lvbmFsTG9h ZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5cGVSZWYgdXNl ckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgaWYgKCFXS0ZyYW1lSXNNYWlu RnJhbWUoZnJhbWUpKQogICAgICAgICByZXR1cm47CkBAIC05MCwxMiArOTAsMTIgQEAgdm9pZCBx dF93a19kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0Zy YW1lUmVmIGZyYW1lLCBXS1QKICAgICB0b1F0V2ViUGFnZVByb3h5KGNsaWVudEluZm8pLT5sb2Fk RGlkQmVnaW4oKTsKIH0KIAotdm9pZCBxdF93a19kaWRGYWlsUHJvdmlzaW9uYWxMb2FkV2l0aEVy cm9yRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLRXJyb3JSZWYg ZXJyb3IsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRp YyB2b2lkIHF0X3drX2RpZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZShXS1Bh Z2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tFcnJvclJlZiBlcnJvciwgV0tUeXBlUmVm IHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIGRpc3BhdGNoTG9hZEZh aWxlZChmcmFtZSwgY2xpZW50SW5mbywgZXJyb3IpOwogfQogCi12b2lkIHF0X3drX2RpZENvbW1p dExvYWRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVm IHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorc3RhdGljIHZvaWQgcXRfd2tfZGlk Q29tbWl0TG9hZEZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1R5 cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgaWYgKCFXS0Zy YW1lSXNNYWluRnJhbWUoZnJhbWUpKQogICAgICAgICByZXR1cm47CkBAIC0xMDcsMTcgKzEwNywx NyBAQCB2b2lkIHF0X3drX2RpZENvbW1pdExvYWRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tG cmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmIHVzZQogICAgIHRvUXRXZWJQYWdlUHJveHkoY2xpZW50 SW5mbyktPmxvYWREaWRDb21taXQoKTsKIH0KIAotdm9pZCBxdF93a19kaWRGaW5pc2hMb2FkRm9y RnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVHlwZVJlZiB1c2VyRGF0 YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIHF0X3drX2RpZEZpbmlzaExv YWRGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmIHVz ZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIGRpc3BhdGNoTG9hZFN1Y2Nl ZWRlZChmcmFtZSwgY2xpZW50SW5mbyk7CiB9CiAKLXZvaWQgcXRfd2tfZGlkRmFpbExvYWRXaXRo RXJyb3JGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tFcnJvclJl ZiBlcnJvciwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorc3Rh dGljIHZvaWQgcXRfd2tfZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZShXS1BhZ2VSZWYgcGFn ZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tFcnJvclJlZiBlcnJvciwgV0tUeXBlUmVmIHVzZXJEYXRh LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIGRpc3BhdGNoTG9hZEZhaWxlZChmcmFt ZSwgY2xpZW50SW5mbywgZXJyb3IpOwogfQogCi12b2lkIHF0X3drX2RpZFNhbWVEb2N1bWVudE5h dmlnYXRpb25Gb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tTYW1l RG9jdW1lbnROYXZpZ2F0aW9uVHlwZSB0eXBlLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZv aWQqIGNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBxdF93a19kaWRTYW1lRG9jdW1lbnROYXZpZ2F0 aW9uRm9yRnJhbWUoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLU2FtZURvY3Vt ZW50TmF2aWdhdGlvblR5cGUgdHlwZSwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKQogewogICAgIFdlYkZyYW1lUHJveHkqIHdrZnJhbWUgPSB0b0ltcGwoZnJhbWUp OwogICAgIFFTdHJpbmcgdXJsU3RyKHdrZnJhbWUtPnVybCgpKTsKQEAgLTEyNiw3ICsxMjYsNyBA QCB2b2lkIHF0X3drX2RpZFNhbWVEb2N1bWVudE5hdmlnYXRpb25Gb3JGcmFtZShXS1BhZ2VSZWYg cGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgVwogICAgIHRvUXRXZWJQYWdlUHJveHkoY2xpZW50SW5m byktPmRpZENoYW5nZVVybChxVXJsKTsKIH0KIAotdm9pZCBxdF93a19kaWRSZWNlaXZlVGl0bGVG b3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgdGl0bGUsIFdLRnJhbWVSZWYgZnJh bWUsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyB2 b2lkIHF0X3drX2RpZFJlY2VpdmVUaXRsZUZvckZyYW1lKFdLUGFnZVJlZiBwYWdlLCBXS1N0cmlu Z1JlZiB0aXRsZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2 b2lkKiBjbGllbnRJbmZvKQogewogICAgIGlmICghV0tGcmFtZUlzTWFpbkZyYW1lKGZyYW1lKSkK ICAgICAgICAgcmV0dXJuOwpAQCAtMTM0LDI4ICsxMzQsMjggQEAgdm9pZCBxdF93a19kaWRSZWNl aXZlVGl0bGVGb3JGcmFtZShXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgdGl0bGUsIFdLRnJh bWVSZWYKICAgICB0b1F0V2ViUGFnZVByb3h5KGNsaWVudEluZm8pLT5kaWRDaGFuZ2VUaXRsZShx VGl0bGUpOwogfQogCi12b2lkIHF0X3drX2RpZFN0YXJ0UHJvZ3Jlc3MoV0tQYWdlUmVmIHBhZ2Us IGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBxdF93a19kaWRTdGFydFByb2dy ZXNzKFdLUGFnZVJlZiBwYWdlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIHRvUXRX ZWJQYWdlUHJveHkoY2xpZW50SW5mbyktPmRpZENoYW5nZUxvYWRQcm9ncmVzcygwKTsKIH0KIAot dm9pZCBxdF93a19kaWRDaGFuZ2VQcm9ncmVzcyhXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCog Y2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIHF0X3drX2RpZENoYW5nZVByb2dyZXNzKFdLUGFnZVJl ZiBwYWdlLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIHRvUXRXZWJQYWdlUHJveHko Y2xpZW50SW5mbyktPmRpZENoYW5nZUxvYWRQcm9ncmVzcyhXS1BhZ2VHZXRFc3RpbWF0ZWRQcm9n cmVzcyhwYWdlKSAqIDEwMCk7CiB9CiAKLXZvaWQgcXRfd2tfZGlkRmluaXNoUHJvZ3Jlc3MoV0tQ YWdlUmVmIHBhZ2UsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCitzdGF0aWMgdm9pZCBxdF93a19k aWRGaW5pc2hQcm9ncmVzcyhXS1BhZ2VSZWYgcGFnZSwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykK IHsKICAgICB0b1F0V2ViUGFnZVByb3h5KGNsaWVudEluZm8pLT5kaWRDaGFuZ2VMb2FkUHJvZ3Jl c3MoMTAwKTsKIH0KIAotdm9pZCBxdF93a19ydW5KYXZhU2NyaXB0QWxlcnQoV0tQYWdlUmVmIHBh Z2UsIFdLU3RyaW5nUmVmIGFsZXJ0VGV4dCwgV0tGcmFtZVJlZiBmcmFtZSwgY29uc3Qgdm9pZCog Y2xpZW50SW5mbykKK3N0YXRpYyB2b2lkIHF0X3drX3J1bkphdmFTY3JpcHRBbGVydChXS1BhZ2VS ZWYgcGFnZSwgV0tTdHJpbmdSZWYgYWxlcnRUZXh0LCBXS0ZyYW1lUmVmIGZyYW1lLCBjb25zdCB2 b2lkKiBjbGllbnRJbmZvKQogewogICAgIFFTdHJpbmcgcUFsZXJ0VGV4dCA9IFdLU3RyaW5nQ29w eVFTdHJpbmcoYWxlcnRUZXh0KTsKICAgICB0b1F0Vmlld0ludGVyZmFjZShjbGllbnRJbmZvKS0+ cnVuSmF2YVNjcmlwdEFsZXJ0KHFBbGVydFRleHQpOwogfQogCi1ib29sIHF0X3drX3J1bkphdmFT Y3JpcHRDb25maXJtKFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tGcmFtZVJlZiwg Y29uc3Qgdm9pZCogY2xpZW50SW5mbykKK3N0YXRpYyBib29sIHF0X3drX3J1bkphdmFTY3JpcHRD b25maXJtKFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tGcmFtZVJlZiwgY29uc3Qg dm9pZCogY2xpZW50SW5mbykKIHsKICAgICBRU3RyaW5nIHFNZXNzYWdlID0gV0tTdHJpbmdDb3B5 UVN0cmluZyhtZXNzYWdlKTsKICAgICByZXR1cm4gdG9RdFZpZXdJbnRlcmZhY2UoY2xpZW50SW5m byktPnJ1bkphdmFTY3JpcHRDb25maXJtKHFNZXNzYWdlKTsKQEAgLTE2Nyw3ICsxNjcsNyBAQCBz dGF0aWMgaW5saW5lIFdLU3RyaW5nUmVmIGNyZWF0ZU51bGxXS1N0cmluZygpCiAgICAgcmV0dXJu IHRvQVBJKHdlYlN0cmluZy5yZWxlYXNlKCkubGVha1JlZigpKTsKIH0KIAotV0tTdHJpbmdSZWYg cXRfd2tfcnVuSmF2YVNjcmlwdFByb21wdChXS1BhZ2VSZWYsIFdLU3RyaW5nUmVmIG1lc3NhZ2Us IFdLU3RyaW5nUmVmIGRlZmF1bHRWYWx1ZSwgV0tGcmFtZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKK3N0YXRpYyBXS1N0cmluZ1JlZiBxdF93a19ydW5KYXZhU2NyaXB0UHJvbXB0KFdLUGFn ZVJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tTdHJpbmdSZWYgZGVmYXVsdFZhbHVlLCBXS0Zy YW1lUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIFFTdHJpbmcgcU1lc3NhZ2Ug PSBXS1N0cmluZ0NvcHlRU3RyaW5nKG1lc3NhZ2UpOwogICAgIFFTdHJpbmcgcURlZmF1bHRWYWx1 ZSA9IFdLU3RyaW5nQ29weVFTdHJpbmcoZGVmYXVsdFZhbHVlKTsKQEAgLTE3OCwxMyArMTc4LDEz IEBAIFdLU3RyaW5nUmVmIHF0X3drX3J1bkphdmFTY3JpcHRQcm9tcHQoV0tQYWdlUmVmLCBXS1N0 cmluZ1JlZiBtZXNzYWdlLCBXS1N0cmluZ1JlCiAgICAgcmV0dXJuIFdLU3RyaW5nQ3JlYXRlV2l0 aFFTdHJpbmcocmVzdWx0KTsKIH0KIAotdm9pZCBxdF93a19zZXRTdGF0dXNUZXh0KFdLUGFnZVJl ZiwgV0tTdHJpbmdSZWYgdGV4dCwgY29uc3Qgdm9pZCAqY2xpZW50SW5mbykKK3N0YXRpYyB2b2lk IHF0X3drX3NldFN0YXR1c1RleHQoV0tQYWdlUmVmLCBXS1N0cmluZ1JlZiB0ZXh0LCBjb25zdCB2 b2lkICpjbGllbnRJbmZvKQogewogICAgIFFTdHJpbmcgcVRleHQgPSBXS1N0cmluZ0NvcHlRU3Ry aW5nKHRleHQpOwogICAgIHRvUXRWaWV3SW50ZXJmYWNlKGNsaWVudEluZm8pLT5kaWRDaGFuZ2VT dGF0dXNUZXh0KHFUZXh0KTsKIH0KIAotdm9pZCBxdF93a19ydW5PcGVuUGFuZWwoV0tQYWdlUmVm LCBXS0ZyYW1lUmVmLCBXS09wZW5QYW5lbFBhcmFtZXRlcnNSZWYgcGFyYW1ldGVycywgV0tPcGVu UGFuZWxSZXN1bHRMaXN0ZW5lclJlZiBsaXN0ZW5lciwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykK K3N0YXRpYyB2b2lkIHF0X3drX3J1bk9wZW5QYW5lbChXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdL T3BlblBhbmVsUGFyYW1ldGVyc1JlZiBwYXJhbWV0ZXJzLCBXS09wZW5QYW5lbFJlc3VsdExpc3Rl bmVyUmVmIGxpc3RlbmVyLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIFZlY3RvcjxT dHJpbmc+IHdrU2VsZWN0ZWRGaWxlTmFtZXMgPSB0b0ltcGwocGFyYW1ldGVycyktPnNlbGVjdGVk RmlsZU5hbWVzKCk7CiAKQEAgLTE5Nyw3ICsxOTcsNyBAQCB2b2lkIHF0X3drX3J1bk9wZW5QYW5l bChXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLT3BlblBhbmVsUGFyYW1ldGVyc1JlZiBwYXJhbWV0 ZQogICAgIHRvUXRWaWV3SW50ZXJmYWNlKGNsaWVudEluZm8pLT5jaG9vc2VGaWxlcyhsaXN0ZW5l ciwgc2VsZWN0ZWRGaWxlTmFtZXMsIGFsbG93TXVsdGlwbGVGaWxlcyk7CiB9CiAKLXZvaWQgcXRf d2tfbW91c2VEaWRNb3ZlT3ZlckVsZW1lbnQoV0tQYWdlUmVmIHBhZ2UsIFdLSGl0VGVzdFJlc3Vs dFJlZiBoaXRUZXN0UmVzdWx0LCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tUeXBlUmVm IHVzZXJEYXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQorc3RhdGljIHZvaWQgcXRfd2tfbW91 c2VEaWRNb3ZlT3ZlckVsZW1lbnQoV0tQYWdlUmVmIHBhZ2UsIFdLSGl0VGVzdFJlc3VsdFJlZiBo aXRUZXN0UmVzdWx0LCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tUeXBlUmVmIHVzZXJE YXRhLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKQogewogICAgIGNvbnN0IFFVcmwgYWJzb2x1dGVM aW5rVXJsID0gV0tVUkxDb3B5UVVybChXS0hpdFRlc3RSZXN1bHRDb3B5QWJzb2x1dGVMaW5rVVJM KGhpdFRlc3RSZXN1bHQpKTsKICAgICBjb25zdCBRU3RyaW5nIGxpbmtUaXRsZSA9IFdLU3RyaW5n Q29weVFTdHJpbmcoV0tIaXRUZXN0UmVzdWx0Q29weUxpbmtUaXRsZShoaXRUZXN0UmVzdWx0KSk7 CkBAIC0yMzEsNyArMjMxLDcgQEAgc3RhdGljIFF0OjpLZXlib2FyZE1vZGlmaWVycyB0b1F0S2V5 Ym9hcmRNb2RpZmllcnMoV0tFdmVudE1vZGlmaWVycyBtb2RpZmllcnMpCiAgICAgcmV0dXJuIHF0 TW9kaWZpZXJzOwogfQogCi12b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rp b24oV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLRnJhbWVOYXZpZ2F0aW9uVHlw ZSBuYXZpZ2F0aW9uVHlwZSwgV0tFdmVudE1vZGlmaWVycyBtb2RpZmllcnMsIFdLRXZlbnRNb3Vz ZUJ1dHRvbiBtb3VzZUJ1dHRvbiwgV0tVUkxSZXF1ZXN0UmVmIHJlcXVlc3QsIFdLRnJhbWVQb2xp Y3lMaXN0ZW5lclJlZiBsaXN0ZW5lciwgV0tUeXBlUmVmIHVzZXJEYXRhLCBjb25zdCB2b2lkKiBj bGllbnRJbmZvKQorc3RhdGljIHZvaWQgcXRfd2tfZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFj dGlvbihXS1BhZ2VSZWYgcGFnZSwgV0tGcmFtZVJlZiBmcmFtZSwgV0tGcmFtZU5hdmlnYXRpb25U eXBlIG5hdmlnYXRpb25UeXBlLCBXS0V2ZW50TW9kaWZpZXJzIG1vZGlmaWVycywgV0tFdmVudE1v dXNlQnV0dG9uIG1vdXNlQnV0dG9uLCBXS1VSTFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tGcmFtZVBv bGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBXS1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQq IGNsaWVudEluZm8pCiB7CiAgICAgUXRQb2xpY3lJbnRlcmZhY2UqIHBvbGljeUludGVyZmFjZSA9 IHRvUXRQb2xpY3lJbnRlcmZhY2UoY2xpZW50SW5mbyk7CiAgICAgV0tVUkxSZWYgcmVxdWVzdFVS TCA9IFdLVVJMUmVxdWVzdENvcHlVUkwocmVxdWVzdCk7CkBAIC0yNTIsNyArMjUyLDcgQEAgdm9p ZCBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdLUGFnZVJlZiBwYWdlLCBX S0ZyYW1lUmVmIGZyYW1lLCBXS0YKICAgICB9CiB9CiAKLXZvaWQgcXRfd2tfZGVjaWRlUG9saWN5 Rm9yUmVzcG9uc2UoV0tQYWdlUmVmIHBhZ2UsIFdLRnJhbWVSZWYgZnJhbWUsIFdLVVJMUmVzcG9u c2VSZWYgcmVzcG9uc2UsIFdLVVJMUmVxdWVzdFJlZiByZXF1ZXN0LCBXS0ZyYW1lUG9saWN5TGlz dGVuZXJSZWYgbGlzdGVuZXIsIFdLVHlwZVJlZiB1c2VyRGF0YSwgY29uc3Qgdm9pZCogY2xpZW50 SW5mbykKK3N0YXRpYyB2b2lkIHF0X3drX2RlY2lkZVBvbGljeUZvclJlc3BvbnNlKFdLUGFnZVJl ZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBXS1VSTFJlc3BvbnNlUmVmIHJlc3BvbnNlLCBXS1VS TFJlcXVlc3RSZWYgcmVxdWVzdCwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmIGxpc3RlbmVyLCBX S1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pCiB7CiAgICAgU3RyaW5n IHR5cGUgPSB0b0ltcGwocmVzcG9uc2UpLT5yZXNvdXJjZVJlc3BvbnNlKCkubWltZVR5cGUoKTsK ICAgICB0eXBlLm1ha2VMb3dlcigpOwpAQCAtMjc4LDMgKzI3OCw0OCBAQCB2b2lkIHF0X3drX2Rl Y2lkZVBvbGljeUZvclJlc3BvbnNlKFdLUGFnZVJlZiBwYWdlLCBXS0ZyYW1lUmVmIGZyYW1lLCBX S1VSTFJlc3BvbgogCiAgICAgV0tGcmFtZVBvbGljeUxpc3RlbmVyVXNlKGxpc3RlbmVyKTsKIH0K Kwordm9pZCBzZXR1cFBhZ2VMb2FkZXJDbGllbnQoUXRXZWJQYWdlUHJveHkqIHF0V2ViUGFnZVBy b3h5LCBXZWJQYWdlUHJveHkqIHdlYlBhZ2VQcm94eSkKK3sKKyAgICBXS1BhZ2VMb2FkZXJDbGll bnQgbG9hZENsaWVudDsKKyAgICBtZW1zZXQoJmxvYWRDbGllbnQsIDAsIHNpemVvZihXS1BhZ2VM b2FkZXJDbGllbnQpKTsKKyAgICBsb2FkQ2xpZW50LnZlcnNpb24gPSBrV0tQYWdlTG9hZGVyQ2xp ZW50Q3VycmVudFZlcnNpb247CisgICAgbG9hZENsaWVudC5jbGllbnRJbmZvID0gcXRXZWJQYWdl UHJveHk7CisgICAgbG9hZENsaWVudC5kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lID0g cXRfd2tfZGlkU3RhcnRQcm92aXNpb25hbExvYWRGb3JGcmFtZTsKKyAgICBsb2FkQ2xpZW50LmRp ZEZhaWxQcm92aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZSA9IHF0X3drX2RpZEZhaWxQcm92 aXNpb25hbExvYWRXaXRoRXJyb3JGb3JGcmFtZTsKKyAgICBsb2FkQ2xpZW50LmRpZENvbW1pdExv YWRGb3JGcmFtZSA9IHF0X3drX2RpZENvbW1pdExvYWRGb3JGcmFtZTsKKyAgICBsb2FkQ2xpZW50 LmRpZEZpbmlzaExvYWRGb3JGcmFtZSA9IHF0X3drX2RpZEZpbmlzaExvYWRGb3JGcmFtZTsKKyAg ICBsb2FkQ2xpZW50LmRpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWUgPSBxdF93a19kaWRGYWls TG9hZFdpdGhFcnJvckZvckZyYW1lOworICAgIGxvYWRDbGllbnQuZGlkU2FtZURvY3VtZW50TmF2 aWdhdGlvbkZvckZyYW1lID0gcXRfd2tfZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1l OworICAgIGxvYWRDbGllbnQuZGlkUmVjZWl2ZVRpdGxlRm9yRnJhbWUgPSBxdF93a19kaWRSZWNl aXZlVGl0bGVGb3JGcmFtZTsKKyAgICBsb2FkQ2xpZW50LmRpZFN0YXJ0UHJvZ3Jlc3MgPSBxdF93 a19kaWRTdGFydFByb2dyZXNzOworICAgIGxvYWRDbGllbnQuZGlkQ2hhbmdlUHJvZ3Jlc3MgPSBx dF93a19kaWRDaGFuZ2VQcm9ncmVzczsKKyAgICBsb2FkQ2xpZW50LmRpZEZpbmlzaFByb2dyZXNz ID0gcXRfd2tfZGlkRmluaXNoUHJvZ3Jlc3M7CisgICAgV0tQYWdlU2V0UGFnZUxvYWRlckNsaWVu dChxdFdlYlBhZ2VQcm94eS0+cGFnZVJlZigpLCAmbG9hZENsaWVudCk7Cit9CisKK3ZvaWQgc2V0 dXBQYWdlVWlDbGllbnQoUXRXZWJQYWdlUHJveHkqIHF0V2ViUGFnZVByb3h5LCBXZWJQYWdlUHJv eHkqIHdlYlBhZ2VQcm94eSkKK3sKKyAgICBXS1BhZ2VVSUNsaWVudCB1aUNsaWVudDsKKyAgICBt ZW1zZXQoJnVpQ2xpZW50LCAwLCBzaXplb2YoV0tQYWdlVUlDbGllbnQpKTsKKyAgICB1aUNsaWVu dC52ZXJzaW9uID0ga1dLUGFnZVVJQ2xpZW50Q3VycmVudFZlcnNpb247CisgICAgdWlDbGllbnQu Y2xpZW50SW5mbyA9IHF0V2ViUGFnZVByb3h5LT52aWV3SW50ZXJmYWNlKCk7CisgICAgdWlDbGll bnQucnVuSmF2YVNjcmlwdEFsZXJ0ID0gcXRfd2tfcnVuSmF2YVNjcmlwdEFsZXJ0OworICAgIHVp Q2xpZW50LnJ1bkphdmFTY3JpcHRDb25maXJtID0gcXRfd2tfcnVuSmF2YVNjcmlwdENvbmZpcm07 CisgICAgdWlDbGllbnQucnVuSmF2YVNjcmlwdFByb21wdCA9IHF0X3drX3J1bkphdmFTY3JpcHRQ cm9tcHQ7CisgICAgdWlDbGllbnQuc2V0U3RhdHVzVGV4dCA9IHF0X3drX3NldFN0YXR1c1RleHQ7 CisgICAgdWlDbGllbnQucnVuT3BlblBhbmVsID0gcXRfd2tfcnVuT3BlblBhbmVsOworICAgIHVp Q2xpZW50Lm1vdXNlRGlkTW92ZU92ZXJFbGVtZW50ID0gcXRfd2tfbW91c2VEaWRNb3ZlT3ZlckVs ZW1lbnQ7CisgICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KHRvQVBJKHdlYlBhZ2VQcm94eSksICZ1 aUNsaWVudCk7Cit9CisKK3ZvaWQgc2V0dXBQYWdlUG9saWN5Q2xpZW50KFF0UG9saWN5SW50ZXJm YWNlKiBwb2xpY3lJbnRlcmZhY2UsIFdlYlBhZ2VQcm94eSogd2ViUGFnZVByb3h5KQoreworICAg IFdLUGFnZVBvbGljeUNsaWVudCBwb2xpY3lDbGllbnQ7CisgICAgbWVtc2V0KCZwb2xpY3lDbGll bnQsIDAsIHNpemVvZihXS1BhZ2VQb2xpY3lDbGllbnQpKTsKKyAgICBwb2xpY3lDbGllbnQudmVy c2lvbiA9IGtXS1BhZ2VQb2xpY3lDbGllbnRDdXJyZW50VmVyc2lvbjsKKyAgICBwb2xpY3lDbGll bnQuY2xpZW50SW5mbyA9IHBvbGljeUludGVyZmFjZTsKKyAgICBwb2xpY3lDbGllbnQuZGVjaWRl UG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbiA9IHF0X3drX2RlY2lkZVBvbGljeUZvck5hdmlnYXRp b25BY3Rpb247CisgICAgcG9saWN5Q2xpZW50LmRlY2lkZVBvbGljeUZvclJlc3BvbnNlID0gcXRf d2tfZGVjaWRlUG9saWN5Rm9yUmVzcG9uc2U7CisgICAgV0tQYWdlU2V0UGFnZVBvbGljeUNsaWVu dCh0b0FQSSh3ZWJQYWdlUHJveHkpLCAmcG9saWN5Q2xpZW50KTsKK30KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvQ2xpZW50SW1wbC5oCmluZGV4IGJiMzIwOWZmYWQxNjE1MTQ2MDQxYjBkOWE0 OWIyMGY3NjQ2NzY3OTguLmMyOGEwMTBkZDViMzBhNGVhMzlmMmQwODc0OTIyOGQwYjk1MmViZWUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9DbGllbnRJbXBsLmgKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L0NsaWVudEltcGwuaApAQCAtMTcsNDIgKzE3 LDE5IEBACiAgICAgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCiAqLwogCi0jaWZuZGVmIERl ZmF1bHRDbGllbnRDYWxsYmFja3NRdF9oCi0jZGVmaW5lIERlZmF1bHRDbGllbnRDYWxsYmFja3NR dF9oCisjaWZuZGVmIENsaWVudEltcGxfaAorI2RlZmluZSBDbGllbnRJbXBsX2gKIAogI2luY2x1 ZGUgPFdlYktpdDIvV0tQYWdlLmg+CiAKLSNpZmRlZiBfX2NwbHVzcGx1cwotZXh0ZXJuICJDIiB7 Ci0jZW5kaWYKLQotLy8gbG9hZGVyIGNsaWVudAotdm9pZCBxdF93a19kaWRTdGFydFByb3Zpc2lv bmFsTG9hZEZvckZyYW1lKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tUeXBlUmVmLCBjb25zdCB2 b2lkKiBjbGllbnRJbmZvKTsKLXZvaWQgcXRfd2tfZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhF cnJvckZvckZyYW1lKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tFcnJvclJlZiwgV0tUeXBlUmVm LCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLXZvaWQgcXRfd2tfZGlkQ29tbWl0TG9hZEZvckZy YW1lKFdLUGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tUeXBlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJ bmZvKTsKLXZvaWQgcXRfd2tfZGlkRmluaXNoTG9hZEZvckZyYW1lKFdLUGFnZVJlZiwgV0tGcmFt ZVJlZiwgV0tUeXBlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLXZvaWQgcXRfd2tfZGlk RmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLRXJyb3JS ZWYsIFdLVHlwZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Ci12b2lkIHF0X3drX2RpZFJl Y2VpdmVUaXRsZUZvckZyYW1lKFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgdGl0bGUsIFdLRnJhbWVS ZWYsIFdLVHlwZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Ci12b2lkIHF0X3drX2RpZFN0 YXJ0UHJvZ3Jlc3MoV0tQYWdlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLXZvaWQgcXRf d2tfZGlkQ2hhbmdlUHJvZ3Jlc3MoV0tQYWdlUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsK LXZvaWQgcXRfd2tfZGlkRmluaXNoUHJvZ3Jlc3MoV0tQYWdlUmVmLCBjb25zdCB2b2lkKiBjbGll bnRJbmZvKTsKLXZvaWQgcXRfd2tfZGlkU2FtZURvY3VtZW50TmF2aWdhdGlvbkZvckZyYW1lKFdL UGFnZVJlZiwgV0tGcmFtZVJlZiwgV0tTYW1lRG9jdW1lbnROYXZpZ2F0aW9uVHlwZSwgV0tUeXBl UmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLQotLy8gdWkgY2xpZW50Ci12b2lkIHF0X3dr X3J1bkphdmFTY3JpcHRBbGVydChXS1BhZ2VSZWYsIFdLU3RyaW5nUmVmIGFsZXJ0VGV4dCwgV0tG cmFtZVJlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Ci1ib29sIHF0X3drX3J1bkphdmFTY3Jp cHRDb25maXJtKFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tGcmFtZVJlZiwgY29u c3Qgdm9pZCogY2xpZW50SW5mbyk7Ci1XS1N0cmluZ1JlZiBxdF93a19ydW5KYXZhU2NyaXB0UHJv bXB0KFdLUGFnZVJlZiwgV0tTdHJpbmdSZWYgbWVzc2FnZSwgV0tTdHJpbmdSZWYgZGVmYXVsdFZh bHVlLCBXS0ZyYW1lUmVmLCBjb25zdCB2b2lkKiBjbGllbnRJbmZvKTsKLXZvaWQgcXRfd2tfc2V0 U3RhdHVzVGV4dChXS1BhZ2VSZWYgcGFnZSwgV0tTdHJpbmdSZWYgdGV4dCwgY29uc3Qgdm9pZCAq Y2xpZW50SW5mbyk7Ci12b2lkIHF0X3drX3J1bk9wZW5QYW5lbChXS1BhZ2VSZWYsIFdLRnJhbWVS ZWYsIFdLT3BlblBhbmVsUGFyYW1ldGVyc1JlZiwgV0tPcGVuUGFuZWxSZXN1bHRMaXN0ZW5lclJl ZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbyk7Ci12b2lkIHF0X3drX21vdXNlRGlkTW92ZU92ZXJF bGVtZW50KFdLUGFnZVJlZiwgV0tIaXRUZXN0UmVzdWx0UmVmLCBXS0V2ZW50TW9kaWZpZXJzLCBX S1R5cGVSZWYsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotCi0vLyBQb2xpY3kgY2xpZW50Lgot dm9pZCBxdF93a19kZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKFdLUGFnZVJlZiwgV0tG cmFtZVJlZiwgV0tGcmFtZU5hdmlnYXRpb25UeXBlLCBXS0V2ZW50TW9kaWZpZXJzLCBXS0V2ZW50 TW91c2VCdXR0b24sIFdLVVJMUmVxdWVzdFJlZiwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmLCBX S1R5cGVSZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotdm9pZCBxdF93a19k ZWNpZGVQb2xpY3lGb3JSZXNwb25zZShXS1BhZ2VSZWYsIFdLRnJhbWVSZWYsIFdLVVJMUmVzcG9u c2VSZWYsIFdLVVJMUmVxdWVzdFJlZiwgV0tGcmFtZVBvbGljeUxpc3RlbmVyUmVmLCBXS1R5cGVS ZWYgdXNlckRhdGEsIGNvbnN0IHZvaWQqIGNsaWVudEluZm8pOwotCi0jaWZkZWYgX19jcGx1c3Bs dXMKK2NsYXNzIFF0V2ViUGFnZVByb3h5OworbmFtZXNwYWNlIFdlYktpdCB7CitjbGFzcyBRdFBv bGljeUludGVyZmFjZTsKK2NsYXNzIFdlYlBhZ2VQcm94eTsKIH0KLSNlbmRpZgordm9pZCBzZXR1 cFBhZ2VMb2FkZXJDbGllbnQoUXRXZWJQYWdlUHJveHkqLCBXZWJLaXQ6OldlYlBhZ2VQcm94eSop Owordm9pZCBzZXR1cFBhZ2VVaUNsaWVudChRdFdlYlBhZ2VQcm94eSosIFdlYktpdDo6V2ViUGFn ZVByb3h5Kik7Cit2b2lkIHNldHVwUGFnZVBvbGljeUNsaWVudChXZWJLaXQ6OlF0UG9saWN5SW50 ZXJmYWNlKiwgV2ViS2l0OjpXZWJQYWdlUHJveHkqKTsKIAotI2VuZGlmIC8qIERlZmF1bHRDbGll bnRDYWxsYmFja3NRdF9oICovCisjZW5kaWYgLyogQ2xpZW50SW1wbF9oICovCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuY3BwCmluZGV4IGI0YjA3NzE2 NTc3NDcwNTc5OTliMTk0YTg1YzQ0MDIwMmFkOTUwZjIuLjZmZmQ4NTgyNjExN2RmNmYyZDE4NmU4 ZDI2OWUzODA3MjcwNDJmNjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFdlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0 V2ViUGFnZVByb3h5LmNwcApAQCAtMTE5LDQzICsxMTksMTEgQEAgdm9pZCBRdFdlYlBhZ2VQcm94 eTo6aW5pdCgpCiB7CiAgICAgbV93ZWJQYWdlUHJveHktPmluaXRpYWxpemVXZWJQYWdlKCk7CiAK LSAgICBXS1BhZ2VMb2FkZXJDbGllbnQgbG9hZENsaWVudDsKLSAgICBtZW1zZXQoJmxvYWRDbGll bnQsIDAsIHNpemVvZihXS1BhZ2VMb2FkZXJDbGllbnQpKTsKLSAgICBsb2FkQ2xpZW50LnZlcnNp b24gPSBrV0tQYWdlTG9hZGVyQ2xpZW50Q3VycmVudFZlcnNpb247Ci0gICAgbG9hZENsaWVudC5j bGllbnRJbmZvID0gdGhpczsKLSAgICBsb2FkQ2xpZW50LmRpZFN0YXJ0UHJvdmlzaW9uYWxMb2Fk Rm9yRnJhbWUgPSBxdF93a19kaWRTdGFydFByb3Zpc2lvbmFsTG9hZEZvckZyYW1lOwotICAgIGxv YWRDbGllbnQuZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lID0gcXRfd2tf ZGlkRmFpbFByb3Zpc2lvbmFsTG9hZFdpdGhFcnJvckZvckZyYW1lOwotICAgIGxvYWRDbGllbnQu ZGlkQ29tbWl0TG9hZEZvckZyYW1lID0gcXRfd2tfZGlkQ29tbWl0TG9hZEZvckZyYW1lOwotICAg IGxvYWRDbGllbnQuZGlkRmluaXNoTG9hZEZvckZyYW1lID0gcXRfd2tfZGlkRmluaXNoTG9hZEZv ckZyYW1lOwotICAgIGxvYWRDbGllbnQuZGlkRmFpbExvYWRXaXRoRXJyb3JGb3JGcmFtZSA9IHF0 X3drX2RpZEZhaWxMb2FkV2l0aEVycm9yRm9yRnJhbWU7Ci0gICAgbG9hZENsaWVudC5kaWRTYW1l RG9jdW1lbnROYXZpZ2F0aW9uRm9yRnJhbWUgPSBxdF93a19kaWRTYW1lRG9jdW1lbnROYXZpZ2F0 aW9uRm9yRnJhbWU7Ci0gICAgbG9hZENsaWVudC5kaWRSZWNlaXZlVGl0bGVGb3JGcmFtZSA9IHF0 X3drX2RpZFJlY2VpdmVUaXRsZUZvckZyYW1lOwotICAgIGxvYWRDbGllbnQuZGlkU3RhcnRQcm9n cmVzcyA9IHF0X3drX2RpZFN0YXJ0UHJvZ3Jlc3M7Ci0gICAgbG9hZENsaWVudC5kaWRDaGFuZ2VQ cm9ncmVzcyA9IHF0X3drX2RpZENoYW5nZVByb2dyZXNzOwotICAgIGxvYWRDbGllbnQuZGlkRmlu aXNoUHJvZ3Jlc3MgPSBxdF93a19kaWRGaW5pc2hQcm9ncmVzczsKLSAgICBXS1BhZ2VTZXRQYWdl TG9hZGVyQ2xpZW50KHBhZ2VSZWYoKSwgJmxvYWRDbGllbnQpOwotCi0gICAgV0tQYWdlVUlDbGll bnQgdWlDbGllbnQ7Ci0gICAgbWVtc2V0KCZ1aUNsaWVudCwgMCwgc2l6ZW9mKFdLUGFnZVVJQ2xp ZW50KSk7Ci0gICAgdWlDbGllbnQudmVyc2lvbiA9IGtXS1BhZ2VVSUNsaWVudEN1cnJlbnRWZXJz aW9uOwotICAgIHVpQ2xpZW50LmNsaWVudEluZm8gPSBtX3ZpZXdJbnRlcmZhY2U7Ci0gICAgdWlD bGllbnQucnVuSmF2YVNjcmlwdEFsZXJ0ID0gcXRfd2tfcnVuSmF2YVNjcmlwdEFsZXJ0OwotICAg IHVpQ2xpZW50LnJ1bkphdmFTY3JpcHRDb25maXJtID0gcXRfd2tfcnVuSmF2YVNjcmlwdENvbmZp cm07Ci0gICAgdWlDbGllbnQucnVuSmF2YVNjcmlwdFByb21wdCA9IHF0X3drX3J1bkphdmFTY3Jp cHRQcm9tcHQ7Ci0gICAgdWlDbGllbnQuc2V0U3RhdHVzVGV4dCA9IHF0X3drX3NldFN0YXR1c1Rl eHQ7Ci0gICAgdWlDbGllbnQucnVuT3BlblBhbmVsID0gcXRfd2tfcnVuT3BlblBhbmVsOwotICAg IHVpQ2xpZW50Lm1vdXNlRGlkTW92ZU92ZXJFbGVtZW50ID0gcXRfd2tfbW91c2VEaWRNb3ZlT3Zl ckVsZW1lbnQ7Ci0gICAgV0tQYWdlU2V0UGFnZVVJQ2xpZW50KHRvQVBJKG1fd2ViUGFnZVByb3h5 LmdldCgpKSwgJnVpQ2xpZW50KTsKLQotICAgIGlmIChtX3BvbGljeUludGVyZmFjZSkgewotICAg ICAgICBXS1BhZ2VQb2xpY3lDbGllbnQgcG9saWN5Q2xpZW50OwotICAgICAgICBtZW1zZXQoJnBv bGljeUNsaWVudCwgMCwgc2l6ZW9mKFdLUGFnZVBvbGljeUNsaWVudCkpOwotICAgICAgICBwb2xp Y3lDbGllbnQudmVyc2lvbiA9IGtXS1BhZ2VQb2xpY3lDbGllbnRDdXJyZW50VmVyc2lvbjsKLSAg ICAgICAgcG9saWN5Q2xpZW50LmNsaWVudEluZm8gPSBtX3BvbGljeUludGVyZmFjZTsKLSAgICAg ICAgcG9saWN5Q2xpZW50LmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24gPSBxdF93a19k ZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uOwotICAgICAgICBwb2xpY3lDbGllbnQuZGVj aWRlUG9saWN5Rm9yUmVzcG9uc2UgPSBxdF93a19kZWNpZGVQb2xpY3lGb3JSZXNwb25zZTsKLSAg ICAgICAgV0tQYWdlU2V0UGFnZVBvbGljeUNsaWVudCh0b0FQSShtX3dlYlBhZ2VQcm94eS5nZXQo KSksICZwb2xpY3lDbGllbnQpOwotICAgIH0KKyAgICBzZXR1cFBhZ2VMb2FkZXJDbGllbnQodGhp cywgbV93ZWJQYWdlUHJveHkuZ2V0KCkpOworICAgIHNldHVwUGFnZVVpQ2xpZW50KHRoaXMsIG1f d2ViUGFnZVByb3h5LmdldCgpKTsKKworICAgIGlmIChtX3BvbGljeUludGVyZmFjZSkKKyAgICAg ICAgc2V0dXBQYWdlUG9saWN5Q2xpZW50KG1fcG9saWN5SW50ZXJmYWNlLCBtX3dlYlBhZ2VQcm94 eS5nZXQoKSk7CiB9CiAKIFF0V2ViUGFnZVByb3h5Ojp+UXRXZWJQYWdlUHJveHkoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZVByb3h5LmggYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQYWdlUHJveHkuaAppbmRleCAxMmIwYTk1NWNk ZGZkZmUwZTFmZmQ4NTc2NmQ1YjM1NWIyYzI1YjVlLi4xNGE3ZmZlOTk4OTc1MWIyYzE3ZTFjMjVi YTk0YzY5MzM1MjFlNzVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRXZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRXZWJQ YWdlUHJveHkuaApAQCAtMTcwLDYgKzE3MCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHNldFBhZ2VB bmRUZXh0Wm9vbUZhY3RvcnMocXJlYWwgcGFnZVpvb21GYWN0b3IsIHFyZWFsIHRleHRab29tRmFj dG9yKTsKIAogICAgIFFXS0hpc3RvcnkqIGhpc3RvcnkoKSBjb25zdDsKKyAgICBRdFZpZXdJbnRl cmZhY2UqIHZpZXdJbnRlcmZhY2UoKSBjb25zdCB7IHJldHVybiBtX3ZpZXdJbnRlcmZhY2U7IH0K IAogcHVibGljIFFfU0xPVFM6CiAgICAgdm9pZCBuYXZpZ2F0aW9uU3RhdGVDaGFuZ2VkKCk7Cg==