141800 2015-02-19 10:55:32 -0800 Remove the stray storage manager from WebProcessPool 2015-02-19 11:48:23 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1070444 0 andersca 2015-02-19 10:55:32 -0800 Remove the stray storage manager from WebProcessPool 1070445 1 246896 andersca 2015-02-19 10:57:43 -0800 Created attachment 246896 Patch 1070465 2 andersca 2015-02-19 11:48:23 -0800 Committed r180354: <http://trac.webkit.org/changeset/180354> 246896 2015-02-19 10:57:43 -0800 2015-02-19 11:34:45 -0800 Patch bug-141800-20150219105735.patch text/plain 11890 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTgwMzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMzZkNTMzOTg5NGFiYzQ0 YTRlY2FjMDExZGNhMGQ5Njk0YjdlMzk4OS4uOTQ0MTU3ZjE1MDI4NzMxMzJhMTU3ZmE3ZWZlN2E4 ZDI3ZGMzMzZiYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQwIEBACiAyMDE1LTAyLTE5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgUmVtb3ZlIHRoZSBz dHJheSBzdG9yYWdlIG1hbmFnZXIgZnJvbSBXZWJQcm9jZXNzUG9vbAorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQxODAwCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXcubW06CisgICAgICAgICgtW1dLVmlldyBkZWFsbG9jXSk6CisgICAgICAgICgtW1dLVmlldyBp bml0V2l0aEZyYW1lOnByb2Nlc3NQb29sOmNvbmZpZ3VyYXRpb246d2ViVmlldzpdKToKKyAgICAg ICAgKC1bV0tWaWV3IF9hcHBsaWNhdGlvbldpbGxUZXJtaW5hdGU6XSk6IERlbGV0ZWQuCisgICAg ICAgIFJlbW92ZSBjb2RlIHRoYXQgY2FsbHMgYXBwbGljYXRpb25XaWxsVGVybWluYXRlIG9uIHRo ZSBXZWJQYWdlUHJveHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViS2V5VmFsdWVTdG9yYWdl TWFuYWdlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6 OmdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMpOgorICAgICAgICAoV2ViS2l0OjpXZWJLZXlWYWx1 ZVN0b3JhZ2VNYW5hZ2VyOjpnZXRTdG9yYWdlRGV0YWlsc0J5T3JpZ2luKToKKyAgICAgICAgKFdl YktpdDo6V2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6ZGVsZXRlRW50cmllc0Zvck9yaWdpbik6 CisgICAgICAgIChXZWJLaXQ6OldlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUFsbEVu dHJpZXMpOgorICAgICAgICBHZXQgdGhlIHN0b3JhZ2UgbWFuYWdlciBmcm9tIHRoZSB3ZWJzaXRl IGRhdGEgc3RvcmUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkpOgorICAgICAgICAoV2Vi S2l0OjpXZWJQYWdlUHJveHk6OmNsb3NlKToKKyAgICAgICAgUmVtb3ZlIHN0b3JhZ2UgbWFuYWdl ciBjYWxscy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpXZWJQcm9jZXNzUG9vbCk6CisgICAgICAgIChX ZWJLaXQ6OldlYlByb2Nlc3NQb29sOjphcHBsaWNhdGlvbldpbGxUZXJtaW5hdGUpOiBEZWxldGVk LgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorICAgICAgICBSZW1vdmUg c3RvcmFnZSBtYW5hZ2VyIGNvZGUuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEv V2Vic2l0ZURhdGFTdG9yZS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJzaXRlRGF0YVN0b3JlOjpz dG9yYWdlTWFuYWdlcik6CisgICAgICAgIEFkZCBnZXR0ZXIuCisKKzIwMTUtMDItMTkgIEFuZGVy cyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBXZWJzaXRlRGF0YVN0 b3JlIHNob3VsZCBlbnN1cmUgdGhhdCBsb2NhbCBzdG9yYWdlIGlzIHdyaXR0ZW4gYmVmb3JlIGV4 aXRpbmcKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0 MTc5OAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1Zp ZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9XS1ZpZXcubW0KaW5kZXgg MmEzMzg0ZTk2YjZjNmY2YmZlMGUzNGZiYzg3YjgxNmNmZDllY2JiYS4uNTMwNjcxY2M2OTgwMmEz NTU4OWM0NmE1MGZiOTgyMGM3OTk2MTllNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9tYWMvV0tWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvbWFjL1dLVmlldy5tbQpAQCAtMzM5LDggKzMzOSw2IEBAIHN0cnVjdCBXS1ZpZXdJbnRlcnBy ZXRLZXlFdmVudHNQYXJhbWV0ZXJzIHsKICAgICBOU05vdGlmaWNhdGlvbkNlbnRlciogd29ya3Nw YWNlTm90aWZpY2F0aW9uQ2VudGVyID0gW1tOU1dvcmtzcGFjZSBzaGFyZWRXb3Jrc3BhY2VdIG5v dGlmaWNhdGlvbkNlbnRlcl07CiAgICAgW3dvcmtzcGFjZU5vdGlmaWNhdGlvbkNlbnRlciByZW1v dmVPYnNlcnZlcjpzZWxmIG5hbWU6TlNXb3Jrc3BhY2VBY3RpdmVTcGFjZURpZENoYW5nZU5vdGlm aWNhdGlvbiBvYmplY3Q6bmlsXTsKIAotICAgIFtbTlNOb3RpZmljYXRpb25DZW50ZXIgZGVmYXVs dENlbnRlcl0gcmVtb3ZlT2JzZXJ2ZXI6c2VsZiBuYW1lOk5TQXBwbGljYXRpb25XaWxsVGVybWlu YXRlTm90aWZpY2F0aW9uIG9iamVjdDpOU0FwcF07Ci0KICAgICBpZiAoY2FuTG9hZExVTm90aWZp Y2F0aW9uUG9wb3ZlcldpbGxDbG9zZSgpKQogICAgICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVy IGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGYgbmFtZTpnZXRMVU5vdGlmaWNhdGlv blBvcG92ZXJXaWxsQ2xvc2UoKSBvYmplY3Q6bmlsXTsKIApAQCAtMjcxNiwxMSArMjcxNCw2IEBA IHN0YXRpYyB2b2lkKiBrZXlWYWx1ZU9ic2VydmluZ0NvbnRleHQgPSAma2V5VmFsdWVPYnNlcnZp bmdDb250ZXh0OwogICAgIF9kYXRhLT5fcGFnZS0+dmlld1N0YXRlRGlkQ2hhbmdlKFZpZXdTdGF0 ZTo6SXNWaXNpYmxlKTsKIH0KIAotLSAodm9pZClfYXBwbGljYXRpb25XaWxsVGVybWluYXRlOihO U05vdGlmaWNhdGlvbiAqKW5vdGlmaWNhdGlvbgotewotICAgIF9kYXRhLT5fcGFnZS0+cHJvY2Vz cygpLnByb2Nlc3NQb29sKCkuYXBwbGljYXRpb25XaWxsVGVybWluYXRlKCk7Ci19Ci0KIC0gKHZv aWQpX2RpY3Rpb25hcnlMb29rdXBQb3BvdmVyV2lsbENsb3NlOihOU05vdGlmaWNhdGlvbiAqKW5v dGlmaWNhdGlvbgogewogICAgIFtzZWxmIF9zZXRUZXh0SW5kaWNhdG9yOm5pbCBmYWRlT3V0Ok5P XTsKQEAgLTM2MjEsOCArMzYxNCw2IEBAIHN0YXRpYyBOU1N0cmluZyAqcGF0aFdpdGhVbmlxdWVG aWxlbmFtZUZvclBhdGgoTlNTdHJpbmcgKnBhdGgpCiAgICAgTlNOb3RpZmljYXRpb25DZW50ZXIq IHdvcmtzcGFjZU5vdGlmaWNhdGlvbkNlbnRlciA9IFtbTlNXb3Jrc3BhY2Ugc2hhcmVkV29ya3Nw YWNlXSBub3RpZmljYXRpb25DZW50ZXJdOwogICAgIFt3b3Jrc3BhY2VOb3RpZmljYXRpb25DZW50 ZXIgYWRkT2JzZXJ2ZXI6c2VsZiBzZWxlY3RvcjpAc2VsZWN0b3IoX2FjdGl2ZVNwYWNlRGlkQ2hh bmdlOikgbmFtZTpOU1dvcmtzcGFjZUFjdGl2ZVNwYWNlRGlkQ2hhbmdlTm90aWZpY2F0aW9uIG9i amVjdDpuaWxdOwogCi0gICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBh ZGRPYnNlcnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfYXBwbGljYXRpb25XaWxsVGVybWlu YXRlOikgbmFtZTpOU0FwcGxpY2F0aW9uV2lsbFRlcm1pbmF0ZU5vdGlmaWNhdGlvbiBvYmplY3Q6 TlNBcHBdOwotCiAgICAgaWYgKGNhbkxvYWRMVU5vdGlmaWNhdGlvblBvcG92ZXJXaWxsQ2xvc2Uo KSkKICAgICAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSBhZGRPYnNl cnZlcjpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfZGljdGlvbmFyeUxvb2t1cFBvcG92ZXJXaWxs Q2xvc2U6KSBuYW1lOmdldExVTm90aWZpY2F0aW9uUG9wb3ZlcldpbGxDbG9zZSgpIG9iamVjdDpu aWxdOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlci5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViS2V5VmFsdWVT dG9yYWdlTWFuYWdlci5jcHAKaW5kZXggNmQ2MjA0MGQ2MTY2MDQ2ZmE2NGE3MTQzNWVmNWFhODAw ZDM4NGYxMS4uMzE2MzBjMjI1MWFhN2M3OTQ5OWVlMjEyMjdlZDk4ZWU3ZDEwMGFjMyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYktleVZhbHVlU3RvcmFnZU1hbmFnZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJLZXlWYWx1ZVN0b3JhZ2VNYW5h Z2VyLmNwcApAQCAtMzAsNyArMzAsOSBAQAogI2luY2x1ZGUgIkFQSVNlY3VyaXR5T3JpZ2luLmgi CiAjaW5jbHVkZSAiTG9jYWxTdG9yYWdlRGV0YWlscy5oIgogI2luY2x1ZGUgIlNlY3VyaXR5T3Jp Z2luRGF0YS5oIgorI2luY2x1ZGUgIlN0b3JhZ2VNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiV2ViUHJv Y2Vzc1Bvb2wuaCIKKyNpbmNsdWRlICJXZWJzaXRlRGF0YVN0b3JlLmgiCiAjaW5jbHVkZSA8d3Rm L05ldmVyRGVzdHJveWVkLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwpAQCAtODgsNyAr OTAsMTUgQEAgdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpkZXJlZldlYkNvbnRleHRT dXBwbGVtZW50KCkKIAogdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpnZXRLZXlWYWx1 ZVN0b3JhZ2VPcmlnaW5zKHN0ZDo6ZnVuY3Rpb248dm9pZCAoQVBJOjpBcnJheSosIENhbGxiYWNr QmFzZTo6RXJyb3IpPiBjYWxsYmFja0Z1bmN0aW9uKQogewotICAgIHByb2Nlc3NQb29sKCktPnN0 b3JhZ2VNYW5hZ2VyKCkuZ2V0T3JpZ2lucyhbY2FsbGJhY2tGdW5jdGlvbl0oVmVjdG9yPFJlZlB0 cjxTZWN1cml0eU9yaWdpbj4+IHNlY3VyaXR5T3JpZ2lucykgeworICAgIFN0b3JhZ2VNYW5hZ2Vy KiBzdG9yYWdlTWFuYWdlciA9IHByb2Nlc3NQb29sKCktPndlYnNpdGVEYXRhU3RvcmUoKS5zdG9y YWdlTWFuYWdlcigpOworICAgIGlmICghc3RvcmFnZU1hbmFnZXIpIHsKKyAgICAgICAgUnVuTG9v cDo6bWFpbigpLmRpc3BhdGNoKFtjYWxsYmFja0Z1bmN0aW9uXSB7CisgICAgICAgICAgICBjYWxs YmFja0Z1bmN0aW9uKEFQSTo6QXJyYXk6OmNyZWF0ZSgpLmdldCgpLCBDYWxsYmFja0Jhc2U6OkVy cm9yOjpOb25lKTsKKyAgICAgICAgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBz dG9yYWdlTWFuYWdlci0+Z2V0T3JpZ2lucyhbY2FsbGJhY2tGdW5jdGlvbl0oVmVjdG9yPFJlZlB0 cjxTZWN1cml0eU9yaWdpbj4+IHNlY3VyaXR5T3JpZ2lucykgewogICAgICAgICBWZWN0b3I8UmVm UHRyPEFQSTo6T2JqZWN0Pj4gd2ViU2VjdXJpdHlPcmlnaW5zOwogICAgICAgICB3ZWJTZWN1cml0 eU9yaWdpbnMucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShzZWN1cml0eU9yaWdpbnMuc2l6ZSgpKTsK ICAgICAgICAgZm9yIChhdXRvJiBvcmlnaW4gOiBzZWN1cml0eU9yaWdpbnMpCkBAIC0xMDAsNyAr MTEwLDE1IEBAIHZvaWQgV2ViS2V5VmFsdWVTdG9yYWdlTWFuYWdlcjo6Z2V0S2V5VmFsdWVTdG9y YWdlT3JpZ2lucyhzdGQ6OmZ1bmN0aW9uPHZvaWQgKEFQCiAKIHZvaWQgV2ViS2V5VmFsdWVTdG9y YWdlTWFuYWdlcjo6Z2V0U3RvcmFnZURldGFpbHNCeU9yaWdpbihzdGQ6OmZ1bmN0aW9uPHZvaWQg KEFQSTo6QXJyYXkqLCBDYWxsYmFja0Jhc2U6OkVycm9yKT4gY2FsbGJhY2tGdW5jdGlvbikKIHsK LSAgICBwcm9jZXNzUG9vbCgpLT5zdG9yYWdlTWFuYWdlcigpLmdldFN0b3JhZ2VEZXRhaWxzQnlP cmlnaW4oW2NhbGxiYWNrRnVuY3Rpb25dKFZlY3RvcjxMb2NhbFN0b3JhZ2VEZXRhaWxzPiBzdG9y YWdlRGV0YWlscykgeworICAgIFN0b3JhZ2VNYW5hZ2VyKiBzdG9yYWdlTWFuYWdlciA9IHByb2Nl c3NQb29sKCktPndlYnNpdGVEYXRhU3RvcmUoKS5zdG9yYWdlTWFuYWdlcigpOworICAgIGlmICgh c3RvcmFnZU1hbmFnZXIpIHsKKyAgICAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtjYWxs YmFja0Z1bmN0aW9uXSB7CisgICAgICAgICAgICBjYWxsYmFja0Z1bmN0aW9uKEFQSTo6QXJyYXk6 OmNyZWF0ZSgpLmdldCgpLCBDYWxsYmFja0Jhc2U6OkVycm9yOjpOb25lKTsKKyAgICAgICAgfSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBzdG9yYWdlTWFuYWdlci0+Z2V0U3RvcmFn ZURldGFpbHNCeU9yaWdpbihbY2FsbGJhY2tGdW5jdGlvbl0oVmVjdG9yPExvY2FsU3RvcmFnZURl dGFpbHM+IHN0b3JhZ2VEZXRhaWxzKSB7CiAgICAgICAgIEhhc2hNYXA8U3RyaW5nLCBSZWZQdHI8 QVBJOjpPYmplY3Q+PiBkZXRhaWxzTWFwOwogICAgICAgICBWZWN0b3I8UmVmUHRyPEFQSTo6T2Jq ZWN0Pj4gcmVzdWx0OwogICAgICAgICByZXN1bHQucmVzZXJ2ZUluaXRpYWxDYXBhY2l0eShzdG9y YWdlRGV0YWlscy5zaXplKCkpOwpAQCAtMTI1LDEyICsxNDMsMjAgQEAgdm9pZCBXZWJLZXlWYWx1 ZVN0b3JhZ2VNYW5hZ2VyOjpnZXRTdG9yYWdlRGV0YWlsc0J5T3JpZ2luKHN0ZDo6ZnVuY3Rpb248 dm9pZCAoQVAKIAogdm9pZCBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyOjpkZWxldGVFbnRyaWVz Rm9yT3JpZ2luKEFQSTo6U2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKIHsKLSAgICBwcm9jZXNzUG9v bCgpLT5zdG9yYWdlTWFuYWdlcigpLmRlbGV0ZUVudHJpZXNGb3JPcmlnaW4ob3JpZ2luLT5zZWN1 cml0eU9yaWdpbigpKTsKKyAgICBTdG9yYWdlTWFuYWdlciogc3RvcmFnZU1hbmFnZXIgPSBwcm9j ZXNzUG9vbCgpLT53ZWJzaXRlRGF0YVN0b3JlKCkuc3RvcmFnZU1hbmFnZXIoKTsKKyAgICBpZiAo IXN0b3JhZ2VNYW5hZ2VyKQorICAgICAgICByZXR1cm47CisKKyAgICBzdG9yYWdlTWFuYWdlci0+ ZGVsZXRlRW50cmllc0Zvck9yaWdpbihvcmlnaW4tPnNlY3VyaXR5T3JpZ2luKCkpOwogfQogCiB2 b2lkIFdlYktleVZhbHVlU3RvcmFnZU1hbmFnZXI6OmRlbGV0ZUFsbEVudHJpZXMoKQogewotICAg IHByb2Nlc3NQb29sKCktPnN0b3JhZ2VNYW5hZ2VyKCkuZGVsZXRlQWxsRW50cmllcygpOworICAg IFN0b3JhZ2VNYW5hZ2VyKiBzdG9yYWdlTWFuYWdlciA9IHByb2Nlc3NQb29sKCktPndlYnNpdGVE YXRhU3RvcmUoKS5zdG9yYWdlTWFuYWdlcigpOworICAgIGlmICghc3RvcmFnZU1hbmFnZXIpCisg ICAgICAgIHJldHVybjsKKworICAgIHN0b3JhZ2VNYW5hZ2VyLT5kZWxldGVBbGxFbnRyaWVzKCk7 CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcAppbmRleCAwN2RhZDYwZWRmMmQ4M2ZkN2NjZDVjYzJhOTAzZjJkYmMxOWYx NTJhLi4xZmFkYzFhMTRlNjE3NWJlODEyYWM4ZTMxODZmZDQxMjZiNGQ1Nzg1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtNDAyLDE1ICs0MDIsMTIgQEAg V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHkoUGFnZUNsaWVudCYgcGFnZUNsaWVudCwgV2ViUHJv Y2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW4KICAgICAsIG1fdmlld1N0YXRlQ2hhbmdlV2FudHNTeW5j aHJvbm91c1JlcGx5KGZhbHNlKQogICAgICwgbV9pc1BsYXlpbmdBdWRpbyhmYWxzZSkKIHsKLSAg ICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuc3RvcmFnZU1hbmFnZXIoKS5jcmVhdGVTZXNzaW9u U3RvcmFnZU5hbWVzcGFjZShtX3BhZ2VJRCwgc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46 Om1heCgpKTsKLQogICAgIG1fd2ViUHJvY2Vzc0xpZmV0aW1lVHJhY2tlci5hZGRPYnNlcnZlciht X3Zpc2l0ZWRMaW5rUHJvdmlkZXIpOwogICAgIG1fd2ViUHJvY2Vzc0xpZmV0aW1lVHJhY2tlci5h ZGRPYnNlcnZlcihtX3dlYnNpdGVEYXRhU3RvcmUpOwogCiAgICAgaWYgKG1fcHJvY2Vzcy0+c3Rh dGUoKSA9PSBXZWJQcm9jZXNzUHJveHk6OlN0YXRlOjpSdW5uaW5nKSB7CiAgICAgICAgIGlmICht X3VzZXJDb250ZW50Q29udHJvbGxlcikKICAgICAgICAgICAgIG1fcHJvY2Vzcy0+YWRkV2ViVXNl ckNvbnRlbnRDb250cm9sbGVyUHJveHkoKm1fdXNlckNvbnRlbnRDb250cm9sbGVyKTsKLSAgICAg ICAgbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLnN0b3JhZ2VNYW5hZ2VyKCkuc2V0QWxsb3dlZFNl c3Npb25TdG9yYWdlTmFtZXNwYWNlQ29ubmVjdGlvbihtX3BhZ2VJRCwgbV9wcm9jZXNzLT5jb25u ZWN0aW9uKCkpOwogICAgICAgICBtX3Byb2Nlc3MtPmFkZFZpc2l0ZWRMaW5rUHJvdmlkZXIobV92 aXNpdGVkTGlua1Byb3ZpZGVyKTsKICAgICB9CiAKQEAgLTc3Miw3ICs3NjksNiBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6Y2xvc2UoKQogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6Q2xvc2UoKSwgbV9wYWdlSUQpOwogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlV2ViUGFnZShtX3Bh Z2VJRCk7CiAgICAgbV9wcm9jZXNzLT5yZW1vdmVNZXNzYWdlUmVjZWl2ZXIoTWVzc2FnZXM6Oldl YlBhZ2VQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCBtX3BhZ2VJRCk7Ci0gICAgbV9wcm9j ZXNzLT5wcm9jZXNzUG9vbCgpLnN0b3JhZ2VNYW5hZ2VyKCkuZGVzdHJveVNlc3Npb25TdG9yYWdl TmFtZXNwYWNlKG1fcGFnZUlEKTsKICAgICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuc3VwcGxl bWVudDxXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHk+KCktPmNsZWFyTm90aWZpY2F0aW9ucyh0 aGlzKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nl c3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAK aW5kZXggMmRjZjllMjk2Y2NlMWI3YTE3ZjZlZDFiYjAyOGZkNGUzMTEyNGUyMy4uMDNlN2EwNjY3 ZmU2M2U4ZGRiYTg3Yzg1NGZhODU4NGIyMzJlM2MwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xNTgsNyArMTU4LDYgQEAgV2ViUHJvY2Vzc1Bv b2w6OldlYlByb2Nlc3NQb29sKEFQSTo6UHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uJiBjb25maWd1 cmF0aW9uKQogICAgICwgbV9tZW1vcnlTYW1wbGVyRW5hYmxlZChmYWxzZSkKICAgICAsIG1fbWVt b3J5U2FtcGxlckludGVydmFsKDE0MDAuMCkKICAgICAsIG1fd2Vic2l0ZURhdGFTdG9yZShXZWJz aXRlRGF0YVN0b3JlOjpjcmVhdGUod2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24obV9jb25m aWd1cmF0aW9uLmdldCgpKSkpCi0gICAgLCBtX3N0b3JhZ2VNYW5hZ2VyKFN0b3JhZ2VNYW5hZ2Vy OjpjcmVhdGUobV9jb25maWd1cmF0aW9uLT5sb2NhbFN0b3JhZ2VEaXJlY3RvcnkoKSkpCiAjaWYg VVNFKFNPVVApCiAgICAgLCBtX2luaXRpYWxIVFRQQ29va2llQWNjZXB0UG9saWN5KEhUVFBDb29r aWVBY2NlcHRQb2xpY3lPbmx5RnJvbU1haW5Eb2N1bWVudERvbWFpbikKICNlbmRpZgpAQCAtNzY3 LDExICs3NjYsNiBAQCBib29sIFdlYlByb2Nlc3NQb29sOjpzaG91bGRUZXJtaW5hdGUoV2ViUHJv Y2Vzc1Byb3h5KiBwcm9jZXNzKQogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lkIFdlYlByb2Nl c3NQb29sOjphcHBsaWNhdGlvbldpbGxUZXJtaW5hdGUoKQotewotICAgIG1fc3RvcmFnZU1hbmFn ZXItPmFwcGxpY2F0aW9uV2lsbFRlcm1pbmF0ZSgpOwotfQotCiB2b2lkIFdlYlByb2Nlc3NQb29s Ojpwcm9jZXNzRGlkRmluaXNoTGF1bmNoaW5nKFdlYlByb2Nlc3NQcm94eSogcHJvY2VzcykKIHsK ICAgICBBU1NFUlQobV9wcm9jZXNzZXMuY29udGFpbnMocHJvY2VzcykpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAppbmRleCAwOTlmYzg5OWU3YzA0N2U3NzZmMzFj YTk5NjJkOTA1ZjBiYTc0YjQwLi4yZjY1NTU5NDhkNDUwZTJmZGQyOGQyYjI0MTQ0Yjg4MDczOTI3 MTNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaApAQCAtMzcs NyArMzcsNiBAQAogI2luY2x1ZGUgIlByb2Nlc3NNb2RlbC5oIgogI2luY2x1ZGUgIlByb2Nlc3NU aHJvdHRsZXIuaCIKICNpbmNsdWRlICJTdGF0aXN0aWNzUmVxdWVzdC5oIgotI2luY2x1ZGUgIlN0 b3JhZ2VNYW5hZ2VyLmgiCiAjaW5jbHVkZSAiVmlzaXRlZExpbmtQcm92aWRlci5oIgogI2luY2x1 ZGUgIldlYkNvbnRleHRDbGllbnQuaCIKICNpbmNsdWRlICJXZWJDb250ZXh0Q29ubmVjdGlvbkNs aWVudC5oIgpAQCAtMTYyLDExICsxNjEsMTAgQEAgcHVibGljOgogCiAgICAgdm9pZCBwcm9jZXNz RGlkRmluaXNoTGF1bmNoaW5nKFdlYlByb2Nlc3NQcm94eSopOwogCi0gICAgdm9pZCBhcHBsaWNh dGlvbldpbGxUZXJtaW5hdGUoKTsKICAgICAvLyBEaXNjb25uZWN0IHRoZSBwcm9jZXNzIGZyb20g dGhlIGNvbnRleHQuCiAgICAgdm9pZCBkaXNjb25uZWN0UHJvY2VzcyhXZWJQcm9jZXNzUHJveHkq KTsKIAotICAgIFN0b3JhZ2VNYW5hZ2VyJiBzdG9yYWdlTWFuYWdlcigpIGNvbnN0IHsgcmV0dXJu ICptX3N0b3JhZ2VNYW5hZ2VyOyB9CisgICAgV2Vic2l0ZURhdGFTdG9yZSYgd2Vic2l0ZURhdGFT dG9yZSgpIGNvbnN0IHsgcmV0dXJuICptX3dlYnNpdGVEYXRhU3RvcmU7IH0KIAogICAgIFBhc3NS ZWZQdHI8V2ViUGFnZVByb3h5PiBjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQmLCBXZWJQYWdlQ29u ZmlndXJhdGlvbik7CiAKQEAgLTQ4Miw3ICs0ODAsNiBAQCBwcml2YXRlOgogI2VuZGlmCiAKICAg ICBSZWZQdHI8V2Vic2l0ZURhdGFTdG9yZT4gbV93ZWJzaXRlRGF0YVN0b3JlOwotICAgIFJlZlB0 cjxTdG9yYWdlTWFuYWdlcj4gbV9zdG9yYWdlTWFuYWdlcjsKIAogICAgIHR5cGVkZWYgSGFzaE1h cDxjb25zdCBjaGFyKiwgUmVmUHRyPFdlYkNvbnRleHRTdXBwbGVtZW50PiwgUHRySGFzaDxjb25z dCBjaGFyKj4+IFdlYkNvbnRleHRTdXBwbGVtZW50TWFwOwogICAgIFdlYkNvbnRleHRTdXBwbGVt ZW50TWFwIG1fc3VwcGxlbWVudHM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAppbmRleCAwNjI5MDM4YmI3NTNkZDU5 NDE2ZTVlZDlkZTllZWJlZGUwYzZiOWY1Li42M2EwNmU4NzI4MTUzOTQ3ZjEyZmJkN2Q5NGZjNDMz OThlNWFkMzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2Vic2l0ZURh dGEvV2Vic2l0ZURhdGFTdG9yZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJz aXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTU4LDYgKzU4LDggQEAgcHVibGljOgogCiAg ICAgdm9pZCByZW1vdmVEYXRhKFdlYnNpdGVEYXRhVHlwZXMsIHN0ZDo6Y2hyb25vOjpzeXN0ZW1f Y2xvY2s6OnRpbWVfcG9pbnQgbW9kaWZpZWRTaW5jZSwgc3RkOjpmdW5jdGlvbjx2b2lkICgpPiBj b21wbGV0aW9uSGFuZGxlcik7CiAKKyAgICBTdG9yYWdlTWFuYWdlciogc3RvcmFnZU1hbmFnZXIo KSB7IHJldHVybiBtX3N0b3JhZ2VNYW5hZ2VyLmdldCgpOyB9CisKIHByaXZhdGU6CiAgICAgZXhw bGljaXQgV2Vic2l0ZURhdGFTdG9yZShXZWJDb3JlOjpTZXNzaW9uSUQpOwogICAgIGV4cGxpY2l0 IFdlYnNpdGVEYXRhU3RvcmUoQ29uZmlndXJhdGlvbik7Cg==