145269 2015-05-21 09:47:19 -0700 Add a _WKWebKitContentExtensionStore initializer that takes a path 2015-05-21 11:54:28 -0700 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bweinstein bweinstein achristensen beidson benjamin commit-queue sam oldest_to_newest 1096592 0 bweinstein 2015-05-21 09:47:19 -0700 We need a _WKWebKitContentExtensionStore initializer that takes a path 1096595 1 253529 bweinstein 2015-05-21 10:07:20 -0700 Created attachment 253529 [PATCH] Fix I’m not sure if UserContentExtensionStore::storeWithPath is correct in terms of memory management, but the rest should be good. 1096596 2 commit-queue 2015-05-21 10:09:27 -0700 Attachment 253529 did not pass style-queue: ERROR: Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp:57: Declaration has space between type name and * in UserContentExtensionStore *store [whitespace/declaration] [3] Total errors found: 1 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1096597 3 253529 achristensen 2015-05-21 10:18:52 -0700 Comment on attachment 253529 [PATCH] Fix View in context: https://bugs.webkit.org/attachment.cgi?id=253529&action=review > Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp:57 > + UserContentExtensionStore *store = new UserContentExtensionStore(storePath); This is definitely a memory leak. 1096598 4 achristensen 2015-05-21 10:21:56 -0700 You'll probably need to use UserContentExtensionStore.wrapper directly and maybe an adoptNS somewhere to make refcounting work right. I probably shouldn't be the final reviewer on this patch. 1096599 5 253529 andersca 2015-05-21 10:24:43 -0700 Comment on attachment 253529 [PATCH] Fix View in context: https://bugs.webkit.org/attachment.cgi?id=253529&action=review >> Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp:57 >> + UserContentExtensionStore *store = new UserContentExtensionStore(storePath); > > This is definitely a memory leak. This should return a RefPtr<UserContentExtensionStore>. > Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h:36 > ++ (instancetype)storeWithPath:(NSURL *)path; This should be storeWithURL: Alternatively just make an initializer. Can this fail? If so, maybe it should take an NSError out parameter as well? 1096608 6 bweinstein 2015-05-21 10:37:08 -0700 (In reply to comment #5) > Comment on attachment 253529 [details] > [PATCH] Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=253529&action=review > > >> Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp:57 > >> + UserContentExtensionStore *store = new UserContentExtensionStore(storePath); > > > > This is definitely a memory leak. > > This should return a RefPtr<UserContentExtensionStore>. Will fix. > > > Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h:36 > > ++ (instancetype)storeWithPath:(NSURL *)path; > > This should be storeWithURL: Alternatively just make an initializer. Can > this fail? If so, maybe it should take an NSError out parameter as well? (In reply to comment #5) > Comment on attachment 253529 [details] > [PATCH] Fix > > View in context: > https://bugs.webkit.org/attachment.cgi?id=253529&action=review > > >> Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp:57 > >> + UserContentExtensionStore *store = new UserContentExtensionStore(storePath); > > > > This is definitely a memory leak. > > This should return a RefPtr<UserContentExtensionStore>. > > > Source/WebKit2/UIProcess/API/Cocoa/_WKUserContentExtensionStore.h:36 > > ++ (instancetype)storeWithPath:(NSURL *)path; > > This should be storeWithURL: Alternatively just make an initializer. Can > this fail? If so, maybe it should take an NSError out parameter as well? This should not fail. I’ll rename it to storeWithURL. 1096622 7 253533 bweinstein 2015-05-21 10:59:24 -0700 Created attachment 253533 [PATCH] Fix v2 1096643 8 253533 commit-queue 2015-05-21 11:54:24 -0700 Comment on attachment 253533 [PATCH] Fix v2 Clearing flags on attachment: 253533 Committed r184726: <http://trac.webkit.org/changeset/184726> 1096644 9 commit-queue 2015-05-21 11:54:28 -0700 All reviewed patches have been landed. Closing bug. 253529 2015-05-21 10:07:20 -0700 2015-05-21 10:59:24 -0700 [PATCH] Fix 0001-Add-a-_WKWebKitContentExtensionStore-initializer-tha.patch text/plain 5176 bweinstein RnJvbSBlYjY0ODQ3ZGEzZjlmMGEyMWVhMTlkNDc4NzZkMmM0NTU0ZWEzMzZlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcmlhbiBXZWluc3RlaW4gPGJ3ZWluc3RlaW5AYXBwbGUuY29t PgpEYXRlOiBUaHUsIDIxIE1heSAyMDE1IDEwOjA2OjA1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g QWRkIGEgX1dLV2ViS2l0Q29udGVudEV4dGVuc2lvblN0b3JlIGluaXRpYWxpemVyIHRoYXQgdGFr ZXMgYQogcGF0aCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ1MjY5 IGFuZCB3b3JrIHRvd2FyZHMKIDxyZGFyOi8vcHJvYmxlbS8yMTAzMTQxND4KClJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgoKKiBVSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9u U3RvcmUuY3BwOgooQVBJOjpVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlOjpzdG9yZVdpdGhQYXRo KToKKiBVSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaDoKKiBVSVBy b2Nlc3MvQVBJL0NvY29hL19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaDoKKiBVSVByb2Nl c3MvQVBJL0NvY29hL19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUubW06CigrW19XS1VzZXJD b250ZW50RXh0ZW5zaW9uU3RvcmUgc3RvcmVXaXRoUGF0aDpdKToKLS0tCiBTb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTQgKysrKysr KysrKysrKysKIC4uLi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVXNlckNvbnRlbnRFeHRlbnNp b25TdG9yZS5jcHAgfCAgNiArKysrKysKIC4uLi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVXNl ckNvbnRlbnRFeHRlbnNpb25TdG9yZS5oICAgfCAgMSArCiAuLi4vVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmggICAgIHwgIDEgKwogLi4uL1VJUHJvY2Vz cy9BUEkvQ29jb2EvX1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5tbSAgICB8ICA1ICsrKysr CiA1IGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTc2YjU2 Zi4uNDI0Njk1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA1LTIxICBCcmlh biBXZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBfV0tX ZWJLaXRDb250ZW50RXh0ZW5zaW9uU3RvcmUgaW5pdGlhbGl6ZXIgdGhhdCB0YWtlcyBhIHBhdGgK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTI2OSBh bmQgd29yayB0b3dhcmRzIDxyZGFyOi8vcHJvYmxlbS8yMTAzMTQxND4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJVXNl ckNvbnRlbnRFeHRlbnNpb25TdG9yZS5jcHA6CisgICAgICAgIChBUEk6OlVzZXJDb250ZW50RXh0 ZW5zaW9uU3RvcmU6OnN0b3JlV2l0aFBhdGgpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJ VXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29j b2EvX1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5tbToKKyAgICAgICAgKCtbX1dL VXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSBzdG9yZVdpdGhQYXRoOl0pOgorCiAyMDE1LTA1LTE4 ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0dUS10g VVJUQkYgYWZ0ZXIgcjE4NDUwMy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQVBJVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuY3BwCmluZGV4IGQ1ZDlm M2IuLjBiMTUwMjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJ VXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9BUElVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmNwcApAQCAtNTIsNiArNTIsMTIg QEAgVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSYgVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZTo6 ZGVmYXVsdFN0b3JlKCkKICAgICByZXR1cm4gKmRlZmF1bHRTdG9yZTsKIH0KIAorVXNlckNvbnRl bnRFeHRlbnNpb25TdG9yZSYgVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZTo6c3RvcmVXaXRoUGF0 aChjb25zdCBXVEY6OlN0cmluZyYgc3RvcmVQYXRoKQoreworICAgIFVzZXJDb250ZW50RXh0ZW5z aW9uU3RvcmUgKnN0b3JlID0gbmV3IFVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUoc3RvcmVQYXRo KTsKKyAgICByZXR1cm4gKnN0b3JlOworfQorCiBVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlOjpV c2VyQ29udGVudEV4dGVuc2lvblN0b3JlKCkKICAgICA6IFVzZXJDb250ZW50RXh0ZW5zaW9uU3Rv cmUoZGVmYXVsdFN0b3JlUGF0aCgpKQogewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9BUElVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaAppbmRleCBjYzc2 MGIyLi5kYWI4ZDE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQ SVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaApAQCAtNTQsNiArNTQsNyBAQCBw dWJsaWM6CiAgICAgY29uc3Qgc3RhdGljIHVpbnQzMl90IEN1cnJlbnRDb250ZW50RXh0ZW5zaW9u RmlsZVZlcnNpb24gPSAyOwogCiAgICAgc3RhdGljIFVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUm IGRlZmF1bHRTdG9yZSgpOworICAgIHN0YXRpYyBVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlJiBz dG9yZVdpdGhQYXRoKGNvbnN0IFdURjo6U3RyaW5nJiBzdG9yZVBhdGgpOwogCiAgICAgZXhwbGlj aXQgVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSgpOwogICAgIGV4cGxpY2l0IFVzZXJDb250ZW50 RXh0ZW5zaW9uU3RvcmUoY29uc3QgV1RGOjpTdHJpbmcmIHN0b3JlUGF0aCk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1VzZXJDb250ZW50RXh0ZW5z aW9uU3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVXNlckNv bnRlbnRFeHRlbnNpb25TdG9yZS5oCmluZGV4IGQ0M2U3ZjkuLmE4NGZiYjEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVXNlckNvbnRlbnRFeHRlbnNp b25TdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVXNl ckNvbnRlbnRFeHRlbnNpb25TdG9yZS5oCkBAIC0zMyw2ICszMyw3IEBAIFdLX0NMQVNTX0FWQUlM QUJMRShXS19NQUNfVEJBLCBXS19JT1NfVEJBKQogQGludGVyZmFjZSBfV0tVc2VyQ29udGVudEV4 dGVuc2lvblN0b3JlIDogTlNPYmplY3QKIAogKyAoaW5zdGFuY2V0eXBlKWRlZmF1bHRTdG9yZTsK KysgKGluc3RhbmNldHlwZSlzdG9yZVdpdGhQYXRoOihOU1VSTCAqKXBhdGg7CiAKIC0gKHZvaWQp Y29tcGlsZUNvbnRlbnRFeHRlbnNpb25Gb3JJZGVudGlmaWVyOihOU1N0cmluZyAqKWlkZW50aWZp ZXIgZW5jb2RlZENvbnRlbnRFeHRlbnNpb246KE5TU3RyaW5nICopIE5TX1JFTEVBU0VTX0FSR1VN RU5UIGVuY29kZWRDb250ZW50RXh0ZW5zaW9uIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShf V0tVc2VyQ29udGVudEZpbHRlciAqLCBOU0Vycm9yICopKWNvbXBsZXRpb25IYW5kbGVyOwogLSAo dm9pZClsb29rdXBDb250ZW50RXh0ZW5zaW9uRm9ySWRlbnRpZmllcjooTlNTdHJpbmcgKilpZGVu dGlmaWVyIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShfV0tVc2VyQ29udGVudEZpbHRlciAq LCBOU0Vycm9yICopKWNvbXBsZXRpb25IYW5kbGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tVc2VyQ29udGVudEV4dGVuc2lv blN0b3JlLm1tCmluZGV4IGQ1OWM0NDAuLjQ5NzZhYWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5tbQor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1VzZXJDb250ZW50RXh0 ZW5zaW9uU3RvcmUubW0KQEAgLTQ2LDYgKzQ2LDExIEBAICsgKGluc3RhbmNldHlwZSlkZWZhdWx0 U3RvcmUKICAgICByZXR1cm4gV2ViS2l0Ojp3cmFwcGVyKEFQSTo6VXNlckNvbnRlbnRFeHRlbnNp b25TdG9yZTo6ZGVmYXVsdFN0b3JlKCkpOwogfQogCisrIChpbnN0YW5jZXR5cGUpc3RvcmVXaXRo UGF0aDooTlNVUkwgKilwYXRoCit7CisgICAgcmV0dXJuIFdlYktpdDo6d3JhcHBlcihBUEk6OlVz ZXJDb250ZW50RXh0ZW5zaW9uU3RvcmU6OnN0b3JlV2l0aFBhdGgocGF0aC5hYnNvbHV0ZVVSTC5w YXRoLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlvbikpOworfQorCiAtICh2b2lkKWNvbXBpbGVDb250 ZW50RXh0ZW5zaW9uRm9ySWRlbnRpZmllcjooTlNTdHJpbmcgKilpZGVudGlmaWVyIGVuY29kZWRD b250ZW50RXh0ZW5zaW9uOihOU1N0cmluZyAqKWVuY29kZWRDb250ZW50RXh0ZW5zaW9uIGNvbXBs ZXRpb25IYW5kbGVyOih2b2lkICheKShfV0tVc2VyQ29udGVudEZpbHRlciAqLCBOU0Vycm9yICop KWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbY29tcGxl dGlvbkhhbmRsZXIgY29weV0pOwotLSAKMi4zLjcgKEFwcGxlIEdpdC01NykKCg== 253533 2015-05-21 10:59:24 -0700 2015-05-21 11:54:24 -0700 [PATCH] Fix v2 0001-Add-a-_WKWebKitContentExtensionStore-initializer-tha.patch text/plain 5203 bweinstein RnJvbSAzNzc2MWUxNjQyOGU1ZWNiY2E4NDI0MDQzMzc0NmY3MWE0YmM0ZDZkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBCcmlhbiBXZWluc3RlaW4gPGJ3ZWluc3RlaW5AYXBwbGUuY29t PgpEYXRlOiBUaHUsIDIxIE1heSAyMDE1IDEwOjA2OjA1IC0wNzAwClN1YmplY3Q6IFtQQVRDSF0g QWRkIGEgX1dLV2ViS2l0Q29udGVudEV4dGVuc2lvblN0b3JlIGluaXRpYWxpemVyIHRoYXQgdGFr ZXMgYQogcGF0aC4gaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NTI2 OSBhbmQgd29yayB0b3dhcmRzCiA8cmRhcjovL3Byb2JsZW0vMjEwMzE0MTQ+CgpSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KCiogVUlQcm9jZXNzL0FQSS9BUElVc2VyQ29udGVudEV4dGVuc2lv blN0b3JlLmNwcDoKKEFQSTo6VXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZTo6c3RvcmVXaXRoUGF0 aCk6CiogVUlQcm9jZXNzL0FQSS9BUElVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmg6CiogVUlQ cm9jZXNzL0FQSS9Db2NvYS9fV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmg6CiogVUlQcm9j ZXNzL0FQSS9Db2NvYS9fV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLm1tOgooK1tfV0tVc2Vy Q29udGVudEV4dGVuc2lvblN0b3JlIHN0b3JlV2l0aFVSTDpdKToKLS0tCiBTb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgMTQgKysrKysr KysrKysrKysKIC4uLi9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJVXNlckNvbnRlbnRFeHRlbnNp b25TdG9yZS5jcHAgfCAgNSArKysrKwogLi4uL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElVc2Vy Q29udGVudEV4dGVuc2lvblN0b3JlLmggICB8ICAxICsKIC4uLi9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaCAgICAgfCAgMSArCiAuLi4vVUlQcm9jZXNz L0FQSS9Db2NvYS9fV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLm1tICAgIHwgIDYgKysrKysr CiA1IGZpbGVzIGNoYW5nZWQsIDI3IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTc2YjU2 Zi4uNjNiNWJjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE1LTA1LTIxICBCcmlh biBXZWluc3RlaW4gIDxid2VpbnN0ZWluQGFwcGxlLmNvbT4KKworICAgICAgICBBZGQgYSBfV0tX ZWJLaXRDb250ZW50RXh0ZW5zaW9uU3RvcmUgaW5pdGlhbGl6ZXIgdGhhdCB0YWtlcyBhIHBhdGgu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNDUyNjkg YW5kIHdvcmsgdG93YXJkcyA8cmRhcjovL3Byb2JsZW0vMjEwMzE0MTQ+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQSVVz ZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuY3BwOgorICAgICAgICAoQVBJOjpVc2VyQ29udGVudEV4 dGVuc2lvblN0b3JlOjpzdG9yZVdpdGhQYXRoKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0FQ SVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0NvY29hL19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUubW06CisgICAgICAgICgrW19X S1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUgc3RvcmVXaXRoVVJMOl0pOgorCiAyMDE1LTA1LTE4 ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0dUS10g VVJUQkYgYWZ0ZXIgcjE4NDUwMy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9BUEkvQVBJVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuY3BwCmluZGV4IGQ1ZDlm M2IuLmE4NTMwZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJ VXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9BUElVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmNwcApAQCAtNTIsNiArNTIsMTEg QEAgVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSYgVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZTo6 ZGVmYXVsdFN0b3JlKCkKICAgICByZXR1cm4gKmRlZmF1bHRTdG9yZTsKIH0KIAorUmVmPFVzZXJD b250ZW50RXh0ZW5zaW9uU3RvcmU+IFVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmU6OnN0b3JlV2l0 aFBhdGgoY29uc3QgV1RGOjpTdHJpbmcmIHN0b3JlUGF0aCkKK3sKKyAgICByZXR1cm4gYWRvcHRS ZWYoKm5ldyBVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlKHN0b3JlUGF0aCkpOworfQorCiBVc2Vy Q29udGVudEV4dGVuc2lvblN0b3JlOjpVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlKCkKICAgICA6 IFVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUoZGVmYXVsdFN0b3JlUGF0aCgpKQogewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElVc2VyQ29udGVudEV4dGVuc2lv blN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0 ZW5zaW9uU3RvcmUuaAppbmRleCBjYzc2MGIyLi5jNWNjZGQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0FQSVVzZXJDb250ZW50RXh0ZW5zaW9uU3Rv cmUuaApAQCAtNTQsNiArNTQsNyBAQCBwdWJsaWM6CiAgICAgY29uc3Qgc3RhdGljIHVpbnQzMl90 IEN1cnJlbnRDb250ZW50RXh0ZW5zaW9uRmlsZVZlcnNpb24gPSAyOwogCiAgICAgc3RhdGljIFVz ZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUmIGRlZmF1bHRTdG9yZSgpOworICAgIHN0YXRpYyBSZWY8 VXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZT4gc3RvcmVXaXRoUGF0aChjb25zdCBXVEY6OlN0cmlu ZyYgc3RvcmVQYXRoKTsKIAogICAgIGV4cGxpY2l0IFVzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUo KTsKICAgICBleHBsaWNpdCBVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlKGNvbnN0IFdURjo6U3Ry aW5nJiBzdG9yZVBhdGgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaAppbmRleCBk NDNlN2Y5Li5hMGU0NGI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUuaApAQCAt MzMsNiArMzMsNyBAQCBXS19DTEFTU19BVkFJTEFCTEUoV0tfTUFDX1RCQSwgV0tfSU9TX1RCQSkK IEBpbnRlcmZhY2UgX1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZSA6IE5TT2JqZWN0CiAKICsg KGluc3RhbmNldHlwZSlkZWZhdWx0U3RvcmU7CisrIChpbnN0YW5jZXR5cGUpc3RvcmVXaXRoVVJM OihOU1VSTCAqKXVybDsKIAogLSAodm9pZCljb21waWxlQ29udGVudEV4dGVuc2lvbkZvcklkZW50 aWZpZXI6KE5TU3RyaW5nICopaWRlbnRpZmllciBlbmNvZGVkQ29udGVudEV4dGVuc2lvbjooTlNT dHJpbmcgKikgTlNfUkVMRUFTRVNfQVJHVU1FTlQgZW5jb2RlZENvbnRlbnRFeHRlbnNpb24gY29t cGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKF9XS1VzZXJDb250ZW50RmlsdGVyICosIE5TRXJyb3Ig KikpY29tcGxldGlvbkhhbmRsZXI7CiAtICh2b2lkKWxvb2t1cENvbnRlbnRFeHRlbnNpb25Gb3JJ ZGVudGlmaWVyOihOU1N0cmluZyAqKWlkZW50aWZpZXIgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQg KF4pKF9XS1VzZXJDb250ZW50RmlsdGVyICosIE5TRXJyb3IgKikpY29tcGxldGlvbkhhbmRsZXI7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1VzZXJD b250ZW50RXh0ZW5zaW9uU3RvcmUubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1VzZXJDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0KaW5kZXggZDU5YzQ0MC4uMzk4MThi MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tVc2Vy Q29udGVudEV4dGVuc2lvblN0b3JlLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLVXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZS5tbQpAQCAtNDYsNiArNDYsMTIg QEAgKyAoaW5zdGFuY2V0eXBlKWRlZmF1bHRTdG9yZQogICAgIHJldHVybiBXZWJLaXQ6OndyYXBw ZXIoQVBJOjpVc2VyQ29udGVudEV4dGVuc2lvblN0b3JlOjpkZWZhdWx0U3RvcmUoKSk7CiB9CiAK KysgKGluc3RhbmNldHlwZSlzdG9yZVdpdGhVUkw6KE5TVVJMICopdXJsCit7CisgICAgUmVmPEFQ STo6VXNlckNvbnRlbnRFeHRlbnNpb25TdG9yZT4gc3RvcmUgPSBBUEk6OlVzZXJDb250ZW50RXh0 ZW5zaW9uU3RvcmU6OnN0b3JlV2l0aFBhdGgodXJsLmFic29sdXRlVVJMLmZpbGVTeXN0ZW1SZXBy ZXNlbnRhdGlvbik7CisgICAgcmV0dXJuIFdlYktpdDo6d3JhcHBlcihzdG9yZS5sZWFrUmVmKCkp OworfQorCiAtICh2b2lkKWNvbXBpbGVDb250ZW50RXh0ZW5zaW9uRm9ySWRlbnRpZmllcjooTlNT dHJpbmcgKilpZGVudGlmaWVyIGVuY29kZWRDb250ZW50RXh0ZW5zaW9uOihOU1N0cmluZyAqKWVu Y29kZWRDb250ZW50RXh0ZW5zaW9uIGNvbXBsZXRpb25IYW5kbGVyOih2b2lkICheKShfV0tVc2Vy Q29udGVudEZpbHRlciAqLCBOU0Vycm9yICopKWNvbXBsZXRpb25IYW5kbGVyCiB7CiAgICAgYXV0 byBoYW5kbGVyID0gYWRvcHROUyhbY29tcGxldGlvbkhhbmRsZXIgY29weV0pOwotLSAKMi4zLjcg KEFwcGxlIEdpdC01NykKCg==