105111 2012-12-15 14:43:13 -0800 [BlackBerry] Prevent CookieManager from blocking the WKT thread 2012-12-17 13:49:57 -0800 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 otcheung webkit-unassigned mifenton rwlbuis tonikitoo webkit.review.bot yong.li.webkit oldest_to_newest 792205 0 otcheung 2012-12-15 14:43:13 -0800 Make the databasebackingstore make the getBackingStoreCookies call to prevent blocking on the WKT thread. 792210 1 179620 otcheung 2012-12-15 14:50:31 -0800 Created attachment 179620 Patch 792212 2 179620 rwlbuis 2012-12-15 14:58:03 -0800 Comment on attachment 179620 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=179620&action=review > Source/WebCore/platform/blackberry/CookieManager.h:107 > + void getBackingStoreCookies(); Could be just private AFAICS. 792213 3 179621 otcheung 2012-12-15 14:59:21 -0800 Created attachment 179621 Patch 792215 4 179621 rwlbuis 2012-12-15 15:04:27 -0800 Comment on attachment 179621 Patch LGTM. 792227 5 179621 webkit.review.bot 2012-12-15 15:33:15 -0800 Comment on attachment 179621 Patch Clearing flags on attachment: 179621 Committed r137814: <http://trac.webkit.org/changeset/137814> 792228 6 webkit.review.bot 2012-12-15 15:33:18 -0800 All reviewed patches have been landed. Closing bug. 792923 7 otcheung 2012-12-17 12:21:40 -0800 Reopening to attach new patch. 792924 8 179779 otcheung 2012-12-17 12:21:47 -0800 Created attachment 179779 Patch 792966 9 179790 otcheung 2012-12-17 13:24:39 -0800 Created attachment 179790 Patch 792969 10 179790 rwlbuis 2012-12-17 13:26:18 -0800 Comment on attachment 179790 Patch LGTM. 793007 11 179790 webkit.review.bot 2012-12-17 13:49:54 -0800 Comment on attachment 179790 Patch Clearing flags on attachment: 179790 Committed r137940: <http://trac.webkit.org/changeset/137940> 793008 12 webkit.review.bot 2012-12-17 13:49:57 -0800 All reviewed patches have been landed. Closing bug. 179620 2012-12-15 14:50:31 -0800 2012-12-15 14:59:18 -0800 Patch bug-105111-20121215174750.patch text/plain 4429 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZhMGQ5NmJhODFkNTRl NTkzMTIzODBjMzMxOWIyNjVhN2NmYjM3Mi4uZGViYmU4MzhkMTlmMjcwMDljY2JlM2NkNmZlNmMy OTExNzY4MmE2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEyLTE1ICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IFByZXZlbnQgQ29va2llTWFuYWdlciBmcm9tIGJsb2NraW5nIHRoZSBXS1QgdGhyZWFkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDUxMTEKKworICAg ICAgICBQUiAyNjU2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAg ICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBLb25yYWQgUGlhc2Npay4KKworICAgICAgICBU aGUgZ2V0QmFja2luZ1N0b3JlQ29va2llcyBpbiBXS1QgaXMgYmxvY2tpbmcgdGhlIHRocmVhZCBi ZWNhdXNlIGl0IGhhcyB0byB3YWl0IGZvcgorICAgICAgICB0aGUgZGIgdG8gYmUgb3BlbmVkIGJl Zm9yZSBpdCBjYW4gY2FsbCBvbiBpdC4KKworICAgICAgICBUaGUgZml4IGlzIHRvIG1ha2UgQ29v a2llRGF0YWJhc2VCYWNraW5nU3RvcmUgaW4gdGhlIGNvb2tpZV9kYiB0aHJlYWQgZGlzcGF0Y2gK KyAgICAgICAgYSBnZXRCYWNraW5nU3RvcmVDb29raWVzIGNhbGwgb24gV0tUIGFmdGVyIGludm9r ZU9wZW4gaXMgZmluaXNoZWQuCisKKyAgICAgICAgVGVzdGVkIGxvYWRpbmcgdGhlIGJyb3dzZXIu IENvb2tpZXMgYXJlIGJlaW5nIGxvYWRlZCBpbnRvIG1lbW9yeSBvbiBzdGFydCB1cC4KKworICAg ICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29v a2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llRGF0 YWJhc2VCYWNraW5nU3RvcmU6Omludm9rZU9wZW4pOgorICAgICAgICAqIHBsYXRmb3JtL2JsYWNr YmVycnkvQ29va2llTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVNYW5hZ2Vy KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuaDoKKwogMjAx Mi0xMi0xNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggcmVwYWludCBpc3N1ZXMgd2hlbiByZXNpemluZyBhIHdpbmRvdyB3aXRoIGNlbnRlcmVk IGNvbnRlbnQsIGZvciBwbGF0Zm9ybXMgd2l0aCBhIHRpbGUgY2FjaGUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3Rv cmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9Db29raWVEYXRhYmFzZUJh Y2tpbmdTdG9yZS5jcHAKaW5kZXggOGU3MDRjMzYwNWI4NDc1YTQzMzNmZWUxMTIzMmM4ZmI0MzI3 MDljZi4uZWYwZmNjODMwOWUyMjJhZWI3MTJkODA1YmYyOGEwMGEyNTBiMGQyYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tp bmdTdG9yZS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9Db29raWVE YXRhYmFzZUJhY2tpbmdTdG9yZS5jcHAKQEAgLTE2Nyw2ICsxNjcsNyBAQCB2b2lkIENvb2tpZURh dGFiYXNlQmFja2luZ1N0b3JlOjppbnZva2VPcGVuKGNvbnN0IFN0cmluZyYgY29va2llSmFyKQog ICAgICAgICBMT0dfRVJST1IoIlNRTGl0ZSBFcnJvciBNZXNzYWdlOiAlcyIsIG1fZGIubGFzdEVy cm9yTXNnKCkpOwogICAgIH0KIAorICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjp3ZWJLaXRUaHJl YWRNZXNzYWdlQ2xpZW50KCktPmRpc3BhdGNoTWVzc2FnZShjcmVhdGVNZXRob2RDYWxsTWVzc2Fn ZSgmQ29va2llTWFuYWdlcjo6Z2V0QmFja2luZ1N0b3JlQ29va2llcywgJmNvb2tpZU1hbmFnZXIo KSkpOwogfQogCiB2b2lkIENvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOjpjbG9zZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNw cAppbmRleCBiNGRkMGVmNmMxOGUzMGVhZTYzODA0NzQ5MjhhYmRjZTQzOGE0ODI5Li41ZmZjNDc2 OGFhMzkzMTU2ZTljODc1ODFkYjc4NDQyMWM3Njk4ZTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKQEAgLTc4LDggKzc4 LDYgQEAgQ29va2llTWFuYWdlciYgY29va2llTWFuYWdlcigpCiAgICAgICAgIC8vIE9wZW4gdGhl IGNvb2tpZUphciBub3cgYW5kIGdldCB0aGUgYmFja2luZyBzdG9yZSBjb29raWVzIHRvIGZpbGwg dGhlIG1hbmFnZXIuCiAgICAgICAgIGNvb2tpZU1hbmFnZXIgPSBuZXcgQ29va2llTWFuYWdlcjsK ICAgICAgICAgY29va2llTWFuYWdlci0+bV9jb29raWVCYWNraW5nU3RvcmUtPm9wZW4oY29va2ll TWFuYWdlci0+Y29va2llSmFyKCkpOwotICAgICAgICBjb29raWVNYW5hZ2VyLT5nZXRCYWNraW5n U3RvcmVDb29raWVzKCk7Ci0gICAgICAgIENvb2tpZUxvZygiQ29va2llTWFuYWdlciAtIEJhY2tp bmdzdG9yZSBsb2FkIGNvbXBsZXRlLlxuIik7CiAgICAgfQogICAgIHJldHVybiAqY29va2llTWFu YWdlcjsKIH0KQEAgLTUwMCw2ICs0OTgsNyBAQCB2b2lkIENvb2tpZU1hbmFnZXI6OmdldEJhY2tp bmdTdG9yZUNvb2tpZXMoKQogICAgICAgICBQYXJzZWRDb29raWUqIG5ld0Nvb2tpZSA9IGNvb2tp ZXNbaV07CiAgICAgICAgIGNoZWNrQW5kVHJlYXRDb29raWUobmV3Q29va2llLCBCYWNraW5nU3Rv cmVDb29raWVFbnRyeSk7CiAgICAgfQorICAgIENvb2tpZUxvZygiQ29va2llTWFuYWdlciAtIEJh Y2tpbmdzdG9yZSBsb2FkaW5nIGNvbXBsZXRlLiIpOwogfQogCiB2b2lkIENvb2tpZU1hbmFnZXI6 OnNldFByaXZhdGVNb2RlKGJvb2wgcHJpdmF0ZU1vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5oCmluZGV4IDViZDA1ZjI2NjA2NzEz ODM1ODMxOGNiOGM2NzA0N2YxOTQ1MzFlNmYuLmEwZjM1ZGIwZTQyN2ZhNGZmMmQ2ZjQ4YjlkOTM0 NTA5ZWRmYWI1YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy cnkvQ29va2llTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy cnkvQ29va2llTWFuYWdlci5oCkBAIC0xMDEsOCArMTAxLDE0IEBAIHB1YmxpYzoKICAgICAvLyBS ZXR1cm5zIGFsbCBjb29raWVzIHRoYXQgYXJlIGFzc29jaWF0ZWQgd2l0aCB0aGUgc3BlY2lmaWVk IFVSTCBhcyByYXcgY29va2llcy4KICAgICB2b2lkIGdldFJhd0Nvb2tpZXMoVmVjdG9yPFBhcnNl ZENvb2tpZSo+JiBzdGFja09mQ29va2llcywgY29uc3QgS1VSTCYgcmVxdWVzdFVSTCwgQ29va2ll RmlsdGVyID0gV2l0aEh0dHBPbmx5Q29va2llcykgY29uc3Q7CiAKK3Byb3RlY3RlZDoKKworICAg IC8vIEZJWE1FOiBUaGlzIG1ldGhvZCBzaG91bGQgYmUgcmVtb3ZlZC4KKyAgICB2b2lkIGdldEJh Y2tpbmdTdG9yZUNvb2tpZXMoKTsKKwogcHJpdmF0ZToKICAgICBmcmllbmQgQ29va2llTWFuYWdl ciYgY29va2llTWFuYWdlcigpOworICAgIGZyaWVuZCBjbGFzcyBDb29raWVEYXRhYmFzZUJhY2tp bmdTdG9yZTsKIAogICAgIENvb2tpZU1hbmFnZXIoKTsKICAgICB2aXJ0dWFsIH5Db29raWVNYW5h Z2VyKCk7CkBAIC0xMjUsOSArMTMxLDYgQEAgcHJpdmF0ZToKIAogICAgIFN0cmluZyBtX2Nvb2tp ZUphckZpbGVOYW1lOwogCi0gICAgLy8gRklYTUU6IFRoaXMgbWV0aG9kIHNob3VsZCBiZSByZW1v dmVkLgotICAgIHZvaWQgZ2V0QmFja2luZ1N0b3JlQ29va2llcygpOwotCiAgICAgLy8gQ29va2ll IHNpemUgbGltaXQgb2YgNGtCIGFzIGFkdmlzZWQgcGVyIFJGQzIxMDkKICAgICBzdGF0aWMgY29u c3QgdW5zaWduZWQgc19tYXhDb29raWVMZW5ndGggPSA0MDk2OwogCg== 179621 2012-12-15 14:59:21 -0800 2012-12-17 12:21:34 -0800 Patch bug-105111-20121215175641.patch text/plain 3852 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3ODExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZhMGQ5NmJhODFkNTRl NTkzMTIzODBjMzMxOWIyNjVhN2NmYjM3Mi4uZGViYmU4MzhkMTlmMjcwMDljY2JlM2NkNmZlNmMy OTExNzY4MmE2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTEyLTE1ICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IFByZXZlbnQgQ29va2llTWFuYWdlciBmcm9tIGJsb2NraW5nIHRoZSBXS1QgdGhyZWFkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDUxMTEKKworICAg ICAgICBQUiAyNjU2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKyAg ICAgICAgSW50ZXJuYWxseSByZXZpZXdlZCBieSBLb25yYWQgUGlhc2Npay4KKworICAgICAgICBU aGUgZ2V0QmFja2luZ1N0b3JlQ29va2llcyBpbiBXS1QgaXMgYmxvY2tpbmcgdGhlIHRocmVhZCBi ZWNhdXNlIGl0IGhhcyB0byB3YWl0IGZvcgorICAgICAgICB0aGUgZGIgdG8gYmUgb3BlbmVkIGJl Zm9yZSBpdCBjYW4gY2FsbCBvbiBpdC4KKworICAgICAgICBUaGUgZml4IGlzIHRvIG1ha2UgQ29v a2llRGF0YWJhc2VCYWNraW5nU3RvcmUgaW4gdGhlIGNvb2tpZV9kYiB0aHJlYWQgZGlzcGF0Y2gK KyAgICAgICAgYSBnZXRCYWNraW5nU3RvcmVDb29raWVzIGNhbGwgb24gV0tUIGFmdGVyIGludm9r ZU9wZW4gaXMgZmluaXNoZWQuCisKKyAgICAgICAgVGVzdGVkIGxvYWRpbmcgdGhlIGJyb3dzZXIu IENvb2tpZXMgYXJlIGJlaW5nIGxvYWRlZCBpbnRvIG1lbW9yeSBvbiBzdGFydCB1cC4KKworICAg ICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUvQ29v a2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llRGF0 YWJhc2VCYWNraW5nU3RvcmU6Omludm9rZU9wZW4pOgorICAgICAgICAqIHBsYXRmb3JtL2JsYWNr YmVycnkvQ29va2llTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVNYW5hZ2Vy KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuaDoKKwogMjAx Mi0xMi0xNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAg ICBGaXggcmVwYWludCBpc3N1ZXMgd2hlbiByZXNpemluZyBhIHdpbmRvdyB3aXRoIGNlbnRlcmVk IGNvbnRlbnQsIGZvciBwbGF0Zm9ybXMgd2l0aCBhIHRpbGUgY2FjaGUKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llRGF0YWJhc2VCYWNraW5nU3Rv cmUvQ29va2llRGF0YWJhc2VCYWNraW5nU3RvcmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9Db29raWVEYXRhYmFzZUJh Y2tpbmdTdG9yZS5jcHAKaW5kZXggOGU3MDRjMzYwNWI4NDc1YTQzMzNmZWUxMTIzMmM4ZmI0MzI3 MDljZi4uZWYwZmNjODMwOWUyMjJhZWI3MTJkODA1YmYyOGEwMGEyNTBiMGQyYyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tp bmdTdG9yZS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVEYXRhYmFzZUJhY2tpbmdTdG9yZS9Db29raWVE YXRhYmFzZUJhY2tpbmdTdG9yZS5jcHAKQEAgLTE2Nyw2ICsxNjcsNyBAQCB2b2lkIENvb2tpZURh dGFiYXNlQmFja2luZ1N0b3JlOjppbnZva2VPcGVuKGNvbnN0IFN0cmluZyYgY29va2llSmFyKQog ICAgICAgICBMT0dfRVJST1IoIlNRTGl0ZSBFcnJvciBNZXNzYWdlOiAlcyIsIG1fZGIubGFzdEVy cm9yTXNnKCkpOwogICAgIH0KIAorICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjp3ZWJLaXRUaHJl YWRNZXNzYWdlQ2xpZW50KCktPmRpc3BhdGNoTWVzc2FnZShjcmVhdGVNZXRob2RDYWxsTWVzc2Fn ZSgmQ29va2llTWFuYWdlcjo6Z2V0QmFja2luZ1N0b3JlQ29va2llcywgJmNvb2tpZU1hbmFnZXIo KSkpOwogfQogCiB2b2lkIENvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOjpjbG9zZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNw cAppbmRleCBiNGRkMGVmNmMxOGUzMGVhZTYzODA0NzQ5MjhhYmRjZTQzOGE0ODI5Li41ZmZjNDc2 OGFhMzkzMTU2ZTljODc1ODFkYjc4NDQyMWM3Njk4ZTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKQEAgLTc4LDggKzc4 LDYgQEAgQ29va2llTWFuYWdlciYgY29va2llTWFuYWdlcigpCiAgICAgICAgIC8vIE9wZW4gdGhl IGNvb2tpZUphciBub3cgYW5kIGdldCB0aGUgYmFja2luZyBzdG9yZSBjb29raWVzIHRvIGZpbGwg dGhlIG1hbmFnZXIuCiAgICAgICAgIGNvb2tpZU1hbmFnZXIgPSBuZXcgQ29va2llTWFuYWdlcjsK ICAgICAgICAgY29va2llTWFuYWdlci0+bV9jb29raWVCYWNraW5nU3RvcmUtPm9wZW4oY29va2ll TWFuYWdlci0+Y29va2llSmFyKCkpOwotICAgICAgICBjb29raWVNYW5hZ2VyLT5nZXRCYWNraW5n U3RvcmVDb29raWVzKCk7Ci0gICAgICAgIENvb2tpZUxvZygiQ29va2llTWFuYWdlciAtIEJhY2tp bmdzdG9yZSBsb2FkIGNvbXBsZXRlLlxuIik7CiAgICAgfQogICAgIHJldHVybiAqY29va2llTWFu YWdlcjsKIH0KQEAgLTUwMCw2ICs0OTgsNyBAQCB2b2lkIENvb2tpZU1hbmFnZXI6OmdldEJhY2tp bmdTdG9yZUNvb2tpZXMoKQogICAgICAgICBQYXJzZWRDb29raWUqIG5ld0Nvb2tpZSA9IGNvb2tp ZXNbaV07CiAgICAgICAgIGNoZWNrQW5kVHJlYXRDb29raWUobmV3Q29va2llLCBCYWNraW5nU3Rv cmVDb29raWVFbnRyeSk7CiAgICAgfQorICAgIENvb2tpZUxvZygiQ29va2llTWFuYWdlciAtIEJh Y2tpbmdzdG9yZSBsb2FkaW5nIGNvbXBsZXRlLiIpOwogfQogCiB2b2lkIENvb2tpZU1hbmFnZXI6 OnNldFByaXZhdGVNb2RlKGJvb2wgcHJpdmF0ZU1vZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuaCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5oCmluZGV4IDViZDA1ZjI2NjA2NzEz ODM1ODMxOGNiOGM2NzA0N2YxOTQ1MzFlNmYuLjUyZjc4NGNhYzhlMWRhNzlmOTAwM2IyNTVjNDUx NTk5YTQ3ZmZiNDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy cnkvQ29va2llTWFuYWdlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVy cnkvQ29va2llTWFuYWdlci5oCkBAIC0xMDMsNiArMTAzLDcgQEAgcHVibGljOgogCiBwcml2YXRl OgogICAgIGZyaWVuZCBDb29raWVNYW5hZ2VyJiBjb29raWVNYW5hZ2VyKCk7CisgICAgZnJpZW5k IGNsYXNzIENvb2tpZURhdGFiYXNlQmFja2luZ1N0b3JlOwogCiAgICAgQ29va2llTWFuYWdlcigp OwogICAgIHZpcnR1YWwgfkNvb2tpZU1hbmFnZXIoKTsK 179779 2012-12-17 12:21:47 -0800 2012-12-17 13:24:35 -0800 Patch bug-105111-20121217151905.patch text/plain 8682 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3OTI5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTFiYzk2OTJkNmY3ZDBj MDI2YmQzMGNkNDNjOWViMTQzZGMwYmE4Ny4uMTcyZDRjYmJkMWYwOWEyZTE0NzRlMDcwMmM3MGJh ZWY0Y2I2N2U0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTEyLTE3ICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IFByZXZlbnQgQ29va2llTWFuYWdlciBmcm9tIGJsb2NraW5nIHRoZSBXS1QgdGhyZWFkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDUxMTEKKworICAg ICAgICBQcmV2ZW50IENvb2tpZU1hbmFnZXIgZnJvbSBibG9ja2luZyB0aGUgV0tUIFRocmVhZC4K KworICAgICAgICBQUiAyNjU2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDb29raWVNYW5hZ2VyIHdpbGwgcmV0dXJuIGltbWVkYXRlbHkgaWYgZ2V0 Q29va2llIGZ1bmN0aW9ucyBhcmUgY2FsbGVkCisgICAgICAgIHdoZW4gdGhlIGRhdGFiYXNlIGlz bid0IGxvYWRlZCB5ZXQuCisKKyAgICAgICAgc2V0Q29va2llIGZ1bmN0aW9ucyB3aWxsIGJlIHJl ZGlzcGF0Y2hlZCB1bnRpbCB0aGUgZGF0YWJhc2UgaXMgcmVhZHkuCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29v a2llTWFuYWdlcjo6Q29va2llTWFuYWdlcik6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVNYW5h Z2VyOjpzZXRDb29raWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZU1hbmFnZXI6OmdldENv b2tpZSk6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVNYW5hZ2VyOjpnZW5lcmF0ZUh0bWxGcmFn bWVudEZvckNvb2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6Z2V0UmF3 Q29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVNYW5hZ2VyOjpyZW1vdmVBbGxDb29r aWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZU1hbmFnZXI6OmdldEJhY2tpbmdTdG9yZUNv b2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6c2V0UHJpdmF0ZU1vZGUp OgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6cmVtb3ZlQ29va2llV2l0aE5hbWUp OgorICAgICAgICAqIHBsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5oOgorCiAyMDEy LTEyLTE3ICBKb2huIEouIEJhcnRvbiAgPGpvaG5qYmFydG9uQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBTZWFyY2ggYnkgc2VsZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcAppbmRleCA1ZmZj NDc2OGFhMzkzMTU2ZTljODc1ODFkYjc4NDQyMWM3Njk4ZTFjLi43YWVkOWVlNDVjMWMyYWM3MjU3 OThmYTIzMTI3MDczMjAxNTZhNzYzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKQEAgLTg2LDYgKzg2LDcgQEAgQ29va2ll TWFuYWdlcjo6Q29va2llTWFuYWdlcigpCiAgICAgOiBtX2NvdW50KDApCiAgICAgLCBtX3ByaXZh dGVNb2RlKGZhbHNlKQogICAgICwgbV9zaG91bGREdW1wQWxsQ29va2llcyhmYWxzZSkKKyAgICAs IG1fc3luY2VkV2l0aERhdGFiYXNlKGZhbHNlKQogICAgICwgbV9jb29raWVKYXJGaWxlTmFtZShw YXRoQnlBcHBlbmRpbmdDb21wb25lbnQoQmxhY2tCZXJyeTo6UGxhdGZvcm06OlNldHRpbmdzOjpp bnN0YW5jZSgpLT5hcHBsaWNhdGlvbkRhdGFEaXJlY3RvcnkoKS5jX3N0cigpLCAiL2Nvb2tpZUNv bGxlY3Rpb24uZGIiKSkKICAgICAsIG1fcG9saWN5KENvb2tpZVN0b3JhZ2VBY2NlcHRQb2xpY3lB bHdheXMpCiAgICAgLCBtX2Nvb2tpZUJhY2tpbmdTdG9yZShDb29raWVEYXRhYmFzZUJhY2tpbmdT dG9yZTo6Y3JlYXRlKCkpCkBAIC0xMjUsNiArMTI2LDE2IEBAIHN0YXRpYyBib29sIHNob3VsZEln bm9yZVNjaGVtZShjb25zdCBTdHJpbmcmIHByb3RvY29sKQogCiB2b2lkIENvb2tpZU1hbmFnZXI6 OnNldENvb2tpZXMoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBDb29raWVG aWx0ZXIgZmlsdGVyKQogeworICAgIC8vIERpc3BhdGNoIHRoZSBtZXNzYWdlIGJlY2F1c2UgdGhl IGRhdGFiYXNlIGNvb2tpZXMgYXJlIG5vdCBsb2FkZWQgaW4gbWVtb3J5IHlldC4KKyAgICBpZiAo IW1fc3luY2VkV2l0aERhdGFiYXNlICYmICFtX3ByaXZhdGVNb2RlKSB7CisgICAgICAgIHR5cGVk ZWYgdm9pZCAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6KkZ1bmN0aW9uVHlwZSkoY29uc3QgV2Vi Q29yZTo6S1VSTCYsIGNvbnN0IFdURjo6U3RyaW5nJiwgV2ViQ29yZTo6Q29va2llRmlsdGVyKTsK KworICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6d2ViS2l0VGhyZWFkTWVzc2FnZUNsaWVu dCgpLT5kaXNwYXRjaE1lc3NhZ2UoCisgICAgICAgICAgICBCbGFja0JlcnJ5OjpQbGF0Zm9ybTo6 Y3JlYXRlTWV0aG9kQ2FsbE1lc3NhZ2U8RnVuY3Rpb25UeXBlLCBDb29raWVNYW5hZ2VyLCBjb25z dCBXZWJDb3JlOjpLVVJMLCBjb25zdCBXVEY6OlN0cmluZywgV2ViQ29yZTo6Q29va2llRmlsdGVy PigKKyAgICAgICAgICAgICAgICAmQ29va2llTWFuYWdlcjo6c2V0Q29va2llcywgdGhpcywgdXJs LCB2YWx1ZSwgZmlsdGVyKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBDb29raWVM b2coIkNvb2tpZU1hbmFnZXIgLSBTZXR0aW5nIGNvb2tpZXMiKTsKICAgICBDb29raWVQYXJzZXIg cGFyc2VyKHVybCk7CiAgICAgVmVjdG9yPFBhcnNlZENvb2tpZSo+IGNvb2tpZXMgPSBwYXJzZXIu cGFyc2UodmFsdWUpOwpAQCAtMTM3LDYgKzE0OCwxNSBAQCB2b2lkIENvb2tpZU1hbmFnZXI6OnNl dENvb2tpZXMoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHZhbHVlLCBDb29raWVGaWx0 ZQogCiB2b2lkIENvb2tpZU1hbmFnZXI6OnNldENvb2tpZXMoY29uc3QgS1VSTCYgdXJsLCBjb25z dCBWZWN0b3I8U3RyaW5nPiYgY29va2llcywgQ29va2llRmlsdGVyIGZpbHRlcikKIHsKKyAgICAv LyBEaXNwYXRjaCB0aGUgbWVzc2FnZSBiZWNhdXNlIHRoZSBkYXRhYmFzZSBjb29raWVzIGFyZSBu b3QgbG9hZGVkIGluIG1lbW9yeSB5ZXQuCisgICAgaWYgKCFtX3N5bmNlZFdpdGhEYXRhYmFzZSAm JiAhbV9wcml2YXRlTW9kZSkgeworICAgICAgICB0eXBlZGVmIHZvaWQgKFdlYkNvcmU6OkNvb2tp ZU1hbmFnZXI6OipGdW5jdGlvblR5cGUpKGNvbnN0IFdlYkNvcmU6OktVUkwmLCBjb25zdCBXVEY6 OlZlY3RvcjxTdHJpbmc+JiwgV2ViQ29yZTo6Q29va2llRmlsdGVyKTsKKyAgICAgICAgQmxhY2tC ZXJyeTo6UGxhdGZvcm06OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+ZGlzcGF0Y2hNZXNz YWdlKAorICAgICAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmNyZWF0ZU1ldGhvZENhbGxN ZXNzYWdlPEZ1bmN0aW9uVHlwZSwgQ29va2llTWFuYWdlciwgY29uc3QgV2ViQ29yZTo6S1VSTCwg Y29uc3QgV1RGOjpWZWN0b3I8V1RGOjpTdHJpbmc+LCBXZWJDb3JlOjpDb29raWVGaWx0ZXI+KAor ICAgICAgICAgICAgICAgICZDb29raWVNYW5hZ2VyOjpzZXRDb29raWVzLCB0aGlzLCB1cmwsIGNv b2tpZXMsIGZpbHRlcikpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgQ29va2llTG9n KCJDb29raWVNYW5hZ2VyIC0gU2V0dGluZyBjb29raWVzIik7CiAgICAgQ29va2llUGFyc2VyIHBh cnNlcih1cmwpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgY29va2llcy5zaXplKCk7ICsr aSkgewpAQCAtMTQ4LDYgKzE2OCwxMSBAQCB2b2lkIENvb2tpZU1hbmFnZXI6OnNldENvb2tpZXMo Y29uc3QgS1VSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgY29va2llcywgQwogCiBTdHJp bmcgQ29va2llTWFuYWdlcjo6Z2V0Q29va2llKGNvbnN0IEtVUkwmIHVybCwgQ29va2llRmlsdGVy IGZpbHRlcikgY29uc3QKIHsKKyAgICBpZiAoIW1fc3luY2VkV2l0aERhdGFiYXNlICYmICFtX3By aXZhdGVNb2RlKSB7CisgICAgICAgIExPR19FUlJPUigiQ29va2llTWFuYWdlciBpcyBjYWxsaW5n IGdldENvb2tpZXMgYmVmb3JlIGRhdGFiYXNlIHZhbHVlcyBhcmUgbG9hZGVkLiIpOworICAgICAg ICByZXR1cm4gU3RyaW5nKCk7CisgICAgfQorCiAgICAgVmVjdG9yPFBhcnNlZENvb2tpZSo+IHJh d0Nvb2tpZXM7CiAgICAgcmF3Q29va2llcy5yZXNlcnZlSW5pdGlhbENhcGFjaXR5KHNfbWF4Q29v a2llQ291bnRQZXJIb3N0KTsKIApAQCAtMTczLDYgKzE5OCwxMSBAQCBTdHJpbmcgQ29va2llTWFu YWdlcjo6Z2V0Q29va2llKGNvbnN0IEtVUkwmIHVybCwgQ29va2llRmlsdGVyIGZpbHRlcikgY29u c3QKIAogU3RyaW5nIENvb2tpZU1hbmFnZXI6OmdlbmVyYXRlSHRtbEZyYWdtZW50Rm9yQ29va2ll cygpCiB7CisgICAgaWYgKCFtX3N5bmNlZFdpdGhEYXRhYmFzZSAmJiAhbV9wcml2YXRlTW9kZSkg eworICAgICAgICBMT0dfRVJST1IoIkNvb2tpZU1hbmFnZXIgaXMgY2FsbGluZyBnZW5lcmF0ZUh0 bWxGcmFnbWVudEZvckNvb2tpZXMgYmVmb3JlIGRhdGFiYXNlIHZhbHVlcyBhcmUgbG9hZGVkLiIp OworICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgfQorCiAgICAgQ29va2llTG9nKCJDb29r aWVNYW5hZ2VyIC0gZ2VuZXJhdGVIdG1sRnJhZ21lbnRGb3JDb29raWVzXG4iKTsKIAogICAgIFZl Y3RvcjxQYXJzZWRDb29raWUqPiBjb29raWVDYW5kaWRhdGVzOwpAQCAtMjA4LDYgKzIzOCwxMSBA QCBTdHJpbmcgQ29va2llTWFuYWdlcjo6Z2VuZXJhdGVIdG1sRnJhZ21lbnRGb3JDb29raWVzKCkK IAogdm9pZCBDb29raWVNYW5hZ2VyOjpnZXRSYXdDb29raWVzKFZlY3RvcjxQYXJzZWRDb29raWUq PiAmc3RhY2tPZkNvb2tpZXMsIGNvbnN0IEtVUkwmIHJlcXVlc3RVUkwsIENvb2tpZUZpbHRlciBm aWx0ZXIpIGNvbnN0CiB7CisgICAgaWYgKCFtX3N5bmNlZFdpdGhEYXRhYmFzZSAmJiAhbV9wcml2 YXRlTW9kZSkgeworICAgICAgICBMT0dfRVJST1IoIkNvb2tpZU1hbmFnZXIgaXMgY2FsbGluZyBn ZXRSYXdDb29raWVzIGJlZm9yZSBkYXRhYmFzZSB2YWx1ZXMgYXJlIGxvYWRlZC4iKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKwogICAgIENvb2tpZUxvZygiQ29va2llTWFuYWdlciAtIGdldFJh d0Nvb2tpZXMgLSBwcm9jZXNzaW5nIHVybCB3aXRoIGRvbWFpbiAtICVzICYgcHJvdG9jb2w6ICVz ICYgcGF0aDogJXNcbiIsIHJlcXVlc3RVUkwuaG9zdCgpLnV0ZjgoKS5kYXRhKCksIHJlcXVlc3RV UkwucHJvdG9jb2woKS51dGY4KCkuZGF0YSgpLCByZXF1ZXN0VVJMLnBhdGgoKS51dGY4KCkuZGF0 YSgpKTsKIAogICAgIGNvbnN0IGJvb2wgaW52YWxpZFNjaGVtZSA9IHNob3VsZElnbm9yZVNjaGVt ZShyZXF1ZXN0VVJMLnByb3RvY29sKCkpOwpAQCAtMzI2LDYgKzM2MSw3IEBAIHZvaWQgQ29va2ll TWFuYWdlcjo6cmVtb3ZlQWxsQ29va2llcyhCYWNraW5nU3RvcmVSZW1vdmFsUG9saWN5IGJhY2tp bmdTdG9yZVJlbW92CiAgICAgaWYgKGJhY2tpbmdTdG9yZVJlbW92YWwgPT0gUmVtb3ZlRnJvbUJh Y2tpbmdTdG9yZSkKICAgICAgICAgbV9jb29raWVCYWNraW5nU3RvcmUtPnJlbW92ZUFsbCgpOwog ICAgIG1fY291bnQgPSAwOworCiB9CiAKIHZvaWQgQ29va2llTWFuYWdlcjo6c2V0Q29va2llSmFy KGNvbnN0IGNoYXIqIGZpbGVOYW1lKQpAQCAtNDg3LDYgKzUyMywxMCBAQCB2b2lkIENvb2tpZU1h bmFnZXI6OmFkZENvb2tpZVRvTWFwKENvb2tpZU1hcCogdGFyZ2V0TWFwLCBQYXJzZWRDb29raWUq IGNhbmRpZGF0ZQogCiB2b2lkIENvb2tpZU1hbmFnZXI6OmdldEJhY2tpbmdTdG9yZUNvb2tpZXMo KQogeworICAgIC8vIE1ha2Ugc3VyZSBwcml2YXRlIG1vZGUgaXMgb2ZmIHdoZW4gdGhlIGRhdGFi YXNlIHRocmVhZCBjYWxscyB0aGlzIG1ldGhvZAorICAgIGlmIChtX3ByaXZhdGVNb2RlKQorICAg ICAgICByZXR1cm47CisKICAgICAvLyBUaGlzIG1ldGhvZCBzaG91bGQgYmUgY2FsbGVkIGp1c3Qg YWZ0ZXIgaGF2aW5nIGNyZWF0ZWQgdGhlIGNvb2tpZU1hbmFnZXIKICAgICAvLyBORVZFUiBhZnRl cndhcmRzIQogICAgIEFTU0VSVCghbV9jb3VudCk7CkBAIC00OTgsNyArNTM4LDEwIEBAIHZvaWQg Q29va2llTWFuYWdlcjo6Z2V0QmFja2luZ1N0b3JlQ29va2llcygpCiAgICAgICAgIFBhcnNlZENv b2tpZSogbmV3Q29va2llID0gY29va2llc1tpXTsKICAgICAgICAgY2hlY2tBbmRUcmVhdENvb2tp ZShuZXdDb29raWUsIEJhY2tpbmdTdG9yZUNvb2tpZUVudHJ5KTsKICAgICB9CisKICAgICBDb29r aWVMb2coIkNvb2tpZU1hbmFnZXIgLSBCYWNraW5nc3RvcmUgbG9hZGluZyBjb21wbGV0ZS4iKTsK KworICAgIG1fc3luY2VkV2l0aERhdGFiYXNlID0gdHJ1ZTsKIH0KIAogdm9pZCBDb29raWVNYW5h Z2VyOjpzZXRQcml2YXRlTW9kZShib29sIHByaXZhdGVNb2RlKQpAQCAtNTA4LDYgKzU1MSwxMSBA QCB2b2lkIENvb2tpZU1hbmFnZXI6OnNldFByaXZhdGVNb2RlKGJvb2wgcHJpdmF0ZU1vZGUpCiAK ICAgICBtX3ByaXZhdGVNb2RlID0gcHJpdmF0ZU1vZGU7CiAKKyAgICAvLyBJZiB3ZSBzd2l0Y2hl ZCB0byBwcml2YXRlIG1vZGUgd2hlbiB0aGUgZGF0YWJhc2UgY29va2llcyBoYXZlbid0IGxvYWRl ZCBpbnRvIG1lbW9yeSB5ZXQKKyAgICAvLyB3ZSBjYW4gcmV0dXJuIGJlY2F1c2UgdGhlcmUncyBu b3RoaW5nIGluIG1lbW9yeSBhbnl3YXkuCisgICAgaWYgKG1fcHJpdmF0ZU1vZGUgJiYgIW1fc3lu Y2VkV2l0aERhdGFiYXNlKQorICAgICAgICByZXR1cm47CisKICAgICByZW1vdmVBbGxDb29raWVz KERvTm90UmVtb3ZlRnJvbUJhY2tpbmdTdG9yZSk7CiAKICAgICAvLyBJZiB3ZSBhcmUgc3dpdGNo aW5nIGJhY2sgdG8gcHVibGljIG1vZGUsIHJlbG9hZCB0aGUgZGF0YWJhc2UgdG8gbWVtb3J5LgpA QCAtNTU0LDYgKzYwMiwxNSBAQCBDb29raWVNYXAqIENvb2tpZU1hbmFnZXI6OmZpbmRPckNyZWF0 ZUNvb2tpZU1hcChDb29raWVNYXAqIHByb3RvY29sTWFwLCBjb25zdCBQYQogCiB2b2lkIENvb2tp ZU1hbmFnZXI6OnJlbW92ZUNvb2tpZVdpdGhOYW1lKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3Ry aW5nJiBjb29raWVOYW1lKQogeworICAgIC8vIERpc3BhdGNoIHRoZSBtZXNzYWdlIGJlY2F1c2Ug dGhlIGRhdGFiYXNlIGNvb2tpZXMgYXJlIG5vdCBsb2FkZWQgaW4gbWVtb3J5IHlldC4KKyAgICBp ZiAoIW1fc3luY2VkV2l0aERhdGFiYXNlICYmICFtX3ByaXZhdGVNb2RlKSB7CisgICAgICAgIHR5 cGVkZWYgdm9pZCAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6KkZ1bmN0aW9uVHlwZSkoY29uc3Qg V2ViQ29yZTo6S1VSTCYsIGNvbnN0IFdURjo6U3RyaW5nJik7CisgICAgICAgIEJsYWNrQmVycnk6 OlBsYXRmb3JtOjp3ZWJLaXRUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmRpc3BhdGNoTWVzc2FnZSgK KyAgICAgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpjcmVhdGVNZXRob2RDYWxsTWVzc2Fn ZTxGdW5jdGlvblR5cGUsIENvb2tpZU1hbmFnZXIsIGNvbnN0IFdlYkNvcmU6OktVUkwsIGNvbnN0 IFdURjo6U3RyaW5nPigKKyAgICAgICAgICAgICAgICAmQ29va2llTWFuYWdlcjo6cmVtb3ZlQ29v a2llV2l0aE5hbWUsIHRoaXMsIHVybCwgY29va2llTmFtZSkpOworICAgICAgICByZXR1cm47Cisg ICAgfQorCiAgICAgLy8gV2UgZ2V0IGFsbCBjb29raWVzIGZyb20gYWxsIGRvbWFpbnMgdGhhdCBk b21haW4gbWF0Y2hlcyB0aGUgcmVxdWVzdCBkb21haW4KICAgICAvLyBhbmQgZGVsZXRlIGFueSBj b29raWVzIHdpdGggdGhlIHNwZWNpZmllZCBuYW1lIHRoYXQgcGF0aCBtYXRjaGVzIHRoZSByZXF1 ZXN0IHBhdGgKICAgICBWZWN0b3I8UGFyc2VkQ29va2llKj4gcmVzdWx0czsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5oIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKaW5kZXggNTJm Nzg0Y2FjOGUxZGE3OWY5MDAzYjI1NWM0NTE1OTlhNDdmZmI0NC4uM2QxMDFkOWVkNzM2MzdjYzdm ZmZkZDdmYzRjM2FiYzg1MzRhMjRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKQEAgLTEyMyw2ICsxMjMsNyBAQCBwcml2YXRl OgogCiAgICAgYm9vbCBtX3ByaXZhdGVNb2RlOwogICAgIGJvb2wgbV9zaG91bGREdW1wQWxsQ29v a2llczsKKyAgICBib29sIG1fc3luY2VkV2l0aERhdGFiYXNlOwogCiAgICAgU3RyaW5nIG1fY29v a2llSmFyRmlsZU5hbWU7CiAK 179790 2012-12-17 13:24:39 -0800 2012-12-17 13:49:53 -0800 Patch bug-105111-20121217162157.patch text/plain 8286 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTM3OTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTJiZDA0Njk2ZWE4ZDE3 YmRlNWUzMTgwYWJmODk2NTY3NDkyYzZjNC4uOTAyNTlmOTY1YThkMjZlNTU3N2RlYTYwNzFhOGVl YmFmYmFiMmQ0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTEyLTE3ICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IFByZXZlbnQgQ29va2llTWFuYWdlciBmcm9tIGJsb2NraW5nIHRoZSBXS1QgdGhyZWFkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDUxMTEKKworICAg ICAgICBQcmV2ZW50IENvb2tpZU1hbmFnZXIgZnJvbSBibG9ja2luZyB0aGUgV0tUIFRocmVhZC4K KworICAgICAgICBQUiAyNjU2MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBBZGRpbmcgc29tZSBndWFyZHMgdG8gQ29va2llTWFuYWdlciBzbyBpdCB3 aWxsIHJldHVybiBpbW1lZGF0ZWx5CisgICAgICAgIGlmIGdldENvb2tpZSBmdW5jdGlvbnMgYXJl IGNhbGxlZCB3aGVuIHRoZSBkYXRhYmFzZSBpc24ndCBsb2FkZWQgeWV0LgorCisgICAgICAgIHNl dENvb2tpZSBmdW5jdGlvbnMgd2lsbCBiZSByZWRpc3BhdGNoZWQgdW50aWwgdGhlIGRhdGFiYXNl IGlzIHJlYWR5LgorCisgICAgICAgICogcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2Vy LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZU1hbmFnZXI6OkNvb2tpZU1hbmFnZXIpOgor ICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6c2V0Q29va2llcyk6CisgICAgICAgIChX ZWJDb3JlOjpDb29raWVNYW5hZ2VyOjpnZXRDb29raWUpOgorICAgICAgICAoV2ViQ29yZTo6Q29v a2llTWFuYWdlcjo6Z2VuZXJhdGVIdG1sRnJhZ21lbnRGb3JDb29raWVzKToKKyAgICAgICAgKFdl YkNvcmU6OkNvb2tpZU1hbmFnZXI6OmdldFJhd0Nvb2tpZXMpOgorICAgICAgICAoV2ViQ29yZTo6 Q29va2llTWFuYWdlcjo6cmVtb3ZlQWxsQ29va2llcyk6CisgICAgICAgIChXZWJDb3JlOjpDb29r aWVNYW5hZ2VyOjpnZXRCYWNraW5nU3RvcmVDb29raWVzKToKKyAgICAgICAgKFdlYkNvcmU6OkNv b2tpZU1hbmFnZXI6OnNldFByaXZhdGVNb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZU1h bmFnZXI6OnJlbW92ZUNvb2tpZVdpdGhOYW1lKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2Jl cnJ5L0Nvb2tpZU1hbmFnZXIuaDoKKwogMjAxMi0xMi0xNyAgQmVtIEpvbmVzLUJleSAgPGJqb25l c2JlQGFkb2JlLmNvbT4KIAogICAgICAgICBbQ1NTIEV4Y2x1c2lvbnNdIHNoYXBlLW91dHNpZGUg b24gZmxvYXRzIGZvciByZWN0YW5nbGUgc2hhcGVzIGhlaWdodC93aWR0aApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKaW5kZXgg NWZmYzQ3NjhhYTM5MzE1NmU5Yzg3NTgxZGI3ODQ0MjFjNzY5OGUxYy4uMTg2YTlmNDBkNDU4YzFl Y2FmNWEyYTgyN2EwMzRhNGNkZTUzM2JhMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCkBAIC04Niw2ICs4Niw3IEBAIENv b2tpZU1hbmFnZXI6OkNvb2tpZU1hbmFnZXIoKQogICAgIDogbV9jb3VudCgwKQogICAgICwgbV9w cml2YXRlTW9kZShmYWxzZSkKICAgICAsIG1fc2hvdWxkRHVtcEFsbENvb2tpZXMoZmFsc2UpCisg ICAgLCBtX3N5bmNlZFdpdGhEYXRhYmFzZShmYWxzZSkKICAgICAsIG1fY29va2llSmFyRmlsZU5h bWUocGF0aEJ5QXBwZW5kaW5nQ29tcG9uZW50KEJsYWNrQmVycnk6OlBsYXRmb3JtOjpTZXR0aW5n czo6aW5zdGFuY2UoKS0+YXBwbGljYXRpb25EYXRhRGlyZWN0b3J5KCkuY19zdHIoKSwgIi9jb29r aWVDb2xsZWN0aW9uLmRiIikpCiAgICAgLCBtX3BvbGljeShDb29raWVTdG9yYWdlQWNjZXB0UG9s aWN5QWx3YXlzKQogICAgICwgbV9jb29raWVCYWNraW5nU3RvcmUoQ29va2llRGF0YWJhc2VCYWNr aW5nU3RvcmU6OmNyZWF0ZSgpKQpAQCAtMTI1LDYgKzEyNiwxNiBAQCBzdGF0aWMgYm9vbCBzaG91 bGRJZ25vcmVTY2hlbWUoY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKIAogdm9pZCBDb29raWVNYW5h Z2VyOjpzZXRDb29raWVzKGNvbnN0IEtVUkwmIHVybCwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgQ29v a2llRmlsdGVyIGZpbHRlcikKIHsKKyAgICAvLyBEaXNwYXRjaCB0aGUgbWVzc2FnZSBiZWNhdXNl IHRoZSBkYXRhYmFzZSBjb29raWVzIGFyZSBub3QgbG9hZGVkIGluIG1lbW9yeSB5ZXQuCisgICAg aWYgKCFtX3N5bmNlZFdpdGhEYXRhYmFzZSAmJiAhbV9wcml2YXRlTW9kZSkgeworICAgICAgICB0 eXBlZGVmIHZvaWQgKFdlYkNvcmU6OkNvb2tpZU1hbmFnZXI6OipGdW5jdGlvblR5cGUpKGNvbnN0 IEtVUkwmLCBjb25zdCBTdHJpbmcmLCBDb29raWVGaWx0ZXIpOworCisgICAgICAgIEJsYWNrQmVy cnk6OlBsYXRmb3JtOjp3ZWJLaXRUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmRpc3BhdGNoTWVzc2Fn ZSgKKyAgICAgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpjcmVhdGVNZXRob2RDYWxsTWVz c2FnZTxGdW5jdGlvblR5cGUsIENvb2tpZU1hbmFnZXIsIGNvbnN0IEtVUkwsIGNvbnN0IFN0cmlu ZywgQ29va2llRmlsdGVyPigKKyAgICAgICAgICAgICAgICAmQ29va2llTWFuYWdlcjo6c2V0Q29v a2llcywgdGhpcywgdXJsLCB2YWx1ZSwgZmlsdGVyKSk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKICAgICBDb29raWVMb2coIkNvb2tpZU1hbmFnZXIgLSBTZXR0aW5nIGNvb2tpZXMiKTsKICAg ICBDb29raWVQYXJzZXIgcGFyc2VyKHVybCk7CiAgICAgVmVjdG9yPFBhcnNlZENvb2tpZSo+IGNv b2tpZXMgPSBwYXJzZXIucGFyc2UodmFsdWUpOwpAQCAtMTM3LDYgKzE0OCwxNSBAQCB2b2lkIENv b2tpZU1hbmFnZXI6OnNldENvb2tpZXMoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHZh bHVlLCBDb29raWVGaWx0ZQogCiB2b2lkIENvb2tpZU1hbmFnZXI6OnNldENvb2tpZXMoY29uc3Qg S1VSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5nPiYgY29va2llcywgQ29va2llRmlsdGVyIGZp bHRlcikKIHsKKyAgICAvLyBEaXNwYXRjaCB0aGUgbWVzc2FnZSBiZWNhdXNlIHRoZSBkYXRhYmFz ZSBjb29raWVzIGFyZSBub3QgbG9hZGVkIGluIG1lbW9yeSB5ZXQuCisgICAgaWYgKCFtX3N5bmNl ZFdpdGhEYXRhYmFzZSAmJiAhbV9wcml2YXRlTW9kZSkgeworICAgICAgICB0eXBlZGVmIHZvaWQg KFdlYkNvcmU6OkNvb2tpZU1hbmFnZXI6OipGdW5jdGlvblR5cGUpKGNvbnN0IEtVUkwmLCBjb25z dCBWZWN0b3I8U3RyaW5nPiYsIENvb2tpZUZpbHRlcik7CisgICAgICAgIEJsYWNrQmVycnk6OlBs YXRmb3JtOjp3ZWJLaXRUaHJlYWRNZXNzYWdlQ2xpZW50KCktPmRpc3BhdGNoTWVzc2FnZSgKKyAg ICAgICAgICAgIEJsYWNrQmVycnk6OlBsYXRmb3JtOjpjcmVhdGVNZXRob2RDYWxsTWVzc2FnZTxG dW5jdGlvblR5cGUsIENvb2tpZU1hbmFnZXIsIGNvbnN0IEtVUkwsIGNvbnN0IFZlY3RvcjxTdHJp bmc+LCBDb29raWVGaWx0ZXI+KAorICAgICAgICAgICAgICAgICZDb29raWVNYW5hZ2VyOjpzZXRD b29raWVzLCB0aGlzLCB1cmwsIGNvb2tpZXMsIGZpbHRlcikpOworICAgICAgICByZXR1cm47Cisg ICAgfQorCiAgICAgQ29va2llTG9nKCJDb29raWVNYW5hZ2VyIC0gU2V0dGluZyBjb29raWVzIik7 CiAgICAgQ29va2llUGFyc2VyIHBhcnNlcih1cmwpOwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgY29va2llcy5zaXplKCk7ICsraSkgewpAQCAtMTQ4LDYgKzE2OCwxMSBAQCB2b2lkIENvb2tp ZU1hbmFnZXI6OnNldENvb2tpZXMoY29uc3QgS1VSTCYgdXJsLCBjb25zdCBWZWN0b3I8U3RyaW5n PiYgY29va2llcywgQwogCiBTdHJpbmcgQ29va2llTWFuYWdlcjo6Z2V0Q29va2llKGNvbnN0IEtV UkwmIHVybCwgQ29va2llRmlsdGVyIGZpbHRlcikgY29uc3QKIHsKKyAgICBpZiAoIW1fc3luY2Vk V2l0aERhdGFiYXNlICYmICFtX3ByaXZhdGVNb2RlKSB7CisgICAgICAgIExPR19FUlJPUigiQ29v a2llTWFuYWdlciBpcyBjYWxsaW5nIGdldENvb2tpZXMgYmVmb3JlIGRhdGFiYXNlIHZhbHVlcyBh cmUgbG9hZGVkLiIpOworICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgfQorCiAgICAgVmVj dG9yPFBhcnNlZENvb2tpZSo+IHJhd0Nvb2tpZXM7CiAgICAgcmF3Q29va2llcy5yZXNlcnZlSW5p dGlhbENhcGFjaXR5KHNfbWF4Q29va2llQ291bnRQZXJIb3N0KTsKIApAQCAtMTczLDYgKzE5OCwx MSBAQCBTdHJpbmcgQ29va2llTWFuYWdlcjo6Z2V0Q29va2llKGNvbnN0IEtVUkwmIHVybCwgQ29v a2llRmlsdGVyIGZpbHRlcikgY29uc3QKIAogU3RyaW5nIENvb2tpZU1hbmFnZXI6OmdlbmVyYXRl SHRtbEZyYWdtZW50Rm9yQ29va2llcygpCiB7CisgICAgaWYgKCFtX3N5bmNlZFdpdGhEYXRhYmFz ZSAmJiAhbV9wcml2YXRlTW9kZSkgeworICAgICAgICBMT0dfRVJST1IoIkNvb2tpZU1hbmFnZXIg aXMgY2FsbGluZyBnZW5lcmF0ZUh0bWxGcmFnbWVudEZvckNvb2tpZXMgYmVmb3JlIGRhdGFiYXNl IHZhbHVlcyBhcmUgbG9hZGVkLiIpOworICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgfQor CiAgICAgQ29va2llTG9nKCJDb29raWVNYW5hZ2VyIC0gZ2VuZXJhdGVIdG1sRnJhZ21lbnRGb3JD b29raWVzXG4iKTsKIAogICAgIFZlY3RvcjxQYXJzZWRDb29raWUqPiBjb29raWVDYW5kaWRhdGVz OwpAQCAtMjA4LDYgKzIzOCwxMSBAQCBTdHJpbmcgQ29va2llTWFuYWdlcjo6Z2VuZXJhdGVIdG1s RnJhZ21lbnRGb3JDb29raWVzKCkKIAogdm9pZCBDb29raWVNYW5hZ2VyOjpnZXRSYXdDb29raWVz KFZlY3RvcjxQYXJzZWRDb29raWUqPiAmc3RhY2tPZkNvb2tpZXMsIGNvbnN0IEtVUkwmIHJlcXVl c3RVUkwsIENvb2tpZUZpbHRlciBmaWx0ZXIpIGNvbnN0CiB7CisgICAgaWYgKCFtX3N5bmNlZFdp dGhEYXRhYmFzZSAmJiAhbV9wcml2YXRlTW9kZSkgeworICAgICAgICBMT0dfRVJST1IoIkNvb2tp ZU1hbmFnZXIgaXMgY2FsbGluZyBnZXRSYXdDb29raWVzIGJlZm9yZSBkYXRhYmFzZSB2YWx1ZXMg YXJlIGxvYWRlZC4iKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIENvb2tpZUxvZygi Q29va2llTWFuYWdlciAtIGdldFJhd0Nvb2tpZXMgLSBwcm9jZXNzaW5nIHVybCB3aXRoIGRvbWFp biAtICVzICYgcHJvdG9jb2w6ICVzICYgcGF0aDogJXNcbiIsIHJlcXVlc3RVUkwuaG9zdCgpLnV0 ZjgoKS5kYXRhKCksIHJlcXVlc3RVUkwucHJvdG9jb2woKS51dGY4KCkuZGF0YSgpLCByZXF1ZXN0 VVJMLnBhdGgoKS51dGY4KCkuZGF0YSgpKTsKIAogICAgIGNvbnN0IGJvb2wgaW52YWxpZFNjaGVt ZSA9IHNob3VsZElnbm9yZVNjaGVtZShyZXF1ZXN0VVJMLnByb3RvY29sKCkpOwpAQCAtNDg3LDYg KzUyMiwxMCBAQCB2b2lkIENvb2tpZU1hbmFnZXI6OmFkZENvb2tpZVRvTWFwKENvb2tpZU1hcCog dGFyZ2V0TWFwLCBQYXJzZWRDb29raWUqIGNhbmRpZGF0ZQogCiB2b2lkIENvb2tpZU1hbmFnZXI6 OmdldEJhY2tpbmdTdG9yZUNvb2tpZXMoKQogeworICAgIC8vIE1ha2Ugc3VyZSBwcml2YXRlIG1v ZGUgaXMgb2ZmIHdoZW4gdGhlIGRhdGFiYXNlIHRocmVhZCBjYWxscyB0aGlzIG1ldGhvZAorICAg IGlmIChtX3ByaXZhdGVNb2RlKQorICAgICAgICByZXR1cm47CisKICAgICAvLyBUaGlzIG1ldGhv ZCBzaG91bGQgYmUgY2FsbGVkIGp1c3QgYWZ0ZXIgaGF2aW5nIGNyZWF0ZWQgdGhlIGNvb2tpZU1h bmFnZXIKICAgICAvLyBORVZFUiBhZnRlcndhcmRzIQogICAgIEFTU0VSVCghbV9jb3VudCk7CkBA IC00OTksNiArNTM4LDggQEAgdm9pZCBDb29raWVNYW5hZ2VyOjpnZXRCYWNraW5nU3RvcmVDb29r aWVzKCkKICAgICAgICAgY2hlY2tBbmRUcmVhdENvb2tpZShuZXdDb29raWUsIEJhY2tpbmdTdG9y ZUNvb2tpZUVudHJ5KTsKICAgICB9CiAgICAgQ29va2llTG9nKCJDb29raWVNYW5hZ2VyIC0gQmFj a2luZ3N0b3JlIGxvYWRpbmcgY29tcGxldGUuIik7CisKKyAgICBtX3N5bmNlZFdpdGhEYXRhYmFz ZSA9IHRydWU7CiB9CiAKIHZvaWQgQ29va2llTWFuYWdlcjo6c2V0UHJpdmF0ZU1vZGUoYm9vbCBw cml2YXRlTW9kZSkKQEAgLTUwOCw2ICs1NDksMTEgQEAgdm9pZCBDb29raWVNYW5hZ2VyOjpzZXRQ cml2YXRlTW9kZShib29sIHByaXZhdGVNb2RlKQogCiAgICAgbV9wcml2YXRlTW9kZSA9IHByaXZh dGVNb2RlOwogCisgICAgLy8gSWYgd2Ugc3dpdGNoZWQgdG8gcHJpdmF0ZSBtb2RlIHdoZW4gdGhl IGRhdGFiYXNlIGNvb2tpZXMgaGF2ZW4ndCBsb2FkZWQgaW50byBtZW1vcnkgeWV0CisgICAgLy8g d2UgY2FuIHJldHVybiBiZWNhdXNlIHRoZXJlJ3Mgbm90aGluZyBpbiBtZW1vcnkgYW55d2F5Lgor ICAgIGlmIChtX3ByaXZhdGVNb2RlICYmICFtX3N5bmNlZFdpdGhEYXRhYmFzZSkKKyAgICAgICAg cmV0dXJuOworCiAgICAgcmVtb3ZlQWxsQ29va2llcyhEb05vdFJlbW92ZUZyb21CYWNraW5nU3Rv cmUpOwogCiAgICAgLy8gSWYgd2UgYXJlIHN3aXRjaGluZyBiYWNrIHRvIHB1YmxpYyBtb2RlLCBy ZWxvYWQgdGhlIGRhdGFiYXNlIHRvIG1lbW9yeS4KQEAgLTU1NCw2ICs2MDAsMTUgQEAgQ29va2ll TWFwKiBDb29raWVNYW5hZ2VyOjpmaW5kT3JDcmVhdGVDb29raWVNYXAoQ29va2llTWFwKiBwcm90 b2NvbE1hcCwgY29uc3QgUGEKIAogdm9pZCBDb29raWVNYW5hZ2VyOjpyZW1vdmVDb29raWVXaXRo TmFtZShjb25zdCBLVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgY29va2llTmFtZSkKIHsKKyAgICAv LyBEaXNwYXRjaCB0aGUgbWVzc2FnZSBiZWNhdXNlIHRoZSBkYXRhYmFzZSBjb29raWVzIGFyZSBu b3QgbG9hZGVkIGluIG1lbW9yeSB5ZXQuCisgICAgaWYgKCFtX3N5bmNlZFdpdGhEYXRhYmFzZSAm JiAhbV9wcml2YXRlTW9kZSkgeworICAgICAgICB0eXBlZGVmIHZvaWQgKFdlYkNvcmU6OkNvb2tp ZU1hbmFnZXI6OipGdW5jdGlvblR5cGUpKGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmKTsKKyAg ICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OndlYktpdFRocmVhZE1lc3NhZ2VDbGllbnQoKS0+ ZGlzcGF0Y2hNZXNzYWdlKAorICAgICAgICAgICAgQmxhY2tCZXJyeTo6UGxhdGZvcm06OmNyZWF0 ZU1ldGhvZENhbGxNZXNzYWdlPEZ1bmN0aW9uVHlwZSwgQ29va2llTWFuYWdlciwgY29uc3QgS1VS TCwgY29uc3QgU3RyaW5nPigKKyAgICAgICAgICAgICAgICAmQ29va2llTWFuYWdlcjo6cmVtb3Zl Q29va2llV2l0aE5hbWUsIHRoaXMsIHVybCwgY29va2llTmFtZSkpOworICAgICAgICByZXR1cm47 CisgICAgfQorCiAgICAgLy8gV2UgZ2V0IGFsbCBjb29raWVzIGZyb20gYWxsIGRvbWFpbnMgdGhh dCBkb21haW4gbWF0Y2hlcyB0aGUgcmVxdWVzdCBkb21haW4KICAgICAvLyBhbmQgZGVsZXRlIGFu eSBjb29raWVzIHdpdGggdGhlIHNwZWNpZmllZCBuYW1lIHRoYXQgcGF0aCBtYXRjaGVzIHRoZSBy ZXF1ZXN0IHBhdGgKICAgICBWZWN0b3I8UGFyc2VkQ29va2llKj4gcmVzdWx0czsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKaW5kZXgg NTJmNzg0Y2FjOGUxZGE3OWY5MDAzYjI1NWM0NTE1OTlhNDdmZmI0NC4uM2QxMDFkOWVkNzM2Mzdj YzdmZmZkZDdmYzRjM2FiYzg1MzRhMjRiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmgKQEAgLTEyMyw2ICsxMjMsNyBAQCBwcml2 YXRlOgogCiAgICAgYm9vbCBtX3ByaXZhdGVNb2RlOwogICAgIGJvb2wgbV9zaG91bGREdW1wQWxs Q29va2llczsKKyAgICBib29sIG1fc3luY2VkV2l0aERhdGFiYXNlOwogCiAgICAgU3RyaW5nIG1f Y29va2llSmFyRmlsZU5hbWU7CiAK