116346 2013-05-17 13:17:45 -0700 WKKeyValueStorageManagerGetKeyValueStorageOrigins should get origins from the UI process 2013-05-17 21:46:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca benjamin cmarcelo commit-queue oldest_to_newest 890625 0 andersca 2013-05-17 13:17:45 -0700 WKKeyValueStorageManagerGetKeyValueStorageOrigins should get origins from the UI process 890627 1 202144 andersca 2013-05-17 13:21:42 -0700 Created attachment 202144 Patch 890629 2 commit-queue 2013-05-17 13:24:17 -0700 Attachment 202144 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/ChangeLog', u'Source/WTF/wtf/Forward.h', u'Source/WebCore/ChangeLog', u'Source/WebCore/WebCore.exp.in', u'Source/WebKit2/ChangeLog', u'Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.cpp', u'Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h', u'Source/WebKit2/UIProcess/Storage/StorageManager.cpp', u'Source/WebKit2/UIProcess/Storage/StorageManager.h', u'Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp']" exit_code: 1 Source/WebKit2/UIProcess/Storage/StorageManager.h:64: Missing spaces around >> [whitespace/operators] [3] Source/WebKit2/UIProcess/Storage/StorageManager.h:96: Missing spaces around >> [whitespace/operators] [3] Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp:86: Missing spaces around >> [whitespace/operators] [3] Source/WebKit2/UIProcess/Storage/StorageManager.cpp:384: Missing spaces around >> [whitespace/operators] [3] Source/WebKit2/UIProcess/Storage/StorageManager.cpp:569: Missing spaces around >> [whitespace/operators] [3] Source/WebKit2/UIProcess/Storage/StorageManager.cpp:575: Missing spaces around >> [whitespace/operators] [3] Source/WebKit2/UIProcess/Storage/StorageManager.cpp:577: Missing spaces around >> [whitespace/operators] [3] Total errors found: 7 in 10 files If any of these errors are false positives, please file a bug against check-webkit-style. 890638 3 202144 kling 2013-05-17 13:38:02 -0700 Comment on attachment 202144 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202144&action=review r=me with some itches.. > Source/WebKit2/UIProcess/Storage/LocalStorageDatabaseTracker.h:56 > + Vector<RefPtr<WebCore::SecurityOrigin>> origins(); This method should be const. > Source/WebKit2/UIProcess/Storage/StorageManager.cpp:340 > + // Make sure the encoding is initialized before we start dispatching things to the queue. > + UTF8Encoding(); This looks somewhat arbitrary. Are we sure this is the only encoding that will ever be needed? > Source/WebKit2/UIProcess/Storage/StorageManager.cpp:571 > +static void callCallbackFunction(void* context, void (*callbackFunction)(const Vector<RefPtr<WebCore::SecurityOrigin>>& securityOrigins, void* context), Vector<RefPtr<WebCore::SecurityOrigin>>* securityOriginsPtr) > +{ > + OwnPtr<Vector<RefPtr<WebCore::SecurityOrigin>>> securityOrigins = adoptPtr(securityOriginsPtr); I wish we could pass securityOriginsPtr as a PassOwnPtr instead here. > Source/WebKit2/UIProcess/WebKeyValueStorageManagerProxy.cpp:93 > + for (size_t i = 0; i < securityOrigins.size(); ++i) I prefer to use 'unsigned' to iterate over Vectors in new code, as we're planning to move away from size_t there eventually. 890644 4 andersca 2013-05-17 13:41:19 -0700 Committed r150295: <http://trac.webkit.org/changeset/150295> 890822 5 202144 ap 2013-05-17 21:46:09 -0700 Comment on attachment 202144 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=202144&action=review >> Source/WebKit2/UIProcess/Storage/StorageManager.cpp:340 >> + UTF8Encoding(); > > This looks somewhat arbitrary. Are we sure this is the only encoding that will ever be needed? It's a nice catch. Shouldn't we have ASSERT(isMainThread()) in all those functions? Or better yet, have a dispatch_once? I agree with Andreas that this looks a bit troubling even if it's 100% correct. 202144 2013-05-17 13:21:42 -0700 2013-05-17 21:46:09 -0700 Patch bug-116346-20130517132035.patch text/plain 12768 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTUwMjczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDI2ZjdiYzRiMTBhYzlmNjk1N2FlNTll N2MxMTM0NWRlNDZhYjk4OGQuLjI3YjFlMzlmMTRjYjI0MWFmZmRmYjRkZDNiM2VlOTNmODU3ZGU1 OWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMDUtMTcgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRL ZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zIHNob3VsZCBnZXQgb3JpZ2lucyBmcm9tIHRoZSBVSSBwcm9j ZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTYz NDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEzODUyODI5PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBmb3J3YXJkIGRlY2xhcmF0aW9uIGZv ciBGdW5jdGlvbi4KKworICAgICAgICAqIHd0Zi9Gb3J3YXJkLmg6CisKIDIwMTMtMDUtMTcgIFBh dHJpY2sgR2Fuc3RlcmVyICA8cGFyb2dhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgW0NNYWtlXSBS ZW1vdmUgaW52YWxpZCBpbmNsdWRlIHBhdGhzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzM0NjJhNDFlZWJhNDJk YWVhNjRiM2RkNTJlMWNkNWEyOTIxZjgzMy4uODU2YzA1OWVjOGFmNDRlN2JhMDhlMGFlODEwZmNk MWFlOGU0MGM1YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEzLTA1LTE3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgV0tLZXlWYWx1ZVN0 b3JhZ2VNYW5hZ2VyR2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyBzaG91bGQgZ2V0IG9yaWdpbnMg ZnJvbSB0aGUgVUkgcHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE2MzQ2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMzg1MjgyOT4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHBvcnQgdGhl IFVURjhFbmNvZGluZyBzeW1ib2wuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKwogMjAx My0wNS0xNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0VGTF0g TW92ZSBFRkwgcG9ydCBvZmYgbGVnYWN5IGNsaXBib2FyZApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDg5ZWQ4YzNj YTkzZTVlNTEzOTUwMmI5OGVhNDUzZjQyYjQ4MTM5NGUuLmE5OGZlN2E5ZWY5NTBiZmEwNTBmNzcz YzBmMDFmYmJjZWUxYmM3NDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwor KysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNSBAQAorMjAxMy0wNS0x NyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFdLS2V5 VmFsdWVTdG9yYWdlTWFuYWdlckdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMgc2hvdWxkIGdldCBv cmlnaW5zIGZyb20gdGhlIFVJIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTExNjM0NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM4NTI4 Mjk+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBV SVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwOgorICAgICAg ICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6Om9yaWdpbnMpOgorICAgICAg ICBOZXcgaGVscGVyIGZ1bmN0aW9uIHRvIHJldHVybiBhbGwgdGhlIHRyYWNrZWQgb3JpZ2lucy4K KworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6U3RvcmFnZU1hbmFnZXI6OlN0b3JhZ2VNYW5hZ2VyKToKKyAgICAgICAgSW5p dGlhbGl6ZSB0aGUgVVRGLTggZW5jb2RpbmcuCisKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZU1h bmFnZXI6OmdldE9yaWdpbnMpOgorICAgICAgICBDYWxsIGdldE9yaWdpbnNJbnRlcm5hbCBvbiBv dXIgcXVldWUuCisKKyAgICAgICAgKFdlYktpdDo6Y2FsbENhbGxiYWNrRnVuY3Rpb24pOgorICAg ICAgICBIZWxwZXIgZnVuY3Rpb24gZm9yIGNhbGxpbmcgdGhlIGNhbGxiYWNrIGZ1bmN0aW9uLgor CisgICAgICAgIChXZWJLaXQ6OlN0b3JhZ2VNYW5hZ2VyOjpnZXRPcmlnaW5zSW50ZXJuYWwpOgor ICAgICAgICBHZXQgdGhlIG9yaWdpbnMgYW5kIG1ha2Ugc3VyZSB3ZSBjYWxsIHRoZSBjYWxsYmFj ayB3aXRoIHRoZSBnaXZlbiBmdW5jdGlvbiBkaXNwYXRjaGVyLgorCisgICAgICAgICogVUlQcm9j ZXNzL1dlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OmRpZEdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnNDYWxsYmFjayk6CisgICAgICAgIENvbnN0cnVj dCB0aGUgYXJyYXkgb2YgV2ViU2VjdXJpdHlPcmlnaW4gb2JqZWN0cyBhbmQgY2FsbCB0aGUgY2Fs bGJhY2suCisKKyAgICAgICAgKFdlYktpdDo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5 OjpnZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKToKKyAgICAgICAgQ2FsbCBTdG9yYWdlTWFuYWdl cjo6Z2V0T3JpZ2lucy4KKwogMjAxMy0wNS0xNyAgU2FtIFdlaW5pZyAgPHNhbUB3ZWJraXQub3Jn PgogCiAgICAgICAgIEFkZCBXS1BhZ2VMb2FkRGF0YSBhbmQgV0tQYWdlTG9hZERhdGFXaXRoVXNl ckRhdGEgU1BJIHRvIHN1cHBvcnQgbG9hZGluZyBhcmJpdHJhcnkgZGF0YSBibG9icwpkaWZmIC0t Z2l0IGEvU291cmNlL1dURi93dGYvRm9yd2FyZC5oIGIvU291cmNlL1dURi93dGYvRm9yd2FyZC5o CmluZGV4IDUzMzMwNzc0NTQ1MzAzNGFkYTRkMjI0MTMwYjlmOTU4YTYzZWVmYjkuLjgyYzJlMTgx YWM2MmU0Nzc4MTMyYTAzOTI3MDFhYjE5YTQzYzI5YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYv d3RmL0ZvcndhcmQuaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9Gb3J3YXJkLmgKQEAgLTQ0LDYgKzQ0 LDcgQEAgbmFtZXNwYWNlIFdURiB7CiAgICAgY2xhc3MgRW5jb2RlcjsKICAgICBjbGFzcyBGbG9h dDMyQXJyYXk7CiAgICAgY2xhc3MgRmxvYXQ2NEFycmF5OworICAgIGNsYXNzIEZ1bmN0aW9uRGlz cGF0Y2hlcjsKICAgICBjbGFzcyBJbnQ4QXJyYXk7CiAgICAgY2xhc3MgSW50MTZBcnJheTsKICAg ICBjbGFzcyBJbnQzMkFycmF5OwpAQCAtNzcsNiArNzgsNyBAQCB1c2luZyBXVEY6OkVuY29kZXI7 CiB1c2luZyBXVEY6OkRlY29kZXI7CiB1c2luZyBXVEY6OkZsb2F0MzJBcnJheTsKIHVzaW5nIFdU Rjo6RmxvYXQ2NEFycmF5OwordXNpbmcgV1RGOjpGdW5jdGlvbkRpc3BhdGNoZXI7CiB1c2luZyBX VEY6OkludDhBcnJheTsKIHVzaW5nIFdURjo6SW50MTZBcnJheTsKIHVzaW5nIFdURjo6SW50MzJB cnJheTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggNjdlZGI4Nzg2Mjk3YTY1ZDEyOWU0ODIxOTFi ZjliMWEzYWZkYzIxNy4uZGIwNDBhNDlmOWNlZTQ2NzJiM2E1Mjc3Y2EwODdiZGQ4Y2I0YzczZCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTIyNSw2ICsyMjUsNyBAQCBfX1pON1dlYkNvcmUxMlRl eHRJdGVyYXRvcjdhZHZhbmNlRXYKIF9fWk43V2ViQ29yZTEyVGV4dEl0ZXJhdG9yOHN1YnJhbmdl RVBOU181UmFuZ2VFaWkKIF9fWk43V2ViQ29yZTEyVGV4dEl0ZXJhdG9yQzFFUEtOU181UmFuZ2VF TlNfMjBUZXh0SXRlcmF0b3JCZWhhdmlvckUKIF9fWk43V2ViQ29yZTEyVGV4dEl0ZXJhdG9yRDFF dgorX19aTjdXZWJDb3JlMTJVVEY4RW5jb2RpbmdFdgogX19aTjdXZWJDb3JlMTJjYWNoZVN0b3Jh Z2VFdgogX19aTjdXZWJDb3JlMTJjcmVhdGVNYXJrdXBFUEtOU181UmFuZ2VFUE4zV1RGNlZlY3Rv cklQTlNfNE5vZGVFTG0wRU5TM18xNUNyYXNoT25PdmVyZmxvd0VFRU5TXzIzRUFubm90YXRlRm9y SW50ZXJjaGFuZ2VFYk5TXzEzRUFic29sdXRlVVJMc0UKIF9fWk43V2ViQ29yZTEyZGVsZXRlQ29v a2llRVJLTlNfMjFOZXR3b3JrU3RvcmFnZVNlc3Npb25FUktOU180S1VSTEVSS04zV1RGNlN0cmlu Z0UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3Rv cmFnZURhdGFiYXNlVHJhY2tlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCmluZGV4IDY4ZWVlMDFkMjQ2Mzc5NGJl MmU2NGFmZTUyMGVmNGYzOWFkZTE2N2UuLjkwNWI4ZmFjOGI0ZjQwZTMwMmI3NjAwZWRmZmIwM2Zl ZTVlOTU4MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xv Y2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmNwcApAQCAtNzAsNiArNzAs MTcgQEAgdm9pZCBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZUVtcHR5RGF0YWJh c2VXaXRoT3JpZ2luKFNlY3VyaXR5T3JpZ2luKgogICAgIHJlbW92ZURhdGFiYXNlV2l0aE9yaWdp bklkZW50aWZpZXIoc2VjdXJpdHlPcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigpKTsKIH0KIAor VmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+IExvY2FsU3RvcmFnZURhdGFi YXNlVHJhY2tlcjo6b3JpZ2lucygpCit7CisgICAgVmVjdG9yPFJlZlB0cjxTZWN1cml0eU9yaWdp bj4+IG9yaWdpbnM7CisgICAgb3JpZ2lucy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KG1fb3JpZ2lu cy5zaXplKCkpOworCisgICAgZm9yIChIYXNoU2V0PFN0cmluZz46OmNvbnN0X2l0ZXJhdG9yIGl0 ID0gbV9vcmlnaW5zLmJlZ2luKCksIGVuZCA9IG1fb3JpZ2lucy5lbmQoKTsgaXQgIT0gZW5kOyAr K2l0KQorICAgICAgICBvcmlnaW5zLnVuY2hlY2tlZEFwcGVuZChTZWN1cml0eU9yaWdpbjo6Y3Jl YXRlRnJvbURhdGFiYXNlSWRlbnRpZmllcigqaXQpKTsKKworICAgIHJldHVybiBvcmlnaW5zOwor fQorCiB2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6c2V0TG9jYWxTdG9yYWdlRGly ZWN0b3J5SW50ZXJuYWwoY29uc3QgU3RyaW5nJiBsb2NhbFN0b3JhZ2VEaXJlY3RvcnkpCiB7CiAg ICAgaWYgKG1fZGF0YWJhc2UuaXNPcGVuKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oCmlu ZGV4IDJlMTRlZTVmMjg1YjQxOWY0M2NlOGFhYTI0ODdmZTViNjNjY2E5MDMuLjdjOGE1NGQ5NWRi MmY3MmQ1NDZiNDEzYjRhOGExYTdkZGYxNWVkZmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tl ci5oCkBAIC01Myw2ICs1Myw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZE9wZW5EYXRhYmFzZVdp dGhPcmlnaW4oV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qKTsKICAgICB2b2lkIGRlbGV0ZUVtcHR5 RGF0YWJhc2VXaXRoT3JpZ2luKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luKik7CiAKKyAgICBWZWN0 b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4gb3JpZ2lucygpOworCiBwcml2YXRl OgogICAgIGV4cGxpY2l0IExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcihQYXNzUmVmUHRyPFdv cmtRdWV1ZT4pOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9TdG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9T dG9yYWdlTWFuYWdlci5jcHAKaW5kZXggMGRkODQ5YjE1NDAxZjM3ZjJiNDhhYzlhNWRjZGZmMDBi ZGIyZDY5YS4uYmMxMGM1MjNkM2Y3NWRlODgxOGNlMDE1NDVjZTQ4YWEyMjFmOWFiNCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmNw cApAQCAtMzUsNiArMzUsNyBAQAogI2luY2x1ZGUgIldvcmtRdWV1ZS5oIgogI2luY2x1ZGUgPFdl YkNvcmUvU2VjdXJpdHlPcmlnaW5IYXNoLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TdG9yYWdlTWFw Lmg+CisjaW5jbHVkZSA8V2ViQ29yZS9UZXh0RW5jb2RpbmcuaD4KIAogdXNpbmcgbmFtZXNwYWNl IFdlYkNvcmU7CiAKQEAgLTMzNSw2ICszMzYsOCBAQCBTdG9yYWdlTWFuYWdlcjo6U3RvcmFnZU1h bmFnZXIoKQogICAgIDogbV9xdWV1ZShXb3JrUXVldWU6OmNyZWF0ZSgiY29tLmFwcGxlLldlYktp dC5TdG9yYWdlTWFuYWdlciIpKQogICAgICwgbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIo TG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpjcmVhdGUobV9xdWV1ZSkpCiB7CisgICAgLy8g TWFrZSBzdXJlIHRoZSBlbmNvZGluZyBpcyBpbml0aWFsaXplZCBiZWZvcmUgd2Ugc3RhcnQgZGlz cGF0Y2hpbmcgdGhpbmdzIHRvIHRoZSBxdWV1ZS4KKyAgICBVVEY4RW5jb2RpbmcoKTsKIH0KIAog U3RvcmFnZU1hbmFnZXI6On5TdG9yYWdlTWFuYWdlcigpCkBAIC0zNzgsNiArMzgxLDExIEBAIHZv aWQgU3RvcmFnZU1hbmFnZXI6OnByb2Nlc3NXaWxsQ2xvc2VDb25uZWN0aW9uKFdlYlByb2Nlc3NQ cm94eSogd2ViUHJvY2Vzc1Byb3h5CiAgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goYmluZCgmU3RvcmFn ZU1hbmFnZXI6OmludmFsaWRhdGVDb25uZWN0aW9uSW50ZXJuYWwsIHRoaXMsIFJlZlB0cjxDb3Jl SVBDOjpDb25uZWN0aW9uPih3ZWJQcm9jZXNzUHJveHktPmNvbm5lY3Rpb24oKSkpKTsKIH0KIAor dm9pZCBTdG9yYWdlTWFuYWdlcjo6Z2V0T3JpZ2lucyhGdW5jdGlvbkRpc3BhdGNoZXIqIGNhbGxi YWNrRGlzcGF0Y2hlciwgdm9pZCogY29udGV4dCwgdm9pZCAoKmNhbGxiYWNrKShjb25zdCBWZWN0 b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4mIHNlY3VyaXR5T3JpZ2lucywgdm9p ZCogY29udGV4dCkpCit7CisgICAgbV9xdWV1ZS0+ZGlzcGF0Y2goYmluZCgmU3RvcmFnZU1hbmFn ZXI6OmdldE9yaWdpbnNJbnRlcm5hbCwgdGhpcywgUmVmUHRyPEZ1bmN0aW9uRGlzcGF0Y2hlcj4o Y2FsbGJhY2tEaXNwYXRjaGVyKSwgY29udGV4dCwgY2FsbGJhY2spKTsKK30KKwogdm9pZCBTdG9y YWdlTWFuYWdlcjo6Y3JlYXRlTG9jYWxTdG9yYWdlTWFwKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNv bm5lY3Rpb24sIHVpbnQ2NF90IHN0b3JhZ2VNYXBJRCwgdWludDY0X3Qgc3RvcmFnZU5hbWVzcGFj ZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhdGEmIHNlY3VyaXR5T3JpZ2luRGF0YSkKIHsKICAg ICBzdGQ6OnBhaXI8UmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+LCB1aW50NjRfdD4gY29ubmVj dGlvbkFuZFN0b3JhZ2VNYXBJRFBhaXIoY29ubmVjdGlvbiwgc3RvcmFnZU1hcElEKTsKQEAgLTU1 OCw0ICs1NjYsMTYgQEAgU3RvcmFnZU1hbmFnZXI6OkxvY2FsU3RvcmFnZU5hbWVzcGFjZSogU3Rv cmFnZU1hbmFnZXI6OmdldE9yQ3JlYXRlTG9jYWxTdG9yYWdlTmEKICAgICByZXR1cm4gcmVzdWx0 Lml0ZXJhdG9yLT52YWx1ZS5nZXQoKTsKIH0KIAorc3RhdGljIHZvaWQgY2FsbENhbGxiYWNrRnVu Y3Rpb24odm9pZCogY29udGV4dCwgdm9pZCAoKmNhbGxiYWNrRnVuY3Rpb24pKGNvbnN0IFZlY3Rv cjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+PiYgc2VjdXJpdHlPcmlnaW5zLCB2b2lk KiBjb250ZXh0KSwgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+KiBzZWN1 cml0eU9yaWdpbnNQdHIpCit7CisgICAgT3duUHRyPFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2Vj dXJpdHlPcmlnaW4+Pj4gc2VjdXJpdHlPcmlnaW5zID0gYWRvcHRQdHIoc2VjdXJpdHlPcmlnaW5z UHRyKTsKKyAgICBjYWxsYmFja0Z1bmN0aW9uKCpzZWN1cml0eU9yaWdpbnMsIGNvbnRleHQpOwor fQorCit2b2lkIFN0b3JhZ2VNYW5hZ2VyOjpnZXRPcmlnaW5zSW50ZXJuYWwoRnVuY3Rpb25EaXNw YXRjaGVyKiBkaXNwYXRjaGVyLCB2b2lkKiBjb250ZXh0LCB2b2lkICgqY2FsbGJhY2tGdW5jdGlv bikoY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+JiBzZWN1cml0 eU9yaWdpbnMsIHZvaWQqIGNvbnRleHQpKQoreworICAgIE93blB0cjxWZWN0b3I8UmVmUHRyPFdl YkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4+IHNlY3VyaXR5T3JpZ2lucyA9IGFkb3B0UHRyKG5ldyBW ZWN0b3I8UmVmUHRyPFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luPj4obV9sb2NhbFN0b3JhZ2VEYXRh YmFzZVRyYWNrZXItPm9yaWdpbnMoKSkpOworICAgIGRpc3BhdGNoZXItPmRpc3BhdGNoKGJpbmQo Y2FsbENhbGxiYWNrRnVuY3Rpb24sIGNvbnRleHQsIGNhbGxiYWNrRnVuY3Rpb24sIHNlY3VyaXR5 T3JpZ2lucy5sZWFrUHRyKCkpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZU1hbmFnZXIuaAppbmRleCAz OWMyMjNkMGY1NDNkMGNmNDc2ODE5ZTc1NWZlOTY0YzJiZmJmYmNmLi4xYzk3Y2RlMDRkZDZiNGVh ZDAxNzNhMTIyZWU0N2U1MzIyOTM3ODkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvU3RvcmFnZS9TdG9yYWdlTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VNYW5hZ2VyLmgKQEAgLTI3LDEyICsyNywxNyBAQAogI2RlZmlu ZSBTdG9yYWdlTWFuYWdlcl9oCiAKICNpbmNsdWRlICJDb25uZWN0aW9uLmgiCisjaW5jbHVkZSA8 d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvUGFzc1JlZlB0ci5oPgogI2luY2x1ZGUgPHd0 Zi9UaHJlYWRTYWZlUmVmQ291bnRlZC5oPgogI2luY2x1ZGUgPHd0Zi90ZXh0L1N0cmluZ0hhc2gu aD4KIAogY2xhc3MgV29ya1F1ZXVlOwogCituYW1lc3BhY2UgV2ViQ29yZSB7CitjbGFzcyBTZWN1 cml0eU9yaWdpbjsKK30KKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIHN0cnVjdCBTZWN1cml0eU9y aWdpbkRhdGE7CkBAIC01NCw2ICs1OSwxMCBAQCBwdWJsaWM6CiAgICAgdm9pZCBwcm9jZXNzV2ls bE9wZW5Db25uZWN0aW9uKFdlYlByb2Nlc3NQcm94eSopOwogICAgIHZvaWQgcHJvY2Vzc1dpbGxD bG9zZUNvbm5lY3Rpb24oV2ViUHJvY2Vzc1Byb3h5Kik7CiAKKyAgICAvLyBGSVhNRTogSW5zdGVh ZCBvZiBhIGNvbnRleHQgKyBDIGZ1bmN0aW9uLCB0aGlzIHNob3VsZCB0YWtlIGEgV1RGOjpGdW5j dGlvbiwgYnV0IHdlIGN1cnJlbnRseSBkb24ndAorICAgIC8vIHN1cHBvcnQgYXJndW1lbnRzIGlu IGZ1bmN0aW9ucy4KKyAgICB2b2lkIGdldE9yaWdpbnMoRnVuY3Rpb25EaXNwYXRjaGVyKiBjYWxs YmFja0Rpc3BhdGNoZXIsIHZvaWQqIGNvbnRleHQsIHZvaWQgKCpjYWxsYmFjaykoY29uc3QgVmVj dG9yPFJlZlB0cjxXZWJDb3JlOjpTZWN1cml0eU9yaWdpbj4+JiBzZWN1cml0eU9yaWdpbnMsIHZv aWQqIGNvbnRleHQpKTsKKwogcHJpdmF0ZToKICAgICBTdG9yYWdlTWFuYWdlcigpOwogCkBAIC04 NCw2ICs5Myw4IEBAIHByaXZhdGU6CiAgICAgY2xhc3MgTG9jYWxTdG9yYWdlTmFtZXNwYWNlOwog ICAgIExvY2FsU3RvcmFnZU5hbWVzcGFjZSogZ2V0T3JDcmVhdGVMb2NhbFN0b3JhZ2VOYW1lc3Bh Y2UodWludDY0X3Qgc3RvcmFnZU5hbWVzcGFjZUlEKTsKIAorICAgIHZvaWQgZ2V0T3JpZ2luc0lu dGVybmFsKEZ1bmN0aW9uRGlzcGF0Y2hlciogY2FsbGJhY2tEaXNwYXRjaGVyLCB2b2lkKiBjb250 ZXh0LCB2b2lkICgqY2FsbGJhY2spKGNvbnN0IFZlY3RvcjxSZWZQdHI8V2ViQ29yZTo6U2VjdXJp dHlPcmlnaW4+PiYgc2VjdXJpdHlPcmlnaW5zLCB2b2lkKiBjb250ZXh0KSk7CisKICAgICBSZWZQ dHI8V29ya1F1ZXVlPiBtX3F1ZXVlOwogCiAgICAgUmVmUHRyPExvY2FsU3RvcmFnZURhdGFiYXNl VHJhY2tlcj4gbV9sb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5LmNwcCBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHku Y3BwCmluZGV4IDkwNmZmM2FmMWU3M2JhNDJmZjc3ZjNhN2JmMmQwN2E0OGEyYjQ5OGUuLmI2NzFk NTNkMzRiM2E3N2NkNTY4MWRmNWI0Njk5ZmE0YmY2ZjU4MWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHku Y3BwCkBAIC0zMiw2ICszMiw4IEBACiAjaW5jbHVkZSAiV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdl clByb3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJXZWJTZWN1cml0eU9yaWdpbi5oIgogCit1c2lu ZyBuYW1lc3BhY2UgV2ViQ29yZTsKKwogbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNvbnN0IGNoYXIq IFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eTo6c3VwcGxlbWVudE5hbWUoKQpAQCAtODEs MTQgKzgzLDIyIEBAIHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5OjpkZXJlZldl YkNvbnRleHRTdXBwbGVtZW50KCkKICAgICBBUElPYmplY3Q6OmRlcmVmKCk7CiB9CiAKLXZvaWQg V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5OjpnZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5z KFBhc3NSZWZQdHI8QXJyYXlDYWxsYmFjaz4gcHJwQ2FsbGJhY2spCitzdGF0aWMgdm9pZCBkaWRH ZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zQ2FsbGJhY2soY29uc3QgVmVjdG9yPFJlZlB0cjxXZWJD b3JlOjpTZWN1cml0eU9yaWdpbj4+JiBzZWN1cml0eU9yaWdpbnMsIHZvaWQqIGNvbnRleHQpCiB7 Ci0gICAgUmVmUHRyPEFycmF5Q2FsbGJhY2s+IGNhbGxiYWNrID0gcHJwQ2FsbGJhY2s7Ci0gICAg dWludDY0X3QgY2FsbGJhY2tJRCA9IGNhbGxiYWNrLT5jYWxsYmFja0lEKCk7Ci0gICAgbV9hcnJh eUNhbGxiYWNrcy5zZXQoY2FsbGJhY2tJRCwgY2FsbGJhY2sucmVsZWFzZSgpKTsKKyAgICBSZWZQ dHI8QXJyYXlDYWxsYmFjaz4gY2FsbGJhY2sgPSBhZG9wdFJlZihzdGF0aWNfY2FzdDxBcnJheUNh bGxiYWNrKj4oY29udGV4dCkpOwogCi0gICAgLy8gRklYTUUgKE11bHRpLVdlYlByb2Nlc3MpOiA8 cmRhcjovL3Byb2JsZW0vMTIyMzk3NjU+IFNob3VsZCBrZXktdmFsdWUgc3RvcmFnZSBiZSBoYW5k bGVkIGluIHRoZSB3ZWIgcHJvY2Vzcz8KLSAgICBjb250ZXh0KCktPnNlbmRUb0FsbFByb2Nlc3Nl c1JlbGF1bmNoaW5nVGhlbUlmTmVjZXNzYXJ5KE1lc3NhZ2VzOjpXZWJLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyOjpHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKGNhbGxiYWNrSUQpKTsKKyAgICBWZWN0 b3I8UmVmUHRyPEFQSU9iamVjdD4+IHdlYlNlY3VyaXR5T3JpZ2luczsKKyAgICB3ZWJTZWN1cml0 eU9yaWdpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShzZWN1cml0eU9yaWdpbnMuc2l6ZSgpKTsK KworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgc2VjdXJpdHlPcmlnaW5zLnNpemUoKTsgKytp KQorICAgICAgICB3ZWJTZWN1cml0eU9yaWdpbnMudW5jaGVja2VkQXBwZW5kKFdlYlNlY3VyaXR5 T3JpZ2luOjpjcmVhdGUoc2VjdXJpdHlPcmlnaW5zW2ldKSk7CisKKyAgICBjYWxsYmFjay0+cGVy Zm9ybUNhbGxiYWNrV2l0aFJldHVyblZhbHVlKEltbXV0YWJsZUFycmF5OjphZG9wdCh3ZWJTZWN1 cml0eU9yaWdpbnMpLmdldCgpKTsKK30KKwordm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2Vy UHJveHk6OmdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMoUGFzc1JlZlB0cjxBcnJheUNhbGxiYWNr PiBwcnBDYWxsYmFjaykKK3sKKyAgICBjb250ZXh0KCktPnN0b3JhZ2VNYW5hZ2VyKCkuZ2V0T3Jp Z2lucyhSdW5Mb29wOjptYWluKCksIHBycENhbGxiYWNrLmxlYWtSZWYoKSwgZGlkR2V0S2V5VmFs dWVTdG9yYWdlT3JpZ2luc0NhbGxiYWNrKTsKIH0KICAgICAKIHZvaWQgV2ViS2V5VmFsdWVTdG9y YWdlTWFuYWdlclByb3h5OjpkaWRHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKGNvbnN0IFZlY3Rv cjxTZWN1cml0eU9yaWdpbkRhdGE+JiBvcmlnaW5EYXRhcywgdWludDY0X3QgY2FsbGJhY2tJRCkK