73374 2011-11-29 16:39:21 -0800 REGRESSION(r91931): WKKeyValueStorageManagerGetKeyValueStorageOrigins may not report the correct list of origins the first time it is called 2011-11-29 18:29:59 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar, Regression P2 Normal --- 1 jberlin jberlin adauria beidson jberlin levin+threading webkit.review.bot oldest_to_newest 511210 0 jberlin 2011-11-29 16:39:21 -0800 After http://trac.webkit.org/changeset/91931, the list of origins using local storage is not read into memory until the first time local storage is used or the list is requested. Reading into memory from disk happens on another thread, so it is possible for the first call to WKKeyValueStorageManagerGetKeyValueStorageOrigins to report 0 origins before the reading from disk is done. <rdar://problem/10196057> 511241 1 117078 jberlin 2011-11-29 17:22:47 -0800 Created attachment 117078 Patch 511289 2 117078 jberlin 2011-11-29 18:29:48 -0800 Comment on attachment 117078 Patch Committed in http://trac.webkit.org/changeset/101441 117078 2011-11-29 17:22:47 -0800 2011-11-29 18:29:48 -0800 Patch patch.patch text/plain 12991 jberlin ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBiNDBiOTRiLi41NzJmNzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjgg QEAKKzIwMTEtMTEtMjkgIEplc3NpZSBCZXJsaW4gIDxqYmVybGluQGFwcGxlLmNvbT4KKworICAg ICAgICBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zIG1h eSBub3QgcmVwb3J0IHRoZSBjb3JyZWN0IGxpc3Qgb2Ygb3JpZ2lucworICAgICAgICB0aGUgZmly c3QgdGltZSBpdCBpcyBjYWxsZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03MzM3NCAoPHJkYXI6Ly9wcm9ibGVtLzEwMTk2MDU3PikKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBjYWxsYmFjayBm b3Igd2hlbiB0aGUgU3RvcmFnZSBUcmFja2VyIGlzIGRvbmUgbG9hZGluZyB0aGUgbGlzdCBvZiBv cmlnaW5zIHdpdGggTG9jYWwKKyAgICAgICAgU3RvcmFnZS4KKworICAgICAgICAqIHN0b3JhZ2Uv U3RvcmFnZVRyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZVRyYWNrZXI6OlN0 b3JhZ2VUcmFja2VyKToKKyAgICAgICAgS2VlcCB0cmFjayBvZiB3aGV0aGVyIHRoZSBpbXBvcnQg ZnJvbSBkaXNrIGhhcyBiZWVuIGNvbXBsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VU cmFja2VyOjpub3RpZnlGaW5pc2hlZEltcG9ydGluZ09yaWdpbklkZW50aWZpZXJzT25NYWluVGhy ZWFkKToKKyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VUcmFja2VyOjpmaW5pc2hlZEltcG9ydGlu Z09yaWdpbklkZW50aWZpZXJzKToKKyAgICAgICAgU2V0IG1fZmluaXNoZWRJbXBvcnRpbmdPcmln aW5JZGVudGlmaWVycyB0byB0cnVlIGFuZCB0ZWxsIHRoZSBjbGllbnQuCisgICAgICAgIChXZWJD b3JlOjpTdG9yYWdlVHJhY2tlcjo6c3luY0ltcG9ydE9yaWdpbklkZW50aWZpZXJzKToKKyAgICAg ICAgV2hlbiBmaW5pc2hlZCwgbm90aWZ5IHRoZSBzaGFyZWQgU3RvcmFnZVRyYWNrZXIgb24gdGhl IG1haW4gdGhyZWFkLgorICAgICAgICAqIHN0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlN0b3JhZ2VUcmFja2VyOjpvcmlnaW5zTG9hZGVkKToKKworICAgICAgICAq IHN0b3JhZ2UvU3RvcmFnZVRyYWNrZXJDbGllbnQuaDoKKyAgICAgICAgQWRkIGRpZEZpbmlzaExv YWRpbmdPcmlnaW5zLgorCiAyMDExLTExLTI4ICBWc2V2b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hy b21pdW0ub3JnPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFRleHRQcm9tcHQgc2hvdWxkIHNo b3cgc3VnZ2VzdCBhYm92ZSBvciB1bmRlciBzbyB0aGF0IGl0IGhhcyBtYXhpbWFsIGhlaWdodC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHAKaW5kZXggNzM4OWY3OC4u NGU1YzEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHAKQEAg LTkwLDYgKzkwLDcgQEAgU3RvcmFnZVRyYWNrZXI6OlN0b3JhZ2VUcmFja2VyKGNvbnN0IFN0cmlu ZyYgc3RvcmFnZVBhdGgpCiAgICAgLCBtX3RocmVhZChMb2NhbFN0b3JhZ2VUaHJlYWQ6OmNyZWF0 ZSgpKQogICAgICwgbV9pc0FjdGl2ZShmYWxzZSkKICAgICAsIG1fbmVlZHNJbml0aWFsaXphdGlv bihmYWxzZSkKKyAgICAsIG1fZmluaXNoZWRJbXBvcnRpbmdPcmlnaW5JZGVudGlmaWVycyhmYWxz ZSkKIHsKIH0KIApAQCAtMTQwLDYgKzE0MSwxOSBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjppbXBv cnRPcmlnaW5JZGVudGlmaWVycygpCiAgICAgbV90aHJlYWQtPnNjaGVkdWxlVGFzayhMb2NhbFN0 b3JhZ2VUYXNrOjpjcmVhdGVPcmlnaW5JZGVudGlmaWVyc0ltcG9ydCgpKTsKIH0KIAordm9pZCBT dG9yYWdlVHJhY2tlcjo6bm90aWZ5RmluaXNoZWRJbXBvcnRpbmdPcmlnaW5JZGVudGlmaWVyc09u TWFpblRocmVhZCh2b2lkKikKK3sKKyAgICB0cmFja2VyKCkuZmluaXNoZWRJbXBvcnRpbmdPcmln aW5JZGVudGlmaWVycygpOworfQorCit2b2lkIFN0b3JhZ2VUcmFja2VyOjpmaW5pc2hlZEltcG9y dGluZ09yaWdpbklkZW50aWZpZXJzKCkKK3sKKyAgICBtX2ZpbmlzaGVkSW1wb3J0aW5nT3JpZ2lu SWRlbnRpZmllcnMgPSB0cnVlOworICAgIE11dGV4TG9ja2VyIGxvY2tDbGllbnQobV9jbGllbnRH dWFyZCk7CisgICAgaWYgKG1fY2xpZW50KQorICAgICAgICBtX2NsaWVudC0+ZGlkRmluaXNoTG9h ZGluZ09yaWdpbnMoKTsKK30KKwogdm9pZCBTdG9yYWdlVHJhY2tlcjo6c3luY0ltcG9ydE9yaWdp bklkZW50aWZpZXJzKCkKIHsKICAgICBBU1NFUlQobV9pc0FjdGl2ZSk7CkBAIC0xODgsNiArMjAy LDggQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6c3luY0ltcG9ydE9yaWdpbklkZW50aWZpZXJzKCkK ICAgICAgICAgICAgICAgICBtX2NsaWVudC0+ZGlzcGF0Y2hEaWRNb2RpZnlPcmlnaW4oKml0KTsK ICAgICAgICAgfQogICAgIH0KKworICAgIGNhbGxPbk1haW5UaHJlYWQobm90aWZ5RmluaXNoZWRJ bXBvcnRpbmdPcmlnaW5JZGVudGlmaWVyc09uTWFpblRocmVhZCwgMCk7CiB9CiAgICAgCiB2b2lk IFN0b3JhZ2VUcmFja2VyOjpzeW5jRmlsZVN5c3RlbUFuZFRyYWNrZXJEYXRhYmFzZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmggYi9Tb3VyY2Uv V2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmgKaW5kZXggZTczY2JmOC4uYzhlMjE3NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuaApAQCAtNTIsNiArNTIsNyBA QCBwdWJsaWM6CiAgICAgdm9pZCBkZWxldGVBbGxPcmlnaW5zKCk7CiAgICAgdm9pZCBkZWxldGVP cmlnaW4oU2VjdXJpdHlPcmlnaW4qKTsKICAgICB2b2lkIGRlbGV0ZU9yaWdpbihjb25zdCBTdHJp bmcmIG9yaWdpbklkZW50aWZpZXIpOworICAgIGJvb2wgb3JpZ2luc0xvYWRlZCgpIGNvbnN0IHsg cmV0dXJuIG1fZmluaXNoZWRJbXBvcnRpbmdPcmlnaW5JZGVudGlmaWVyczsgfQogICAgIHZvaWQg b3JpZ2lucyhWZWN0b3I8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPiA+JiByZXN1bHQpOwogICAgIGxv bmcgbG9uZyBkaXNrVXNhZ2VGb3JPcmlnaW4oU2VjdXJpdHlPcmlnaW4qKTsKICAgICAKQEAgLTgw LDYgKzgxLDggQEAgcHJpdmF0ZToKICAgICB2b2lkIG9wZW5UcmFja2VyRGF0YWJhc2UoYm9vbCBj cmVhdGVJZkRvZXNOb3RFeGlzdCk7CiAKICAgICB2b2lkIGltcG9ydE9yaWdpbklkZW50aWZpZXJz KCk7CisgICAgc3RhdGljIHZvaWQgbm90aWZ5RmluaXNoZWRJbXBvcnRpbmdPcmlnaW5JZGVudGlm aWVyc09uTWFpblRocmVhZCh2b2lkKik7CisgICAgdm9pZCBmaW5pc2hlZEltcG9ydGluZ09yaWdp bklkZW50aWZpZXJzKCk7CiAgICAgCiAgICAgdm9pZCBkZWxldGVUcmFja2VyRmlsZXMoKTsKICAg ICBTdHJpbmcgZGF0YWJhc2VQYXRoRm9yT3JpZ2luKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRp Zmllcik7CkBAIC0xMTEsNiArMTE0LDcgQEAgcHJpdmF0ZToKICAgICAKICAgICBib29sIG1faXNB Y3RpdmU7CiAgICAgYm9vbCBtX25lZWRzSW5pdGlhbGl6YXRpb247CisgICAgYm9vbCBtX2Zpbmlz aGVkSW1wb3J0aW5nT3JpZ2luSWRlbnRpZmllcnM7CiB9OwogICAgIAogfSAvLyBuYW1lc3BhY2Ug V2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tl ckNsaWVudC5oIGIvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlckNsaWVudC5o CmluZGV4IDljMmQ1M2UuLjcxYTYwMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3N0b3Jh Z2UvU3RvcmFnZVRyYWNrZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0 b3JhZ2VUcmFja2VyQ2xpZW50LmgKQEAgLTM0LDYgKzM0LDcgQEAgY2xhc3MgU3RvcmFnZVRyYWNr ZXJDbGllbnQgewogcHVibGljOgogICAgIHZpcnR1YWwgflN0b3JhZ2VUcmFja2VyQ2xpZW50KCkg eyB9CiAgICAgdmlydHVhbCB2b2lkIGRpc3BhdGNoRGlkTW9kaWZ5T3JpZ2luKGNvbnN0IFN0cmlu ZyYgb3JpZ2luSWRlbnRpZmllcikgPSAwOworICAgIHZpcnR1YWwgdm9pZCBkaWRGaW5pc2hMb2Fk aW5nT3JpZ2lucygpID0gMDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5n ZUxvZwppbmRleCA1OTg1MTdhMy4uZmIxY2Q4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9t YWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAtMSwzICsx LDE1IEBACisyMDExLTExLTI5ICBKZXNzaWUgQmVybGluICA8amJlcmxpbkBhcHBsZS5jb20+CisK KyAgICAgICAgV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lu cyBtYXkgbm90IHJlcG9ydCB0aGUgY29ycmVjdCBsaXN0IG9mIG9yaWdpbnMKKyAgICAgICAgdGhl IGZpcnN0IHRpbWUgaXQgaXMgY2FsbGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NzMzNzQgKDxyZGFyOi8vcHJvYmxlbS8xMDE5NjA1Nz4pCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTdG9yYWdlL1dl YlN0b3JhZ2VUcmFja2VyQ2xpZW50Lmg6CisgICAgICAgICogU3RvcmFnZS9XZWJTdG9yYWdlVHJh Y2tlckNsaWVudC5tbToKKyAgICAgICAgKFdlYlN0b3JhZ2VUcmFja2VyQ2xpZW50OjpkaWRGaW5p c2hMb2FkaW5nT3JpZ2lucyk6CisKIDIwMTEtMTEtMjkgIFJvbGFuZCBTdGVpbmVyICA8cm9sYW5k c3RlaW5lckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgPHN0eWxlIHNjb3BlZD46IGFkZCBFTkFC TEUoU1RZTEVfU0NPUEVEKSBmbGFnIHRvIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9tYWMvU3RvcmFnZS9XZWJTdG9yYWdlVHJhY2tlckNsaWVudC5oIGIvU291cmNlL1dlYktpdC9t YWMvU3RvcmFnZS9XZWJTdG9yYWdlVHJhY2tlckNsaWVudC5oCmluZGV4IDI1ZGQ5NDEuLmYzZjI1 NzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1N0b3JhZ2UvV2ViU3RvcmFnZVRyYWNr ZXJDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9TdG9yYWdlL1dlYlN0b3JhZ2VUcmFj a2VyQ2xpZW50LmgKQEAgLTM2LDYgKzM2LDEwIEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIH5XZWJT dG9yYWdlVHJhY2tlckNsaWVudCgpOwogICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZE1vZGlm eU9yaWdpbihjb25zdCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIpOwogICAgIHZpcnR1YWwgdm9p ZCBkaXNwYXRjaERpZE1vZGlmeU9yaWdpbihQYXNzUmVmUHRyPFNlY3VyaXR5T3JpZ2luPik7CisK IHByaXZhdGU6CiAgICAgV2ViU3RvcmFnZVRyYWNrZXJDbGllbnQoKTsKKworICAgIC8vIFdlYkNv cmU6OlN0b3JhZ2VUcmFja2VyQ2xpZW50CisgICAgdmlydHVhbCB2b2lkIGRpZEZpbmlzaExvYWRp bmdPcmlnaW5zKCkgT1ZFUlJJREU7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMv U3RvcmFnZS9XZWJTdG9yYWdlVHJhY2tlckNsaWVudC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1N0 b3JhZ2UvV2ViU3RvcmFnZVRyYWNrZXJDbGllbnQubW0KaW5kZXggNjFiMmQxNy4uMjI1N2I1NSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9tYWMvU3RvcmFnZS9XZWJTdG9yYWdlVHJhY2tlckNs aWVudC5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9TdG9yYWdlL1dlYlN0b3JhZ2VUcmFja2Vy Q2xpZW50Lm1tCkBAIC03NiwzICs3Niw3IEBAIHZvaWQgV2ViU3RvcmFnZVRyYWNrZXJDbGllbnQ6 OmRpc3BhdGNoRGlkTW9kaWZ5T3JpZ2luKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpCiAKICAg ICBkaXNwYXRjaERpZE1vZGlmeU9yaWdpbihvcmlnaW4pOwogfQorCit2b2lkIFdlYlN0b3JhZ2VU cmFja2VyQ2xpZW50OjpkaWRGaW5pc2hMb2FkaW5nT3JpZ2lucygpCit7Cit9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5k ZXggMzg2ZjM4NS4uYTNmOGQyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDExLTEx LTI5ICBKZXNzaWUgQmVybGluICA8amJlcmxpbkBhcHBsZS5jb20+CisKKyAgICAgICAgV0tLZXlW YWx1ZVN0b3JhZ2VNYW5hZ2VyR2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyBtYXkgbm90IHJlcG9y dCB0aGUgY29ycmVjdCBsaXN0IG9mIG9yaWdpbnMKKyAgICAgICAgdGhlIGZpcnN0IHRpbWUgaXQg aXMgY2FsbGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9NzMzNzQgKDxyZGFyOi8vcHJvYmxlbS8xMDE5NjA1Nz4pCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUXVldWUgYW55IHJlcXVlc3RzIGZvciB0aGUg b3JpZ2lucyB0aGF0IGhhdmUgTG9jYWwgU3RvcmFnZSB1bnRpbCB0aGUgU3RvcmFnZVRyYWNrZXIg aXMgZG9uZQorICAgICAgICBsb2FkaW5nIHRoZSBsaXN0IG9mIHRob3NlIG9yaWdpbnMgZnJvbSBk aXNrLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9LZXlWYWx1ZVN0b3JhZ2UvV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OmtleVZhbHVlU3RvcmFnZU9yaWdp bklkZW50aWZpZXJzKToKKyAgICAgICAgUmVmYWN0b3JlZCBoZXJlIGZyb20gZ2V0S2V5VmFsdWVT dG9yYWdlT3JpZ2lucyBzbyBpdCBjYW4gYmUgdXNlZCBieSBkaWRGaW5pc2hMb2FkaW5nT3JpZ2lu cy4KKyAgICAgICAgKFdlYktpdDo6ZGlzcGF0Y2hEaWRHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5z KToKKyAgICAgICAgRGl0dG8uCisgICAgICAgIChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1h bmFnZXI6OmdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMpOgorICAgICAgICBJZiB0aGUgU3RvcmFn ZVRyYWNrZXIgaXMgbm90IGRvbmUgbG9hZGluZyB0aGUgbGlzdCBvZiBvcmlnaW5zIGZyb20gZGlz aywgcXVldWUgdXAgdGhlCisgICAgICAgIHJlcXVlc3QgdG8gYmUgaGFuZGxlZCBsYXRlci4KKyAg ICAgICAgKFdlYktpdDo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGlkRmluaXNoTG9hZGlu Z09yaWdpbnMpOgorICAgICAgICBEaXNwYXRjaCB0aGUgcmVzdWx0cyBmb3IgYW55IHJlcXVlc3Rz IHRoYXQgd2VyZSBtYWtlIGJlZm9yZSB0aGUgU3RvcmFnZVRyYWNrZXIgd2FzIGRvbmUKKyAgICAg ICAgbG9hZGluZyB0aGUgbGlzdCBvZiBvcmlnaW5zIGZyb20gZGlzay4KKyAgICAgICAgKFdlYktp dDo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGlzcGF0Y2hEaWRNb2RpZnlPcmlnaW4pOgor ICAgICAgICAqIFdlYlByb2Nlc3MvS2V5VmFsdWVTdG9yYWdlL1dlYktleVZhbHVlU3RvcmFnZU1h bmFnZXIuaDoKKworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHA6CisgICAgICAg IChXZWJLaXQ6OldlYlByb2Nlc3M6OmluaXRpYWxpemVXZWJQcm9jZXNzKToKKyAgICAgICAgU2V0 IHRoZSBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyIGFzIHRoZSBTdG9yYWdlVHJhY2tlckNsaWVu dC4KKwogMjAxMS0xMS0yOSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5j b20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IHRoZSBHVEsrIHBvcnQgYnVpbGQgYWZ0ZXIg cjEwMTMwNy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvS2V5VmFsdWVT dG9yYWdlL1dlYktleVZhbHVlU3RvcmFnZU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9LZXlWYWx1ZVN0b3JhZ2UvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHAKaW5k ZXggM2MyZWQ5NC4uMTEzN2JhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9LZXlWYWx1ZVN0b3JhZ2UvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9LZXlWYWx1ZVN0b3JhZ2UvV2ViS2V5VmFsdWVTdG9yYWdl TWFuYWdlci5jcHAKQEAgLTU0LDMxICs1NCw2NSBAQCB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1h bmFnZXI6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpbwog ICAgIGRpZFJlY2VpdmVXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyTWVzc2FnZShjb25uZWN0aW9u LCBtZXNzYWdlSUQsIGFyZ3VtZW50cyk7CiB9CiAKLXZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFu YWdlcjo6Z2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyh1aW50NjRfdCBjYWxsYmFja0lEKQorc3Rh dGljIHZvaWQga2V5VmFsdWVTdG9yYWdlT3JpZ2luSWRlbnRpZmllcnMoVmVjdG9yPFNlY3VyaXR5 T3JpZ2luRGF0YT4mIGlkZW50aWZpZXJzKQogewotICAgIFdlYlByb2Nlc3M6OkxvY2FsVGVybWlu YXRpb25EaXNhYmxlciB0ZXJtaW5hdGlvbkRpc2FibGVyKFdlYlByb2Nlc3M6OnNoYXJlZCgpKTsK KyAgICBBU1NFUlQoaWRlbnRpZmllcnMuaXNFbXB0eSgpKTsKIAogICAgIFZlY3RvcjxSZWZQdHI8 U2VjdXJpdHlPcmlnaW4+ID4gY29yZU9yaWdpbnM7CiAKICAgICBTdG9yYWdlVHJhY2tlcjo6dHJh Y2tlcigpLm9yaWdpbnMoY29yZU9yaWdpbnMpOwogCiAgICAgc2l6ZV90IHNpemUgPSBjb3JlT3Jp Z2lucy5zaXplKCk7Ci0gICAgVmVjdG9yPFNlY3VyaXR5T3JpZ2luRGF0YT4gaWRlbnRpZmllcnM7 CiAgICAgaWRlbnRpZmllcnMucmVzZXJ2ZUNhcGFjaXR5KHNpemUpOwogCi0gICAgZm9yIChzaXpl X3QgaSA9IDA7IGkgPCBzaXplOyArK2kpIHsgICAgICAgIAorICAgIGZvciAoc2l6ZV90IGkgPSAw OyBpIDwgc2l6ZTsgKytpKSB7CiAgICAgICAgIFNlY3VyaXR5T3JpZ2luRGF0YSBvcmlnaW5EYXRh OwotICAgICAgICAKKwogICAgICAgICBvcmlnaW5EYXRhLnByb3RvY29sID0gY29yZU9yaWdpbnNb aV0tPnByb3RvY29sKCk7CiAgICAgICAgIG9yaWdpbkRhdGEuaG9zdCA9IGNvcmVPcmlnaW5zW2ld LT5ob3N0KCk7CiAgICAgICAgIG9yaWdpbkRhdGEucG9ydCA9IGNvcmVPcmlnaW5zW2ldLT5wb3J0 KCk7CiAKICAgICAgICAgaWRlbnRpZmllcnMudW5jaGVja2VkQXBwZW5kKG9yaWdpbkRhdGEpOwog ICAgIH0KK30KIAorc3RhdGljIHZvaWQgZGlzcGF0Y2hEaWRHZXRLZXlWYWx1ZVN0b3JhZ2VPcmln aW5zKGNvbnN0IFZlY3RvcjxTZWN1cml0eU9yaWdpbkRhdGE+JiBpZGVudGlmaWVycywgdWludDY0 X3QgY2FsbGJhY2tJRCkKK3sKICAgICBXZWJQcm9jZXNzOjpzaGFyZWQoKS5jb25uZWN0aW9uKCkt PnNlbmQoTWVzc2FnZXM6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eTo6RGlkR2V0S2V5 VmFsdWVTdG9yYWdlT3JpZ2lucyhpZGVudGlmaWVycywgY2FsbGJhY2tJRCksIDApOwogfQogCit2 b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMo dWludDY0X3QgY2FsbGJhY2tJRCkKK3sKKyAgICBXZWJQcm9jZXNzOjpMb2NhbFRlcm1pbmF0aW9u RGlzYWJsZXIgdGVybWluYXRpb25EaXNhYmxlcihXZWJQcm9jZXNzOjpzaGFyZWQoKSk7CisKKyAg ICBpZiAoIVN0b3JhZ2VUcmFja2VyOjp0cmFja2VyKCkub3JpZ2luc0xvYWRlZCgpKSB7CisgICAg ICAgIG1fb3JpZ2luc1JlcXVlc3RDYWxsYmFja0lEcy5hcHBlbmQoY2FsbGJhY2tJRCk7CisgICAg ICAgIHJldHVybjsKKyAgICB9CisKKyAgICBWZWN0b3I8U2VjdXJpdHlPcmlnaW5EYXRhPiBpZGVu dGlmaWVyczsKKyAgICBrZXlWYWx1ZVN0b3JhZ2VPcmlnaW5JZGVudGlmaWVycyhpZGVudGlmaWVy cyk7CisgICAgZGlzcGF0Y2hEaWRHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zKGlkZW50aWZpZXJz LCBjYWxsYmFja0lEKTsKK30KKwordm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpkaWRG aW5pc2hMb2FkaW5nT3JpZ2lucygpCit7CisgICAgaWYgKG1fb3JpZ2luc1JlcXVlc3RDYWxsYmFj a0lEcy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKworICAgIFZlY3RvcjxTZWN1cml0eU9y aWdpbkRhdGE+IGlkZW50aWZpZXJzOworICAgIGtleVZhbHVlU3RvcmFnZU9yaWdpbklkZW50aWZp ZXJzKGlkZW50aWZpZXJzKTsKKworICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV9vcmlnaW5z UmVxdWVzdENhbGxiYWNrSURzLnNpemUoKTsgKytpKQorICAgICAgICBkaXNwYXRjaERpZEdldEtl eVZhbHVlU3RvcmFnZU9yaWdpbnMoaWRlbnRpZmllcnMsIG1fb3JpZ2luc1JlcXVlc3RDYWxsYmFj a0lEc1tpXSk7CisKKyAgICBtX29yaWdpbnNSZXF1ZXN0Q2FsbGJhY2tJRHMuY2xlYXIoKTsKK30K Kwordm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpkaXNwYXRjaERpZE1vZGlmeU9yaWdp bihjb25zdCBTdHJpbmcmKQoreworfQorCiB2b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6 OmRlbGV0ZUVudHJpZXNGb3JPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJiBvcmlnaW5E YXRhKQogewogICAgIFdlYlByb2Nlc3M6OkxvY2FsVGVybWluYXRpb25EaXNhYmxlciB0ZXJtaW5h dGlvbkRpc2FibGVyKFdlYlByb2Nlc3M6OnNoYXJlZCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvS2V5VmFsdWVTdG9yYWdlL1dlYktleVZhbHVlU3RvcmFnZU1hbmFn ZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvS2V5VmFsdWVTdG9yYWdlL1dlYktleVZh bHVlU3RvcmFnZU1hbmFnZXIuaAppbmRleCBkODZhOGJlLi5lOGRlMGFkIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0tleVZhbHVlU3RvcmFnZS9XZWJLZXlWYWx1ZVN0b3Jh Z2VNYW5hZ2VyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9LZXlWYWx1ZVN0b3Jh Z2UvV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5oCkBAIC0yNiw2ICsyNiw3IEBACiAjaWZuZGVm IFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXJfaAogI2RlZmluZSBXZWJLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyX2gKIAorI2luY2x1ZGUgPFdlYkNvcmUvU3RvcmFnZVRyYWNrZXJDbGllbnQuaD4KICNp bmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcu aD4KIApAQCAtMzksNyArNDAsNyBAQCBuYW1lc3BhY2UgV2ViS2l0IHsKIAogc3RydWN0IFNlY3Vy aXR5T3JpZ2luRGF0YTsKIAotY2xhc3MgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlciB7CitjbGFz cyBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyIDogcHVibGljIFdlYkNvcmU6OlN0b3JhZ2VUcmFj a2VyQ2xpZW50IHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShXZWJLZXlWYWx1ZVN0b3JhZ2VN YW5hZ2VyKTsKIAogcHVibGljOgpAQCAtNTQsNyArNTUsMTQgQEAgcHJpdmF0ZToKICAgICB2b2lk IGRlbGV0ZUVudHJpZXNGb3JPcmlnaW4oY29uc3QgU2VjdXJpdHlPcmlnaW5EYXRhJik7CiAgICAg dm9pZCBkZWxldGVBbGxFbnRyaWVzKCk7CiAKKyAgICAvLyBXZWJDb3JlOjpTdG9yYWdlVHJhY2tl ckNsaWVudAorICAgIHZpcnR1YWwgdm9pZCBkaXNwYXRjaERpZE1vZGlmeU9yaWdpbihjb25zdCBT dHJpbmcmKSBPVkVSUklERTsKKyAgICB2aXJ0dWFsIHZvaWQgZGlkRmluaXNoTG9hZGluZ09yaWdp bnMoKSBPVkVSUklERTsKKwogICAgIHZvaWQgZGlkUmVjZWl2ZVdlYktleVZhbHVlU3RvcmFnZU1h bmFnZXJNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQsIENv cmVJUEM6OkFyZ3VtZW50RGVjb2RlciopOworCisgICAgVmVjdG9yPHVpbnQ2NF90PiBtX29yaWdp bnNSZXF1ZXN0Q2FsbGJhY2tJRHM7CisgICAgYm9vbCBtX29yaWdpbnNMb2FkZWQ7CiB9OwogCiB9 IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViUHJvY2Vzcy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlByb2Nlc3Mu Y3BwCmluZGV4IGZjMGUzZTIuLmUwMWM2NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQcm9jZXNzLmNwcApAQCAtMjA0LDcgKzIwNCw3IEBAIHZvaWQgV2ViUHJvY2Vzczo6aW5pdGlh bGl6ZVdlYlByb2Nlc3MoY29uc3QgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1l CiAgICAgbV9pY29uRGF0YWJhc2VQcm94eS5zZXRFbmFibGVkKHBhcmFtZXRlcnMuaWNvbkRhdGFi YXNlRW5hYmxlZCk7CiAjZW5kaWYKIAotICAgIFN0b3JhZ2VUcmFja2VyOjppbml0aWFsaXplVHJh Y2tlcihwYXJhbWV0ZXJzLmxvY2FsU3RvcmFnZURpcmVjdG9yeSwgMCk7CisgICAgU3RvcmFnZVRy YWNrZXI6OmluaXRpYWxpemVUcmFja2VyKHBhcmFtZXRlcnMubG9jYWxTdG9yYWdlRGlyZWN0b3J5 LCAmV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6c2hhcmVkKCkpOwogICAgIG1fbG9jYWxTdG9y YWdlRGlyZWN0b3J5ID0gcGFyYW1ldGVycy5sb2NhbFN0b3JhZ2VEaXJlY3Rvcnk7CiAKICAgICBp ZiAoIXBhcmFtZXRlcnMuYXBwbGljYXRpb25DYWNoZURpcmVjdG9yeS5pc0VtcHR5KCkpCg==