23072 2009-01-02 00:47:34 -0800 REGRESSION (r37371): In the Dictionary application, scroll bar appears inside its web view when resizing its window 2009-01-02 18:06:22 -0800 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 darin darin zwarich oldest_to_newest 104041 0 darin 2009-01-02 00:47:34 -0800 <rdar://problem/6368028> Cameron figured out this is due to the Dictionary application erroneously setting the scrolling attribute on frames. I will do a workaround so we can work with the old Dictionary application and ask the Dictionary application folks to fix the new version. 104043 1 26363 darin 2009-01-02 01:06:08 -0800 Created attachment 26363 patch 104044 2 26363 oliver 2009-01-02 01:21:44 -0800 Comment on attachment 26363 patch r=me 104045 3 darin 2009-01-02 01:27:33 -0800 http://trac.webkit.org/changeset/39547 104137 4 darin 2009-01-02 11:35:55 -0800 Cameron says the fix did not work. 104138 5 26363 darin 2009-01-02 11:36:14 -0800 Comment on attachment 26363 patch Clearing patch since this was landed. 104140 6 26373 darin 2009-01-02 11:40:34 -0800 Created attachment 26373 second try 104180 7 26373 zwarich 2009-01-02 14:43:48 -0800 Comment on attachment 26373 second try This patch still has the b/f problem, although I am not sure why. I'll r- it until we figure it out. 104194 8 26385 darin 2009-01-02 16:43:21 -0800 Created attachment 26385 third try -- this one I was able to test 104208 9 darin 2009-01-02 18:06:22 -0800 http://trac.webkit.org/changeset/39566 26363 2009-01-02 01:06:08 -0800 2009-01-02 11:36:14 -0800 patch DictionaryQuirkPatch.txt text/plain 12046 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTU0NSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMDktMDEtMDIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAy MzA3MjogUkVHUkVTU0lPTiAocjM3MzcxKTogSW4gdGhlIERpY3Rpb25hcnkgYXBwbGljYXRpb24s IHNjcm9sbCBiYXIgYXBwZWFycyBpbnNpZGUgaXRzIHdlYiB2aWV3IHdoZW4gcmVzaXppbmcgaXRz IHdpbmRvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjMwNzIKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNjM2ODAyOAorCisgICAgICAgICogV2ViQ29y ZS5iYXNlLmV4cDogVXBkYXRlZC4KKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2o6IE1hcmsgSFRNTEhlYWRFbGVtZW50LmggUHJpdmF0ZSBzbyBpdCBjYW4gYmUgdXNl ZCBpbiBXZWJLaXQuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RG9jdW1lbnQ6OkRvY3VtZW50KTogSW5pdGlhbGl6ZSBtX2ZyYW1lRWxlbWVudHNTaG91 bGRJZ25vcmVTY3JvbGxpbmcgdG8gZmFsc2UuCisgICAgICAgICogZG9tL0RvY3VtZW50Lmg6IEFk ZGVkIHNldEZyYW1lRWxlbWVudHNTaG91bGRJZ25vcmVTY3JvbGxpbmcsIGZyYW1lRWxlbWVudHNT aG91bGRJZ25vcmVTY3JvbGxpbmcsCisgICAgICAgIGFuZCBtX2ZyYW1lRWxlbWVudHNTaG91bGRJ Z25vcmVTY3JvbGxpbmcuCisKKyAgICAgICAgKiBodG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGcmFtZUVsZW1lbnRCYXNlOjpwYXJzZU1hcHBlZEF0 dHJpYnV0ZSk6IERvbid0IGFsbG93IGNoYW5nZXMgdG8gdGhlIHNjcm9sbGluZyBhdHRyaWJ1dGUK KyAgICAgICAgdG8gYWZmZWN0IHRoZSBzY3JvbGxpbmcgbW9kZSBpZiBmcmFtZUVsZW1lbnRzU2hv dWxkSWdub3JlU2Nyb2xsaW5nKCkgcmV0dXJucyB0cnVlLiBUaGlzIGlzIG9ubHkKKyAgICAgICAg dHJpZ2dlcmVkIG9uIE1hYyBPUyBYIHdoZW4gcnVubmluZyB0aGUgRGljdGlvbmFyeSBhcHBsaWNh dGlvbi4KKwogMjAwOS0wMS0wMSAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERhbiBCZXJuc3RlaW4uCkluZGV4OiBXZWJDb3JlL1dlYkNvcmUu YmFzZS5leHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLmJhc2UuZXhwCShyZXZpc2lv biAzOTU0NSkKKysrIFdlYkNvcmUvV2ViQ29yZS5iYXNlLmV4cAkod29ya2luZyBjb3B5KQpAQCAt MTMxLDYgKzEzMSw3IEBAIF9fWk43V2ViQ29yZTEwTW91c2VFdmVudEMxRVJLTlNfMTJBdG9taWMK IF9fWk43V2ViQ29yZTEwU2Nyb2xsVmlldzE3c2V0U2Nyb2xsYmFyTW9kZXNFTlNfMTNTY3JvbGxi YXJNb2RlRVMxXwogX19aTjdXZWJDb3JlMTBTY3JvbGxWaWV3MjBzZXRDYW5IYXZlU2Nyb2xsYmFy c0ViCiBfX1pON1dlYkNvcmUxMFN0cmluZ0ltcGw3cmVwbGFjZUV0dAorX19aTjdXZWJDb3JlMTBT dHJpbmdJbXBsOGVuZHNXaXRoRVBTMF9iCiBfX1pON1dlYkNvcmUxMFN0cmluZ0ltcGxEMUV2CiBf X1pON1dlYkNvcmUxMFN0cmluZ0ltcGxjdlA4TlNTdHJpbmdFdgogX19aTjdXZWJDb3JlMTFDb250 ZXh0TWVudTIyc2V0UGxhdGZvcm1EZXNjcmlwdGlvbkVQMTROU011dGFibGVBcnJheQpAQCAtNTcw LDYgKzU3MSw3IEBAIF9fWk43V2ViQ29yZThEb2N1bWVudDIzcmVuZGVyZWRSZWN0c0Zvck0KIF9f Wk43V2ViQ29yZThEb2N1bWVudDI0c2V0U2hvdWxkQ3JlYXRlUmVuZGVyZXJzRWIKIF9fWk43V2Vi Q29yZThEb2N1bWVudDM2dXBkYXRlTGF5b3V0SWdub3JlUGVuZGluZ1N0eWxlc2hlZXRzRXYKIF9f Wk43V2ViQ29yZThEb2N1bWVudDRib2R5RXYKK19fWk43V2ViQ29yZThEb2N1bWVudDRoZWFkRXYK IF9fWk43V2ViQ29yZThEcmFnRGF0YUMxRVAxMW9iamNfb2JqZWN0UktOU184SW50UG9pbnRFUzVf TlNfMTNEcmFnT3BlcmF0aW9uRVBOU18xNlBhc3RlYm9hcmRIZWxwZXJFCiBfX1pON1dlYkNvcmU4 Rm9ybURhdGFEMUV2CiBfX1pON1dlYkNvcmU4SW50UG9pbnRDMUVSSzhfTlNQb2ludApAQCAtNjY3 LDYgKzY2OSw3IEBAIF9fWk43V2ViQ29yZTlIVE1MTmFtZXM4ZnJhbWVUYWdFCiBfX1pON1dlYkNv cmU5SFRNTE5hbWVzOGhyZWZBdHRyRQogX19aTjdXZWJDb3JlOUhUTUxOYW1lczhpbnB1dFRhZ0UK IF9fWk43V2ViQ29yZTlIVE1MTmFtZXM5aWZyYW1lVGFnRQorX19aTjdXZWJDb3JlOUhUTUxOYW1l czlzY3JpcHRUYWdFCiBfX1pON1dlYkNvcmU5UGFnZUNhY2hlMTFzZXRDYXBhY2l0eUVpCiBfX1pO N1dlYkNvcmU5UGFnZUNhY2hlMjdyZWxlYXNlQXV0b3JlbGVhc2VkUGFnZXNOb3dFdgogX19aTjdX ZWJDb3JlOVBhZ2VHcm91cDE0YWRkVmlzaXRlZExpbmtFUEt0bQpAQCAtNjgyLDYgKzY4NSw3IEBA IF9fWk43V2ViQ29yZTlUaW1lckJhc2VDMkV2CiBfX1pON1dlYkNvcmU5VGltZXJCYXNlRDJFdgog X19aTjdXZWJDb3JlOW1ha2VSYW5nZUVSS05TXzE1VmlzaWJsZVBvc2l0aW9uRVMyXwogX19aTjdX ZWJDb3JlOXBhZ2VDYWNoZUV2CitfX1pON1dlYkNvcmVlcUVSS05TXzEyQXRvbWljU3RyaW5nRVBL YwogX19aTjdXZWJDb3JlZXFFUktOU18xOVJlc291cmNlUmVxdWVzdEJhc2VFUzJfCiBfX1pON1dl YkNvcmVwbEVSS05TXzZTdHJpbmdFUzJfCiBfX1pOSzNKU0M4QmluZGluZ3MxMFJvb3RPYmplY3Qx Mmdsb2JhbE9iamVjdEV2CkBAIC03OTMsNiArNzk3LDcgQEAgX19aTks3V2ViQ29yZTIwUmVzb3Vy Y2VSZXNwb25zZUJhc2UzdXJsRQogX19aTks3V2ViQ29yZTIwUmVzb3VyY2VSZXNwb25zZUJhc2U4 bWltZVR5cGVFdgogX19aTks3V2ViQ29yZTI2TmV0c2NhcGVQbHVnSW5TdHJlYW1Mb2FkZXI2aXNE b25lRXYKIF9fWk5LN1dlYkNvcmU0Rm9udDE2Y2FjaGVQcmltYXJ5Rm9udEV2CitfX1pOSzdXZWJD b3JlNEtVUkwxMWlzTG9jYWxGaWxlRXYKIF9fWk5LN1dlYkNvcmU0S1VSTDE3bGFzdFBhdGhDb21w b25lbnRFdgogX19aTks3V2ViQ29yZTRLVVJMNGhvc3RFdgogX19aTks3V2ViQ29yZTRLVVJMNHBh dGhFdgpJbmRleDogV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oJKHJl dmlzaW9uIDM5NTQ1KQorKysgV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2oJKHdvcmtpbmcgY29weSkKQEAgLTI0MjksNyArMjQyOSw3IEBACiAJCUE4NzFERTJBMEExNTJB QzgwMEIxMkE2OCAvKiBIVE1MSUZyYW1lRWxlbWVudC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0g UEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gQTg3MURFMUUwQTE1MkFDODAwQjEyQTY4IC8qIEhUTUxJ RnJhbWVFbGVtZW50LmggKi87IH07CiAJCUE4NzFERTJCMEExNTJBQzgwMEIxMkE2OCAvKiBIVE1M RnJhbWVFbGVtZW50LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVS ZWYgPSBBODcxREUxRjBBMTUyQUM4MDBCMTJBNjggLyogSFRNTEZyYW1lRWxlbWVudC5oICovOyBz ZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7IH07IH07CiAJCUE4NzFERTJDMEEx NTJBQzgwMEIxMkE2OCAvKiBIVE1MQm9keUVsZW1lbnQuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEE4NzFERTIwMEExNTJBQzgwMEIxMkE2OCAvKiBIVE1M Qm9keUVsZW1lbnQuaCAqLzsgfTsKLQkJQTg3MURFMkQwQTE1MkFDODAwQjEyQTY4IC8qIEhUTUxI ZWFkRWxlbWVudC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gQTg3MURFMjEwQTE1MkFDODAwQjEyQTY4IC8qIEhUTUxIZWFkRWxlbWVudC5oICovOyB9Owor CQlBODcxREUyRDBBMTUyQUM4MDBCMTJBNjggLyogSFRNTEhlYWRFbGVtZW50LmggaW4gSGVhZGVy cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBODcxREUyMTBBMTUyQUM4MDBC MTJBNjggLyogSFRNTEhlYWRFbGVtZW50LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAo UHJpdmF0ZSwgKTsgfTsgfTsKIAkJQTg3MURFMkUwQTE1MkFDODAwQjEyQTY4IC8qIEhUTUxGcmFt ZVNldEVsZW1lbnQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gQTg3MURFMjIwQTE1MkFDODAwQjEyQTY4IC8qIEhUTUxGcmFtZVNldEVsZW1lbnQuY3Bw ICovOyB9OwogCQlBODcxREVEMDBBMTUzMEM3MDBCMTJBNjggLyogUmVuZGVyUGFydC5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBODcxREVDODBBMTUz MEM3MDBCMTJBNjggLyogUmVuZGVyUGFydC5jcHAgKi87IH07CiAJCUE4NzFERUQxMEExNTMwQzcw MEIxMkE2OCAvKiBSZW5kZXJGcmFtZVNldC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gQTg3MURFQzkwQTE1MzBDNzAwQjEyQTY4IC8qIFJlbmRlckZyYW1l U2V0LmggKi87IH07CkluZGV4OiBXZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCShyZXZpc2lvbiAzOTU0NSkKKysrIFdlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc4LDYgKzI3OCw3IEBAIERvY3Vt ZW50OjpEb2N1bWVudChGcmFtZSogZnJhbWUsIGJvb2wgaXMKICAgICA6IENvbnRhaW5lck5vZGUo MCkKICAgICAsIG1fZG9tdHJlZV92ZXJzaW9uKDApCiAgICAgLCBtX3N0eWxlU2hlZXRzKFN0eWxl U2hlZXRMaXN0OjpjcmVhdGUodGhpcykpCisgICAgLCBtX2ZyYW1lRWxlbWVudHNTaG91bGRJZ25v cmVTY3JvbGxpbmcoZmFsc2UpCiAgICAgLCBtX3RpdGxlKCIiKQogICAgICwgbV90aXRsZVNldEV4 cGxpY2l0bHkoZmFsc2UpCiAgICAgLCBtX2ltYWdlTG9hZEV2ZW50VGltZXIodGhpcywgJkRvY3Vt ZW50OjppbWFnZUxvYWRFdmVudFRpbWVyRmlyZWQpCkluZGV4OiBXZWJDb3JlL2RvbS9Eb2N1bWVu dC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvZG9tL0RvY3VtZW50LmgJKHJldmlzaW9uIDM5NTQ1 KQorKysgV2ViQ29yZS9kb20vRG9jdW1lbnQuaAkod29ya2luZyBjb3B5KQpAQCAtODg5LDkgKzg4 OSw5IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX3VzZXNGaXJzdExpbmVSdWxlczsKICAgICBib29s IG1fdXNlc0ZpcnN0TGV0dGVyUnVsZXM7CiAgICAgYm9vbCBtX2dvdG9BbmNob3JOZWVkZWRBZnRl clN0eWxlc2hlZXRzTG9hZDsKLQogICAgIGJvb2wgbV9pc0ROU1ByZWZldGNoRW5hYmxlZDsKICAg ICBib29sIG1faGF2ZUV4cGxpY2l0bHlEaXNhYmxlZEROU1ByZWZldGNoOworICAgIGJvb2wgbV9m cmFtZUVsZW1lbnRzU2hvdWxkSWdub3JlU2Nyb2xsaW5nOwogCiAgICAgU3RyaW5nIG1fdGl0bGU7 CiAgICAgYm9vbCBtX3RpdGxlU2V0RXhwbGljaXRseTsKQEAgLTk2Miw2ICs5NjIsMTAgQEAgcHVi bGljOgogCiAgICAgVUNoYXIgYmFja3NsYXNoQXNDdXJyZW5jeVN5bWJvbCgpIGNvbnN0OwogCisg ICAgLy8gUXVpcmsgZm9yIHRoZSBiZW5lZml0IG9mIEFwcGxlJ3MgRGljdGlvbmFyeSBhcHBsaWNh dGlvbi4KKyAgICB2b2lkIHNldEZyYW1lRWxlbWVudHNTaG91bGRJZ25vcmVTY3JvbGxpbmcoYm9v bCBpZ25vcmUpIHsgbV9mcmFtZUVsZW1lbnRzU2hvdWxkSWdub3JlU2Nyb2xsaW5nID0gaWdub3Jl OyB9CisgICAgYm9vbCBmcmFtZUVsZW1lbnRzU2hvdWxkSWdub3JlU2Nyb2xsaW5nKCkgY29uc3Qg eyByZXR1cm4gbV9mcmFtZUVsZW1lbnRzU2hvdWxkSWdub3JlU2Nyb2xsaW5nOyB9CisKICNpZiBF TkFCTEUoREFTSEJPQVJEX1NVUFBPUlQpCiAgICAgdm9pZCBzZXREYXNoYm9hcmRSZWdpb25zRGly dHkoYm9vbCBmKSB7IG1fZGFzaGJvYXJkUmVnaW9uc0RpcnR5ID0gZjsgfQogICAgIGJvb2wgZGFz aGJvYXJkUmVnaW9uc0RpcnR5KCkgY29uc3QgeyByZXR1cm4gbV9kYXNoYm9hcmRSZWdpb25zRGly dHk7IH0KSW5kZXg6IFdlYkNvcmUvaHRtbC9IVE1MRnJhbWVFbGVtZW50QmFzZS5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViQ29yZS9odG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmNwcAkocmV2aXNpb24g Mzk1NDUpCisrKyBXZWJDb3JlL2h0bWwvSFRNTEZyYW1lRWxlbWVudEJhc2UuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xMjksNiArMTI5LDggQEAgdm9pZCBIVE1MRnJhbWVFbGVtZW50QmFzZTo6cGFy c2VNYXBwZWRBdAogICAgICAgICBtX25vUmVzaXplID0gdHJ1ZTsKICAgICAgICAgLy8gRklYTUU6 IElmIHdlIGFyZSBhbHJlYWR5IGF0dGFjaGVkLCB0aGlzIGhhcyBubyBlZmZlY3QuCiAgICAgfSBl bHNlIGlmIChhdHRyLT5uYW1lKCkgPT0gc2Nyb2xsaW5nQXR0cikgeworICAgICAgICBpZiAoZG9j dW1lbnQoKS0+ZnJhbWVFbGVtZW50c1Nob3VsZElnbm9yZVNjcm9sbGluZygpKQorICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICAvLyBBdXRvIGFuZCB5ZXMgYm90aCBzaW1wbHkgbWVhbiAiYWxs b3cgc2Nyb2xsaW5nLiIgTm8gbWVhbnMgImRvbid0IGFsbG93IHNjcm9sbGluZy4iCiAgICAgICAg IGlmIChlcXVhbElnbm9yaW5nQ2FzZShhdHRyLT52YWx1ZSgpLCAiYXV0byIpIHx8IGVxdWFsSWdu b3JpbmdDYXNlKGF0dHItPnZhbHVlKCksICJ5ZXMiKSkKICAgICAgICAgICAgIG1fc2Nyb2xsaW5n ID0gU2Nyb2xsYmFyQXV0bzsKSW5kZXg6IFdlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g V2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMzk1NDUpCisrKyBXZWJLaXQvQ2hhbmdlTG9nCSh3 b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNyBAQAorMjAwOS0wMS0wMiAgRGFyaW4gQWRsZXIgIDxk YXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgKiBTdHJpbmdzTm90VG9CZUxvY2FsaXplZC50eHQ6 IFVwZGF0ZWQuCisKIDIwMDgtMTItMjMgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCkluZGV4OiBXZWJLaXQv U3RyaW5nc05vdFRvQmVMb2NhbGl6ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9TdHJpbmdz Tm90VG9CZUxvY2FsaXplZC50eHQJKHJldmlzaW9uIDM5NTQ1KQorKysgV2ViS2l0L1N0cmluZ3NO b3RUb0JlTG9jYWxpemVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMTYxLDYgKzE2MSw3IEBACiAi THVjaWRhIEdyYW5kZSIKICJNSU1FVHlwZSIKICJNSU1FXFxEYXRhYmFzZVxcQ29udGVudCBUeXBl IgorIk1haW5QYWdlSmF2YVNjcmlwdC5qcyIKICJNZW1vcnlTdHJlYW0iCiAiTW92ZURvd24iCiAi TW92ZURvd25BbmRNb2RpZnlTZWxlY3Rpb24iCkBAIC00MzQsNiArNDM1LDcgQEAKICJjb20uYWRv YmUuZHJlYW13ZWF2ZXItOS4wIgogImNvbS5hcHBsZS5BcGVydHVyZSIKICJjb20uYXBwbGUuQXBw S2l0IgorImNvbS5hcHBsZS5EaWN0aW9uYXJ5IgogImNvbS5hcHBsZS5ISVdlYlZpZXciCiAiY29t LmFwcGxlLkphdmFBcHBsZXRQbHVnaW4iCiAiY29tLmFwcGxlLkphdmFQbHVnaW5Db2NvYSIKSW5k ZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hhbmdl TG9nCShyZXZpc2lvbiAzOTU0NSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDktMDEtMDIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBw bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEJ1ZyAyMzA3MjogUkVHUkVTU0lPTiAocjM3MzcxKTogSW4gdGhlIERpY3Rpb25hcnkgYXBwbGlj YXRpb24sIHNjcm9sbCBiYXIgYXBwZWFycyBpbnNpZGUgaXRzIHdlYiB2aWV3IHdoZW4gcmVzaXpp bmcgaXRzIHdpbmRvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MjMwNzIKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNjM2ODAyOAorCisgICAgICAgICog V2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW06CisgICAgICAgIChpc0FwcGxl RGljdGlvbmFyeUFwcGxpY2F0aW9uKTogQWRkZWQuCisgICAgICAgIChhcHBseUFwcGxlRGljdGlv bmFyeUFwcGxpY2F0aW9uUXVpcmspOiBBZGRlZC4gVW5kZXIgdGhlIHJpZ2h0IGNvbmRpdGlvbnMs IHNldHMKKyAgICAgICAgYSBmbGFnIHRvIGFzayBIVE1MRnJhbWVFbGVtZW50QmFzZSB0byBpZ25v cmUgdGhlIHNjcm9sbGluZyBhdHRyaWJ1dGUuCisgICAgICAgIChXZWJGcmFtZUxvYWRlckNsaWVu dDo6ZGlzcGF0Y2hXaWxsU2VuZFJlcXVlc3QpOiBDYWxsIHRoZSB0d28gZnVuY3Rpb25zIGFib3Zl IHRvCisgICAgICAgIGFwcGx5IHRoZSBxdWlyayB3aGVuIHRoZSByZWxldmFudCBzY3JpcHQgaXMg bG9hZGVkLgorCiAyMDA4LTEyLTI2ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KSW5kZXg6IFdlYktpdC9tYWMvV2ViQ29y ZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQubW0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L21h Yy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5tbQkocmV2aXNpb24gMzk1NDUp CisrKyBXZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1tCSh3 b3JraW5nIGNvcHkpCkBAIC04NCw2ICs4NCw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL0ZyYW1lTG9h ZGVyVHlwZXMuaD4KICNpbXBvcnQgPFdlYkNvcmUvRnJhbWVUcmVlLmg+CiAjaW1wb3J0IDxXZWJD b3JlL0ZyYW1lVmlldy5oPgorI2ltcG9ydCA8V2ViQ29yZS9IVE1MSGVhZEVsZW1lbnQuaD4KICNp bXBvcnQgPFdlYkNvcmUvSFRNTEZvcm1FbGVtZW50Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxG cmFtZUVsZW1lbnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvSFRNTEZyYW1lT3duZXJFbGVtZW50Lmg+ CkBAIC0xNDcsNiArMTQ4LDQ0IEBAIHN0YXRpYyBpbmxpbmUgV2ViRGF0YVNvdXJjZSAqZGF0YVNv dXJjZSgKICAgICByZXR1cm4gbG9hZGVyID8gc3RhdGljX2Nhc3Q8V2ViRG9jdW1lbnRMb2FkZXJN YWMqPihsb2FkZXIpLT5kYXRhU291cmNlKCkgOiBuaWw7CiB9CiAKKy8vIFF1aXJrIGZvciB0aGUg QXBwbGUgRGljdGlvbmFyeSBhcHBsaWNhdGlvbi4KKy8vCisvLyBJZiBhIHRvcCBsZXZlbCBmcmFt ZSBoYXMgYSA8c2NyaXB0PiBlbGVtZW50IGluIGl0cyA8aGVhZD4gZm9yIGEgc2NyaXB0IG5hbWVk IE1haW5QYWdlSmF2YVNjcmlwdC5qcywKKy8vIHRoZW4gZm9yIHRoYXQgZnJhbWUncyBkb2N1bWVu dCwgaWdub3JlIGNoYW5nZXMgdG8gdGhlIHNjcm9sbGluZyBhdHRyaWJ1dGUgb2YgZnJhbWVzLiBU aGF0IHNjcmlwdAorLy8gaGFzIGEgYnVnIGluIGl0IHdoZXJlIGl0IHNldHMgdGhlIHNjcm9sbGlu ZyBhdHRyaWJ1dGUgb24gZnJhbWVzLCBhbmQgdGhhdCBlcnJvbmVvdXMgc2Nyb2xsaW5nCisvLyBh dHRyaWJ1dGUgbmVlZHMgdG8gYmUgaWdub3JlZCB0byBhdm9pZCBzaG93aW5nIGV4dHJhIHNjcm9s bCBiYXJzIGluIHRoZSB3aW5kb3cuCisvLyBUaGlzIHF1aXJrIGNhbiBiZSByZW1vdmVkIHdoZW4g QXBwbGUgRGljdGlvbmFyeSBpcyBmaXhlZCAoc2VlIDxyZGFyOi8vcHJvYmxlbS82NDcxMDU4Piku CisKK3N0YXRpYyBib29sIGlzQXBwbGVEaWN0aW9uYXJ5QXBwbGljYXRpb24oKQoreworICAgIHJl dHVybiBbW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXSBpc0VxdWFsVG9T dHJpbmc6QCJjb20uYXBwbGUuRGljdGlvbmFyeSJdOworfQorCitzdGF0aWMgdm9pZCBhcHBseUFw cGxlRGljdGlvbmFyeUFwcGxpY2F0aW9uUXVpcmsoV2ViRnJhbWUgKndlYkZyYW1lLCBjb25zdCBS ZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCit7CisgICAgaWYgKCFyZXF1ZXN0LnVybCgpLmlzTG9j YWxGaWxlKCkpCisgICAgICAgIHJldHVybjsKKyAgICBpZiAoIXJlcXVlc3QudXJsKCkuc3RyaW5n KCkuZW5kc1dpdGgoIk1haW5QYWdlSmF2YVNjcmlwdC5qcyIpKQorICAgICAgICByZXR1cm47Cisg ICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJGcmFtZSk7CisgICAgaWYgKCFmcmFtZSkKKyAgICAg ICAgcmV0dXJuOworICAgIGlmIChmcmFtZS0+dHJlZSgpLT5wYXJlbnQoKSkKKyAgICAgICAgcmV0 dXJuOworICAgIERvY3VtZW50KiBkb2N1bWVudCA9IGZyYW1lLT5kb2N1bWVudCgpOworICAgIGlm ICghZG9jdW1lbnQpCisgICAgICAgIHJldHVybjsKKyAgICBIVE1MSGVhZEVsZW1lbnQqIGhlYWQg PSBkb2N1bWVudC0+aGVhZCgpOworICAgIGlmICghaGVhZCkKKyAgICAgICAgcmV0dXJuOworICAg IGZvciAoTm9kZSogYyA9IGhlYWQtPmZpcnN0Q2hpbGQoKTsgYzsgYyA9IGMtPm5leHRTaWJsaW5n KCkpIHsKKyAgICAgICAgaWYgKGMtPmhhc1RhZ05hbWUoc2NyaXB0VGFnKSAmJiBzdGF0aWNfY2Fz dDxFbGVtZW50Kj4oYyktPmdldEF0dHJpYnV0ZShzcmNBdHRyKSA9PSAiTWFpblBhZ2VKYXZhU2Ny aXB0LmpzIikgeworICAgICAgICAgICAgZG9jdW1lbnQtPnNldEZyYW1lRWxlbWVudHNTaG91bGRJ Z25vcmVTY3JvbGxpbmcodHJ1ZSk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICB9Cit9CisKIFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpXZWJGcmFtZUxvYWRlckNsaWVudChXZWJG cmFtZSAqd2ViRnJhbWUpCiAgICAgOiBtX3dlYkZyYW1lKHdlYkZyYW1lKQogICAgICwgbV9wb2xp Y3lGdW5jdGlvbigwKQpAQCAtMzEwLDYgKzM0OSwxMCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xp ZW50Ojphc3NpZ25JZGVudGlmCiAKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNo V2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNl JiByZWRpcmVjdFJlc3BvbnNlKQogeworICAgIHN0YXRpYyBib29sIGlzRGljdGlvbmFyeSA9IGlz QXBwbGVEaWN0aW9uYXJ5QXBwbGljYXRpb24oKTsKKyAgICBpZiAoaXNEaWN0aW9uYXJ5KQorICAg ICAgICBhcHBseUFwcGxlRGljdGlvbmFyeUFwcGxpY2F0aW9uUXVpcmsobV93ZWJGcmFtZS5nZXQo KSwgcmVxdWVzdCk7CisKICAgICBXZWJWaWV3ICp3ZWJWaWV3ID0gZ2V0V2ViVmlldyhtX3dlYkZy YW1lLmdldCgpKTsKICAgICBXZWJSZXNvdXJjZURlbGVnYXRlSW1wbGVtZW50YXRpb25DYWNoZSog aW1wbGVtZW50YXRpb25zID0gV2ViVmlld0dldFJlc291cmNlTG9hZERlbGVnYXRlSW1wbGVtZW50 YXRpb25zKHdlYlZpZXcpOwogCg== 26373 2009-01-02 11:40:34 -0800 2009-01-02 16:44:11 -0800 second try DictionaryPatch2.txt text/plain 2022 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTU1MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMDktMDEtMDIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAy MzA3MjogUkVHUkVTU0lPTiAocjM3MzcxKTogSW4gdGhlIERpY3Rpb25hcnkgYXBwbGljYXRpb24s IHNjcm9sbCBiYXIgYXBwZWFycyBpbnNpZGUgaXRzIHdlYiB2aWV3IHdoZW4gcmVzaXppbmcgaXRz IHdpbmRvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjMwNzIKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNjM2ODAyOAorCisgICAgICAgIFRoZSBwcmV2 aW91cyBmaXggZGlkbid0IHdvcmsgcmlnaHQuCisKKyAgICAgICAgKiBodG1sL0hUTUxGcmFtZUVs ZW1lbnRCYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGcmFtZUVsZW1lbnRCYXNlOjpw YXJzZU1hcHBlZEF0dHJpYnV0ZSk6IFNldCBtX3Njcm9sbGluZyB0byBTY3JvbGxiYXJBbHdheXNP ZmYKKyAgICAgICAgcmF0aGVyIHRoYW4gZG9pbmcgbm90aGluZyB3aGVuIGZyYW1lRWxlbWVudHNT aG91bGRJZ25vcmVTY3JvbGxpbmcgaXMgdHJ1ZS4gVGhpcyBpc24ndCByZWFsbHkKKyAgICAgICAg YWxsIHRoYXQgZWxlZ2FudCwgYnV0IGl0IHdvcmtzLCBhbmQgd2UnbGwgcmlwIGl0IG91dCBvbmNl IERpY3Rpb25hcnkgZG9lc24ndCBuZWVkIGl0IGFueSBtb3JlLgorCiAyMDA5LTAxLTAyICBFcmlj IENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5 IERhcmluIEFkbGVyCkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTEZyYW1lRWxlbWVudEJhc2UuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvaHRtbC9IVE1MRnJhbWVFbGVtZW50QmFzZS5jcHAJKHJl dmlzaW9uIDM5NTUyKQorKysgV2ViQ29yZS9odG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmNwcAko d29ya2luZyBjb3B5KQpAQCAtMTI5LDExICsxMjksOSBAQCB2b2lkIEhUTUxGcmFtZUVsZW1lbnRC YXNlOjpwYXJzZU1hcHBlZEF0CiAgICAgICAgIG1fbm9SZXNpemUgPSB0cnVlOwogICAgICAgICAv LyBGSVhNRTogSWYgd2UgYXJlIGFscmVhZHkgYXR0YWNoZWQsIHRoaXMgaGFzIG5vIGVmZmVjdC4K ICAgICB9IGVsc2UgaWYgKGF0dHItPm5hbWUoKSA9PSBzY3JvbGxpbmdBdHRyKSB7Ci0gICAgICAg IGlmIChkb2N1bWVudCgpLT5mcmFtZUVsZW1lbnRzU2hvdWxkSWdub3JlU2Nyb2xsaW5nKCkpCi0g ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIC8vIEF1dG8gYW5kIHllcyBib3RoIHNpbXBseSBt ZWFuICJhbGxvdyBzY3JvbGxpbmcuIiBObyBtZWFucyAiZG9uJ3QgYWxsb3cgc2Nyb2xsaW5nLiIK ICAgICAgICAgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGF0dHItPnZhbHVlKCksICJhdXRvIikgfHwg ZXF1YWxJZ25vcmluZ0Nhc2UoYXR0ci0+dmFsdWUoKSwgInllcyIpKQotICAgICAgICAgICAgbV9z Y3JvbGxpbmcgPSBTY3JvbGxiYXJBdXRvOworICAgICAgICAgICAgbV9zY3JvbGxpbmcgPSBkb2N1 bWVudCgpLT5mcmFtZUVsZW1lbnRzU2hvdWxkSWdub3JlU2Nyb2xsaW5nKCkgPyBTY3JvbGxiYXJB bHdheXNPZmYgOiBTY3JvbGxiYXJBdXRvOwogICAgICAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5n Q2FzZShhdHRyLT52YWx1ZSgpLCAibm8iKSkKICAgICAgICAgICAgIG1fc2Nyb2xsaW5nID0gU2Ny b2xsYmFyQWx3YXlzT2ZmOwogICAgICAgICAvLyBGSVhNRTogSWYgd2UgYXJlIGFscmVhZHkgYXR0 YWNoZWQsIHRoaXMgaGFzIG5vIGVmZmVjdC4K 26385 2009-01-02 16:43:21 -0800 2009-01-02 17:08:39 -0800 third try -- this one I was able to test DictionaryPatch3.txt text/plain 21924 darin SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzOTU2MikKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTcgQEAKKzIwMDktMDEtMDIgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAy MzA3MjogUkVHUkVTU0lPTiAocjM3MzcxKTogSW4gdGhlIERpY3Rpb25hcnkgYXBwbGljYXRpb24s IHNjcm9sbCBiYXIgYXBwZWFycworICAgICAgICBpbnNpZGUgaXRzIHdlYiB2aWV3IHdoZW4gcmVz aXppbmcgaXRzIHdpbmRvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjMwNzIKKyAgICAgICAgcmRhcjovL3Byb2JsZW0vNjM2ODAyOAorCisgICAgICAg IFRoZSBmaXJzdCBhdHRlbXB0IGF0IGZpeGluZyB0aGlzIGRpZCBub3Qgd29yay4KKyAgICAgICAg VGhpcyB0aW1lIEkgd2FzIGFibGUgdG8gcmVwcm9kdWNlIHRoZSBidWcgYW5kIHRlc3QgdGhlIGZp eC4KKworICAgICAgICBCdWcgMTEyMTI6IFJFR1JFU1NJT046IEFjdGl2aXR5IHdpbmRvdyBkb2Vz bid0IGFsd2F5cyBsaXN0IGFsbCBmaWxlcyB1bnRpbCByZWZyZXNoCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTIxMgorICAgICAgICByZGFyOi8vcHJv YmxlbS80OTU5NzAyCisKKyAgICAgICAgSSBoYWQgdG8gZml4IHRoaXMgc2Vjb25kIGJ1ZyBiZWNh dXNlIG90aGVyd2lzZSB0aGUgV2ViS2l0IGNvZGUgdG8gdHJpZ2dlciB0aGUgZmlyc3QKKyAgICAg ICAgZml4IGRpZG4ndCBydW4uCisKKyAgICAgICAgQWxzbyBmaXhlcyBtZW1vcnkgdXNlIHRoYXQg a2VwdCBncm93aW5nIGFzIHdlIG1haW50YWluZWQgYSBzZXQgb2YgYWxsIFVSTHMgbG9hZGVkIGlu CisgICAgICAgIGEgcGFydGljdWxhciBmcmFtZS4gQmFkIGlkZWEhIEl0J3MgYmFkIGVub3VnaCB0 aGF0IHdlIGRvIGl0IGZvciBlYWNoIGRvY3VtZW50LCBidXQKKyAgICAgICAgdGhlIG9sZCB2ZXJz aW9uIGtlcHQgdGhlIHNldCBhcm91bmQgZm9yZXZlciBhcyB5b3UgbW92ZWQgZnJvbSBvbmUgZG9j dW1lbnQgdG8gdGhlIG5leHQuCisKKyAgICAgICAgKiBodG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxGcmFtZUVsZW1lbnRCYXNlOjpwYXJzZU1hcHBl ZEF0dHJpYnV0ZSk6IENoYW5nZSB0aGlzIHNvIHRoYXQgd2UgYWxsb3cKKyAgICAgICAgdHVybmlu ZyBvZmYgc2Nyb2xsaW5nIHdoZW4gdGhlIHF1aXJrIGlzIGVuYWJsZWQuIFdlIGp1c3QgZG9uJ3Qg YWxsb3cgdHVybmluZyBpdCBvbi4KKyAgICAgICAgVGhpcyBmaXhlcyBvbmUgb2YgdGhlIHR3byBw cm9ibGVtcyB3aXRoIHRoZSBpbml0aWFsIHBhdGNoOyB0aGUgb3RoZXIgZml4IGlzIGluIFdlYktp dC4KKworICAgICAgICAqIGxvYWRlci9Eb2N1bWVudExvYWRlci5oOiBNb3ZlZCBkaWRUZWxsQ2xp ZW50QWJvdXRMb2FkIGFuZCBoYXZlVG9sZENsaWVudEFib3V0TG9hZAorICAgICAgICBoZXJlIGZy b20gRnJhbWVMb2FkZXIuIFRoZSBvbGQgd2F5IG1lYW50IHRoYXQgYSBnaXZlbiBmcmFtZSB3b3Vs ZCBmb3JldmVyIHJlbWVtYmVyCisgICAgICAgIHRoZSBVUkwgb2YgYW55IHJlc291cmNlcyBsb2Fk ZWQgaW4gdGhhdCBmcmFtZSBhbmQgbmV2ZXIgc2VuZCBhbnkgImxvYWRlZCBmcm9tIGNhY2hlIgor ICAgICAgICBjbGllbnQgY2FsbHMgYWJvdXQgdGhvc2UgVVJMcy4KKworICAgICAgICAqIGxvYWRl ci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6bG9hZFJl c291cmNlU3luY2hyb25vdXNseSk6IFJlbW92ZWQgY2FsbCB0byBkaWRUZWxsQ2llbnRBYm91dExv YWQuCisgICAgICAgIFRoaXMgaXMgbm93IGhhbmRsZWQgYnkgZGlzcGF0Y2hXaWxsU2VuZFJlcXVl c3QsIHdoaWNoIGlzIHNhZmVyIHNpbmNlIHRoYXQncyB0aGUgYWN0dWFsCisgICAgICAgIGZ1bmN0 aW9uIHRoYXQgdGVsbHMgdGhlIGNsaWVudCBhYm91dCB0aGUgbG9hZC4KKyAgICAgICAgKFdlYkNv cmU6OkZyYW1lTG9hZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6IENoYW5nZWQg Y2FsbHMgdG8KKyAgICAgICAgaGF2ZVRvbGRDbGllbnRBYm91dExvYWQgYW5kIGRpZFRlbGxDbGll bnRBYm91dExvYWQgdG8gY2FsbCB0aGUgZG9jdW1lbnQgbG9hZGVyLgorICAgICAgICBBbHNvIHJl bW92ZWQgdGhlIGNhbGwgaW4gdGhlIGNhc2Ugd2hlcmUgd2UgZG9uJ3QgbG9hZCBmcm9tIHRoZSBj YWNoZSwgc2luY2UKKyAgICAgICAgZGlzcGF0Y2hXaWxsU2VuZFJlcXVlc3Qgbm93IHRha2VzIGNh cmUgb2YgaXQuCisgICAgICAgIChXZWJDb3JlOjpGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hXaWxsU2Vu ZFJlcXVlc3QpOiBQdXQgY2FsbHMgdG8gZGlkVGVsbENsaWVudEFib3V0TG9hZAorICAgICAgICBo ZXJlLiBDYWxsIGl0IGJvdGggb24gdGhlIFVSTCB3ZSBwYXNzIGluIGFuZCB0aGUgVVJMIHRoZSBj bGllbnQgcmV0dXJuczsgd2Ugd29uJ3QKKyAgICAgICAgdGVsbCB0aGUgY2xpZW50IGFib3V0IGVp dGhlciBpZiBpdCdzIGxvYWRlZCBmcm9tIHRoZSBtZW1vcnkgY2FjaGUuCisKKyAgICAgICAgKiBs b2FkZXIvRnJhbWVMb2FkZXIuaDogUmVtb3ZlZCBkaWRUZWxsQ2xpZW50QWJvdXRMb2FkLCBoYXZl VG9sZENsaWVudEFib3V0TG9hZCwgYW5kCisgICAgICAgIG1fdXJsc0NsaWVudEtub3dzQWJvdXQu CisKKyAgICAgICAgKiBsb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwOiBSZW1vdmVkIHVubmVl ZGVkIGxvYWQgZnVuY3Rpb24gdGhhdCBjYWxsZWQKKyAgICAgICAgZGlkVGVsbENsaWVudEFib3V0 TG9hZC4gVGhhdCdzIG5vdyB0YWtlbiBjYXJlIG9mIGluIGRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0 LgorCisgICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmg6IFJlbW92ZWQgbG9hZCBm dW5jdGlvbi4gQWxzbyBtYWRlIGFsbCBtZW1iZXJzIHByaXZhdGUKKyAgICAgICAgZXhjZXB0IGZv ciBjcmVhdGUgYW5kIGNsZWFyQ2xpZW50LgorCiAyMDA5LTAxLTAyICBFcmljIENhcmxzb24gIDxl cmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVy CkluZGV4OiBXZWJDb3JlL2h0bWwvSFRNTEZyYW1lRWxlbWVudEJhc2UuY3BwCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvaHRtbC9IVE1MRnJhbWVFbGVtZW50QmFzZS5jcHAJKHJldmlzaW9uIDM5NTUy KQorKysgV2ViQ29yZS9odG1sL0hUTUxGcmFtZUVsZW1lbnRCYXNlLmNwcAkod29ya2luZyBjb3B5 KQpAQCAtMyw3ICszLDcgQEAKICAqICAgICAgICAgICAoQykgMTk5OSBBbnR0aSBLb2l2aXN0byAo a29pdmlzdG9Aa2RlLm9yZykKICAqICAgICAgICAgICAoQykgMjAwMCBTaW1vbiBIYXVzbWFubiAo aGF1c21hbm5Aa2RlLm9yZykKICAqICAgICAgICAgICAoQykgMjAwMSBEaXJrIE11ZWxsZXIgKG11 ZWxsZXJAa2RlLm9yZykKLSAqIENvcHlyaWdodCAoQykgMjAwNCwgMjAwNiwgMjAwOCBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDQsIDIwMDYsIDIw MDgsIDIwMDkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFRoaXMgbGli cmFyeSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKICAq IG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2YgdGhlIEdOVSBMaWJyYXJ5IEdlbmVyYWwgUHVi bGljCkBAIC0xMjksMTEgKzEyOSw5IEBAIHZvaWQgSFRNTEZyYW1lRWxlbWVudEJhc2U6OnBhcnNl TWFwcGVkQXQKICAgICAgICAgbV9ub1Jlc2l6ZSA9IHRydWU7CiAgICAgICAgIC8vIEZJWE1FOiBJ ZiB3ZSBhcmUgYWxyZWFkeSBhdHRhY2hlZCwgdGhpcyBoYXMgbm8gZWZmZWN0LgogICAgIH0gZWxz ZSBpZiAoYXR0ci0+bmFtZSgpID09IHNjcm9sbGluZ0F0dHIpIHsKLSAgICAgICAgaWYgKGRvY3Vt ZW50KCktPmZyYW1lRWxlbWVudHNTaG91bGRJZ25vcmVTY3JvbGxpbmcoKSkKLSAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgLy8gQXV0byBhbmQgeWVzIGJvdGggc2ltcGx5IG1lYW4gImFsbG93 IHNjcm9sbGluZy4iIE5vIG1lYW5zICJkb24ndCBhbGxvdyBzY3JvbGxpbmcuIgogICAgICAgICBp ZiAoZXF1YWxJZ25vcmluZ0Nhc2UoYXR0ci0+dmFsdWUoKSwgImF1dG8iKSB8fCBlcXVhbElnbm9y aW5nQ2FzZShhdHRyLT52YWx1ZSgpLCAieWVzIikpCi0gICAgICAgICAgICBtX3Njcm9sbGluZyA9 IFNjcm9sbGJhckF1dG87CisgICAgICAgICAgICBtX3Njcm9sbGluZyA9IGRvY3VtZW50KCktPmZy YW1lRWxlbWVudHNTaG91bGRJZ25vcmVTY3JvbGxpbmcoKSA/IFNjcm9sbGJhckFsd2F5c09mZiA6 IFNjcm9sbGJhckF1dG87CiAgICAgICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGF0dHIt PnZhbHVlKCksICJubyIpKQogICAgICAgICAgICAgbV9zY3JvbGxpbmcgPSBTY3JvbGxiYXJBbHdh eXNPZmY7CiAgICAgICAgIC8vIEZJWE1FOiBJZiB3ZSBhcmUgYWxyZWFkeSBhdHRhY2hlZCwgdGhp cyBoYXMgbm8gZWZmZWN0LgpJbmRleDogV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRlci5oCShyZXZpc2lvbiAz OTU1MikKKysrIFdlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmgJKHdvcmtpbmcgY29weSkK QEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3IEFwcGxlIElu Yy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNiwgMjAwNywgMjAw OCwgMjAwOSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKQEAgLTI5LDM4ICsyOSwyOCBAQAogI2lmbmRlZiBEb2N1bWVudExvYWRl cl9oCiAjZGVmaW5lIERvY3VtZW50TG9hZGVyX2gKIAotI2luY2x1ZGUgIkljb25EYXRhYmFzZS5o IgogI2luY2x1ZGUgIk5hdmlnYXRpb25BY3Rpb24uaCIKLSNpbmNsdWRlIDx3dGYvUmVmQ291bnRl ZC5oPgotI2luY2x1ZGUgIlBsYXRmb3JtU3RyaW5nLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VFcnJv ci5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVz cG9uc2UuaCIKICNpbmNsdWRlICJTdWJzdGl0dXRlRGF0YS5oIgotI2luY2x1ZGUgPHd0Zi9IYXNo U2V0Lmg+Ci0jaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgotI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4K KyNpbmNsdWRlICJUaW1lci5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKLSNpZiBFTkFCTEUo T0ZGTElORV9XRUJfQVBQTElDQVRJT05TKQogICAgIGNsYXNzIEFwcGxpY2F0aW9uQ2FjaGU7CiAg ICAgY2xhc3MgQXBwbGljYXRpb25DYWNoZUdyb3VwOwogICAgIGNsYXNzIEFwcGxpY2F0aW9uQ2Fj aGVSZXNvdXJjZTsKLSNlbmRpZgogICAgIGNsYXNzIEFyY2hpdmU7CiAgICAgY2xhc3MgQXJjaGl2 ZVJlc291cmNlOwogICAgIGNsYXNzIEFyY2hpdmVSZXNvdXJjZUNvbGxlY3Rpb247CiAgICAgY2xh c3MgQ2FjaGVkUGFnZTsKICAgICBjbGFzcyBGcmFtZTsKICAgICBjbGFzcyBGcmFtZUxvYWRlcjsK LSAgICBjbGFzcyBIaXN0b3J5SXRlbTsKLSAgICBjbGFzcyBLVVJMOwogICAgIGNsYXNzIE1haW5S ZXNvdXJjZUxvYWRlcjsKICAgICBjbGFzcyBSZXNvdXJjZUxvYWRlcjsKICAgICBjbGFzcyBTY2hl ZHVsZVBhaXI7CiAgICAgY2xhc3MgU2hhcmVkQnVmZmVyOwotICAgIGNsYXNzIFN1YnN0aXR1dGVE YXRhOwogICAgIGNsYXNzIFN1YnN0aXR1dGVSZXNvdXJjZTsKIAogICAgIHR5cGVkZWYgSGFzaFNl dDxSZWZQdHI8UmVzb3VyY2VMb2FkZXI+ID4gUmVzb3VyY2VMb2FkZXJTZXQ7CkBAIC0xOTYsNiAr MTg2LDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICB2b2lkIHNldERlZmVyTWFpblJl c291cmNlRGF0YUxvYWQoYm9vbCBkZWZlcikgeyBtX2RlZmVyTWFpblJlc291cmNlRGF0YUxvYWQg PSBkZWZlcjsgfQogICAgICAgICBib29sIGRlZmVyTWFpblJlc291cmNlRGF0YUxvYWQoKSBjb25z dCB7IHJldHVybiBtX2RlZmVyTWFpblJlc291cmNlRGF0YUxvYWQ7IH0KICAgICAgICAgCisgICAg ICAgIHZvaWQgZGlkVGVsbENsaWVudEFib3V0TG9hZChjb25zdCBTdHJpbmcmIHVybCkgeyBtX3Jl c291cmNlc0NsaWVudEtub3dzQWJvdXQuYWRkKHVybCk7IH0KKyAgICAgICAgYm9vbCBoYXZlVG9s ZENsaWVudEFib3V0TG9hZChjb25zdCBTdHJpbmcmIHVybCkgeyByZXR1cm4gbV9yZXNvdXJjZXND bGllbnRLbm93c0Fib3V0LmNvbnRhaW5zKHVybCk7IH0KKwogI2lmIEVOQUJMRShPRkZMSU5FX1dF Ql9BUFBMSUNBVElPTlMpCiAgICAgICAgIGJvb2wgc2NoZWR1bGVBcHBsaWNhdGlvbkNhY2hlTG9h ZChSZXNvdXJjZUxvYWRlciosIGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIGNvbnN0IEtVUkwmIG9y aWdpbmFsVVJMKTsKICAgICAgICAgYm9vbCBzY2hlZHVsZUxvYWRGYWxsYmFja1Jlc291cmNlRnJv bUFwcGxpY2F0aW9uQ2FjaGUoUmVzb3VyY2VMb2FkZXIqLCBjb25zdCBSZXNvdXJjZVJlcXVlc3Qm LCBBcHBsaWNhdGlvbkNhY2hlKiA9IDApOwpAQCAtMjg5LDcgKzI4Miw5IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKICAgICAgICAgICAgICAgICAKICAgICAgICAgT3duUHRyPEFyY2hpdmVSZXNvdXJj ZUNvbGxlY3Rpb24+IG1fYXJjaGl2ZVJlc291cmNlQ29sbGVjdGlvbjsKICAgICAgICAgUmVmUHRy PFNoYXJlZEJ1ZmZlcj4gbV9wYXJzZWRBcmNoaXZlRGF0YTsKLSAgICAgICAgCisKKyAgICAgICAg SGFzaFNldDxTdHJpbmc+IG1fcmVzb3VyY2VzQ2xpZW50S25vd3NBYm91dDsKKwogI2lmIEVOQUJM RShPRkZMSU5FX1dFQl9BUFBMSUNBVElPTlMpICAKICAgICAgICAgLy8gVGhlIGFwcGxpY2F0aW9u IGNhY2hlIHRoYXQgdGhlIGRvY3VtZW50IGxvYWRlciBpcyBhc3NvY2lhdGVkIHdpdGggKGlmIGFu eSkuCiAgICAgICAgIFJlZlB0cjxBcHBsaWNhdGlvbkNhY2hlPiBtX2FwcGxpY2F0aW9uQ2FjaGU7 CkluZGV4OiBXZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi Q29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCShyZXZpc2lvbiAzOTU1MikKKysrIFdlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8q Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqIENvcHlyaWdodCAoQykgMjAwOCBOb2tpYSBD b3Jwb3JhdGlvbiBhbmQvb3IgaXRzIHN1YnNpZGlhcnkoLWllcykKICAqIENvcHlyaWdodCAoQykg MjAwOCBUb3JjaCBNb2JpbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLiAoaHR0cDovL3d3dy50 b3JjaG1vYmlsZS5jb20vKQogICoKQEAgLTMzODUsMTYgKzMzODUsNiBAQCB2b2lkIEZyYW1lTG9h ZGVyOjp0b2tlbml6ZXJQcm9jZXNzZWREYXRhCiAgICAgY2hlY2tDb21wbGV0ZWQoKTsKIH0KIAot dm9pZCBGcmFtZUxvYWRlcjo6ZGlkVGVsbENsaWVudEFib3V0TG9hZChjb25zdCBTdHJpbmcmIHVy bCkKLXsKLSAgICBtX3VybHNDbGllbnRLbm93c0Fib3V0LmFkZCh1cmwpOwotfQotCi1ib29sIEZy YW1lTG9hZGVyOjpoYXZlVG9sZENsaWVudEFib3V0TG9hZChjb25zdCBTdHJpbmcmIHVybCkKLXsK LSAgICByZXR1cm4gbV91cmxzQ2xpZW50S25vd3NBYm91dC5jb250YWlucyh1cmwpOwotfQotCiB2 b2lkIEZyYW1lTG9hZGVyOjpoYW5kbGVkT25sb2FkRXZlbnRzKCkKIHsKICAgICBtX2NsaWVudC0+ ZGlzcGF0Y2hEaWRIYW5kbGVPbmxvYWRFdmVudHMoKTsKQEAgLTM1ODUsNyArMzU3NSw2IEBAIHVu c2lnbmVkIGxvbmcgRnJhbWVMb2FkZXI6OmxvYWRSZXNvdXJjZVMKIAogICAgIGlmIChlcnJvci5p c051bGwoKSkgewogICAgICAgICBBU1NFUlQoIW5ld1JlcXVlc3QuaXNOdWxsKCkpOwotICAgICAg ICBkaWRUZWxsQ2xpZW50QWJvdXRMb2FkKG5ld1JlcXVlc3QudXJsKCkuc3RyaW5nKCkpOwogICAg ICAgICAKICNpZiBFTkFCTEUoT0ZGTElORV9XRUJfQVBQTElDQVRJT05TKQogICAgICAgICBBcHBs aWNhdGlvbkNhY2hlUmVzb3VyY2UqIHJlc291cmNlOwpAQCAtNDAzNywxMSArNDAyNiwxMSBAQCB2 b2lkIEZyYW1lTG9hZGVyOjpsb2FkZWRSZXNvdXJjZUZyb21NZW1vCiAgICAgaWYgKFBhZ2UqIHBh Z2UgPSBtX2ZyYW1lLT5wYWdlKCkpCiAgICAgICAgIHBhZ2UtPmluc3BlY3RvckNvbnRyb2xsZXIo KS0+ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCks IHJlcXVlc3QsIHJlc3BvbnNlLCBsZW5ndGgpOwogCi0gICAgaWYgKCFyZXNvdXJjZS0+c2VuZFJl c291cmNlTG9hZENhbGxiYWNrcygpIHx8IGhhdmVUb2xkQ2xpZW50QWJvdXRMb2FkKHJlc291cmNl LT51cmwoKSkpCisgICAgaWYgKCFyZXNvdXJjZS0+c2VuZFJlc291cmNlTG9hZENhbGxiYWNrcygp IHx8IG1fZG9jdW1lbnRMb2FkZXItPmhhdmVUb2xkQ2xpZW50QWJvdXRMb2FkKHJlcXVlc3QudXJs KCkpKQogICAgICAgICByZXR1cm47CiAKICAgICBpZiAobV9jbGllbnQtPmRpc3BhdGNoRGlkTG9h ZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKG1fZG9jdW1lbnRMb2FkZXIuZ2V0KCksIHJlcXVlc3Qs IHJlc3BvbnNlLCBsZW5ndGgpKSB7Ci0gICAgICAgIGRpZFRlbGxDbGllbnRBYm91dExvYWQocmVz b3VyY2UtPnVybCgpKTsKKyAgICAgICAgbV9kb2N1bWVudExvYWRlci0+ZGlkVGVsbENsaWVudEFi b3V0TG9hZChyZXF1ZXN0LnVybCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNDA1 MCw4ICs0MDM5LDYgQEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZGVkUmVzb3VyY2VGcm9tTWVtbwog ICAgIFJlc291cmNlUmVxdWVzdCByKHJlcXVlc3QpOwogICAgIHJlcXVlc3RGcm9tRGVsZWdhdGUo ciwgaWRlbnRpZmllciwgZXJyb3IpOwogICAgIHNlbmRSZW1haW5pbmdEZWxlZ2F0ZU1lc3NhZ2Vz KGlkZW50aWZpZXIsIHJlc3BvbnNlLCBsZW5ndGgsIGVycm9yKTsKLQotICAgIGRpZFRlbGxDbGll bnRBYm91dExvYWQocmVzb3VyY2UtPnVybCgpKTsKIH0KIAogdm9pZCBGcmFtZUxvYWRlcjo6YXBw bHlVc2VyQWdlbnQoUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQpAQCAtNTEyNSw3ICs1MTEyLDkg QEAgdm9pZCBGcmFtZUxvYWRlcjo6ZGlzcGF0Y2hBc3NpZ25JZGVudGlmaQogCiB2b2lkIEZyYW1l TG9hZGVyOjpkaXNwYXRjaFdpbGxTZW5kUmVxdWVzdChEb2N1bWVudExvYWRlciogbG9hZGVyLCB1 bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3Qg UmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKIHsKKyAgICBtX2RvY3VtZW50TG9h ZGVyLT5kaWRUZWxsQ2xpZW50QWJvdXRMb2FkKHJlcXVlc3QudXJsKCkpOwogICAgIG1fY2xpZW50 LT5kaXNwYXRjaFdpbGxTZW5kUmVxdWVzdChsb2FkZXIsIGlkZW50aWZpZXIsIHJlcXVlc3QsIHJl ZGlyZWN0UmVzcG9uc2UpOworICAgIG1fZG9jdW1lbnRMb2FkZXItPmRpZFRlbGxDbGllbnRBYm91 dExvYWQocmVxdWVzdC51cmwoKSk7CiAKICAgICBpZiAoUGFnZSogcGFnZSA9IG1fZnJhbWUtPnBh Z2UoKSkKICAgICAgICAgcGFnZS0+aW5zcGVjdG9yQ29udHJvbGxlcigpLT53aWxsU2VuZFJlcXVl c3QobG9hZGVyLCBpZGVudGlmaWVyLCByZXF1ZXN0LCByZWRpcmVjdFJlc3BvbnNlKTsKSW5kZXg6 IFdlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2Fk ZXIvRnJhbWVMb2FkZXIuaAkocmV2aXNpb24gMzk1NTIpCisrKyBXZWJDb3JlL2xvYWRlci9GcmFt ZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdo dCAoQykgMjAwNiwgMjAwNyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5 cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMDgsIDIwMDkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJl c2VydmVkLgogICogQ29weXJpZ2h0IChDKSAyMDA4IFRvcmNoIE1vYmlsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuIChodHRwOi8vd3d3LnRvcmNobW9iaWxlLmNvbS8pCiAgKgogICogUmVkaXN0 cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRo b3V0CkBAIC0zMCwyMCArMzAsMTEgQEAKICNpZm5kZWYgRnJhbWVMb2FkZXJfaAogI2RlZmluZSBG cmFtZUxvYWRlcl9oCiAKLSNpbmNsdWRlICJDYWNoZWRSZXNvdXJjZS5oIgogI2luY2x1ZGUgIkNh Y2hlUG9saWN5LmgiCi0jaW5jbHVkZSAiRm9ybVN0YXRlLmgiCiAjaW5jbHVkZSAiRnJhbWVMb2Fk ZXJUeXBlcy5oIgotI2luY2x1ZGUgIktVUkwuaCIKLSNpbmNsdWRlICJTdHJpbmdIYXNoLmgiCi0j aW5jbHVkZSAiVGltZXIuaCIKLSNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgotI2luY2x1ZGUgPHd0 Zi9IYXNoU2V0Lmg+Ci0jaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KLSNpbmNsdWRlIDx3dGYvTm9u Y29weWFibGUuaD4KLSNpbmNsdWRlIDx3dGYvT3duUHRyLmg+Ci0jaW5jbHVkZSA8d3RmL1JlZlB0 ci5oPgogI2luY2x1ZGUgIlJlc291cmNlUmVxdWVzdC5oIgorI2luY2x1ZGUgIlRpbWVyLmgiCisK ICNpZiBVU0UoTE9XX0JBTkRXSURUSF9ESVNQTEFZKQogI2luY2x1ZGUgIkNhY2hlZFJlc291cmNl Q2xpZW50LmgiCiAjZW5kaWYKQEAgLTUxLDE0ICs0MiwxNSBAQAogbmFtZXNwYWNlIFdlYkNvcmUg ewogCiAgICAgY2xhc3MgQXJjaGl2ZTsKLSAgICBjbGFzcyBBcmNoaXZlUmVzb3VyY2U7CiAgICAg Y2xhc3MgQXV0aGVudGljYXRpb25DaGFsbGVuZ2U7CiAgICAgY2xhc3MgQ2FjaGVkUGFnZTsKKyAg ICBjbGFzcyBDYWNoZWRSZXNvdXJjZTsKICAgICBjbGFzcyBEb2N1bWVudDsKICAgICBjbGFzcyBE b2N1bWVudExvYWRlcjsKICAgICBjbGFzcyBFbGVtZW50OwogICAgIGNsYXNzIEV2ZW50OwogICAg IGNsYXNzIEZvcm1EYXRhOworICAgIGNsYXNzIEZvcm1TdGF0ZTsKICAgICBjbGFzcyBGcmFtZTsK ICAgICBjbGFzcyBGcmFtZUxvYWRlckNsaWVudDsKICAgICBjbGFzcyBIaXN0b3J5SXRlbTsKQEAg LTY3LDEyICs1OSw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBjbGFzcyBJY29uTG9hZGVy OwogICAgIGNsYXNzIEludFNpemU7CiAgICAgY2xhc3MgTmF2aWdhdGlvbkFjdGlvbjsKLSAgICBj bGFzcyBOb2RlOwotICAgIGNsYXNzIFBhZ2U7CiAgICAgY2xhc3MgUmVuZGVyUGFydDsKICAgICBj bGFzcyBSZXNvdXJjZUVycm9yOwogICAgIGNsYXNzIFJlc291cmNlTG9hZGVyOwotICAgIGNsYXNz IFJlc291cmNlUmVxdWVzdDsKICAgICBjbGFzcyBSZXNvdXJjZVJlc3BvbnNlOwogICAgIGNsYXNz IFNjcmlwdFNvdXJjZUNvZGU7CiAgICAgY2xhc3MgU2NyaXB0VmFsdWU7CkBAIC0xMjYsNyArMTE1 LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgY2xhc3MgRnJhbWVMb2FkZXIgOiBOb25j b3B5YWJsZQogI2lmIFVTRShMT1dfQkFORFdJRFRIX0RJU1BMQVkpCi0gICAgLCBwcml2YXRlIENh Y2hlZFJlc291cmNlQ2xpZW50CisgICAgICAgICwgcHJpdmF0ZSBDYWNoZWRSZXNvdXJjZUNsaWVu dAogI2VuZGlmCiAgICAgewogICAgIHB1YmxpYzoKQEAgLTQwNCw5ICszOTMsNiBAQCBuYW1lc3Bh Y2UgV2ViQ29yZSB7CiAKICAgICAgICAgS1VSTCBjb21wbGV0ZVVSTChjb25zdCBTdHJpbmcmIHVy bCk7CiAKLSAgICAgICAgdm9pZCBkaWRUZWxsQ2xpZW50QWJvdXRMb2FkKGNvbnN0IFN0cmluZyYg dXJsKTsKLSAgICAgICAgYm9vbCBoYXZlVG9sZENsaWVudEFib3V0TG9hZChjb25zdCBTdHJpbmcm IHVybCk7Ci0KICAgICAgICAgS1VSTCBvcmlnaW5hbFJlcXVlc3RVUkwoKSBjb25zdDsKIAogICAg ICAgICB2b2lkIGNhbmNlbEFuZENsZWFyKCk7CkBAIC02MTgsOCArNjA0LDYgQEAgbmFtZXNwYWNl IFdlYkNvcmUgewogCiAgICAgICAgIFN0cmluZyBtX291dGdvaW5nUmVmZXJyZXI7CiAKLSAgICAg ICAgSGFzaFNldDxTdHJpbmc+IG1fdXJsc0NsaWVudEtub3dzQWJvdXQ7Ci0KICAgICAgICAgT3du UHRyPEZvcm1TdWJtaXNzaW9uPiBtX2RlZmVycmVkRm9ybVN1Ym1pc3Npb247CiAKICAgICAgICAg Ym9vbCBtX2lzRXhlY3V0aW5nSmF2YVNjcmlwdEZvcm1BY3Rpb247CkluZGV4OiBXZWJDb3JlL2xv YWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9sb2FkZXIv U3VicmVzb3VyY2VMb2FkZXIuY3BwCShyZXZpc2lvbiAzOTU1MikKKysrIFdlYkNvcmUvbG9hZGVy L1N1YnJlc291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8q Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2Vy dmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3LCAyMDA5IEFwcGxlIEluYy4gQWxsIHJp Z2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBh bmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBl cm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMjksMTUg KzI5LDExIEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU3VicmVzb3VyY2VMb2Fk ZXIuaCIKIAotI2luY2x1ZGUgIkRvY3VtZW50LmgiCiAjaW5jbHVkZSAiRG9jdW1lbnRMb2FkZXIu aCIKICNpbmNsdWRlICJGcmFtZS5oIgogI2luY2x1ZGUgIkZyYW1lTG9hZGVyLmgiCi0jaW5jbHVk ZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIlJlc291cmNlSGFuZGxlLmgiCi0jaW5jbHVkZSAiUmVz b3VyY2VSZXF1ZXN0LmgiCiAjaW5jbHVkZSAiU3VicmVzb3VyY2VMb2FkZXJDbGllbnQuaCIKLSNp bmNsdWRlICJTaGFyZWRCdWZmZXIuaCIKICNpbmNsdWRlIDx3dGYvUmVmQ291bnRlZExlYWtDb3Vu dGVyLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTY0LDEzICs2MCw2IEBAIFN1YnJlc291 cmNlTG9hZGVyOjp+U3VicmVzb3VyY2VMb2FkZXIoKQogI2VuZGlmCiB9CiAKLWJvb2wgU3VicmVz b3VyY2VMb2FkZXI6OmxvYWQoY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByKQotewotICAgIG1fZnJh bWUtPmxvYWRlcigpLT5kaWRUZWxsQ2xpZW50QWJvdXRMb2FkKHIudXJsKCkuc3RyaW5nKCkpOwot ICAgIAotICAgIHJldHVybiBSZXNvdXJjZUxvYWRlcjo6bG9hZChyKTsKLX0KLQogUGFzc1JlZlB0 cjxTdWJyZXNvdXJjZUxvYWRlcj4gU3VicmVzb3VyY2VMb2FkZXI6OmNyZWF0ZShGcmFtZSogZnJh bWUsIFN1YnJlc291cmNlTG9hZGVyQ2xpZW50KiBjbGllbnQsIGNvbnN0IFJlc291cmNlUmVxdWVz dCYgcmVxdWVzdCwgYm9vbCBza2lwQ2FuTG9hZENoZWNrLCBib29sIHNlbmRSZXNvdXJjZUxvYWRD YWxsYmFja3MsIGJvb2wgc2hvdWxkQ29udGVudFNuaWZmKQogewogICAgIGlmICghZnJhbWUpCklu ZGV4OiBXZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdl YkNvcmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmgJKHJldmlzaW9uIDM5NTUyKQorKysgV2Vi Q29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsx LDUgQEAKIC8qCi0gKiBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDYgQXBwbGUgQ29tcHV0ZXIsIElu Yy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDUsIDIwMDYsIDIw MDkgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9u IGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICog bW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBj b25kaXRpb25zCkBAIC0zMCwyMyArMzAsMjEgQEAKICNkZWZpbmUgU3VicmVzb3VyY2VMb2FkZXJf aAogIAogI2luY2x1ZGUgIlJlc291cmNlTG9hZGVyLmgiCi0jaW5jbHVkZSA8d3RmL1Bhc3NSZWZQ dHIuaD4KICAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotICAgIGNsYXNzIEZvcm1EYXRhOwotICAg IGNsYXNzIFN0cmluZzsKLSAgICBjbGFzcyBSZXNvdXJjZUhhbmRsZTsKICAgICBjbGFzcyBSZXNv dXJjZVJlcXVlc3Q7CiAgICAgY2xhc3MgU3VicmVzb3VyY2VMb2FkZXJDbGllbnQ7CiAgICAgCiAg ICAgY2xhc3MgU3VicmVzb3VyY2VMb2FkZXIgOiBwdWJsaWMgUmVzb3VyY2VMb2FkZXIgewogICAg IHB1YmxpYzoKICAgICAgICAgc3RhdGljIFBhc3NSZWZQdHI8U3VicmVzb3VyY2VMb2FkZXI+IGNy ZWF0ZShGcmFtZSosIFN1YnJlc291cmNlTG9hZGVyQ2xpZW50KiwgY29uc3QgUmVzb3VyY2VSZXF1 ZXN0JiwgYm9vbCBza2lwQ2FuTG9hZENoZWNrID0gZmFsc2UsIGJvb2wgc2VuZFJlc291cmNlTG9h ZENhbGxiYWNrcyA9IHRydWUsIGJvb2wgc2hvdWxkQ29udGVudFNuaWZmID0gdHJ1ZSk7Ci0gICAg ICAgIAotICAgICAgICB2aXJ0dWFsIH5TdWJyZXNvdXJjZUxvYWRlcigpOwogCi0gICAgICAgIHZp cnR1YWwgYm9vbCBsb2FkKGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOworICAgICAgICB2b2lkIGNs ZWFyQ2xpZW50KCkgeyBtX2NsaWVudCA9IDA7IH0KKworICAgIHByaXZhdGU6CisgICAgICAgIFN1 YnJlc291cmNlTG9hZGVyKEZyYW1lKiwgU3VicmVzb3VyY2VMb2FkZXJDbGllbnQqLCBib29sIHNl bmRSZXNvdXJjZUxvYWRDYWxsYmFja3MsIGJvb2wgc2hvdWxkQ29udGVudFNuaWZmKTsKKyAgICAg ICAgdmlydHVhbCB+U3VicmVzb3VyY2VMb2FkZXIoKTsKICAgICAgICAgCiAgICAgICAgIHZpcnR1 YWwgdm9pZCB3aWxsU2VuZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSk7CiAgICAgICAgIHZpcnR1YWwgdm9pZCBkaWRTZW5k RGF0YSh1bnNpZ25lZCBsb25nIGxvbmcgYnl0ZXNTZW50LCB1bnNpZ25lZCBsb25nIGxvbmcgdG90 YWxCeXRlc1RvQmVTZW50KTsKQEAgLTU2LDE0ICs1NCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgdmlydHVhbCB2b2lkIGRpZEZhaWwoY29uc3QgUmVzb3VyY2VFcnJvciYpOwogICAg ICAgICB2aXJ0dWFsIGJvb2wgc2hvdWxkVXNlQ3JlZGVudGlhbFN0b3JhZ2UoKTsKICAgICAgICAg dmlydHVhbCB2b2lkIGRpZFJlY2VpdmVBdXRoZW50aWNhdGlvbkNoYWxsZW5nZShjb25zdCBBdXRo ZW50aWNhdGlvbkNoYWxsZW5nZSYpOwotICAgICAgICB2aXJ0dWFsIHZvaWQgcmVjZWl2ZWRDYW5j ZWxsYXRpb24oY29uc3QgQXV0aGVudGljYXRpb25DaGFsbGVuZ2UmKTsKLSAgICAgICAgCi0gICAg ICAgIHZvaWQgY2xlYXJDbGllbnQoKSB7IG1fY2xpZW50ID0gMDsgfQotCi0gICAgcHJpdmF0ZToK LSAgICAgICAgU3VicmVzb3VyY2VMb2FkZXIoRnJhbWUqLCBTdWJyZXNvdXJjZUxvYWRlckNsaWVu dCosIGJvb2wgc2VuZFJlc291cmNlTG9hZENhbGxiYWNrcywgYm9vbCBzaG91bGRDb250ZW50U25p ZmYpOwotCisgICAgICAgIHZpcnR1YWwgdm9pZCByZWNlaXZlZENhbmNlbGxhdGlvbihjb25zdCBB dXRoZW50aWNhdGlvbkNoYWxsZW5nZSYpOyAgICAgICAgCiAgICAgICAgIHZpcnR1YWwgdm9pZCBk aWRDYW5jZWwoY29uc3QgUmVzb3VyY2VFcnJvciYpOworCiAgICAgICAgIFN1YnJlc291cmNlTG9h ZGVyQ2xpZW50KiBtX2NsaWVudDsKICAgICAgICAgYm9vbCBtX2xvYWRpbmdNdWx0aXBhcnRDb250 ZW50OwogICAgIH07CkluZGV4OiBXZWJLaXQvbWFjL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMzk1NjIpCisrKyBXZWJLaXQvbWFjL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDA5LTAxLTAyICBEYXJpbiBB ZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBCdWcgMjMwNzI6IFJFR1JFU1NJT04gKHIzNzM3MSk6IEluIHRoZSBE aWN0aW9uYXJ5IGFwcGxpY2F0aW9uLCBzY3JvbGwgYmFyIGFwcGVhcnMKKyAgICAgICAgaW5zaWRl IGl0cyB3ZWIgdmlldyB3aGVuIHJlc2l6aW5nIGl0cyB3aW5kb3cKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMDcyCisgICAgICAgIHJkYXI6Ly9wcm9i bGVtLzYzNjgwMjgKKworICAgICAgICBUaGUgZmlyc3QgYXR0ZW1wdCBhdCBmaXhpbmcgdGhpcyBk aWQgbm90IHdvcmsuCisgICAgICAgIFRoaXMgdGltZSBJIHdhcyBhYmxlIHRvIHJlcHJvZHVjZSB0 aGUgYnVnIGFuZCB0ZXN0IHRoZSBmaXguCisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJG cmFtZUxvYWRlckNsaWVudC5tbToKKyAgICAgICAgKGFwcGx5QXBwbGVEaWN0aW9uYXJ5QXBwbGlj YXRpb25RdWlya05vbklubGluZVBhcnQpOiBDaGFuZ2VkIHRoZSBhcmd1bWVudHMgYW5kCisgICAg ICAgIGZ1bmN0aW9uIG5hbWVzIGFyb3VuZCBhIGJpdCB0byBtYWtlIGV2ZW4gbGVzcyBjb2RlIGF0 IHRoZSBjYWxsIHNpdGUuCisgICAgICAgIChhcHBseUFwcGxlRGljdGlvbmFyeUFwcGxpY2F0aW9u UXVpcmspOiBQdXQgdGhlIGNoZWNrIGZvciB3aGV0aGVyIHRoaXMgaXMgdGhlCisgICAgICAgIERp Y3Rpb25hcnkgYXBwbGljYXRpb24gaW4gaGVyZS4KKyAgICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xp ZW50OjpkaXNwYXRjaERpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZSk6IFB1dCBhIGNhbGwg dG8KKyAgICAgICAgYXBwbHlBcHBsZURpY3Rpb25hcnlBcHBsaWNhdGlvblF1aXJrIGhlcmUuIFRo aXMgd2FzIGEgY2FzZSBJIGhhZCBtaXNzZWQgYmVmb3JlLAorICAgICAgICB3aGVuIHRoZSBzY3Jp cHQgaXMgY2FjaGVkLiBUaGlzIGZpeGVzIG9uZSBvZiB0aGUgdHdvIHByb2JsZW1zIHdpdGggdGhl IGluaXRpYWwKKyAgICAgICAgcGF0Y2g7IHRoZSBvdGhlciBmaXggaXMgaW4gV2ViQ29yZS4KKyAg ICAgICAgKFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpkaXNwYXRjaFdpbGxTZW5kUmVxdWVzdCk6IENo YW5nZWQgdGhlCisgICAgICAgIGFwcGx5QXBwbGVEaWN0aW9uYXJ5QXBwbGljYXRpb25RdWlyayBj YWxsIGhlcmUgdG8gd29yayB0aGUgbmV3IHNpbXBsZXIgd2F5LgorCisgICAgICAgICogV2ViVmll dy9XZWJWaWV3Lm1tOiBIYWQgdG8gYWRkIGFuIGluY2x1ZGUgZHVlIHRvIGNoYW5nZXMgaW4gV2Vi Q29yZSBoZWFkZXIgaW5jbHVkZXMuCisKIDIwMDktMDEtMDIgIENhbWVyb24gWndhcmljaCAgPGN3 endhcmljaEB1d2F0ZXJsb28uY2E+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIu CkluZGV4OiBXZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50Lm1t Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJD bGllbnQubW0JKHJldmlzaW9uIDM5NTUyKQorKysgV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9X ZWJGcmFtZUxvYWRlckNsaWVudC5tbQkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8q Ci0gKiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcsIDIwMDggQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5IEFwcGxl IEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cwpAQCAtMTU2LDE4ICsxNTYsMTMgQEAgc3RhdGljIGlubGluZSBXZWJEYXRhU291cmNlICpkYXRh U291cmNlKAogLy8gYXR0cmlidXRlIG5lZWRzIHRvIGJlIGlnbm9yZWQgdG8gYXZvaWQgc2hvd2lu ZyBleHRyYSBzY3JvbGwgYmFycyBpbiB0aGUgd2luZG93LgogLy8gVGhpcyBxdWlyayBjYW4gYmUg cmVtb3ZlZCB3aGVuIEFwcGxlIERpY3Rpb25hcnkgaXMgZml4ZWQgKHNlZSA8cmRhcjovL3Byb2Js ZW0vNjQ3MTA1OD4pLgogCi1zdGF0aWMgYm9vbCBpc0FwcGxlRGljdGlvbmFyeUFwcGxpY2F0aW9u KCkKLXsKLSAgICByZXR1cm4gW1tbTlNCdW5kbGUgbWFpbkJ1bmRsZV0gYnVuZGxlSWRlbnRpZmll cl0gaXNFcXVhbFRvU3RyaW5nOkAiY29tLmFwcGxlLkRpY3Rpb25hcnkiXTsKLX0KLQotc3RhdGlj IHZvaWQgYXBwbHlBcHBsZURpY3Rpb25hcnlBcHBsaWNhdGlvblF1aXJrKFdlYkZyYW1lICp3ZWJG cmFtZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQorc3RhdGljIHZvaWQgYXBwbHlB cHBsZURpY3Rpb25hcnlBcHBsaWNhdGlvblF1aXJrTm9uSW5saW5lUGFydChXZWJGcmFtZUxvYWRl ckNsaWVudCogY2xpZW50LCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QpCiB7CiAgICAg aWYgKCFyZXF1ZXN0LnVybCgpLmlzTG9jYWxGaWxlKCkpCiAgICAgICAgIHJldHVybjsKICAgICBp ZiAoIXJlcXVlc3QudXJsKCkuc3RyaW5nKCkuZW5kc1dpdGgoIk1haW5QYWdlSmF2YVNjcmlwdC5q cyIpKQogICAgICAgICByZXR1cm47Ci0gICAgRnJhbWUqIGZyYW1lID0gY29yZSh3ZWJGcmFtZSk7 CisgICAgRnJhbWUqIGZyYW1lID0gY29yZShjbGllbnQtPndlYkZyYW1lKCkpOwogICAgIGlmICgh ZnJhbWUpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAoZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkp CkBAIC0xODYsNiArMTgxLDE1IEBAIHN0YXRpYyB2b2lkIGFwcGx5QXBwbGVEaWN0aW9uYXJ5QXBw bGljYXQKICAgICB9CiB9CiAKK3N0YXRpYyBpbmxpbmUgdm9pZCBhcHBseUFwcGxlRGljdGlvbmFy eUFwcGxpY2F0aW9uUXVpcmsoV2ViRnJhbWVMb2FkZXJDbGllbnQqIGNsaWVudCwgY29uc3QgUmVz b3VyY2VSZXF1ZXN0JiByZXF1ZXN0KQoreworICAgIC8vIFVzZSBhIG9uZS10aW1lLWluaXRpYWxp emVkIGdsb2JhbCB2YXJpYWJsZSBzbyB3ZSBjYW4gcXVpY2tseSBkZXRlcm1pbmUgdGhlcmUncyBu b3RoaW5nIHRvIGRvIGluCisgICAgLy8gYWxsIGFwcGxpY2F0aW9ucyBvdGhlciB0aGFuIEFwcGxl IERpY3Rpb25hcnkuCisgICAgc3RhdGljIGJvb2wgaXNBcHBsZURpY3Rpb25hcnkgPSBbW1tOU0J1 bmRsZSBtYWluQnVuZGxlXSBidW5kbGVJZGVudGlmaWVyXSBpc0VxdWFsVG9TdHJpbmc6QCJjb20u YXBwbGUuRGljdGlvbmFyeSJdOworICAgIGlmIChpc0FwcGxlRGljdGlvbmFyeSkKKyAgICAgICAg YXBwbHlBcHBsZURpY3Rpb25hcnlBcHBsaWNhdGlvblF1aXJrTm9uSW5saW5lUGFydChjbGllbnQs IHJlcXVlc3QpOworfQorCiBXZWJGcmFtZUxvYWRlckNsaWVudDo6V2ViRnJhbWVMb2FkZXJDbGll bnQoV2ViRnJhbWUgKndlYkZyYW1lKQogICAgIDogbV93ZWJGcmFtZSh3ZWJGcmFtZSkKICAgICAs IG1fcG9saWN5RnVuY3Rpb24oMCkKQEAgLTMxOCw2ICszMjIsOCBAQCB2b2lkIFdlYkZyYW1lTG9h ZGVyQ2xpZW50OjpzZXRPcmlnaW5hbFVSCiAKIGJvb2wgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OmRp c3BhdGNoRGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlKERvY3VtZW50TG9hZGVyKiBsb2Fk ZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNwb25z ZSYgcmVzcG9uc2UsIGludCBsZW5ndGgpCiB7CisgICAgYXBwbHlBcHBsZURpY3Rpb25hcnlBcHBs aWNhdGlvblF1aXJrKHRoaXMsIHJlcXVlc3QpOworCiAgICAgV2ViVmlldyAqd2ViVmlldyA9IGdl dFdlYlZpZXcobV93ZWJGcmFtZS5nZXQoKSk7CiAgICAgV2ViUmVzb3VyY2VEZWxlZ2F0ZUltcGxl bWVudGF0aW9uQ2FjaGUqIGltcGxlbWVudGF0aW9ucyA9IFdlYlZpZXdHZXRSZXNvdXJjZUxvYWRE ZWxlZ2F0ZUltcGxlbWVudGF0aW9ucyh3ZWJWaWV3KTsKICAgICBpZiAoIWltcGxlbWVudGF0aW9u cy0+ZGlkTG9hZFJlc291cmNlRnJvbU1lbW9yeUNhY2hlRnVuYykKQEAgLTM0OSw5ICszNTUsNyBA QCB2b2lkIFdlYkZyYW1lTG9hZGVyQ2xpZW50Ojphc3NpZ25JZGVudGlmCiAKIHZvaWQgV2ViRnJh bWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KERvY3VtZW50TG9hZGVyKiBs b2FkZXIsIHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0 LCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogewotICAgIHN0YXRp YyBib29sIGlzRGljdGlvbmFyeSA9IGlzQXBwbGVEaWN0aW9uYXJ5QXBwbGljYXRpb24oKTsKLSAg ICBpZiAoaXNEaWN0aW9uYXJ5KQotICAgICAgICBhcHBseUFwcGxlRGljdGlvbmFyeUFwcGxpY2F0 aW9uUXVpcmsobV93ZWJGcmFtZS5nZXQoKSwgcmVxdWVzdCk7CisgICAgYXBwbHlBcHBsZURpY3Rp b25hcnlBcHBsaWNhdGlvblF1aXJrKHRoaXMsIHJlcXVlc3QpOwogCiAgICAgV2ViVmlldyAqd2Vi VmlldyA9IGdldFdlYlZpZXcobV93ZWJGcmFtZS5nZXQoKSk7CiAgICAgV2ViUmVzb3VyY2VEZWxl Z2F0ZUltcGxlbWVudGF0aW9uQ2FjaGUqIGltcGxlbWVudGF0aW9ucyA9IFdlYlZpZXdHZXRSZXNv dXJjZUxvYWREZWxlZ2F0ZUltcGxlbWVudGF0aW9ucyh3ZWJWaWV3KTsKSW5kZXg6IFdlYktpdC9t YWMvV2ViVmlldy9XZWJWaWV3Lm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvV2ViVmlldy9X ZWJWaWV3Lm1tCShyZXZpc2lvbiAzOTU1MikKKysrIFdlYktpdC9tYWMvV2ViVmlldy9XZWJWaWV3 Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcsNiArMTA3LDcgQEAKICNpbXBvcnQgPFdlYkNvcmUv R0NDb250cm9sbGVyLmg+CiAjaW1wb3J0IDxXZWJDb3JlL0hUTUxOYW1lcy5oPgogI2ltcG9ydCA8 V2ViQ29yZS9IaXN0b3J5SXRlbS5oPgorI2ltcG9ydCA8V2ViQ29yZS9JY29uRGF0YWJhc2UuaD4K ICNpbXBvcnQgPFdlYkNvcmUvTG9nZ2luZy5oPgogI2ltcG9ydCA8V2ViQ29yZS9NSU1FVHlwZVJl Z2lzdHJ5Lmg+CiAjaW1wb3J0IDxXZWJDb3JlL1BhZ2UuaD4K