111502 2013-03-05 17:21:32 -0800 Apply changes from storage events locally 2013-04-01 13:05:19 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 848293 0 andersca 2013-03-05 17:21:32 -0800 Apply changes from storage events locally 848300 1 191616 andersca 2013-03-05 17:25:28 -0800 Created attachment 191616 Patch 867304 2 andersca 2013-04-01 13:05:19 -0700 Committed r147354: <http://trac.webkit.org/changeset/147354> 191616 2013-03-05 17:25:28 -0800 2013-03-05 23:02:45 -0800 Patch bug-111502-20130305172134.patch text/plain 9934 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ0ODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTA3NGRmYzQ3ZjBlY2Iy NjdhODhhY2QyNzE1M2UzYzMwYTQ1ZTdkOS4uYmQ0NWY4N2U2NGFkZWE0M2ZiMjQyODVlYzFjNmMw ZGRiNTA0NGU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEzLTAzLTA1ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQXBwbHkgY2hhbmdl cyBmcm9tIHN0b3JhZ2UgZXZlbnRzIGxvY2FsbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTExMTUwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhbmQgZXhwb3J0IGEgaGVscGVyIGZ1bmN0aW9uIGZv ciBzZXR0aW5nIGFuIGl0ZW0gd2l0aG91dCB0YWtpbmcKKyAgICAgICAgaW50byBhY2NvdW50IHRo ZSBxdW90YSBmb3IgdGhlIG1hcC4gQWxzbywgcmVpbmRlbnQgU3RvcmFnZU1hcC5oCisKKyAgICAg ICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VNYXAuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZU1hcDo6c2V0SXRlbUlnbm9yaW5nUXVvdGEpOgorICAg ICAgICAoV2ViQ29yZSk6CisgICAgICAgICogc3RvcmFnZS9TdG9yYWdlTWFwLmg6CisgICAgICAg IChTdG9yYWdlTWFwKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VNYXA6OnF1b3RhKToKKwog MjAxMy0wMy0wNSAgQWxlYyBGbGV0dCAgPGFsZWNmbGV0dEBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgRml4IG1hYyBjbGFuZyBidWlsZCB3aXRoIGxvbmcgbG9uZwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDg1OWYw NmE4MDNjZWY0ZmYwODlkMjA3MjM0MTZkODNhMjI0MGJjYTQuLjAwOTc3ZDk2MTgwOTk4MDkwNDcy YjNiMGQ1OTVhNDVjMzFmY2RkMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxv ZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyNSBAQAogMjAxMy0w My0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIEFw cGx5IGNoYW5nZXMgZnJvbSBzdG9yYWdlIGV2ZW50cyBsb2NhbGx5CisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTE1MDIKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9TdG9y YWdlQXJlYVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFQcm94eTo6U3Rv cmFnZUFyZWFQcm94eSk6CisgICAgICAgIFN0b3JlIHRoZSBzZWN1cml0eSBvcmlnaW4gYXMgYSBt ZW1iZXIgdmFyaWFibGUuCisKKyAgICAgICAgKFdlYktpdDo6U3RvcmFnZUFyZWFQcm94eTo6ZGlz cGF0Y2hTdG9yYWdlRXZlbnQpOgorICAgICAgICBTZXQgdGhlIGl0ZW0gYW5kIGNhbGwgdGhlIGFw cHJvcHJpYXRlIGV2ZW50IGRpc3BhdGNoIGZ1bmN0aW9uLgorICAgIAorICAgICAgICAoV2ViS2l0 OjpTdG9yYWdlQXJlYVByb3h5OjpkaXNwYXRjaFNlc3Npb25TdG9yYWdlRXZlbnQpOgorICAgICAg ICAoV2ViS2l0OjpTdG9yYWdlQXJlYVByb3h5OjpkaXNwYXRjaExvY2FsU3RvcmFnZUV2ZW50KToK KyAgICAgICAgQWRkIHN0dWJzLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3Jh Z2VBcmVhUHJveHkuaDoKKworMjAxMy0wMy0wNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgorCiAgICAgICAgIFJlc2V0IHRoZSB2YWx1ZXMgaWYgdGhlcmUgaXMgYSBxdW90 YSBlcnJvcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTExNTAwCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZXhwLmluIGIvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KaW5kZXggODZlZDcyMTNlZGVkN2U1ZWE4YTc2NzIz ZTI4ZGJmOTE4ZmM2Mzc1Mi4uMWJkNTI0ODQzOWJlYTZmODQ3Y2Q1MWRkNGZhMTUzNDNjZDllNjc5 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KKysrIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5leHAuaW4KQEAgLTg0LDYgKzg0LDcgQEAgX19aTjdXZWJDb3JlMTBT Y3JvbGxWaWV3MjNzZXRTY3JvbGxiYXJzU3VwcHJlc3NlZEViYgogX19aTjdXZWJDb3JlMTBTY3Jv bGxWaWV3MjR3aW5kb3dSZXNpemVyUmVjdENoYW5nZWRFdgogX19aTjdXZWJDb3JlMTBTY3JvbGxW aWV3OGFkZENoaWxkRU4zV1RGMTBQYXNzUmVmUHRySU5TXzZXaWRnZXRFRUUKIF9fWk43V2ViQ29y ZTEwU3RvcmFnZU1hcDExaW1wb3J0SXRlbXNFUktOM1dURjdIYXNoTWFwSU5TMV82U3RyaW5nRVMz X05TMV8xMFN0cmluZ0hhc2hFTlMxXzEwSGFzaFRyYWl0c0lTM19FRVM2X0VFCitfX1pON1dlYkNv cmUxMFN0b3JhZ2VNYXAyMHNldEl0ZW1JZ25vcmluZ1F1b3RhRVJLTjNXVEY2U3RyaW5nRVM0Xwog X19aTjdXZWJDb3JlMTBTdG9yYWdlTWFwM2tleUVqCiBfX1pON1dlYkNvcmUxMFN0b3JhZ2VNYXA2 Y3JlYXRlRWoKIF9fWk43V2ViQ29yZTEwU3RvcmFnZU1hcDdzZXRJdGVtRVJLTjNXVEY2U3RyaW5n RVM0X1JTMl9SYgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlTWFw LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU1hcC5jcHAKaW5kZXggZDgzNjdk NmQ3YjU5NjVlYTQ1ZmZhYmZhNmVlZTJiZDBjYjQxZjAzYi4uZmI3ZTQzNTcxNTk2ZGE0MzI4YWYx YzM0ZGUyMTNhZGFkMjc1M2YxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9T dG9yYWdlTWFwLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VNYXAuY3Bw CkBAIC0yNiw2ICsyNiw4IEBACiAjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiU3RvcmFn ZU1hcC5oIgogCisjaW5jbHVkZSA8d3RmL1RlbXBvcmFyeUNoYW5nZS5oPgorCiBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAKIFBhc3NSZWZQdHI8U3RvcmFnZU1hcD4gU3RvcmFnZU1hcDo6Y3JlYXRlKHVu c2lnbmVkIHF1b3RhKQpAQCAtMTQwLDYgKzE0MiwxOSBAQCBQYXNzUmVmUHRyPFN0b3JhZ2VNYXA+ IFN0b3JhZ2VNYXA6OnNldEl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFs dQogICAgIHJldHVybiAwOwogfQogCitQYXNzUmVmUHRyPFN0b3JhZ2VNYXA+IFN0b3JhZ2VNYXA6 OnNldEl0ZW1JZ25vcmluZ1F1b3RhKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZh bHVlKQoreworICAgIFRlbXBvcmFyeUNoYW5nZTx1bnNpZ25lZD4gcXVvdGFTaXplQ2hhbmdlKG1f cXVvdGFTaXplLCBub1F1b3RhKTsKKworICAgIFN0cmluZyBvbGRWYWx1ZTsKKyAgICBib29sIHF1 b3RhRXhjZXB0aW9uOworCisgICAgUmVmUHRyPFN0b3JhZ2VNYXA+IG1hcCA9IHNldEl0ZW0oa2V5 LCB2YWx1ZSwgb2xkVmFsdWUsIHF1b3RhRXhjZXB0aW9uKTsKKyAgICBBU1NFUlQoIXF1b3RhRXhj ZXB0aW9uKTsKKworICAgIHJldHVybiBtYXAucmVsZWFzZSgpOworfQorCiBQYXNzUmVmUHRyPFN0 b3JhZ2VNYXA+IFN0b3JhZ2VNYXA6OnJlbW92ZUl0ZW0oY29uc3QgU3RyaW5nJiBrZXksIFN0cmlu ZyYgb2xkVmFsdWUpCiB7CiAgICAgLy8gSW1wbGVtZW50IGNvcHktb24td3JpdGUgc2VtYW50aWNz IGhlcmUuICBXZSdyZSBndWFyYW50ZWVkIHRoYXQgdGhlIG9ubHkgcmVmcyBvZiBTdG9yYWdlTWFw cyBiZWxvbmcgdG8gU3RvcmFnZSBvYmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9z dG9yYWdlL1N0b3JhZ2VNYXAuaCBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZU1hcC5o CmluZGV4IGQ3Y2NkNWI3NjdhM2VjZDRjMjFjM2VjZTZlNGZkMzkwYzVkNTY5YzQuLmNjY2NiNWNl NDNiOTdlMTgwM2U5Yzc1NWYxN2UxY2MxY2RhNTIwNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3N0b3JhZ2UvU3RvcmFnZU1hcC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3Rv cmFnZU1hcC5oCkBAIC0zNCwzOCArMzQsMzkgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0g ICAgY2xhc3MgU3RvcmFnZU1hcCA6IHB1YmxpYyBSZWZDb3VudGVkPFN0b3JhZ2VNYXA+IHsKLSAg ICBwdWJsaWM6Ci0gICAgICAgIC8vIFF1b3RhIHNpemUgbWVhc3VyZWQgaW4gYnl0ZXMuCi0gICAg ICAgIHN0YXRpYyBQYXNzUmVmUHRyPFN0b3JhZ2VNYXA+IGNyZWF0ZSh1bnNpZ25lZCBxdW90YVNp emUpOworY2xhc3MgU3RvcmFnZU1hcCA6IHB1YmxpYyBSZWZDb3VudGVkPFN0b3JhZ2VNYXA+IHsK K3B1YmxpYzoKKyAgICAvLyBRdW90YSBzaXplIG1lYXN1cmVkIGluIGJ5dGVzLgorICAgIHN0YXRp YyBQYXNzUmVmUHRyPFN0b3JhZ2VNYXA+IGNyZWF0ZSh1bnNpZ25lZCBxdW90YVNpemUpOwogCi0g ICAgICAgIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0OwotICAgICAgICBTdHJpbmcga2V5KHVuc2ln bmVkIGluZGV4KTsKLSAgICAgICAgU3RyaW5nIGdldEl0ZW0oY29uc3QgU3RyaW5nJikgY29uc3Q7 Ci0gICAgICAgIFBhc3NSZWZQdHI8U3RvcmFnZU1hcD4gc2V0SXRlbShjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgU3RyaW5nJiBvbGRWYWx1ZSwgYm9vbCYgcXVvdGFfZXhj ZXB0aW9uKTsKLSAgICAgICAgUGFzc1JlZlB0cjxTdG9yYWdlTWFwPiByZW1vdmVJdGVtKGNvbnN0 IFN0cmluZyYsIFN0cmluZyYgb2xkVmFsdWUpOworICAgIHVuc2lnbmVkIGxlbmd0aCgpIGNvbnN0 OworICAgIFN0cmluZyBrZXkodW5zaWduZWQgaW5kZXgpOworICAgIFN0cmluZyBnZXRJdGVtKGNv bnN0IFN0cmluZyYpIGNvbnN0OworICAgIFBhc3NSZWZQdHI8U3RvcmFnZU1hcD4gc2V0SXRlbShj b25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgU3RyaW5nJiBvbGRWYWx1ZSwg Ym9vbCYgcXVvdGFFeGNlcHRpb24pOworICAgIFBhc3NSZWZQdHI8U3RvcmFnZU1hcD4gc2V0SXRl bUlnbm9yaW5nUXVvdGEoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUpOwor ICAgIFBhc3NSZWZQdHI8U3RvcmFnZU1hcD4gcmVtb3ZlSXRlbShjb25zdCBTdHJpbmcmLCBTdHJp bmcmIG9sZFZhbHVlKTsKIAotICAgICAgICBib29sIGNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5 KSBjb25zdDsKKyAgICBib29sIGNvbnRhaW5zKGNvbnN0IFN0cmluZyYga2V5KSBjb25zdDsKIAot ICAgICAgICB2b2lkIGltcG9ydEl0ZW1zKGNvbnN0IEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+Jik7 CisgICAgdm9pZCBpbXBvcnRJdGVtcyhjb25zdCBIYXNoTWFwPFN0cmluZywgU3RyaW5nPiYpOwog Ci0gICAgICAgIHVuc2lnbmVkIHF1b3RhKCkgY29uc3QgeyByZXR1cm4gbV9xdW90YVNpemU7IH0K KyAgICB1bnNpZ25lZCBxdW90YSgpIGNvbnN0IHsgcmV0dXJuIG1fcXVvdGFTaXplOyB9CiAKLSAg ICAgICAgc3RhdGljIGNvbnN0IHVuc2lnbmVkIG5vUXVvdGEgPSBVSU5UX01BWDsKKyAgICBzdGF0 aWMgY29uc3QgdW5zaWduZWQgbm9RdW90YSA9IFVJTlRfTUFYOwogCi0gICAgcHJpdmF0ZToKLSAg ICAgICAgZXhwbGljaXQgU3RvcmFnZU1hcCh1bnNpZ25lZCBxdW90YSk7Ci0gICAgICAgIFBhc3NS ZWZQdHI8U3RvcmFnZU1hcD4gY29weSgpOwotICAgICAgICB2b2lkIGludmFsaWRhdGVJdGVyYXRv cigpOwotICAgICAgICB2b2lkIHNldEl0ZXJhdG9yVG9JbmRleCh1bnNpZ25lZCk7Citwcml2YXRl OgorICAgIGV4cGxpY2l0IFN0b3JhZ2VNYXAodW5zaWduZWQgcXVvdGEpOworICAgIFBhc3NSZWZQ dHI8U3RvcmFnZU1hcD4gY29weSgpOworICAgIHZvaWQgaW52YWxpZGF0ZUl0ZXJhdG9yKCk7Cisg ICAgdm9pZCBzZXRJdGVyYXRvclRvSW5kZXgodW5zaWduZWQpOwogCi0gICAgICAgIEhhc2hNYXA8 U3RyaW5nLCBTdHJpbmc+IG1fbWFwOwotICAgICAgICBIYXNoTWFwPFN0cmluZywgU3RyaW5nPjo6 aXRlcmF0b3IgbV9pdGVyYXRvcjsKLSAgICAgICAgdW5zaWduZWQgbV9pdGVyYXRvckluZGV4Owor ICAgIEhhc2hNYXA8U3RyaW5nLCBTdHJpbmc+IG1fbWFwOworICAgIEhhc2hNYXA8U3RyaW5nLCBT dHJpbmc+OjppdGVyYXRvciBtX2l0ZXJhdG9yOworICAgIHVuc2lnbmVkIG1faXRlcmF0b3JJbmRl eDsKIAotICAgICAgICB1bnNpZ25lZCBtX3F1b3RhU2l6ZTsgIC8vIE1lYXN1cmVkIGluIGJ5dGVz LgotICAgICAgICB1bnNpZ25lZCBtX2N1cnJlbnRMZW5ndGg7ICAvLyBNZWFzdXJlZCBpbiBVQ2hh cnMuCi0gICAgfTsKKyAgICB1bnNpZ25lZCBtX3F1b3RhU2l6ZTsgLy8gTWVhc3VyZWQgaW4gYnl0 ZXMuCisgICAgdW5zaWduZWQgbV9jdXJyZW50TGVuZ3RoOyAvLyBNZWFzdXJlZCBpbiBVQ2hhcnMu Cit9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5LmNwcCBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5LmNwcAppbmRleCBkZTdkYjE2 ZTc1YjExZmM5MGQ0ZGJhNDljOThlNWZhOWEyYTIyYWY2Li5lZDhhZmYyNmFmNTdjZDUwZGQwYTI1 MGI2NzA5ZWRlODRjYmUyMjQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1N0b3JhZ2UvU3RvcmFnZUFyZWFQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkuY3BwCkBAIC01Nyw4ICs1Nyw5IEBAIFN0b3Jh Z2VBcmVhUHJveHk6OlN0b3JhZ2VBcmVhUHJveHkoU3RvcmFnZU5hbWVzcGFjZVByb3h5KiBzdG9y YWdlTmFtZXNwYWNlUHJveHksCiAgICAgOiBtX3N0b3JhZ2VOYW1lc3BhY2VJRChzdG9yYWdlTmFt ZXNwYWNlUHJveHktPnN0b3JhZ2VOYW1lc3BhY2VJRCgpKQogICAgICwgbV9xdW90YUluQnl0ZXMo c3RvcmFnZU5hbWVzcGFjZVByb3h5LT5xdW90YUluQnl0ZXMoKSkKICAgICAsIG1fc3RvcmFnZUFy ZWFJRChnZW5lcmF0ZVN0b3JhZ2VBcmVhSUQoKSkKKyAgICAsIG1fc2VjdXJpdHlPcmlnaW4oc2Vj dXJpdHlPcmlnaW4pCiB7Ci0gICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5z ZW5kKE1lc3NhZ2VzOjpTdG9yYWdlTWFuYWdlcjo6Q3JlYXRlU3RvcmFnZUFyZWEobV9zdG9yYWdl QXJlYUlELCBzdG9yYWdlTmFtZXNwYWNlUHJveHktPnN0b3JhZ2VOYW1lc3BhY2VJRCgpLCBTZWN1 cml0eU9yaWdpbkRhdGE6OmZyb21TZWN1cml0eU9yaWdpbihzZWN1cml0eU9yaWdpbi5nZXQoKSkp LCAwKTsKKyAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2Fn ZXM6OlN0b3JhZ2VNYW5hZ2VyOjpDcmVhdGVTdG9yYWdlQXJlYShtX3N0b3JhZ2VBcmVhSUQsIHN0 b3JhZ2VOYW1lc3BhY2VQcm94eS0+c3RvcmFnZU5hbWVzcGFjZUlEKCksIFNlY3VyaXR5T3JpZ2lu RGF0YTo6ZnJvbVNlY3VyaXR5T3JpZ2luKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpKSwgMCk7CiAg ICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuYWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpTdG9y YWdlQXJlYVByb3h5OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fc3RvcmFnZUFyZWFJRCwgdGhp cyk7CiB9CiAKQEAgLTIxNiw3ICsyMTcsMTYgQEAgdm9pZCBTdG9yYWdlQXJlYVByb3h5OjpkaXNw YXRjaFN0b3JhZ2VFdmVudChjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGQKICAg ICBpZiAoIXNob3VsZEFwcGx5Q2hhbmdlc0ZvcktleShrZXkpKQogICAgICAgICByZXR1cm47CiAK LSAgICAvLyBGSVhNRTogSW1wbGVtZW50IHRoaXMuCisgICAgQVNTRVJUKCFrZXkuaXNOdWxsKCkp OworICAgIEFTU0VSVCghbmV3VmFsdWUuaXNOdWxsKCkpOworCisgICAgQVNTRVJUKG1fc3RvcmFn ZU1hcC0+aGFzT25lUmVmKCkpOworICAgIG1fc3RvcmFnZU1hcC0+c2V0SXRlbUlnbm9yaW5nUXVv dGEoa2V5LCBuZXdWYWx1ZSk7CisKKyAgICBpZiAoc3RvcmFnZVR5cGUoKSA9PSBTZXNzaW9uU3Rv cmFnZSkKKyAgICAgICAgZGlzcGF0Y2hTZXNzaW9uU3RvcmFnZUV2ZW50KGtleSwgb2xkVmFsdWUs IG5ld1ZhbHVlLCB1cmxTdHJpbmcpOworICAgIGVsc2UKKyAgICAgICAgZGlzcGF0Y2hMb2NhbFN0 b3JhZ2VFdmVudChrZXksIG9sZFZhbHVlLCBuZXdWYWx1ZSwgdXJsU3RyaW5nKTsKIH0KIAogU3Rv cmFnZVR5cGUgU3RvcmFnZUFyZWFQcm94eTo6c3RvcmFnZVR5cGUoKSBjb25zdApAQCAtMjc0LDQg KzI4NCwxOCBAQCB2b2lkIFN0b3JhZ2VBcmVhUHJveHk6OnJlc2V0VmFsdWVzKCkKICAgICBtX3Bl bmRpbmdWYWx1ZUNoYW5nZXMuY2xlYXIoKTsKIH0KIAordm9pZCBTdG9yYWdlQXJlYVByb3h5Ojpk aXNwYXRjaFNlc3Npb25TdG9yYWdlRXZlbnQoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmlu ZyYgb2xkVmFsdWUsIGNvbnN0IFN0cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsU3Ry aW5nKQoreworICAgIEFTU0VSVChzdG9yYWdlVHlwZSgpID09IFNlc3Npb25TdG9yYWdlKTsKKwor ICAgIC8vIEZJWE1FOiBJbXBsZW1lbnQuCit9CisKK3ZvaWQgU3RvcmFnZUFyZWFQcm94eTo6ZGlz cGF0Y2hMb2NhbFN0b3JhZ2VFdmVudChjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBv bGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcp Cit7CisgICAgQVNTRVJUKHN0b3JhZ2VUeXBlKCkgPT0gTG9jYWxTdG9yYWdlKTsKKworICAgIC8v IEZJWE1FOiBJbXBsZW1lbnQuCit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkuaCBi L1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvU3RvcmFnZS9TdG9yYWdlQXJlYVByb3h5LmgKaW5k ZXggMGIxOGJjODA4NTIwODFhMTFkZGViMjljZTIwZTMyNGFiMjRkY2VhZC4uMzZlMjRlYWRmZTA2 NTZjMzBmYzFhMGFmN2NmOWUwODc5NTE0MWNlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9TdG9yYWdlL1N0b3JhZ2VBcmVhUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1N0b3JhZ2UvU3RvcmFnZUFyZWFQcm94eS5oCkBAIC03NCw5ICs3NCwxNCBA QCBwcml2YXRlOgogICAgIHZvaWQgbG9hZFZhbHVlc0lmTmVlZGVkKCk7CiAgICAgdm9pZCByZXNl dFZhbHVlcygpOwogCisgICAgdm9pZCBkaXNwYXRjaFNlc3Npb25TdG9yYWdlRXZlbnQoY29uc3Qg U3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0IFN0cmluZyYgbmV3VmFs dWUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKTsKKyAgICB2b2lkIGRpc3BhdGNoTG9jYWxTdG9y YWdlRXZlbnQoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgb2xkVmFsdWUsIGNvbnN0 IFN0cmluZyYgbmV3VmFsdWUsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nKTsKKwogICAgIHVpbnQ2 NF90IG1fc3RvcmFnZU5hbWVzcGFjZUlEOwogICAgIHVuc2lnbmVkIG1fcXVvdGFJbkJ5dGVzOwog ICAgIHVpbnQ2NF90IG1fc3RvcmFnZUFyZWFJRDsKKworICAgIFJlZlB0cjxXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbj4gbV9zZWN1cml0eU9yaWdpbjsKICAgICBSZWZQdHI8V2ViQ29yZTo6U3RvcmFn ZU1hcD4gbV9zdG9yYWdlTWFwOwogCiAgICAgSGFzaENvdW50ZWRTZXQ8U3RyaW5nPiBtX3BlbmRp bmdWYWx1ZUNoYW5nZXM7Cg==