115373 2013-04-29 13:52:07 -0700 Begin cleaning up StorageTracker 2013-04-29 14:06:45 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 882748 0 andersca 2013-04-29 13:52:07 -0700 Begin cleaning up StorageTracker 882753 1 200044 andersca 2013-04-29 13:56:20 -0700 Created attachment 200044 Patch 882757 2 andersca 2013-04-29 14:06:45 -0700 Committed r149314: <http://trac.webkit.org/changeset/149314> 200044 2013-04-29 13:56:20 -0700 2013-04-29 14:03:11 -0700 Patch bug-115373-20130429135536.patch text/plain 15721 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5MzExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2IzMjllNjAxYzlhZDNh MTE0YWViODY2NTNmYWY1NWFiYTQ0NWRhMS4uMzc3NWQ2NDZjMjkzMjJlZjUyYzU0YjM5OWQ5MWU1 ODdhNmNkY2JiNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDEzLTA0LTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQmVnaW4gY2xlYW5p bmcgdXAgU3RvcmFnZVRyYWNrZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTExNTM3MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFJlbmFtZSBNdXRleGVzIHRvIHVzZSAiTXV0ZXgiIGFuZCBub3QgIkd1YXJk Ii4KKyAgICAgICAgRG9uJ3QgdXNlIHN0YXRpYyBsb2NhbHMgZm9yICIubG9jYWxzdG9yYWdlIiBh bmQgIioubG9jYWxzdG9yYWdlIiBzdHJpbmdzLgorICAgICAgICBQdXQgZW5kIGl0ZXJhdG9yIGRl Y2xhcmF0aW9ucyB0b2dldGhlciB3aXRoIGJlZ2luIGRlY2xhcmF0aW9ucy4KKworICAgICAgICAq IHN0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZVRy YWNrZXI6OnNldERhdGFiYXNlRGlyZWN0b3J5UGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpTdG9y YWdlVHJhY2tlcjo6dHJhY2tlckRhdGFiYXNlUGF0aCk6CisgICAgICAgIChXZWJDb3JlOjpTdG9y YWdlVHJhY2tlcjo6b3BlblRyYWNrZXJEYXRhYmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpTdG9y YWdlVHJhY2tlcjo6ZmluaXNoZWRJbXBvcnRpbmdPcmlnaW5JZGVudGlmaWVycyk6CisgICAgICAg IChXZWJDb3JlOjpTdG9yYWdlVHJhY2tlcjo6c3luY0ltcG9ydE9yaWdpbklkZW50aWZpZXJzKToK KyAgICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VUcmFja2VyOjpzeW5jRmlsZVN5c3RlbUFuZFRyYWNr ZXJEYXRhYmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlVHJhY2tlcjo6c2V0T3JpZ2lu RGV0YWlscyk6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdlVHJhY2tlcjo6c3luY1NldE9yaWdp bkRldGFpbHMpOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZVRyYWNrZXI6Om9yaWdpbnMpOgor ICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZVRyYWNrZXI6OmRlbGV0ZUFsbE9yaWdpbnMpOgorICAg ICAgICAoV2ViQ29yZTo6U3RvcmFnZVRyYWNrZXI6OnN5bmNEZWxldGVBbGxPcmlnaW5zKToKKyAg ICAgICAgKFdlYkNvcmU6OlN0b3JhZ2VUcmFja2VyOjpkZWxldGVPcmlnaW4pOgorICAgICAgICAo V2ViQ29yZTo6U3RvcmFnZVRyYWNrZXI6OnN5bmNEZWxldGVPcmlnaW4pOgorICAgICAgICAoV2Vi Q29yZTo6U3RvcmFnZVRyYWNrZXI6OndpbGxEZWxldGVBbGxPcmlnaW5zKToKKyAgICAgICAgKFdl YkNvcmU6OlN0b3JhZ2VUcmFja2VyOjp3aWxsRGVsZXRlT3JpZ2luKToKKyAgICAgICAgKFdlYkNv cmU6OlN0b3JhZ2VUcmFja2VyOjpjYW5EZWxldGVPcmlnaW4pOgorICAgICAgICAoV2ViQ29yZTo6 U3RvcmFnZVRyYWNrZXI6OmNhbmNlbERlbGV0aW5nT3JpZ2luKToKKyAgICAgICAgKFdlYkNvcmU6 OlN0b3JhZ2VUcmFja2VyOjpzZXRDbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6U3RvcmFnZVRy YWNrZXI6OmRhdGFiYXNlUGF0aEZvck9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpTdG9yYWdl VHJhY2tlcjo6ZGlza1VzYWdlRm9yT3JpZ2luKToKKyAgICAgICAgKiBzdG9yYWdlL1N0b3JhZ2VU cmFja2VyLmg6CisgICAgICAgIChTdG9yYWdlVHJhY2tlcik6CisKKzIwMTMtMDQtMjkgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgdGhlIGxh c3QgU3RvcmFnZVN5bmNNYW5hZ2VyIGZ1bmN0aW9uCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTUzNzEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvc3RvcmFnZS9TdG9yYWdlVHJhY2tlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0 b3JhZ2VUcmFja2VyLmNwcAppbmRleCA3YmY5OTA0NDhhZjhhM2VmZjljYTVlMzE5MDYwZGM0Yjhm MWQ5MDAxLi43Yzc3MDk2YTgxZjRmMjUxOTU1ZDNhNzk0OThmMTdkZTg3OGFmYmMzIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmNwcApAQCAtMTAxLDcgKzEwMSw3IEBA IFN0b3JhZ2VUcmFja2VyOjpTdG9yYWdlVHJhY2tlcihjb25zdCBTdHJpbmcmIHN0b3JhZ2VQYXRo KQogCiB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzZXREYXRhYmFzZURpcmVjdG9yeVBhdGgoY29uc3Qg U3RyaW5nJiBwYXRoKQogewotICAgIE11dGV4TG9ja2VyIGxvY2tTdG9yYWdlKG1fZGF0YWJhc2VH dWFyZCk7CisgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fZGF0YWJhc2VNdXRleCk7CiAKICAgICBp ZiAobV9kYXRhYmFzZS5pc09wZW4oKSkKICAgICAgICAgbV9kYXRhYmFzZS5jbG9zZSgpOwpAQCAt MTA5LDcgKzEwOSw3IEBAIHZvaWQgU3RvcmFnZVRyYWNrZXI6OnNldERhdGFiYXNlRGlyZWN0b3J5 UGF0aChjb25zdCBTdHJpbmcmIHBhdGgpCiAgICAgbV9zdG9yYWdlRGlyZWN0b3J5UGF0aCA9IHBh dGguaXNvbGF0ZWRDb3B5KCk7CiAKICAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tPcmln aW5zKG1fb3JpZ2luU2V0R3VhcmQpOworICAgICAgICBNdXRleExvY2tlciBsb2NrZXIobV9vcmln aW5TZXRNdXRleCk7CiAgICAgICAgIG1fb3JpZ2luU2V0LmNsZWFyKCk7CiAgICAgfQogCkBAIC0x MjYsNyArMTI2LDcgQEAgU3RyaW5nIFN0b3JhZ2VUcmFja2VyOjpkYXRhYmFzZURpcmVjdG9yeVBh dGgoKSBjb25zdAogCiBTdHJpbmcgU3RvcmFnZVRyYWNrZXI6OnRyYWNrZXJEYXRhYmFzZVBhdGgo KQogewotICAgIEFTU0VSVCghbV9kYXRhYmFzZUd1YXJkLnRyeUxvY2soKSk7CisgICAgQVNTRVJU KCFtX2RhdGFiYXNlTXV0ZXgudHJ5TG9jaygpKTsKICAgICByZXR1cm4gU1FMaXRlRmlsZVN5c3Rl bTo6YXBwZW5kRGF0YWJhc2VGaWxlTmFtZVRvUGF0aChtX3N0b3JhZ2VEaXJlY3RvcnlQYXRoLCAi U3RvcmFnZVRyYWNrZXIuZGIiKTsKIH0KIApAQCAtMTM0LDcgKzEzNCw3IEBAIHZvaWQgU3RvcmFn ZVRyYWNrZXI6Om9wZW5UcmFja2VyRGF0YWJhc2UoYm9vbCBjcmVhdGVJZkRvZXNOb3RFeGlzdCkK IHsKICAgICBBU1NFUlQobV9pc0FjdGl2ZSk7CiAgICAgQVNTRVJUKCFpc01haW5UaHJlYWQoKSk7 Ci0gICAgQVNTRVJUKCFtX2RhdGFiYXNlR3VhcmQudHJ5TG9jaygpKTsKKyAgICBBU1NFUlQoIW1f ZGF0YWJhc2VNdXRleC50cnlMb2NrKCkpOwogCiAgICAgaWYgKG1fZGF0YWJhc2UuaXNPcGVuKCkp CiAgICAgICAgIHJldHVybjsKQEAgLTE3OSw3ICsxNzksNyBAQCB2b2lkIFN0b3JhZ2VUcmFja2Vy Ojpub3RpZnlGaW5pc2hlZEltcG9ydGluZ09yaWdpbklkZW50aWZpZXJzT25NYWluVGhyZWFkKHZv aWQqKQogdm9pZCBTdG9yYWdlVHJhY2tlcjo6ZmluaXNoZWRJbXBvcnRpbmdPcmlnaW5JZGVudGlm aWVycygpCiB7CiAgICAgbV9maW5pc2hlZEltcG9ydGluZ09yaWdpbklkZW50aWZpZXJzID0gdHJ1 ZTsKLSAgICBNdXRleExvY2tlciBsb2NrQ2xpZW50KG1fY2xpZW50R3VhcmQpOworICAgIE11dGV4 TG9ja2VyIGxvY2tlcihtX2RhdGFiYXNlTXV0ZXgpOwogICAgIGlmIChtX2NsaWVudCkKICAgICAg ICAgbV9jbGllbnQtPmRpZEZpbmlzaExvYWRpbmdPcmlnaW5zKCk7CiB9CkBAIC0xOTEsNyArMTkx LDcgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6c3luY0ltcG9ydE9yaWdpbklkZW50aWZpZXJzKCkK ICAgICBBU1NFUlQoIWlzTWFpblRocmVhZCgpKTsKIAogICAgIHsKLSAgICAgICAgTXV0ZXhMb2Nr ZXIgbG9ja0RhdGFiYXNlKG1fZGF0YWJhc2VHdWFyZCk7CisgICAgICAgIE11dGV4TG9ja2VyIGxv Y2tlcihtX2RhdGFiYXNlTXV0ZXgpOwogCiAgICAgICAgIC8vIERvbid0IGZvcmNlIGNyZWF0aW9u IG9mIFN0b3JhZ2VUcmFja2VyJ3MgZGIganVzdCBiZWNhdXNlIGEgdHJhY2tlcgogICAgICAgICAv LyB3YXMgaW5pdGlhbGl6ZWQuIEl0IHdpbGwgYmUgY3JlYXRlZCBpZiBsb2NhbCBzdG9yYWdlIGRi cyBhcmUgZm91bmQKQEAgLTIwOSw3ICsyMDksNyBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5j SW1wb3J0T3JpZ2luSWRlbnRpZmllcnMoKQogICAgICAgICAgICAgaW50IHJlc3VsdDsKICAgICAg ICAgICAgIAogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tP cmlnaW5zKG1fb3JpZ2luU2V0R3VhcmQpOworICAgICAgICAgICAgICAgIE11dGV4TG9ja2VyIGxv Y2tPcmlnaW5zKG1fb3JpZ2luU2V0TXV0ZXgpOwogICAgICAgICAgICAgICAgIHdoaWxlICgocmVz dWx0ID0gc3RhdGVtZW50LnN0ZXAoKSkgPT0gU1FMUmVzdWx0Um93KQogICAgICAgICAgICAgICAg ICAgICBtX29yaWdpblNldC5hZGQoc3RhdGVtZW50LmdldENvbHVtblRleHQoMCkuaXNvbGF0ZWRD b3B5KCkpOwogICAgICAgICAgICAgfQpAQCAtMjI0LDkgKzIyNCwxMCBAQCB2b2lkIFN0b3JhZ2VU cmFja2VyOjpzeW5jSW1wb3J0T3JpZ2luSWRlbnRpZmllcnMoKQogICAgIHN5bmNGaWxlU3lzdGVt QW5kVHJhY2tlckRhdGFiYXNlKCk7CiAgICAgCiAgICAgewotICAgICAgICBNdXRleExvY2tlciBs b2NrQ2xpZW50KG1fY2xpZW50R3VhcmQpOworICAgICAgICBNdXRleExvY2tlciBsb2NrZXIobV9j bGllbnRNdXRleCk7CisKICAgICAgICAgaWYgKG1fY2xpZW50KSB7Ci0gICAgICAgICAgICBNdXRl eExvY2tlciBsb2NrT3JpZ2lucyhtX29yaWdpblNldEd1YXJkKTsKKyAgICAgICAgICAgIE11dGV4 TG9ja2VyIGxvY2tlcihtX29yaWdpblNldE11dGV4KTsKICAgICAgICAgICAgIE9yaWdpblNldDo6 Y29uc3RfaXRlcmF0b3IgZW5kID0gbV9vcmlnaW5TZXQuZW5kKCk7CiAgICAgICAgICAgICBmb3Ig KE9yaWdpblNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX29yaWdpblNldC5iZWdpbigpOyBpdCAh PSBlbmQ7ICsraXQpCiAgICAgICAgICAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkTW9kaWZ5 T3JpZ2luKCppdCk7CkBAIC0yNDEsMzYgKzI0MiwzMSBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpz eW5jRmlsZVN5c3RlbUFuZFRyYWNrZXJEYXRhYmFzZSgpCiAgICAgQVNTRVJUKCFpc01haW5UaHJl YWQoKSk7CiAgICAgQVNTRVJUKG1faXNBY3RpdmUpOwogCi0gICAgbV9kYXRhYmFzZUd1YXJkLmxv Y2soKTsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgZmlsZU1hdGNoUGF0 dGVybiwgKEFTQ0lJTGl0ZXJhbCgiKi5sb2NhbHN0b3JhZ2UiKSkpOwotICAgIERFRklORV9TVEFU SUNfTE9DQUwoY29uc3QgU3RyaW5nLCBmaWxlRXh0LCAoQVNDSUlMaXRlcmFsKCIubG9jYWxzdG9y YWdlIikpKTsKLSAgICBzdGF0aWMgY29uc3QgdW5zaWduZWQgZmlsZUV4dExlbmd0aCA9IGZpbGVF eHQubGVuZ3RoKCk7Ci0gICAgbV9kYXRhYmFzZUd1YXJkLnVubG9jaygpOwotCiAgICAgVmVjdG9y PFN0cmluZz4gcGF0aHM7CiAgICAgewotICAgICAgICBNdXRleExvY2tlciBsb2NrKG1fZGF0YWJh c2VHdWFyZCk7Ci0gICAgICAgIHBhdGhzID0gbGlzdERpcmVjdG9yeShtX3N0b3JhZ2VEaXJlY3Rv cnlQYXRoLCBmaWxlTWF0Y2hQYXR0ZXJuKTsKKyAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1f ZGF0YWJhc2VNdXRleCk7CisgICAgICAgIHBhdGhzID0gbGlzdERpcmVjdG9yeShtX3N0b3JhZ2VE aXJlY3RvcnlQYXRoLCAiKi5sb2NhbHN0b3JhZ2UiKTsKICAgICB9CiAKICAgICAvLyBVc2UgYSBj b3B5IG9mIG1fb3JpZ2luU2V0IHRvIGZpbmQgZXhwaXJlZCBlbnRyaWVzIGFuZCB0byBzY2hlZHVs ZSB0aGVpcgogICAgIC8vIGRlbGV0aW9ucyBmcm9tIGRpc2sgYW5kIGZyb20gbV9vcmlnaW5TZXQu CiAgICAgT3JpZ2luU2V0IG9yaWdpblNldENvcHk7CiAgICAgewotICAgICAgICBNdXRleExvY2tl ciBsb2NrKG1fb3JpZ2luU2V0R3VhcmQpOwotICAgICAgICBPcmlnaW5TZXQ6OmNvbnN0X2l0ZXJh dG9yIGVuZCA9IG1fb3JpZ2luU2V0LmVuZCgpOwotICAgICAgICBmb3IgKE9yaWdpblNldDo6Y29u c3RfaXRlcmF0b3IgaXQgPSBtX29yaWdpblNldC5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCisg ICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX29yaWdpblNldE11dGV4KTsKKyAgICAgICAgZm9y IChPcmlnaW5TZXQ6OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9vcmlnaW5TZXQuYmVnaW4oKSwgZW5k ID0gbV9vcmlnaW5TZXQuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKICAgICAgICAgICAgIG9yaWdp blNldENvcHkuYWRkKCgqaXQpLmlzb2xhdGVkQ29weSgpKTsKICAgICB9CiAgICAgCiAgICAgLy8g QWRkIG1pc3NpbmcgU3RvcmFnZVRyYWNrZXIgcmVjb3Jkcy4KICAgICBPcmlnaW5TZXQgZm91bmRP cmlnaW5zOwotICAgIFZlY3RvcjxTdHJpbmc+Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBwYXRocy5l bmQoKTsKLSAgICBmb3IgKFZlY3RvcjxTdHJpbmc+Ojpjb25zdF9pdGVyYXRvciBpdCA9IHBhdGhz LmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkgewotICAgICAgICBTdHJpbmcgcGF0aCA9ICppdDsK LSAgICAgICAgaWYgKHBhdGguZW5kc1dpdGgoZmlsZUV4dCwgdHJ1ZSkgJiYgcGF0aC5sZW5ndGgo KSA+IGZpbGVFeHRMZW5ndGgpIHsKKyAgICBTdHJpbmcgZmlsZUV4dGVuc2lvbiA9IEFTQ0lJTGl0 ZXJhbCgiLmxvY2Fsc3RvcmFnZSIpOworCisgICAgZm9yIChWZWN0b3I8U3RyaW5nPjo6Y29uc3Rf aXRlcmF0b3IgaXQgPSBwYXRocy5iZWdpbigpLCBlbmQgPSBwYXRocy5lbmQoKTsgaXQgIT0gZW5k OyArK2l0KSB7CisgICAgICAgIGNvbnN0IFN0cmluZyYgcGF0aCA9ICppdDsKKworICAgICAgICBp ZiAocGF0aC5sZW5ndGgoKSA+IGZpbGVFeHRlbnNpb24ubGVuZ3RoKCkgJiYgcGF0aC5lbmRzV2l0 aChmaWxlRXh0ZW5zaW9uLCB0cnVlKSkgewogICAgICAgICAgICAgU3RyaW5nIGZpbGUgPSBwYXRo R2V0RmlsZU5hbWUocGF0aCk7Ci0gICAgICAgICAgICBTdHJpbmcgb3JpZ2luSWRlbnRpZmllciA9 IGZpbGUuc3Vic3RyaW5nKDAsIGZpbGUubGVuZ3RoKCkgLSBmaWxlRXh0TGVuZ3RoKTsKKyAgICAg ICAgICAgIFN0cmluZyBvcmlnaW5JZGVudGlmaWVyID0gZmlsZS5zdWJzdHJpbmcoMCwgZmlsZS5s ZW5ndGgoKSAtIGZpbGVFeHRlbnNpb24ubGVuZ3RoKCkpOwogICAgICAgICAgICAgaWYgKCFvcmln aW5TZXRDb3B5LmNvbnRhaW5zKG9yaWdpbklkZW50aWZpZXIpKQogICAgICAgICAgICAgICAgIHN5 bmNTZXRPcmlnaW5EZXRhaWxzKG9yaWdpbklkZW50aWZpZXIsIHBhdGgpOwogCkBAIC0yNzksMTIg KzI3NSwxMyBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5jRmlsZVN5c3RlbUFuZFRyYWNrZXJE YXRhYmFzZSgpCiAgICAgfQogCiAgICAgLy8gRGVsZXRlIHN0YWxlIFN0b3JhZ2VUcmFja2VyIHJl Y29yZHMuCi0gICAgT3JpZ2luU2V0Ojpjb25zdF9pdGVyYXRvciBzZXRFbmQgPSBvcmlnaW5TZXRD b3B5LmVuZCgpOwotICAgIGZvciAoT3JpZ2luU2V0Ojpjb25zdF9pdGVyYXRvciBpdCA9IG9yaWdp blNldENvcHkuYmVnaW4oKTsgaXQgIT0gc2V0RW5kOyArK2l0KSB7Ci0gICAgICAgIGlmICghZm91 bmRPcmlnaW5zLmNvbnRhaW5zKCppdCkpIHsKLSAgICAgICAgICAgIFJlZlB0cjxTdHJpbmdJbXBs PiBvcmlnaW5JZGVudGlmaWVyID0gKCppdCkuaXNvbGF0ZWRDb3B5KCkuaW1wbCgpOwotICAgICAg ICAgICAgY2FsbE9uTWFpblRocmVhZChkZWxldGVPcmlnaW5Pbk1haW5UaHJlYWQsIG9yaWdpbklk ZW50aWZpZXIucmVsZWFzZSgpLmxlYWtSZWYoKSk7Ci0gICAgICAgIH0KKyAgICBmb3IgKE9yaWdp blNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBvcmlnaW5TZXRDb3B5LmJlZ2luKCksIGVuZCA9IG9y aWdpblNldENvcHkuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkgeworICAgICAgICBjb25zdCBTdHJp bmcmIG9yaWdpbklkZW50aWZpZXIgPSAqaXQ7CisgICAgICAgIGlmIChmb3VuZE9yaWdpbnMuY29u dGFpbnMob3JpZ2luSWRlbnRpZmllcikpCisgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAg ICBSZWZQdHI8U3RyaW5nSW1wbD4gb3JpZ2luSWRlbnRpZmllckltcGwgPSBvcmlnaW5JZGVudGlm aWVyLmlzb2xhdGVkQ29weSgpLmltcGwoKTsKKyAgICAgICAgY2FsbE9uTWFpblRocmVhZChkZWxl dGVPcmlnaW5Pbk1haW5UaHJlYWQsIG9yaWdpbklkZW50aWZpZXJJbXBsLnJlbGVhc2UoKS5sZWFr UmVmKCkpOwogICAgIH0KIH0KIApAQCAtMjk0LDcgKzI5MSw3IEBAIHZvaWQgU3RvcmFnZVRyYWNr ZXI6OnNldE9yaWdpbkRldGFpbHMoY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyLCBjb25z dCBTdHJpCiAgICAgICAgIHJldHVybjsKIAogICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9j a09yaWdpbnMobV9vcmlnaW5TZXRHdWFyZCk7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlciht X29yaWdpblNldE11dGV4KTsKIAogICAgICAgICBpZiAobV9vcmlnaW5TZXQuY29udGFpbnMob3Jp Z2luSWRlbnRpZmllcikpCiAgICAgICAgICAgICByZXR1cm47CkBAIC0zMTcsNyArMzE0LDcgQEAg dm9pZCBTdG9yYWdlVHJhY2tlcjo6c3luY1NldE9yaWdpbkRldGFpbHMoY29uc3QgU3RyaW5nJiBv cmlnaW5JZGVudGlmaWVyLCBjb25zdAogewogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwog Ci0gICAgTXV0ZXhMb2NrZXIgbG9ja0RhdGFiYXNlKG1fZGF0YWJhc2VHdWFyZCk7CisgICAgTXV0 ZXhMb2NrZXIgbG9ja2VyKG1fZGF0YWJhc2VNdXRleCk7CiAKICAgICBvcGVuVHJhY2tlckRhdGFi YXNlKHRydWUpOwogICAgIApAQCAtMzM3LDEzICszMzQsMTMgQEAgdm9pZCBTdG9yYWdlVHJhY2tl cjo6c3luY1NldE9yaWdpbkRldGFpbHMoY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyLCBj b25zdAogICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBlc3RhYmxpc2ggb3JpZ2luICclcycg aW4gdGhlIHRyYWNrZXIiLCBvcmlnaW5JZGVudGlmaWVyLmFzY2lpKCkuZGF0YSgpKTsKIAogICAg IHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja09yaWdpbnMobV9vcmlnaW5TZXRHdWFyZCk7Cisg ICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX29yaWdpblNldE11dGV4KTsKICAgICAgICAgaWYg KCFtX29yaWdpblNldC5jb250YWlucyhvcmlnaW5JZGVudGlmaWVyKSkKICAgICAgICAgICAgIG1f b3JpZ2luU2V0LmFkZChvcmlnaW5JZGVudGlmaWVyKTsKICAgICB9CiAKICAgICB7Ci0gICAgICAg IE11dGV4TG9ja2VyIGxvY2tDbGllbnQobV9jbGllbnRHdWFyZCk7CisgICAgICAgIE11dGV4TG9j a2VyIGxvY2tlcihtX2NsaWVudE11dGV4KTsKICAgICAgICAgaWYgKG1fY2xpZW50KQogICAgICAg ICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkTW9kaWZ5T3JpZ2luKG9yaWdpbklkZW50aWZpZXIp OwogICAgIH0KQEAgLTM1NiwxMCArMzUzLDkgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6b3JpZ2lu cyhWZWN0b3I8UmVmUHRyPFNlY3VyaXR5T3JpZ2luPiA+JiByZXN1bHQpCiAgICAgaWYgKCFtX2lz QWN0aXZlKQogICAgICAgICByZXR1cm47CiAKLSAgICBNdXRleExvY2tlciBsb2NrT3JpZ2lucyht X29yaWdpblNldEd1YXJkKTsKKyAgICBNdXRleExvY2tlciBsb2NrZXIobV9vcmlnaW5TZXRNdXRl eCk7CiAKLSAgICBPcmlnaW5TZXQ6OmNvbnN0X2l0ZXJhdG9yIGVuZCA9IG1fb3JpZ2luU2V0LmVu ZCgpOwotICAgIGZvciAoT3JpZ2luU2V0Ojpjb25zdF9pdGVyYXRvciBpdCA9IG1fb3JpZ2luU2V0 LmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkKKyAgICBmb3IgKE9yaWdpblNldDo6Y29uc3RfaXRl cmF0b3IgaXQgPSBtX29yaWdpblNldC5iZWdpbigpLCBlbmQgPSBtX29yaWdpblNldC5lbmQoKTsg aXQgIT0gZW5kOyArK2l0KQogICAgICAgICByZXN1bHQuYXBwZW5kKFNlY3VyaXR5T3JpZ2luOjpj cmVhdGVGcm9tRGF0YWJhc2VJZGVudGlmaWVyKCppdCkpOwogfQogCkBAIC0zNzMsNyArMzY5LDcg QEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6ZGVsZXRlQWxsT3JpZ2lucygpCiAgICAgICAgIHJldHVy bjsKIAogICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja09yaWdpbnMobV9vcmlnaW5TZXRH dWFyZCk7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX29yaWdpblNldE11dGV4KTsKICAg ICAgICAgd2lsbERlbGV0ZUFsbE9yaWdpbnMoKTsKICAgICAgICAgbV9vcmlnaW5TZXQuY2xlYXIo KTsKICAgICB9CkBAIC0zODcsNyArMzgzLDcgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6c3luY0Rl bGV0ZUFsbE9yaWdpbnMoKQogewogICAgIEFTU0VSVCghaXNNYWluVGhyZWFkKCkpOwogICAgIAot ICAgIE11dGV4TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOworICAgIE11dGV4 TG9ja2VyIGxvY2tlcihtX2RhdGFiYXNlTXV0ZXgpOwogICAgIAogICAgIG9wZW5UcmFja2VyRGF0 YWJhc2UoZmFsc2UpOwogICAgIGlmICghbV9kYXRhYmFzZS5pc09wZW4oKSkKQEAgLTQwNyw3ICs0 MDMsNyBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRlQWxsT3JpZ2lucygpCiAgICAg ICAgIFNRTGl0ZUZpbGVTeXN0ZW06OmRlbGV0ZURhdGFiYXNlRmlsZShzdGF0ZW1lbnQuZ2V0Q29s dW1uVGV4dCgxKSk7CiAKICAgICAgICAgewotICAgICAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja0Ns aWVudChtX2NsaWVudEd1YXJkKTsKKyAgICAgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2Ns aWVudE11dGV4KTsKICAgICAgICAgICAgIGlmIChtX2NsaWVudCkKICAgICAgICAgICAgICAgICBt X2NsaWVudC0+ZGlzcGF0Y2hEaWRNb2RpZnlPcmlnaW4oc3RhdGVtZW50LmdldENvbHVtblRleHQo MCkpOwogICAgICAgICB9CkBAIC00NzEsNyArNDY3LDcgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6 ZGVsZXRlT3JpZ2luKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pCiAgICAgU3RyaW5nIG9yaWdpbklk ID0gb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKTsKICAgICAKICAgICB7Ci0gICAgICAgIE11 dGV4TG9ja2VyIGxvY2tPcmlnaW5zKG1fb3JpZ2luU2V0R3VhcmQpOworICAgICAgICBNdXRleExv Y2tlciBsb2NrZXIobV9vcmlnaW5TZXRNdXRleCk7CiAgICAgICAgIHdpbGxEZWxldGVPcmlnaW4o b3JpZ2luSWQpOwogICAgICAgICBtX29yaWdpblNldC5yZW1vdmUob3JpZ2luSWQpOwogICAgIH0K QEAgLTQ4Myw3ICs0NzksNyBAQCB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzeW5jRGVsZXRlT3JpZ2lu KGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikKIHsKICAgICBBU1NFUlQoIWlzTWFpblRo cmVhZCgpKTsKIAotICAgIE11dGV4TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNlR3VhcmQp OworICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2RhdGFiYXNlTXV0ZXgpOwogICAgIAogICAgIGlm ICghY2FuRGVsZXRlT3JpZ2luKG9yaWdpbklkZW50aWZpZXIpKSB7CiAgICAgICAgIExPR19FUlJP UigiQXR0ZW1wdGVkIHRvIGRlbGV0ZSBvcmlnaW4gJyVzJyB3aGlsZSBpdCB3YXMgYmVpbmcgY3Jl YXRlZFxuIiwgb3JpZ2luSWRlbnRpZmllci5hc2NpaSgpLmRhdGEoKSk7CkBAIC01MTYsNyArNTEy LDcgQEAgdm9pZCBTdG9yYWdlVHJhY2tlcjo6c3luY0RlbGV0ZU9yaWdpbihjb25zdCBTdHJpbmcm IG9yaWdpbklkZW50aWZpZXIpCiAgICAgCiAgICAgYm9vbCBzaG91bGREZWxldGVUcmFja2VyRmls ZXMgPSBmYWxzZTsKICAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIG9yaWdpbkxvY2sobV9vcmln aW5TZXRHdWFyZCk7CisgICAgICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX29yaWdpblNldE11dGV4 KTsKICAgICAgICAgbV9vcmlnaW5TZXQucmVtb3ZlKG9yaWdpbklkZW50aWZpZXIpOwogICAgICAg ICBzaG91bGREZWxldGVUcmFja2VyRmlsZXMgPSBtX29yaWdpblNldC5pc0VtcHR5KCk7CiAgICAg fQpAQCAtNTI4LDcgKzUyNCw3IEBAIHZvaWQgU3RvcmFnZVRyYWNrZXI6OnN5bmNEZWxldGVPcmln aW4oY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyKQogICAgIH0KIAogICAgIHsKLSAgICAg ICAgTXV0ZXhMb2NrZXIgbG9ja0NsaWVudChtX2NsaWVudEd1YXJkKTsKKyAgICAgICAgTXV0ZXhM b2NrZXIgbG9ja2VyKG1fY2xpZW50TXV0ZXgpOwogICAgICAgICBpZiAobV9jbGllbnQpCiAgICAg ICAgICAgICBtX2NsaWVudC0+ZGlzcGF0Y2hEaWRNb2RpZnlPcmlnaW4ob3JpZ2luSWRlbnRpZmll cik7CiAgICAgfQpAQCAtNTM2LDcgKzUzMiw3IEBAIHZvaWQgU3RvcmFnZVRyYWNrZXI6OnN5bmNE ZWxldGVPcmlnaW4oY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyKQogICAgIAogdm9pZCBT dG9yYWdlVHJhY2tlcjo6d2lsbERlbGV0ZUFsbE9yaWdpbnMoKQogewotICAgIEFTU0VSVCghbV9v cmlnaW5TZXRHdWFyZC50cnlMb2NrKCkpOworICAgIEFTU0VSVCghbV9vcmlnaW5TZXRNdXRleC50 cnlMb2NrKCkpOwogCiAgICAgT3JpZ2luU2V0Ojpjb25zdF9pdGVyYXRvciBlbmQgPSBtX29yaWdp blNldC5lbmQoKTsKICAgICBmb3IgKE9yaWdpblNldDo6Y29uc3RfaXRlcmF0b3IgaXQgPSBtX29y aWdpblNldC5iZWdpbigpOyBpdCAhPSBlbmQ7ICsraXQpCkBAIC01NDYsMTUgKzU0MiwxNSBAQCB2 b2lkIFN0b3JhZ2VUcmFja2VyOjp3aWxsRGVsZXRlQWxsT3JpZ2lucygpCiB2b2lkIFN0b3JhZ2VU cmFja2VyOjp3aWxsRGVsZXRlT3JpZ2luKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikK IHsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOwotICAgIEFTU0VSVCghbV9vcmlnaW5TZXRH dWFyZC50cnlMb2NrKCkpOworICAgIEFTU0VSVCghbV9vcmlnaW5TZXRNdXRleC50cnlMb2NrKCkp OwogCiAgICAgbV9vcmlnaW5zQmVpbmdEZWxldGVkLmFkZChvcmlnaW5JZGVudGlmaWVyKTsKIH0K ICAgICAKIGJvb2wgU3RvcmFnZVRyYWNrZXI6OmNhbkRlbGV0ZU9yaWdpbihjb25zdCBTdHJpbmcm IG9yaWdpbklkZW50aWZpZXIpCiB7Ci0gICAgQVNTRVJUKCFtX2RhdGFiYXNlR3VhcmQudHJ5TG9j aygpKTsKLSAgICBNdXRleExvY2tlciBsb2NrT3JpZ2lucyhtX29yaWdpblNldEd1YXJkKTsKKyAg ICBBU1NFUlQoIW1fZGF0YWJhc2VNdXRleC50cnlMb2NrKCkpOworICAgIE11dGV4TG9ja2VyIGxv Y2tlcihtX29yaWdpblNldE11dGV4KTsKICAgICByZXR1cm4gbV9vcmlnaW5zQmVpbmdEZWxldGVk LmNvbnRhaW5zKG9yaWdpbklkZW50aWZpZXIpOwogfQogCkBAIC01NjMsMTUgKzU1OSwxNyBAQCB2 b2lkIFN0b3JhZ2VUcmFja2VyOjpjYW5jZWxEZWxldGluZ09yaWdpbihjb25zdCBTdHJpbmcmIG9y aWdpbklkZW50aWZpZXIpCiAgICAgaWYgKCFtX2lzQWN0aXZlKQogICAgICAgICByZXR1cm47CiAK LSAgICBNdXRleExvY2tlciBsb2NrRGF0YWJhc2UobV9kYXRhYmFzZUd1YXJkKTsKLSAgICBNdXRl eExvY2tlciBsb2NrT3JpZ2lucyhtX29yaWdpblNldEd1YXJkKTsKLSAgICBpZiAoIW1fb3JpZ2lu c0JlaW5nRGVsZXRlZC5pc0VtcHR5KCkpCi0gICAgICAgIG1fb3JpZ2luc0JlaW5nRGVsZXRlZC5y ZW1vdmUob3JpZ2luSWRlbnRpZmllcik7CisgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1fZGF0YWJh c2VNdXRleCk7CisgICAgeworICAgICAgICBNdXRleExvY2tlciBsb2NrZXIobV9vcmlnaW5TZXRN dXRleCk7CisgICAgICAgIGlmICghbV9vcmlnaW5zQmVpbmdEZWxldGVkLmlzRW1wdHkoKSkKKyAg ICAgICAgICAgIG1fb3JpZ2luc0JlaW5nRGVsZXRlZC5yZW1vdmUob3JpZ2luSWRlbnRpZmllcik7 CisgICAgfQogfQogCiB2b2lkIFN0b3JhZ2VUcmFja2VyOjpzZXRDbGllbnQoU3RvcmFnZVRyYWNr ZXJDbGllbnQqIGNsaWVudCkKIHsKLSAgICBNdXRleExvY2tlciBsb2NrQ2xpZW50KG1fY2xpZW50 R3VhcmQpOworICAgIE11dGV4TG9ja2VyIGxvY2tlcihtX2NsaWVudE11dGV4KTsKICAgICBtX2Ns aWVudCA9IGNsaWVudDsKIH0KIApAQCAtNTkyLDcgKzU5MCw3IEBAIHZvaWQgU3RvcmFnZVRyYWNr ZXI6OnNldElzQWN0aXZlKGJvb2wgZmxhZykKICAgICAKIFN0cmluZyBTdG9yYWdlVHJhY2tlcjo6 ZGF0YWJhc2VQYXRoRm9yT3JpZ2luKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikKIHsK LSAgICBBU1NFUlQoIW1fZGF0YWJhc2VHdWFyZC50cnlMb2NrKCkpOworICAgIEFTU0VSVCghbV9k YXRhYmFzZU11dGV4LnRyeUxvY2soKSk7CiAgICAgQVNTRVJUKG1faXNBY3RpdmUpOwogICAgIAog ICAgIGlmICghbV9kYXRhYmFzZS5pc09wZW4oKSkKQEAgLTYxNiw3ICs2MTQsNyBAQCBsb25nIGxv bmcgU3RvcmFnZVRyYWNrZXI6OmRpc2tVc2FnZUZvck9yaWdpbihTZWN1cml0eU9yaWdpbiogb3Jp Z2luKQogICAgIGlmICghbV9pc0FjdGl2ZSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBNdXRl eExvY2tlciBsb2NrKG1fZGF0YWJhc2VHdWFyZCk7CisgICAgTXV0ZXhMb2NrZXIgbG9ja2VyKG1f ZGF0YWJhc2VNdXRleCk7CiAKICAgICBTdHJpbmcgcGF0aCA9IGRhdGFiYXNlUGF0aEZvck9yaWdp bihvcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigpKTsKICAgICBpZiAocGF0aC5pc0VtcHR5KCkp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmggYi9T b3VyY2UvV2ViQ29yZS9zdG9yYWdlL1N0b3JhZ2VUcmFja2VyLmgKaW5kZXggNTBhZTMyM2Q2NTli N2U1OWJiMTBkNWQ3OGY1ODI2NGE5ZjQ5NjIxYy4uM2Q3NDEyZGU5YzZhOTliZDRiYzIwZWNjMWI3 OWRhYTZiM2JmN2Q5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3RvcmFnZS9TdG9yYWdl VHJhY2tlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3N0b3JhZ2UvU3RvcmFnZVRyYWNrZXIuaApA QCAtMTAxLDE2ICsxMDEsMTYgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIHNldElzQWN0aXZl KGJvb2wpOwogCi0gICAgLy8gR3VhcmQgZm9yIG1fZGF0YWJhc2UsIG1fc3RvcmFnZURpcmVjdG9y eVBhdGggYW5kIHN0YXRpYyBTdHJpbmdzIGluIHN5bmNGaWxlU3lzdGVtQW5kVHJhY2tlckRhdGFi YXNlKCkuCi0gICAgTXV0ZXggbV9kYXRhYmFzZUd1YXJkOworICAgIC8vIE11dGV4IGZvciBtX2Rh dGFiYXNlIGFuZCBtX3N0b3JhZ2VEaXJlY3RvcnlQYXRoLgorICAgIE11dGV4IG1fZGF0YWJhc2VN dXRleDsKICAgICBTUUxpdGVEYXRhYmFzZSBtX2RhdGFiYXNlOwogICAgIFN0cmluZyBtX3N0b3Jh Z2VEaXJlY3RvcnlQYXRoOwogCi0gICAgTXV0ZXggbV9jbGllbnRHdWFyZDsKKyAgICBNdXRleCBt X2NsaWVudE11dGV4OwogICAgIFN0b3JhZ2VUcmFja2VyQ2xpZW50KiBtX2NsaWVudDsKIAogICAg IC8vIEd1YXJkIGZvciBtX29yaWdpblNldCBhbmQgbV9vcmlnaW5zQmVpbmdEZWxldGVkLgotICAg IE11dGV4IG1fb3JpZ2luU2V0R3VhcmQ7CisgICAgTXV0ZXggbV9vcmlnaW5TZXRNdXRleDsKICAg ICB0eXBlZGVmIEhhc2hTZXQ8U3RyaW5nPiBPcmlnaW5TZXQ7CiAgICAgT3JpZ2luU2V0IG1fb3Jp Z2luU2V0OwogICAgIE9yaWdpblNldCBtX29yaWdpbnNCZWluZ0RlbGV0ZWQ7Cg==