101182 2012-11-04 22:49:31 -0800 [EFL][WK2] The icon database path should be set by the client 2012-11-05 00:56:09 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 99087 100678 1 cdumez cdumez gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi mikhail.pozdnyakov rakuco tmpsantos tonikitoo webkit.review.bot oldest_to_newest 758240 0 cdumez 2012-11-04 22:49:31 -0800 We currently experience crashes in WebKitTestRunner because the icon database path can only be set once. The WebKitTestRunner is now setting the icon database path (Bug 100678) and we set it a second time in ewk_context. We should stop setting the path in ewk_context and let the client take care of it to avoid this issue. 758270 1 172276 cdumez 2012-11-04 23:38:32 -0800 Created attachment 172276 Patch 758278 2 172276 gyuyoung.kim 2012-11-04 23:52:24 -0800 Comment on attachment 172276 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172276&action=review > Source/WebKit2/UIProcess/API/efl/ewk_favicon_database.cpp:43 > + : m_iconDatabase(iconDatabase) Nit : two spaces ? > Tools/ChangeLog:3 > + 101182_iconDatabase_path What is this ? > Tools/ChangeLog:10 > + Additional information of the change such as approach, rationale. Please add per-function descriptions below (OOPS!). Add patch description 758292 3 172280 cdumez 2012-11-05 00:20:11 -0800 Created attachment 172280 Patch Take Gyuyoung's feedback into consideration. I completely missed to update one changelog entry after generating it. Thanks for catching it. 758310 4 172280 webkit.review.bot 2012-11-05 00:56:04 -0800 Comment on attachment 172280 Patch Clearing flags on attachment: 172280 Committed r133442: <http://trac.webkit.org/changeset/133442> 758311 5 webkit.review.bot 2012-11-05 00:56:09 -0800 All reviewed patches have been landed. Closing bug. 172276 2012-11-04 23:38:32 -0800 2012-11-05 00:20:11 -0800 Patch 101182_iconDatabase_path.patch text/plain 15287 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3Mzk0Njk0Li5jNjFkNzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQg QEAKKzIwMTItMTEtMDQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFRoZSBpY29uIGRhdGFiYXNlIHBhdGggc2hvdWxk IGJlIHNldCBieSB0aGUgY2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDExODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBsb25nZXIgc2V0IHRoZSBmYXZpY29uIGRhdGFiYXNlIHBhdGggaW4g ZGF0YWJhc2UgaW5zdGFuY2UgZ2V0dGVyLgorICAgICAgICBJbnN0ZWFkLCBhIG5ldyBld2tfY29u dGV4dF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeV9zZXQoKSBBUEkKKyAgICAgICAgZnVuY3Rp b24gd2FzIGFkZGVkIHRvIGxldCB0aGUgY2xpZW50IHNldCB0aGUgaWNvbiBkYXRhYmFzZSBwYXRo LgorICAgICAgICBUaGlzIGlzIG5lZWRlZCBiZWNhdXNlIHRoZSBpY29uIGRhdGFiYXNlIHBhdGgg Y2FuIG9ubHkgYmUgc2V0IG9uY2UKKyAgICAgICAgYW5kIHNldHRpbmcgaXQgdW5jb25kaXRpb25h bGx5IGluIHRoZSBnZXR0ZXIgcHJldmVudHMgdGhlIGNsaWVudAorICAgICAgICBmcm9tIHNldHRp bmcgaXQuCisKKyAgICAgICAgVGhpcyB3aWxsIGFsc28gYXZvaWQgY3Jhc2hlcyBpbiBXZWJLaXRU ZXN0UnVubmVyIHNpbmNlIFdLVFIgd2FzCisgICAgICAgIHNldHRpbmcgdGhlIHBhdGggb25jZSBh bmQgZXdrX2NvbnRleHQgd2FzIGF0dGVtcHRpbmcgdG8gb3ZlcnJpZGUgaXQuCisKKyAgICAgICAg Tm90ZSB0aGF0IHRoZSBmYXZpY29uIGRhdGFiYXNlIGZ1bmN0aW9uYWxpdHkgaXMgZGlzYWJsZWQg dW50aWwgdGhlCisgICAgICAgIGNsaWVudCBzZXRzIGl0cyBwYXRoLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrX0NvbnRleHQ6OmVu c3VyZUZhdmljb25EYXRhYmFzZSk6CisgICAgICAgIChFd2tfQ29udGV4dDo6c2V0RmF2aWNvbkRh dGFiYXNlRGlyZWN0b3J5UGF0aCk6CisgICAgICAgIChFd2tfQ29udGV4dDo6ZmF2aWNvbkRhdGFi YXNlKToKKyAgICAgICAgKGV3a19jb250ZXh0X2Zhdmljb25fZGF0YWJhc2VfZGlyZWN0b3J5X3Nl dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmg6CisgICAgICAgIChFd2tf Q29udGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25fZGF0YWJh c2UuY3BwOgorICAgICAgICAoRXdrX0Zhdmljb25fRGF0YWJhc2U6OkV3a19GYXZpY29uX0RhdGFi YXNlKToKKyAgICAgICAgKEV3a19GYXZpY29uX0RhdGFiYXNlOjp+RXdrX0Zhdmljb25fRGF0YWJh c2UpOgorICAgICAgICAoRXdrX0Zhdmljb25fRGF0YWJhc2U6Omljb25VUkxGb3JQYWdlVVJMKToK KyAgICAgICAgKEV3a19GYXZpY29uX0RhdGFiYXNlOjppY29uRm9yUGFnZVVSTCk6CisgICAgICAg IChFd2tfRmF2aWNvbl9EYXRhYmFzZTo6Z2V0SWNvblN1cmZhY2VTeW5jaHJvbm91c2x5KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZV9wcml2YXRlLmg6 CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoRXdrX0Zhdmljb25fRGF0YWJhc2U6OmNyZWF0 ZSk6CisgICAgICAgIChFd2tfRmF2aWNvbl9EYXRhYmFzZSk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Zhdmljb25fZGF0YWJhc2UuY3BwOgorICAgICAgICAo VEVTVF9GKToKKwogMjAxMi0xMS0wNCAgSGFsdG9uIEh1byAgPGhhbHRvbi5odW9AaW50ZWwuY29t PgogCiAgICAgICAgIFtFRkxdIFVzZSBfTElCUkFSSUVTIGluc3RlYWQgb2YgX0xJQlJBUlkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcAppbmRl eCA5Mzc5NDUxLi42NDIwOTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHQuY3BwCkBAIC0xNDUsMTcgKzE0NSwzNiBAQCBFd2tfQ29va2llX01h bmFnZXIqIEV3a19Db250ZXh0Ojpjb29raWVNYW5hZ2VyKCkKICAgICByZXR1cm4gbV9jb29raWVN YW5hZ2VyLmdldCgpOwogfQogCit2b2lkIEV3a19Db250ZXh0OjplbnN1cmVGYXZpY29uRGF0YWJh c2UoKQoreworICAgIGlmIChtX2Zhdmljb25EYXRhYmFzZSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgbV9mYXZpY29uRGF0YWJhc2UgPSBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6Y3JlYXRlKHRvSW1w bChtX2NvbnRleHQuZ2V0KCkpLT5pY29uRGF0YWJhc2UoKSk7Cit9CisKK2Jvb2wgRXdrX0NvbnRl eHQ6OnNldEZhdmljb25EYXRhYmFzZURpcmVjdG9yeVBhdGgoY29uc3QgU3RyaW5nJiBkYXRhYmFz ZURpcmVjdG9yeSkKK3sKKyAgICBlbnN1cmVGYXZpY29uRGF0YWJhc2UoKTsKKworICAgIFdlYkNv bnRleHQqIHdlYkNvbnRleHQgPSB0b0ltcGwobV9jb250ZXh0LmdldCgpKTsKKworICAgIC8vIFRo ZSBkYXRhYmFzZSBwYXRoIGlzIGFscmVhZHkgb3BlbiBzbyBpdHMgcGF0aCB3YXMKKyAgICAvLyBh bHJlYWR5IHNldC4KKyAgICBpZiAod2ViQ29udGV4dC0+aWNvbkRhdGFiYXNlKCktPmlzT3Blbigp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBJZiBkYXRhYmFzZURpcmVjdG9yeSBp cyBlbXB0eSwgd2UgdXNlIHRoZSBkZWZhdWx0IGRhdGFiYXNlIHBhdGggZm9yIHRoZSBwbGF0Zm9y bS4KKyAgICBTdHJpbmcgZGF0YWJhc2VQYXRoID0gZGF0YWJhc2VEaXJlY3RvcnkuaXNFbXB0eSgp ID8gd2ViQ29udGV4dC0+aWNvbkRhdGFiYXNlUGF0aCgpIDogcGF0aEJ5QXBwZW5kaW5nQ29tcG9u ZW50KGRhdGFiYXNlRGlyZWN0b3J5LCBXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRlZmF1bHREYXRh YmFzZUZpbGVuYW1lKCkpOworICAgIHdlYkNvbnRleHQtPnNldEljb25EYXRhYmFzZVBhdGgoZGF0 YWJhc2VQYXRoKTsKKworICAgIHJldHVybiB0cnVlOworfQorCiBFd2tfRmF2aWNvbl9EYXRhYmFz ZSogRXdrX0NvbnRleHQ6OmZhdmljb25EYXRhYmFzZSgpCiB7Ci0gICAgaWYgKCFtX2Zhdmljb25E YXRhYmFzZSkgewotICAgICAgICBXS1JldGFpblB0cjxXS0ljb25EYXRhYmFzZVJlZj4gaWNvbkRh dGFiYXNlID0gV0tDb250ZXh0R2V0SWNvbkRhdGFiYXNlKG1fY29udGV4dC5nZXQoKSk7Ci0gICAg ICAgIC8vIFNldCB0aGUgZGF0YWJhc2UgcGF0aCBpZiBpdCBpcyBub3Qgb3BlbiB5ZXQuCi0gICAg ICAgIGlmICghdG9JbXBsKGljb25EYXRhYmFzZS5nZXQoKSktPmlzT3BlbigpKSB7Ci0gICAgICAg ICAgICBXZWJDb250ZXh0KiB3ZWJDb250ZXh0ID0gdG9JbXBsKG1fY29udGV4dC5nZXQoKSk7Ci0g ICAgICAgICAgICB3ZWJDb250ZXh0LT5zZXRJY29uRGF0YWJhc2VQYXRoKHdlYkNvbnRleHQtPmlj b25EYXRhYmFzZVBhdGgoKSk7Ci0gICAgICAgIH0KLSAgICAgICAgbV9mYXZpY29uRGF0YWJhc2Ug PSBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6Y3JlYXRlKGljb25EYXRhYmFzZS5nZXQoKSk7Ci0gICAg fQorICAgIGVuc3VyZUZhdmljb25EYXRhYmFzZSgpOworICAgIEFTU0VSVChtX2Zhdmljb25EYXRh YmFzZSk7CiAKICAgICByZXR1cm4gbV9mYXZpY29uRGF0YWJhc2UuZ2V0KCk7CiB9CkBAIC0yMTUs NiArMjM0LDEzIEBAIEV3a19Db29raWVfTWFuYWdlciogZXdrX2NvbnRleHRfY29va2llX21hbmFn ZXJfZ2V0KGNvbnN0IEV3a19Db250ZXh0KiBld2tDb250ZXh0CiAgICAgcmV0dXJuIGNvbnN0X2Nh c3Q8RXdrX0NvbnRleHQqPihld2tDb250ZXh0KS0+Y29va2llTWFuYWdlcigpOwogfQogCitFaW5h X0Jvb2wgZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9kaXJlY3Rvcnlfc2V0KEV3a19Db250 ZXh0KiBld2tDb250ZXh0LCBjb25zdCBjaGFyKiBkaXJlY3RvcnlQYXRoKQoreworICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChld2tDb250ZXh0LCBmYWxzZSk7CisKKyAgICByZXR1 cm4gZXdrQ29udGV4dC0+c2V0RmF2aWNvbkRhdGFiYXNlRGlyZWN0b3J5UGF0aChTdHJpbmc6OmZy b21VVEY4KGRpcmVjdG9yeVBhdGgpKTsKK30KKwogRXdrX0Zhdmljb25fRGF0YWJhc2UqIGV3a19j b250ZXh0X2Zhdmljb25fZGF0YWJhc2VfZ2V0KGNvbnN0IEV3a19Db250ZXh0KiBld2tDb250ZXh0 KQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChld2tDb250ZXh0LCAwKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oCmluZGV4 IDBkNmI3NGEuLjE0YmEwNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHQuaApAQCAtMTg0LDYgKzE4NCwyNSBAQCBFQVBJIEV3a19Db250ZXh0ICpl d2tfY29udGV4dF9uZXdfd2l0aF9pbmplY3RlZF9idW5kbGVfcGF0aChjb25zdCBjaGFyICpwYXRo KTsKIEVBUEkgRXdrX0Nvb2tpZV9NYW5hZ2VyICpld2tfY29udGV4dF9jb29raWVfbWFuYWdlcl9n ZXQoY29uc3QgRXdrX0NvbnRleHQgKmNvbnRleHQpOwogCiAvKioKKyAqIFNldHMgdGhlIGZhdmlj b24gZGF0YWJhc2UgZGlyZWN0b3J5IGZvciB0aGlzIEBhIGNvbnRleHQuCisgKgorICogU2V0cyB0 aGUgZGlyZWN0b3J5IHBhdGggdG8gYmUgdXNlZCB0byBzdG9yZSB0aGUgZmF2aWNvbnMgZGF0YWJh c2UKKyAqIGZvciBAYSBjb250ZXh0IG9uIGRpc2suIFBhc3NpbmcgQGMgTlVMTCBhcyBAYSBkaXJl Y3RvcnlfcGF0aCB3aWxsCisgKiByZXN1bHQgaW4gdXNpbmcgdGhlIGRlZmF1bHQgZGlyZWN0b3J5 IGZvciB0aGUgcGxhdGZvcm0uCisgKgorICogQ2FsbGluZyB0aGlzIG1ldGhvZCBhbHNvIG1lYW5z IGVuYWJsaW5nIHRoZSBmYXZpY29ucyBkYXRhYmFzZSBmb3IKKyAqIGl0cyB1c2UgZnJvbSB0aGUg YXBwbGljYXRpb25zLCBpdCBpcyB0aGVyZWZvcmUgZXhwZWN0ZWQgdG8gYmUKKyAqIGNhbGxlZCBv bmx5IG9uY2UuIEZ1cnRoZXIgY2FsbHMgZm9yIHRoZSBzYW1lIGluc3RhbmNlIG9mCisgKiBAYSBj b250ZXh0IHdpbGwgbm90IGhhdmUgYW55IGVmZmVjdC4KKyAqCisgKiBAcGFyYW0gY29udGV4dCBj b250ZXh0IG9iamVjdCB0byB1cGRhdGUKKyAqIEBwYXJhbSBkaXJlY3RvcnlfcGF0aCBkYXRhYmFz ZSBkaXJlY3RvcnkgcGF0aCB0byBzZXQKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBpZiBz dWNjZXNzZnVsLCBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQorICovCitFQVBJIEVpbmFfQm9vbCBl d2tfY29udGV4dF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeV9zZXQoRXdrX0NvbnRleHQgKmNv bnRleHQsIGNvbnN0IGNoYXIgKmRpcmVjdG9yeV9wYXRoKTsKKworLyoqCiAgKiBHZXRzIHRoZSBm YXZpY29uIGRhdGFiYXNlIGluc3RhbmNlIGZvciB0aGlzIEBhIGNvbnRleHQuCiAgKgogICogQHBh cmFtIGNvbnRleHQgY29udGV4dCBvYmplY3QgdG8gcXVlcnkuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKaW5kZXggZjQz NjQ4Yy4uMTVmMThiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaApAQCAtNTUsNiArNTUsNyBAQCBwdWJsaWM6CiAK ICAgICBFd2tfQ29va2llX01hbmFnZXIqIGNvb2tpZU1hbmFnZXIoKTsKIAorICAgIGJvb2wgc2V0 RmF2aWNvbkRhdGFiYXNlRGlyZWN0b3J5UGF0aChjb25zdCBTdHJpbmcmIGRhdGFiYXNlRGlyZWN0 b3J5KTsKICAgICBFd2tfRmF2aWNvbl9EYXRhYmFzZSogZmF2aWNvbkRhdGFiYXNlKCk7CiAKICAg ICBFd2tfU3RvcmFnZV9NYW5hZ2VyKiBzdG9yYWdlTWFuYWdlcigpIGNvbnN0OwpAQCAtODIsNiAr ODMsOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IEV3a19Db250ZXh0KFdLQ29u dGV4dFJlZik7CiAKKyAgICB2b2lkIGVuc3VyZUZhdmljb25EYXRhYmFzZSgpOworCiAgICAgV0tS ZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBtX2NvbnRleHQ7CiAKICAgICBPd25QdHI8RXdrX0Nvb2tp ZV9NYW5hZ2VyPiBtX2Nvb2tpZU1hbmFnZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5jcHAKaW5kZXggMTdjOTlj NC4uYTI0MzMwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2Zhdmljb25fZGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1 ZGUgImV3a19mYXZpY29uX2RhdGFiYXNlLmgiCiAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKKyNp bmNsdWRlICJXS0ljb25EYXRhYmFzZS5oIgogI2luY2x1ZGUgIldLVVJMLmgiCiAjaW5jbHVkZSAi V2ViSWNvbkRhdGFiYXNlLmgiCiAjaW5jbHVkZSAiV2ViVVJMLmgiCkBAIC0zOCw4ICszOSw4IEBA CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKLUV3a19GYXZpY29uX0RhdGFiYXNlOjpFd2tf RmF2aWNvbl9EYXRhYmFzZShXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2VSZWYpCi0gICAg OiAgbV93a0ljb25EYXRhYmFzZShpY29uRGF0YWJhc2VSZWYpCitFd2tfRmF2aWNvbl9EYXRhYmFz ZTo6RXdrX0Zhdmljb25fRGF0YWJhc2UoV2ViSWNvbkRhdGFiYXNlKiBpY29uRGF0YWJhc2UpCisg ICAgOiAgbV9pY29uRGF0YWJhc2UoaWNvbkRhdGFiYXNlKQogewogICAgIFdLSWNvbkRhdGFiYXNl Q2xpZW50IGljb25EYXRhYmFzZUNsaWVudDsKICAgICBtZW1zZXQoJmljb25EYXRhYmFzZUNsaWVu dCwgMCwgc2l6ZW9mKFdLSWNvbkRhdGFiYXNlQ2xpZW50KSk7CkBAIC00NywxMyArNDgsMTcgQEAg RXdrX0Zhdmljb25fRGF0YWJhc2U6OkV3a19GYXZpY29uX0RhdGFiYXNlKFdLSWNvbkRhdGFiYXNl UmVmIGljb25EYXRhYmFzZVJlZikKICAgICBpY29uRGF0YWJhc2VDbGllbnQuY2xpZW50SW5mbyA9 IHRoaXM7CiAgICAgaWNvbkRhdGFiYXNlQ2xpZW50LmRpZENoYW5nZUljb25Gb3JQYWdlVVJMID0g ZGlkQ2hhbmdlSWNvbkZvclBhZ2VVUkw7CiAgICAgaWNvbkRhdGFiYXNlQ2xpZW50Lmljb25EYXRh UmVhZHlGb3JQYWdlVVJMID0gaWNvbkRhdGFSZWFkeUZvclBhZ2VVUkw7Ci0gICAgV0tJY29uRGF0 YWJhc2VTZXRJY29uRGF0YWJhc2VDbGllbnQobV93a0ljb25EYXRhYmFzZS5nZXQoKSwgJmljb25E YXRhYmFzZUNsaWVudCk7CisgICAgV0tJY29uRGF0YWJhc2VTZXRJY29uRGF0YWJhc2VDbGllbnQo dG9BUEkobV9pY29uRGF0YWJhc2UuZ2V0KCkpLCAmaWNvbkRhdGFiYXNlQ2xpZW50KTsKK30KKwor RXdrX0Zhdmljb25fRGF0YWJhc2U6On5Fd2tfRmF2aWNvbl9EYXRhYmFzZSgpCit7CiB9CiAKIFN0 cmluZyBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6aWNvblVSTEZvclBhZ2VVUkwoY29uc3QgU3RyaW5n JiBwYWdlVVJMKSBjb25zdAogewogICAgIFN0cmluZyBpY29uVVJMOwotICAgIHRvSW1wbChtX3dr SWNvbkRhdGFiYXNlLmdldCgpKS0+c3luY2hyb25vdXNJY29uVVJMRm9yUGFnZVVSTChwYWdlVVJM LCBpY29uVVJMKTsKKyAgICBtX2ljb25EYXRhYmFzZS0+c3luY2hyb25vdXNJY29uVVJMRm9yUGFn ZVVSTChwYWdlVVJMLCBpY29uVVJMKTsKIAogICAgIHJldHVybiBpY29uVVJMOwogfQpAQCAtOTks OCArMTA0LDYgQEAgc3RhdGljIEVpbmFfQm9vbCByZXNwb25kX2ljb25fcmVxdWVzdF9pZGxlKHZv aWQqIGRhdGEpCiAKIHZvaWQgRXdrX0Zhdmljb25fRGF0YWJhc2U6Omljb25Gb3JQYWdlVVJMKGNv bnN0IFN0cmluZyYgcGFnZVVSTCwgY29uc3QgSWNvblJlcXVlc3RDYWxsYmFja0RhdGEmIGNhbGxi YWNrRGF0YSkKIHsKLSAgICBXZWJJY29uRGF0YWJhc2UqIHdlYkljb25EYXRhYmFzZSA9IHRvSW1w bChtX3drSWNvbkRhdGFiYXNlLmdldCgpKTsKLQogICAgIC8vIFdlIGFzayBmb3IgdGhlIGljb24g ZGlyZWN0bHkuIElmIHdlIGRvbid0IGdldCB0aGUgaWNvbiBkYXRhIG5vdywKICAgICAvLyB3ZSds bCBiZSBub3RpZmllZCBsYXRlciAoZXZlbiBpZiB0aGUgZGF0YWJhc2UgaXMgc3RpbGwgaW1wb3J0 aW5nIGljb25zKS4KICAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBzdXJmYWNlID0gZ2V0SWNv blN1cmZhY2VTeW5jaHJvbm91c2x5KHBhZ2VVUkwpOwpAQCAtMTEwLDcgKzExMyw3IEBAIHZvaWQg RXdrX0Zhdmljb25fRGF0YWJhc2U6Omljb25Gb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYgcGFnZVVS TCwgY29uc3QgSWNvblJlcXVlCiAgICAgLy8gZmluaXNoZWQgeWV0LCB3ZSBuZWVkIHRvIHdhaXQg Zm9yIGljb25EYXRhUmVhZHlGb3JQYWdlVVJMIHRvIGJlCiAgICAgLy8gY2FsbGVkIGJlZm9yZSBt YWtpbmcgYW5kIGluZm9ybWVkIGRlY2lzaW9uLgogICAgIFN0cmluZyBpY29uVVJMID0gaWNvblVS TEZvclBhZ2VVUkwocGFnZVVSTCk7Ci0gICAgaWYgKCFzdXJmYWNlICYmICghaWNvblVSTC5pc0Vt cHR5KCkgfHwgIXdlYkljb25EYXRhYmFzZS0+aXNVcmxJbXBvcnRDb21wbGV0ZWQoKSkpIHsKKyAg ICBpZiAoIXN1cmZhY2UgJiYgKCFpY29uVVJMLmlzRW1wdHkoKSB8fCAhbV9pY29uRGF0YWJhc2Ut PmlzVXJsSW1wb3J0Q29tcGxldGVkKCkpKSB7CiAgICAgICAgIFBlbmRpbmdJY29uUmVxdWVzdFZl Y3RvciByZXF1ZXN0cyA9IG1faWNvblJlcXVlc3RzLmdldChwYWdlVVJMKTsKICAgICAgICAgcmVx dWVzdHMuYXBwZW5kKGNhbGxiYWNrRGF0YSk7CiAgICAgICAgIG1faWNvblJlcXVlc3RzLnNldChw YWdlVVJMLCByZXF1ZXN0cyk7CkBAIC0xMzksMTMgKzE0MiwxMSBAQCB2b2lkIEV3a19GYXZpY29u X0RhdGFiYXNlOjpkaWRDaGFuZ2VJY29uRm9yUGFnZVVSTChXS0ljb25EYXRhYmFzZVJlZiwgV0tV UkxSZWYgcAogCiBQYXNzUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gRXdrX0Zhdmljb25fRGF0YWJh c2U6OmdldEljb25TdXJmYWNlU3luY2hyb25vdXNseShjb25zdCBTdHJpbmcmIHBhZ2VVUkwpIGNv bnN0CiB7Ci0gICAgV2ViSWNvbkRhdGFiYXNlKiB3ZWJJY29uRGF0YWJhc2UgPSB0b0ltcGwobV93 a0ljb25EYXRhYmFzZS5nZXQoKSk7Ci0KLSAgICB3ZWJJY29uRGF0YWJhc2UtPnJldGFpbkljb25G b3JQYWdlVVJMKHBhZ2VVUkwpOworICAgIG1faWNvbkRhdGFiYXNlLT5yZXRhaW5JY29uRm9yUGFn ZVVSTChwYWdlVVJMKTsKIAotICAgIFdlYkNvcmU6Ok5hdGl2ZUltYWdlUHRyIGljb24gPSB3ZWJJ Y29uRGF0YWJhc2UtPm5hdGl2ZUltYWdlRm9yUGFnZVVSTChwYWdlVVJMKTsKKyAgICBXZWJDb3Jl OjpOYXRpdmVJbWFnZVB0ciBpY29uID0gbV9pY29uRGF0YWJhc2UtPm5hdGl2ZUltYWdlRm9yUGFn ZVVSTChwYWdlVVJMKTsKICAgICBpZiAoIWljb24pIHsKLSAgICAgICAgd2ViSWNvbkRhdGFiYXNl LT5yZWxlYXNlSWNvbkZvclBhZ2VVUkwocGFnZVVSTCk7CisgICAgICAgIG1faWNvbkRhdGFiYXNl LT5yZWxlYXNlSWNvbkZvclBhZ2VVUkwocGFnZVVSTCk7CiAgICAgICAgIHJldHVybiAwOwogICAg IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zh dmljb25fZGF0YWJhc2VfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2Zhdmljb25fZGF0YWJhc2VfcHJpdmF0ZS5oCmluZGV4IGI4YmE0ZjYuLjM0ZGE1MDMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19mYXZpY29u X2RhdGFiYXNlX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfZmF2aWNvbl9kYXRhYmFzZV9wcml2YXRlLmgKQEAgLTI2LDEyICsyNiwxNCBAQAogI2lm bmRlZiBld2tfZmF2aWNvbl9kYXRhYmFzZV9wcml2YXRlX2gKICNkZWZpbmUgZXdrX2Zhdmljb25f ZGF0YWJhc2VfcHJpdmF0ZV9oCiAKLSNpbmNsdWRlICJXS0ljb25EYXRhYmFzZS5oIgotI2luY2x1 ZGUgIldLUmV0YWluUHRyLmgiCiAjaW5jbHVkZSAiZXdrX2Zhdmljb25fZGF0YWJhc2UuaCIKICNp bmNsdWRlIDxXZWJLaXQyL1dLQmFzZS5oPgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAKK25h bWVzcGFjZSBXZWJLaXQgeworY2xhc3MgV2ViSWNvbkRhdGFiYXNlOworfQorCiBzdHJ1Y3QgSWNv bkNoYW5nZUNhbGxiYWNrRGF0YSB7CiAgICAgRXdrX0Zhdmljb25fRGF0YWJhc2VfSWNvbl9DaGFu Z2VfQ2IgY2FsbGJhY2s7CiAgICAgdm9pZCogdXNlckRhdGE7CkBAIC03MSwxMCArNzMsMTEgQEAg dHlwZWRlZiBIYXNoTWFwPFN0cmluZyAvKiBwYWdlVVJMICovLCBQZW5kaW5nSWNvblJlcXVlc3RW ZWN0b3I+IFBlbmRpbmdJY29uUmVxdWUKIAogY2xhc3MgRXdrX0Zhdmljb25fRGF0YWJhc2Ugewog cHVibGljOgotICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a19GYXZpY29uX0RhdGFiYXNlPiBjcmVh dGUoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlUmVmKQorICAgIHN0YXRpYyBQYXNzT3du UHRyPEV3a19GYXZpY29uX0RhdGFiYXNlPiBjcmVhdGUoV2ViS2l0OjpXZWJJY29uRGF0YWJhc2Uq IGljb25EYXRhYmFzZSkKICAgICB7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrX0Zh dmljb25fRGF0YWJhc2UoaWNvbkRhdGFiYXNlUmVmKSk7CisgICAgICAgIHJldHVybiBhZG9wdFB0 cihuZXcgRXdrX0Zhdmljb25fRGF0YWJhc2UoaWNvbkRhdGFiYXNlKSk7CiAgICAgfQorICAgIH5F d2tfRmF2aWNvbl9EYXRhYmFzZSgpOwogCiAgICAgU3RyaW5nIGljb25VUkxGb3JQYWdlVVJMKGNv bnN0IFN0cmluZyYgcGFnZVVSTCkgY29uc3Q7CiAgICAgdm9pZCBpY29uRm9yUGFnZVVSTChjb25z dCBTdHJpbmcmIHBhZ2VVUkwsIGNvbnN0IEljb25SZXF1ZXN0Q2FsbGJhY2tEYXRhJiBjYWxsYmFj a0RhdGEpOwpAQCAtODMsMTQgKzg2LDE0IEBAIHB1YmxpYzoKICAgICB2b2lkIHVud2F0Y2hDaGFu Z2VzKEV3a19GYXZpY29uX0RhdGFiYXNlX0ljb25fQ2hhbmdlX0NiIGNhbGxiYWNrKTsKIAogcHJp dmF0ZToKLSAgICBleHBsaWNpdCBFd2tfRmF2aWNvbl9EYXRhYmFzZShXS0ljb25EYXRhYmFzZVJl ZiBpY29uRGF0YWJhc2VSZWYpOworICAgIGV4cGxpY2l0IEV3a19GYXZpY29uX0RhdGFiYXNlKFdl YktpdDo6V2ViSWNvbkRhdGFiYXNlKiBpY29uRGF0YWJhc2UpOwogCiAgICAgUGFzc1JlZlB0cjxj YWlyb19zdXJmYWNlX3Q+IGdldEljb25TdXJmYWNlU3luY2hyb25vdXNseShjb25zdCBTdHJpbmcm IHBhZ2VVUkwpIGNvbnN0OwogCiAgICAgc3RhdGljIHZvaWQgZGlkQ2hhbmdlSWNvbkZvclBhZ2VV UkwoV0tJY29uRGF0YWJhc2VSZWYgaWNvbkRhdGFiYXNlLCBXS1VSTFJlZiBwYWdlVVJMLCBjb25z dCB2b2lkKiBjbGllbnRJbmZvKTsKICAgICBzdGF0aWMgdm9pZCBpY29uRGF0YVJlYWR5Rm9yUGFn ZVVSTChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2UsIFdLVVJMUmVmIHBhZ2VVUkwsIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pOwogCi0gICAgV0tSZXRhaW5QdHI8V0tJY29uRGF0YWJhc2VS ZWY+IG1fd2tJY29uRGF0YWJhc2U7CisgICAgUmVmUHRyPFdlYktpdDo6V2ViSWNvbkRhdGFiYXNl PiBtX2ljb25EYXRhYmFzZTsKICAgICBDaGFuZ2VMaXN0ZW5lck1hcCBtX2NoYW5nZUxpc3RlbmVy czsKICAgICBQZW5kaW5nSWNvblJlcXVlc3RNYXAgbV9pY29uUmVxdWVzdHM7CiB9OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Zh dmljb25fZGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVz dHMvdGVzdF9ld2syX2Zhdmljb25fZGF0YWJhc2UuY3BwCmluZGV4IDdhNTdiOTEuLmNkYTZlZmEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL3Rlc3RzL3Rlc3Rf ZXdrMl9mYXZpY29uX2RhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfZmF2aWNvbl9kYXRhYmFzZS5jcHAKQEAgLTg5LDYgKzg5 LDEwIEBAIFRFU1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfZmF2aWNvbl9kYXRhYmFzZV91cmxf Z2V0KQogICAgIE93blB0cjxFV0syVW5pdFRlc3RTZXJ2ZXI+IGh0dHBTZXJ2ZXIgPSBhZG9wdFB0 cihuZXcgRVdLMlVuaXRUZXN0U2VydmVyKTsKICAgICBodHRwU2VydmVyLT5ydW4oc2VydmVyQ2Fs bGJhY2spOwogCisgICAgLy8gU2V0IGZhdmljb24gZGF0YWJhc2UgcGF0aCBhbmQgZW5hYmxlIGZ1 bmN0aW9uYWxpdHkuCisgICAgRXdrX0NvbnRleHQqIGNvbnRleHQgPSBld2tfdmlld19jb250ZXh0 X2dldCh3ZWJWaWV3KCkpOworICAgIGV3a19jb250ZXh0X2Zhdmljb25fZGF0YWJhc2VfZGlyZWN0 b3J5X3NldChjb250ZXh0LCAwKTsKKwogICAgIGJvb2wgaWNvbkNoYW5nZWQgPSBmYWxzZTsKICAg ICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQod2ViVmlldygpLCAiaWNvbixjaGFuZ2Vk Iiwgb25JY29uQ2hhbmdlZCwgJmljb25DaGFuZ2VkKTsKIApAQCAtMTAzLDcgKzEwNyw2IEBAIFRF U1RfRihFV0syVW5pdFRlc3RCYXNlLCBld2tfZmF2aWNvbl9kYXRhYmFzZV91cmxfZ2V0KQogICAg IGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2RlbCh3ZWJWaWV3KCksICJpY29uLGNoYW5nZWQi LCBvbkljb25DaGFuZ2VkKTsKIAogICAgIC8vIENoZWNrIHRoZSBBUEkgcmV0cmlldmluZyBhIGZh dmljb24gVVJMLgotICAgIEV3a19Db250ZXh0KiBjb250ZXh0ID0gZXdrX3ZpZXdfY29udGV4dF9n ZXQod2ViVmlldygpKTsKICAgICBFd2tfRmF2aWNvbl9EYXRhYmFzZSogZmF2aWNvbkRhdGFiYXNl ID0gZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9nZXQoY29udGV4dCk7CiAgICAgQVNTRVJU X1RSVUUoZmF2aWNvbkRhdGFiYXNlKTsKIApAQCAtMTQ2LDYgKzE0OSwxMCBAQCBURVNUX0YoRVdL MlVuaXRUZXN0QmFzZSwgZXdrX2Zhdmljb25fZGF0YWJhc2VfYXN5bmNfaWNvbl9nZXQpCiAgICAg T3duUHRyPEVXSzJVbml0VGVzdFNlcnZlcj4gaHR0cFNlcnZlciA9IGFkb3B0UHRyKG5ldyBFV0sy VW5pdFRlc3RTZXJ2ZXIpOwogICAgIGh0dHBTZXJ2ZXItPnJ1bihzZXJ2ZXJDYWxsYmFjayk7CiAK KyAgICAvLyBTZXQgZmF2aWNvbiBkYXRhYmFzZSBwYXRoIGFuZCBlbmFibGUgZnVuY3Rpb25hbGl0 eS4KKyAgICBFd2tfQ29udGV4dCogY29udGV4dCA9IGV3a192aWV3X2NvbnRleHRfZ2V0KHdlYlZp ZXcoKSk7CisgICAgZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9kaXJlY3Rvcnlfc2V0KGNv bnRleHQsIDApOworCiAgICAgSWNvblJlcXVlc3REYXRhIGRhdGEgPSB7IHdlYlZpZXcoKSwgMCB9 OwogICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZCh3ZWJWaWV3KCksICJpY29uLGNo YW5nZWQiLCByZXF1ZXN0RmF2aWNvbkRhdGEsICZkYXRhKTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMv Q2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGRlNjY2MzIuLjMxODBiMjUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAxMi0xMS0wNCAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUuZHVtZXpAaW50 ZWwuY29tPgorCisgICAgICAgIDEwMTE4Ml9pY29uRGF0YWJhc2VfcGF0aAorCisgICAgICAgIFtF RkxdW1dLMl0gVGhlIGljb24gZGF0YWJhc2UgcGF0aCBzaG91bGQgYmUgc2V0IGJ5IHRoZSBjbGll bnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMTE4 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGl0 aW9uYWwgaW5mb3JtYXRpb24gb2YgdGhlIGNoYW5nZSBzdWNoIGFzIGFwcHJvYWNoLCByYXRpb25h bGUuIFBsZWFzZSBhZGQgcGVyLWZ1bmN0aW9uIGRlc2NyaXB0aW9ucyBiZWxvdyAoT09QUyEpLgor CisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoKKyAgICAgICAgKGVsbV9tYWluKToK KwogMjAxMi0xMS0wMyAgQmFsYXpzIEtlbGVtZW4gIDxrYmFsYXpzQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgW1F0XVtXSzJdIHNldFBsYXRmb3JtU3RyYXRlZ2llcyBhbHdheXMgYXNzZXJ0cyBhZnRl ciByMTMyNzQ0CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jIGIvVG9v bHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCA3NTNhYTZlLi4zOGI4ODZhIDEwMDY0NAot LS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisrKyBiL1Rvb2xzL01pbmlCcm93c2Vy L2VmbC9tYWluLmMKQEAgLTk5NSw2ICs5OTUsMTAgQEAgZWxtX21haW4oaW50IGFyZ2MsIGNoYXIg KmFyZ3ZbXSkKICAgICB9CiAjZW5kaWYKIAorICAgIC8vIEVuYWJsZSBmYXZpY29uIGRhdGFiYXNl LgorICAgIEV3a19Db250ZXh0ICpjb250ZXh0ID0gZXdrX2NvbnRleHRfZGVmYXVsdF9nZXQoKTsK KyAgICBld2tfY29udGV4dF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeV9zZXQoY29udGV4dCwg TlVMTCk7CisKICAgICBpZiAoYXJncyA8IGFyZ2MpIHsKICAgICAgICAgY2hhciAqdXJsID0gdXJs X2Zyb21fdXNlcl9pbnB1dChhcmd2W2FyZ3NdKTsKICAgICAgICAgd2luZG93ID0gd2luZG93X2Ny ZWF0ZSh1cmwpOwo= 172280 2012-11-05 00:20:11 -0800 2012-11-05 00:56:04 -0800 Patch 101182_iconDatabase_path.patch text/plain 15251 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA3Mzk0Njk0Li5jNjFkNzZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQg QEAKKzIwMTItMTEtMDQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFRoZSBpY29uIGRhdGFiYXNlIHBhdGggc2hvdWxk IGJlIHNldCBieSB0aGUgY2xpZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMDExODIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBObyBsb25nZXIgc2V0IHRoZSBmYXZpY29uIGRhdGFiYXNlIHBhdGggaW4g ZGF0YWJhc2UgaW5zdGFuY2UgZ2V0dGVyLgorICAgICAgICBJbnN0ZWFkLCBhIG5ldyBld2tfY29u dGV4dF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeV9zZXQoKSBBUEkKKyAgICAgICAgZnVuY3Rp b24gd2FzIGFkZGVkIHRvIGxldCB0aGUgY2xpZW50IHNldCB0aGUgaWNvbiBkYXRhYmFzZSBwYXRo LgorICAgICAgICBUaGlzIGlzIG5lZWRlZCBiZWNhdXNlIHRoZSBpY29uIGRhdGFiYXNlIHBhdGgg Y2FuIG9ubHkgYmUgc2V0IG9uY2UKKyAgICAgICAgYW5kIHNldHRpbmcgaXQgdW5jb25kaXRpb25h bGx5IGluIHRoZSBnZXR0ZXIgcHJldmVudHMgdGhlIGNsaWVudAorICAgICAgICBmcm9tIHNldHRp bmcgaXQuCisKKyAgICAgICAgVGhpcyB3aWxsIGFsc28gYXZvaWQgY3Jhc2hlcyBpbiBXZWJLaXRU ZXN0UnVubmVyIHNpbmNlIFdLVFIgd2FzCisgICAgICAgIHNldHRpbmcgdGhlIHBhdGggb25jZSBh bmQgZXdrX2NvbnRleHQgd2FzIGF0dGVtcHRpbmcgdG8gb3ZlcnJpZGUgaXQuCisKKyAgICAgICAg Tm90ZSB0aGF0IHRoZSBmYXZpY29uIGRhdGFiYXNlIGZ1bmN0aW9uYWxpdHkgaXMgZGlzYWJsZWQg dW50aWwgdGhlCisgICAgICAgIGNsaWVudCBzZXRzIGl0cyBwYXRoLgorCisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwOgorICAgICAgICAoRXdrX0NvbnRleHQ6OmVu c3VyZUZhdmljb25EYXRhYmFzZSk6CisgICAgICAgIChFd2tfQ29udGV4dDo6c2V0RmF2aWNvbkRh dGFiYXNlRGlyZWN0b3J5UGF0aCk6CisgICAgICAgIChFd2tfQ29udGV4dDo6ZmF2aWNvbkRhdGFi YXNlKToKKyAgICAgICAgKGV3a19jb250ZXh0X2Zhdmljb25fZGF0YWJhc2VfZGlyZWN0b3J5X3Nl dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuaDoKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmg6CisgICAgICAgIChFd2tf Q29udGV4dCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25fZGF0YWJh c2UuY3BwOgorICAgICAgICAoRXdrX0Zhdmljb25fRGF0YWJhc2U6OkV3a19GYXZpY29uX0RhdGFi YXNlKToKKyAgICAgICAgKEV3a19GYXZpY29uX0RhdGFiYXNlOjp+RXdrX0Zhdmljb25fRGF0YWJh c2UpOgorICAgICAgICAoRXdrX0Zhdmljb25fRGF0YWJhc2U6Omljb25VUkxGb3JQYWdlVVJMKToK KyAgICAgICAgKEV3a19GYXZpY29uX0RhdGFiYXNlOjppY29uRm9yUGFnZVVSTCk6CisgICAgICAg IChFd2tfRmF2aWNvbl9EYXRhYmFzZTo6Z2V0SWNvblN1cmZhY2VTeW5jaHJvbm91c2x5KToKKyAg ICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZV9wcml2YXRlLmg6 CisgICAgICAgIChXZWJLaXQpOgorICAgICAgICAoRXdrX0Zhdmljb25fRGF0YWJhc2U6OmNyZWF0 ZSk6CisgICAgICAgIChFd2tfRmF2aWNvbl9EYXRhYmFzZSk6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX2Zhdmljb25fZGF0YWJhc2UuY3BwOgorICAgICAgICAo VEVTVF9GKToKKwogMjAxMi0xMS0wNCAgSGFsdG9uIEh1byAgPGhhbHRvbi5odW9AaW50ZWwuY29t PgogCiAgICAgICAgIFtFRkxdIFVzZSBfTElCUkFSSUVTIGluc3RlYWQgb2YgX0xJQlJBUlkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0LmNwcAppbmRl eCA5Mzc5NDUxLi42NDIwOTk0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfY29udGV4dC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvZXdrX2NvbnRleHQuY3BwCkBAIC0xNDUsMTcgKzE0NSwzNiBAQCBFd2tfQ29va2llX01h bmFnZXIqIEV3a19Db250ZXh0Ojpjb29raWVNYW5hZ2VyKCkKICAgICByZXR1cm4gbV9jb29raWVN YW5hZ2VyLmdldCgpOwogfQogCit2b2lkIEV3a19Db250ZXh0OjplbnN1cmVGYXZpY29uRGF0YWJh c2UoKQoreworICAgIGlmIChtX2Zhdmljb25EYXRhYmFzZSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgbV9mYXZpY29uRGF0YWJhc2UgPSBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6Y3JlYXRlKHRvSW1w bChtX2NvbnRleHQuZ2V0KCkpLT5pY29uRGF0YWJhc2UoKSk7Cit9CisKK2Jvb2wgRXdrX0NvbnRl eHQ6OnNldEZhdmljb25EYXRhYmFzZURpcmVjdG9yeVBhdGgoY29uc3QgU3RyaW5nJiBkYXRhYmFz ZURpcmVjdG9yeSkKK3sKKyAgICBlbnN1cmVGYXZpY29uRGF0YWJhc2UoKTsKKworICAgIFdlYkNv bnRleHQqIHdlYkNvbnRleHQgPSB0b0ltcGwobV9jb250ZXh0LmdldCgpKTsKKworICAgIC8vIFRo ZSBkYXRhYmFzZSBwYXRoIGlzIGFscmVhZHkgb3BlbiBzbyBpdHMgcGF0aCB3YXMKKyAgICAvLyBh bHJlYWR5IHNldC4KKyAgICBpZiAod2ViQ29udGV4dC0+aWNvbkRhdGFiYXNlKCktPmlzT3Blbigp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICAvLyBJZiBkYXRhYmFzZURpcmVjdG9yeSBp cyBlbXB0eSwgd2UgdXNlIHRoZSBkZWZhdWx0IGRhdGFiYXNlIHBhdGggZm9yIHRoZSBwbGF0Zm9y bS4KKyAgICBTdHJpbmcgZGF0YWJhc2VQYXRoID0gZGF0YWJhc2VEaXJlY3RvcnkuaXNFbXB0eSgp ID8gd2ViQ29udGV4dC0+aWNvbkRhdGFiYXNlUGF0aCgpIDogcGF0aEJ5QXBwZW5kaW5nQ29tcG9u ZW50KGRhdGFiYXNlRGlyZWN0b3J5LCBXZWJDb3JlOjpJY29uRGF0YWJhc2U6OmRlZmF1bHREYXRh YmFzZUZpbGVuYW1lKCkpOworICAgIHdlYkNvbnRleHQtPnNldEljb25EYXRhYmFzZVBhdGgoZGF0 YWJhc2VQYXRoKTsKKworICAgIHJldHVybiB0cnVlOworfQorCiBFd2tfRmF2aWNvbl9EYXRhYmFz ZSogRXdrX0NvbnRleHQ6OmZhdmljb25EYXRhYmFzZSgpCiB7Ci0gICAgaWYgKCFtX2Zhdmljb25E YXRhYmFzZSkgewotICAgICAgICBXS1JldGFpblB0cjxXS0ljb25EYXRhYmFzZVJlZj4gaWNvbkRh dGFiYXNlID0gV0tDb250ZXh0R2V0SWNvbkRhdGFiYXNlKG1fY29udGV4dC5nZXQoKSk7Ci0gICAg ICAgIC8vIFNldCB0aGUgZGF0YWJhc2UgcGF0aCBpZiBpdCBpcyBub3Qgb3BlbiB5ZXQuCi0gICAg ICAgIGlmICghdG9JbXBsKGljb25EYXRhYmFzZS5nZXQoKSktPmlzT3BlbigpKSB7Ci0gICAgICAg ICAgICBXZWJDb250ZXh0KiB3ZWJDb250ZXh0ID0gdG9JbXBsKG1fY29udGV4dC5nZXQoKSk7Ci0g ICAgICAgICAgICB3ZWJDb250ZXh0LT5zZXRJY29uRGF0YWJhc2VQYXRoKHdlYkNvbnRleHQtPmlj b25EYXRhYmFzZVBhdGgoKSk7Ci0gICAgICAgIH0KLSAgICAgICAgbV9mYXZpY29uRGF0YWJhc2Ug PSBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6Y3JlYXRlKGljb25EYXRhYmFzZS5nZXQoKSk7Ci0gICAg fQorICAgIGVuc3VyZUZhdmljb25EYXRhYmFzZSgpOworICAgIEFTU0VSVChtX2Zhdmljb25EYXRh YmFzZSk7CiAKICAgICByZXR1cm4gbV9mYXZpY29uRGF0YWJhc2UuZ2V0KCk7CiB9CkBAIC0yMTUs NiArMjM0LDEzIEBAIEV3a19Db29raWVfTWFuYWdlciogZXdrX2NvbnRleHRfY29va2llX21hbmFn ZXJfZ2V0KGNvbnN0IEV3a19Db250ZXh0KiBld2tDb250ZXh0CiAgICAgcmV0dXJuIGNvbnN0X2Nh c3Q8RXdrX0NvbnRleHQqPihld2tDb250ZXh0KS0+Y29va2llTWFuYWdlcigpOwogfQogCitFaW5h X0Jvb2wgZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9kaXJlY3Rvcnlfc2V0KEV3a19Db250 ZXh0KiBld2tDb250ZXh0LCBjb25zdCBjaGFyKiBkaXJlY3RvcnlQYXRoKQoreworICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChld2tDb250ZXh0LCBmYWxzZSk7CisKKyAgICByZXR1 cm4gZXdrQ29udGV4dC0+c2V0RmF2aWNvbkRhdGFiYXNlRGlyZWN0b3J5UGF0aChTdHJpbmc6OmZy b21VVEY4KGRpcmVjdG9yeVBhdGgpKTsKK30KKwogRXdrX0Zhdmljb25fRGF0YWJhc2UqIGV3a19j b250ZXh0X2Zhdmljb25fZGF0YWJhc2VfZ2V0KGNvbnN0IEV3a19Db250ZXh0KiBld2tDb250ZXh0 KQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChld2tDb250ZXh0LCAwKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19jb250ZXh0 LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5oCmluZGV4 IDBkNmI3NGEuLjE0YmEwNTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHQuaApAQCAtMTg0LDYgKzE4NCwyNSBAQCBFQVBJIEV3a19Db250ZXh0ICpl d2tfY29udGV4dF9uZXdfd2l0aF9pbmplY3RlZF9idW5kbGVfcGF0aChjb25zdCBjaGFyICpwYXRo KTsKIEVBUEkgRXdrX0Nvb2tpZV9NYW5hZ2VyICpld2tfY29udGV4dF9jb29raWVfbWFuYWdlcl9n ZXQoY29uc3QgRXdrX0NvbnRleHQgKmNvbnRleHQpOwogCiAvKioKKyAqIFNldHMgdGhlIGZhdmlj b24gZGF0YWJhc2UgZGlyZWN0b3J5IGZvciB0aGlzIEBhIGNvbnRleHQuCisgKgorICogU2V0cyB0 aGUgZGlyZWN0b3J5IHBhdGggdG8gYmUgdXNlZCB0byBzdG9yZSB0aGUgZmF2aWNvbnMgZGF0YWJh c2UKKyAqIGZvciBAYSBjb250ZXh0IG9uIGRpc2suIFBhc3NpbmcgQGMgTlVMTCBhcyBAYSBkaXJl Y3RvcnlfcGF0aCB3aWxsCisgKiByZXN1bHQgaW4gdXNpbmcgdGhlIGRlZmF1bHQgZGlyZWN0b3J5 IGZvciB0aGUgcGxhdGZvcm0uCisgKgorICogQ2FsbGluZyB0aGlzIG1ldGhvZCBhbHNvIG1lYW5z IGVuYWJsaW5nIHRoZSBmYXZpY29ucyBkYXRhYmFzZSBmb3IKKyAqIGl0cyB1c2UgZnJvbSB0aGUg YXBwbGljYXRpb25zLCBpdCBpcyB0aGVyZWZvcmUgZXhwZWN0ZWQgdG8gYmUKKyAqIGNhbGxlZCBv bmx5IG9uY2UuIEZ1cnRoZXIgY2FsbHMgZm9yIHRoZSBzYW1lIGluc3RhbmNlIG9mCisgKiBAYSBj b250ZXh0IHdpbGwgbm90IGhhdmUgYW55IGVmZmVjdC4KKyAqCisgKiBAcGFyYW0gY29udGV4dCBj b250ZXh0IG9iamVjdCB0byB1cGRhdGUKKyAqIEBwYXJhbSBkaXJlY3RvcnlfcGF0aCBkYXRhYmFz ZSBkaXJlY3RvcnkgcGF0aCB0byBzZXQKKyAqCisgKiBAcmV0dXJuIEBjIEVJTkFfVFJVRSBpZiBz dWNjZXNzZnVsLCBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQorICovCitFQVBJIEVpbmFfQm9vbCBl d2tfY29udGV4dF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeV9zZXQoRXdrX0NvbnRleHQgKmNv bnRleHQsIGNvbnN0IGNoYXIgKmRpcmVjdG9yeV9wYXRoKTsKKworLyoqCiAgKiBHZXRzIHRoZSBm YXZpY29uIGRhdGFiYXNlIGluc3RhbmNlIGZvciB0aGlzIEBhIGNvbnRleHQuCiAgKgogICogQHBh cmFtIGNvbnRleHQgY29udGV4dCBvYmplY3QgdG8gcXVlcnkuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dF9wcml2YXRlLmgKaW5kZXggZjQz NjQ4Yy4uMTVmMThiMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2NvbnRleHRfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19jb250ZXh0X3ByaXZhdGUuaApAQCAtNTUsNiArNTUsNyBAQCBwdWJsaWM6CiAK ICAgICBFd2tfQ29va2llX01hbmFnZXIqIGNvb2tpZU1hbmFnZXIoKTsKIAorICAgIGJvb2wgc2V0 RmF2aWNvbkRhdGFiYXNlRGlyZWN0b3J5UGF0aChjb25zdCBTdHJpbmcmIGRhdGFiYXNlRGlyZWN0 b3J5KTsKICAgICBFd2tfRmF2aWNvbl9EYXRhYmFzZSogZmF2aWNvbkRhdGFiYXNlKCk7CiAKICAg ICBFd2tfU3RvcmFnZV9NYW5hZ2VyKiBzdG9yYWdlTWFuYWdlcigpIGNvbnN0OwpAQCAtODIsNiAr ODMsOCBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAgIGV4cGxpY2l0IEV3a19Db250ZXh0KFdLQ29u dGV4dFJlZik7CiAKKyAgICB2b2lkIGVuc3VyZUZhdmljb25EYXRhYmFzZSgpOworCiAgICAgV0tS ZXRhaW5QdHI8V0tDb250ZXh0UmVmPiBtX2NvbnRleHQ7CiAKICAgICBPd25QdHI8RXdrX0Nvb2tp ZV9NYW5hZ2VyPiBtX2Nvb2tpZU1hbmFnZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2aWNvbl9kYXRhYmFzZS5jcHAKaW5kZXggMTdjOTlj NC4uYjIyYWZjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwv ZXdrX2Zhdmljb25fZGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19mYXZpY29uX2RhdGFiYXNlLmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1 ZGUgImV3a19mYXZpY29uX2RhdGFiYXNlLmgiCiAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKKyNp bmNsdWRlICJXS0ljb25EYXRhYmFzZS5oIgogI2luY2x1ZGUgIldLVVJMLmgiCiAjaW5jbHVkZSAi V2ViSWNvbkRhdGFiYXNlLmgiCiAjaW5jbHVkZSAiV2ViVVJMLmgiCkBAIC0zOCw4ICszOSw4IEBA CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJLaXQ7CiAKLUV3a19GYXZpY29uX0RhdGFiYXNlOjpFd2tf RmF2aWNvbl9EYXRhYmFzZShXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2VSZWYpCi0gICAg OiAgbV93a0ljb25EYXRhYmFzZShpY29uRGF0YWJhc2VSZWYpCitFd2tfRmF2aWNvbl9EYXRhYmFz ZTo6RXdrX0Zhdmljb25fRGF0YWJhc2UoV2ViSWNvbkRhdGFiYXNlKiBpY29uRGF0YWJhc2UpCisg ICAgOiBtX2ljb25EYXRhYmFzZShpY29uRGF0YWJhc2UpCiB7CiAgICAgV0tJY29uRGF0YWJhc2VD bGllbnQgaWNvbkRhdGFiYXNlQ2xpZW50OwogICAgIG1lbXNldCgmaWNvbkRhdGFiYXNlQ2xpZW50 LCAwLCBzaXplb2YoV0tJY29uRGF0YWJhc2VDbGllbnQpKTsKQEAgLTQ3LDEzICs0OCwxNyBAQCBF d2tfRmF2aWNvbl9EYXRhYmFzZTo6RXdrX0Zhdmljb25fRGF0YWJhc2UoV0tJY29uRGF0YWJhc2VS ZWYgaWNvbkRhdGFiYXNlUmVmKQogICAgIGljb25EYXRhYmFzZUNsaWVudC5jbGllbnRJbmZvID0g dGhpczsKICAgICBpY29uRGF0YWJhc2VDbGllbnQuZGlkQ2hhbmdlSWNvbkZvclBhZ2VVUkwgPSBk aWRDaGFuZ2VJY29uRm9yUGFnZVVSTDsKICAgICBpY29uRGF0YWJhc2VDbGllbnQuaWNvbkRhdGFS ZWFkeUZvclBhZ2VVUkwgPSBpY29uRGF0YVJlYWR5Rm9yUGFnZVVSTDsKLSAgICBXS0ljb25EYXRh YmFzZVNldEljb25EYXRhYmFzZUNsaWVudChtX3drSWNvbkRhdGFiYXNlLmdldCgpLCAmaWNvbkRh dGFiYXNlQ2xpZW50KTsKKyAgICBXS0ljb25EYXRhYmFzZVNldEljb25EYXRhYmFzZUNsaWVudCh0 b0FQSShtX2ljb25EYXRhYmFzZS5nZXQoKSksICZpY29uRGF0YWJhc2VDbGllbnQpOworfQorCitF d2tfRmF2aWNvbl9EYXRhYmFzZTo6fkV3a19GYXZpY29uX0RhdGFiYXNlKCkKK3sKIH0KIAogU3Ry aW5nIEV3a19GYXZpY29uX0RhdGFiYXNlOjppY29uVVJMRm9yUGFnZVVSTChjb25zdCBTdHJpbmcm IHBhZ2VVUkwpIGNvbnN0CiB7CiAgICAgU3RyaW5nIGljb25VUkw7Ci0gICAgdG9JbXBsKG1fd2tJ Y29uRGF0YWJhc2UuZ2V0KCkpLT5zeW5jaHJvbm91c0ljb25VUkxGb3JQYWdlVVJMKHBhZ2VVUkws IGljb25VUkwpOworICAgIG1faWNvbkRhdGFiYXNlLT5zeW5jaHJvbm91c0ljb25VUkxGb3JQYWdl VVJMKHBhZ2VVUkwsIGljb25VUkwpOwogCiAgICAgcmV0dXJuIGljb25VUkw7CiB9CkBAIC05OSw4 ICsxMDQsNiBAQCBzdGF0aWMgRWluYV9Cb29sIHJlc3BvbmRfaWNvbl9yZXF1ZXN0X2lkbGUodm9p ZCogZGF0YSkKIAogdm9pZCBFd2tfRmF2aWNvbl9EYXRhYmFzZTo6aWNvbkZvclBhZ2VVUkwoY29u c3QgU3RyaW5nJiBwYWdlVVJMLCBjb25zdCBJY29uUmVxdWVzdENhbGxiYWNrRGF0YSYgY2FsbGJh Y2tEYXRhKQogewotICAgIFdlYkljb25EYXRhYmFzZSogd2ViSWNvbkRhdGFiYXNlID0gdG9JbXBs KG1fd2tJY29uRGF0YWJhc2UuZ2V0KCkpOwotCiAgICAgLy8gV2UgYXNrIGZvciB0aGUgaWNvbiBk aXJlY3RseS4gSWYgd2UgZG9uJ3QgZ2V0IHRoZSBpY29uIGRhdGEgbm93LAogICAgIC8vIHdlJ2xs IGJlIG5vdGlmaWVkIGxhdGVyIChldmVuIGlmIHRoZSBkYXRhYmFzZSBpcyBzdGlsbCBpbXBvcnRp bmcgaWNvbnMpLgogICAgIFJlZlB0cjxjYWlyb19zdXJmYWNlX3Q+IHN1cmZhY2UgPSBnZXRJY29u U3VyZmFjZVN5bmNocm9ub3VzbHkocGFnZVVSTCk7CkBAIC0xMTAsNyArMTEzLDcgQEAgdm9pZCBF d2tfRmF2aWNvbl9EYXRhYmFzZTo6aWNvbkZvclBhZ2VVUkwoY29uc3QgU3RyaW5nJiBwYWdlVVJM LCBjb25zdCBJY29uUmVxdWUKICAgICAvLyBmaW5pc2hlZCB5ZXQsIHdlIG5lZWQgdG8gd2FpdCBm b3IgaWNvbkRhdGFSZWFkeUZvclBhZ2VVUkwgdG8gYmUKICAgICAvLyBjYWxsZWQgYmVmb3JlIG1h a2luZyBhbmQgaW5mb3JtZWQgZGVjaXNpb24uCiAgICAgU3RyaW5nIGljb25VUkwgPSBpY29uVVJM Rm9yUGFnZVVSTChwYWdlVVJMKTsKLSAgICBpZiAoIXN1cmZhY2UgJiYgKCFpY29uVVJMLmlzRW1w dHkoKSB8fCAhd2ViSWNvbkRhdGFiYXNlLT5pc1VybEltcG9ydENvbXBsZXRlZCgpKSkgeworICAg IGlmICghc3VyZmFjZSAmJiAoIWljb25VUkwuaXNFbXB0eSgpIHx8ICFtX2ljb25EYXRhYmFzZS0+ aXNVcmxJbXBvcnRDb21wbGV0ZWQoKSkpIHsKICAgICAgICAgUGVuZGluZ0ljb25SZXF1ZXN0VmVj dG9yIHJlcXVlc3RzID0gbV9pY29uUmVxdWVzdHMuZ2V0KHBhZ2VVUkwpOwogICAgICAgICByZXF1 ZXN0cy5hcHBlbmQoY2FsbGJhY2tEYXRhKTsKICAgICAgICAgbV9pY29uUmVxdWVzdHMuc2V0KHBh Z2VVUkwsIHJlcXVlc3RzKTsKQEAgLTEzOSwxMyArMTQyLDExIEBAIHZvaWQgRXdrX0Zhdmljb25f RGF0YWJhc2U6OmRpZENoYW5nZUljb25Gb3JQYWdlVVJMKFdLSWNvbkRhdGFiYXNlUmVmLCBXS1VS TFJlZiBwCiAKIFBhc3NSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBFd2tfRmF2aWNvbl9EYXRhYmFz ZTo6Z2V0SWNvblN1cmZhY2VTeW5jaHJvbm91c2x5KGNvbnN0IFN0cmluZyYgcGFnZVVSTCkgY29u c3QKIHsKLSAgICBXZWJJY29uRGF0YWJhc2UqIHdlYkljb25EYXRhYmFzZSA9IHRvSW1wbChtX3dr SWNvbkRhdGFiYXNlLmdldCgpKTsKLQotICAgIHdlYkljb25EYXRhYmFzZS0+cmV0YWluSWNvbkZv clBhZ2VVUkwocGFnZVVSTCk7CisgICAgbV9pY29uRGF0YWJhc2UtPnJldGFpbkljb25Gb3JQYWdl VVJMKHBhZ2VVUkwpOwogCi0gICAgV2ViQ29yZTo6TmF0aXZlSW1hZ2VQdHIgaWNvbiA9IHdlYklj b25EYXRhYmFzZS0+bmF0aXZlSW1hZ2VGb3JQYWdlVVJMKHBhZ2VVUkwpOworICAgIFdlYkNvcmU6 Ok5hdGl2ZUltYWdlUHRyIGljb24gPSBtX2ljb25EYXRhYmFzZS0+bmF0aXZlSW1hZ2VGb3JQYWdl VVJMKHBhZ2VVUkwpOwogICAgIGlmICghaWNvbikgewotICAgICAgICB3ZWJJY29uRGF0YWJhc2Ut PnJlbGVhc2VJY29uRm9yUGFnZVVSTChwYWdlVVJMKTsKKyAgICAgICAgbV9pY29uRGF0YWJhc2Ut PnJlbGVhc2VJY29uRm9yUGFnZVVSTChwYWdlVVJMKTsKICAgICAgICAgcmV0dXJuIDA7CiAgICAg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZmF2 aWNvbl9kYXRhYmFzZV9wcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9ld2tfZmF2aWNvbl9kYXRhYmFzZV9wcml2YXRlLmgKaW5kZXggYjhiYTRmNi4uMzRkYTUwMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2Zhdmljb25f ZGF0YWJhc2VfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19mYXZpY29uX2RhdGFiYXNlX3ByaXZhdGUuaApAQCAtMjYsMTIgKzI2LDE0IEBACiAjaWZu ZGVmIGV3a19mYXZpY29uX2RhdGFiYXNlX3ByaXZhdGVfaAogI2RlZmluZSBld2tfZmF2aWNvbl9k YXRhYmFzZV9wcml2YXRlX2gKIAotI2luY2x1ZGUgIldLSWNvbkRhdGFiYXNlLmgiCi0jaW5jbHVk ZSAiV0tSZXRhaW5QdHIuaCIKICNpbmNsdWRlICJld2tfZmF2aWNvbl9kYXRhYmFzZS5oIgogI2lu Y2x1ZGUgPFdlYktpdDIvV0tCYXNlLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KIAorbmFt ZXNwYWNlIFdlYktpdCB7CitjbGFzcyBXZWJJY29uRGF0YWJhc2U7Cit9CisKIHN0cnVjdCBJY29u Q2hhbmdlQ2FsbGJhY2tEYXRhIHsKICAgICBFd2tfRmF2aWNvbl9EYXRhYmFzZV9JY29uX0NoYW5n ZV9DYiBjYWxsYmFjazsKICAgICB2b2lkKiB1c2VyRGF0YTsKQEAgLTcxLDEwICs3MywxMSBAQCB0 eXBlZGVmIEhhc2hNYXA8U3RyaW5nIC8qIHBhZ2VVUkwgKi8sIFBlbmRpbmdJY29uUmVxdWVzdFZl Y3Rvcj4gUGVuZGluZ0ljb25SZXF1ZQogCiBjbGFzcyBFd2tfRmF2aWNvbl9EYXRhYmFzZSB7CiBw dWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RXdrX0Zhdmljb25fRGF0YWJhc2U+IGNyZWF0 ZShXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2VSZWYpCisgICAgc3RhdGljIFBhc3NPd25Q dHI8RXdrX0Zhdmljb25fRGF0YWJhc2U+IGNyZWF0ZShXZWJLaXQ6OldlYkljb25EYXRhYmFzZSog aWNvbkRhdGFiYXNlKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tfRmF2 aWNvbl9EYXRhYmFzZShpY29uRGF0YWJhc2VSZWYpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRy KG5ldyBFd2tfRmF2aWNvbl9EYXRhYmFzZShpY29uRGF0YWJhc2UpKTsKICAgICB9CisgICAgfkV3 a19GYXZpY29uX0RhdGFiYXNlKCk7CiAKICAgICBTdHJpbmcgaWNvblVSTEZvclBhZ2VVUkwoY29u c3QgU3RyaW5nJiBwYWdlVVJMKSBjb25zdDsKICAgICB2b2lkIGljb25Gb3JQYWdlVVJMKGNvbnN0 IFN0cmluZyYgcGFnZVVSTCwgY29uc3QgSWNvblJlcXVlc3RDYWxsYmFja0RhdGEmIGNhbGxiYWNr RGF0YSk7CkBAIC04MywxNCArODYsMTQgQEAgcHVibGljOgogICAgIHZvaWQgdW53YXRjaENoYW5n ZXMoRXdrX0Zhdmljb25fRGF0YWJhc2VfSWNvbl9DaGFuZ2VfQ2IgY2FsbGJhY2spOwogCiBwcml2 YXRlOgotICAgIGV4cGxpY2l0IEV3a19GYXZpY29uX0RhdGFiYXNlKFdLSWNvbkRhdGFiYXNlUmVm IGljb25EYXRhYmFzZVJlZik7CisgICAgZXhwbGljaXQgRXdrX0Zhdmljb25fRGF0YWJhc2UoV2Vi S2l0OjpXZWJJY29uRGF0YWJhc2UqIGljb25EYXRhYmFzZSk7CiAKICAgICBQYXNzUmVmUHRyPGNh aXJvX3N1cmZhY2VfdD4gZ2V0SWNvblN1cmZhY2VTeW5jaHJvbm91c2x5KGNvbnN0IFN0cmluZyYg cGFnZVVSTCkgY29uc3Q7CiAKICAgICBzdGF0aWMgdm9pZCBkaWRDaGFuZ2VJY29uRm9yUGFnZVVS TChXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2UsIFdLVVJMUmVmIHBhZ2VVUkwsIGNvbnN0 IHZvaWQqIGNsaWVudEluZm8pOwogICAgIHN0YXRpYyB2b2lkIGljb25EYXRhUmVhZHlGb3JQYWdl VVJMKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZSwgV0tVUkxSZWYgcGFnZVVSTCwgY29u c3Qgdm9pZCogY2xpZW50SW5mbyk7CiAKLSAgICBXS1JldGFpblB0cjxXS0ljb25EYXRhYmFzZVJl Zj4gbV93a0ljb25EYXRhYmFzZTsKKyAgICBSZWZQdHI8V2ViS2l0OjpXZWJJY29uRGF0YWJhc2U+ IG1faWNvbkRhdGFiYXNlOwogICAgIENoYW5nZUxpc3RlbmVyTWFwIG1fY2hhbmdlTGlzdGVuZXJz OwogICAgIFBlbmRpbmdJY29uUmVxdWVzdE1hcCBtX2ljb25SZXF1ZXN0czsKIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfZmF2 aWNvbl9kYXRhYmFzZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC90ZXN0 cy90ZXN0X2V3azJfZmF2aWNvbl9kYXRhYmFzZS5jcHAKaW5kZXggN2E1N2I5MS4uY2RhNmVmYSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9l d2syX2Zhdmljb25fZGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl9mYXZpY29uX2RhdGFiYXNlLmNwcApAQCAtODksNiArODks MTAgQEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a19mYXZpY29uX2RhdGFiYXNlX3VybF9n ZXQpCiAgICAgT3duUHRyPEVXSzJVbml0VGVzdFNlcnZlcj4gaHR0cFNlcnZlciA9IGFkb3B0UHRy KG5ldyBFV0syVW5pdFRlc3RTZXJ2ZXIpOwogICAgIGh0dHBTZXJ2ZXItPnJ1bihzZXJ2ZXJDYWxs YmFjayk7CiAKKyAgICAvLyBTZXQgZmF2aWNvbiBkYXRhYmFzZSBwYXRoIGFuZCBlbmFibGUgZnVu Y3Rpb25hbGl0eS4KKyAgICBFd2tfQ29udGV4dCogY29udGV4dCA9IGV3a192aWV3X2NvbnRleHRf Z2V0KHdlYlZpZXcoKSk7CisgICAgZXdrX2NvbnRleHRfZmF2aWNvbl9kYXRhYmFzZV9kaXJlY3Rv cnlfc2V0KGNvbnRleHQsIDApOworCiAgICAgYm9vbCBpY29uQ2hhbmdlZCA9IGZhbHNlOwogICAg IGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2FkZCh3ZWJWaWV3KCksICJpY29uLGNoYW5nZWQi LCBvbkljb25DaGFuZ2VkLCAmaWNvbkNoYW5nZWQpOwogCkBAIC0xMDMsNyArMTA3LDYgQEAgVEVT VF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a19mYXZpY29uX2RhdGFiYXNlX3VybF9nZXQpCiAgICAg ZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfZGVsKHdlYlZpZXcoKSwgImljb24sY2hhbmdlZCIs IG9uSWNvbkNoYW5nZWQpOwogCiAgICAgLy8gQ2hlY2sgdGhlIEFQSSByZXRyaWV2aW5nIGEgZmF2 aWNvbiBVUkwuCi0gICAgRXdrX0NvbnRleHQqIGNvbnRleHQgPSBld2tfdmlld19jb250ZXh0X2dl dCh3ZWJWaWV3KCkpOwogICAgIEV3a19GYXZpY29uX0RhdGFiYXNlKiBmYXZpY29uRGF0YWJhc2Ug PSBld2tfY29udGV4dF9mYXZpY29uX2RhdGFiYXNlX2dldChjb250ZXh0KTsKICAgICBBU1NFUlRf VFJVRShmYXZpY29uRGF0YWJhc2UpOwogCkBAIC0xNDYsNiArMTQ5LDEwIEBAIFRFU1RfRihFV0sy VW5pdFRlc3RCYXNlLCBld2tfZmF2aWNvbl9kYXRhYmFzZV9hc3luY19pY29uX2dldCkKICAgICBP d25QdHI8RVdLMlVuaXRUZXN0U2VydmVyPiBodHRwU2VydmVyID0gYWRvcHRQdHIobmV3IEVXSzJV bml0VGVzdFNlcnZlcik7CiAgICAgaHR0cFNlcnZlci0+cnVuKHNlcnZlckNhbGxiYWNrKTsKIAor ICAgIC8vIFNldCBmYXZpY29uIGRhdGFiYXNlIHBhdGggYW5kIGVuYWJsZSBmdW5jdGlvbmFsaXR5 LgorICAgIEV3a19Db250ZXh0KiBjb250ZXh0ID0gZXdrX3ZpZXdfY29udGV4dF9nZXQod2ViVmll dygpKTsKKyAgICBld2tfY29udGV4dF9mYXZpY29uX2RhdGFiYXNlX2RpcmVjdG9yeV9zZXQoY29u dGV4dCwgMCk7CisKICAgICBJY29uUmVxdWVzdERhdGEgZGF0YSA9IHsgd2ViVmlldygpLCAwIH07 CiAgICAgZXZhc19vYmplY3Rfc21hcnRfY2FsbGJhY2tfYWRkKHdlYlZpZXcoKSwgImljb24sY2hh bmdlZCIsIHJlcXVlc3RGYXZpY29uRGF0YSwgJmRhdGEpOwogCmRpZmYgLS1naXQgYS9Ub29scy9D aGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZGU2NjYzMi4uYWM4OGYxMCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDEyLTExLTA0ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5kdW1lekBpbnRl bC5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBUaGUgaWNvbiBkYXRhYmFzZSBwYXRoIHNob3Vs ZCBiZSBzZXQgYnkgdGhlIGNsaWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTAxMTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgRW5hYmxlIGZhdmljb24gZGF0YWJhc2UgZnVuY3Rpb25hbGl0eSBpbiBN aW5pQnJvd3NlciBzaW5jZQorICAgICAgICBpdCBpcyB1c2VkIGFuZCBpdCBpcyBubyBsb25nZXIg ZW5hYmxlZCBieSBkZWZhdWx0LgorCisgICAgICAgICogTWluaUJyb3dzZXIvZWZsL21haW4uYzoK KyAgICAgICAgKGVsbV9tYWluKToKKwogMjAxMi0xMS0wMyAgQmFsYXpzIEtlbGVtZW4gIDxrYmFs YXpzQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XVtXSzJdIHNldFBsYXRmb3JtU3RyYXRlZ2ll cyBhbHdheXMgYXNzZXJ0cyBhZnRlciByMTMyNzQ0CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJv d3Nlci9lZmwvbWFpbi5jIGIvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwppbmRleCA3NTNh YTZlLi4zOGI4ODZhIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCisr KyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKQEAgLTk5NSw2ICs5OTUsMTAgQEAgZWxt X21haW4oaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKICAgICB9CiAjZW5kaWYKIAorICAgIC8vIEVu YWJsZSBmYXZpY29uIGRhdGFiYXNlLgorICAgIEV3a19Db250ZXh0ICpjb250ZXh0ID0gZXdrX2Nv bnRleHRfZGVmYXVsdF9nZXQoKTsKKyAgICBld2tfY29udGV4dF9mYXZpY29uX2RhdGFiYXNlX2Rp cmVjdG9yeV9zZXQoY29udGV4dCwgTlVMTCk7CisKICAgICBpZiAoYXJncyA8IGFyZ2MpIHsKICAg ICAgICAgY2hhciAqdXJsID0gdXJsX2Zyb21fdXNlcl9pbnB1dChhcmd2W2FyZ3NdKTsKICAgICAg ICAgd2luZG93ID0gd2luZG93X2NyZWF0ZSh1cmwpOwo=