37312 2010-04-09 00:43:39 -0700 REGRESSION(r57286): "Caused intermittent test failures on all Mac bots." (Requested by eseidel on #webkit). 2010-04-09 01:15:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 31482 1 webkit.review.bot webkit-unassigned commit-queue dglazkov dumi eric oldest_to_newest 210616 0 webkit.review.bot 2010-04-09 00:43:39 -0700 http://trac.webkit.org/changeset/57286 broke the build: "Caused intermittent test failures on all Mac bots." (Requested by eseidel on #webkit). This is an automatic bug report generated by the sheriff-bot. If this bug report was created because of a flaky test, please file a bug for the flaky test (if we don't already have one on file) and dup this bug against that bug so that we can track how often these flaky tests case pain. "Only you can prevent forest fires." -- Smokey the Bear 210617 1 52946 webkit.review.bot 2010-04-09 00:43:48 -0700 Created attachment 52946 ROLLOUT of r57286 Any committer can land this patch automatically by marking it commit-queue+. The commit-queue will build and test the patch before landing to ensure that the rollout will be successful. This process takes approximately 15 minutes. If you would like to land the rollout faster, you can use the following command: webkit-patch land-attachment ATTACHMENT_ID --no-build --no-test --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 210626 2 52946 eric 2010-04-09 01:15:32 -0700 Comment on attachment 52946 ROLLOUT of r57286 Clearing flags on attachment: 52946 Committed r57317: <http://trac.webkit.org/changeset/57317> 210627 3 eric 2010-04-09 01:15:41 -0700 All reviewed patches have been landed. Closing bug. 52946 2010-04-09 00:43:48 -0700 2010-04-09 01:15:32 -0700 ROLLOUT of r57286 bug-37312-20100409074346.patch text/plain 20504 webkit.review.bot ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YmQ0MWJjYi4uM2Q4MmRmOSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNyBAQAorMjAxMC0wNC0wOSAgU2hlcmlmZiBCb3Qg IDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9s bGluZyBvdXQgcjU3Mjg2LgorICAgICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNl dC81NzI4NgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MzczMTIKKworICAgICAgICAiQ2F1c2VkIGludGVybWl0dGVudCB0ZXN0IGZhaWx1cmVzIG9uIGFs bCBNYWMgYm90cy4iCisgICAgICAgIChSZXF1ZXN0ZWQgYnkgZXNlaWRlbCBvbiAjd2Via2l0KS4K KworICAgICAgICAqIHN0b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRhdGFiYXNlVHJhY2tlcjo6b3JpZ2luUXVvdGFNYW5hZ2VyTm9Mb2NrKToKKyAgICAgICAg KFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6b3JpZ2luUXVvdGFNYW5hZ2VyKToKKyAgICAgICAg KFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6RGF0YWJhc2VUcmFja2VyKToKKyAgICAgICAgKFdl YkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6Y2FuRXN0YWJsaXNoRGF0YWJhc2UpOgorICAgICAgICAo V2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjpoYXNFbnRyeUZvck9yaWdpbik6CisgICAgICAgIChX ZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmdldE1heFNpemVGb3JEYXRhYmFzZSk6CisgICAgICAg IChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OmZ1bGxQYXRoRm9yRGF0YWJhc2VOb0xvY2spOgor ICAgICAgICAoV2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjpmdWxsUGF0aEZvckRhdGFiYXNlKToK KyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6cG9wdWxhdGVPcmlnaW5zKToKKyAg ICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6b3JpZ2lucyk6CisgICAgICAgIChXZWJD b3JlOjpEYXRhYmFzZVRyYWNrZXI6OmRhdGFiYXNlTmFtZXNGb3JPcmlnaW4pOgorICAgICAgICAo V2ViQ29yZTo6RGF0YWJhc2VUcmFja2VyOjphZGRPcGVuRGF0YWJhc2UpOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YWJhc2VUcmFja2VyOjpyZW1vdmVPcGVuRGF0YWJhc2UpOgorICAgICAgICAoV2Vi Q29yZTo6RGF0YWJhc2VUcmFja2VyOjp1c2FnZUZvck9yaWdpbk5vTG9jayk6CisgICAgICAgIChX ZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6OnVzYWdlRm9yT3JpZ2luKToKKyAgICAgICAgKFdlYkNv cmU6OkRhdGFiYXNlVHJhY2tlcjo6cXVvdGFGb3JPcmlnaW4pOgorICAgICAgICAoV2ViQ29yZTo6 RGF0YWJhc2VUcmFja2VyOjpzZXRRdW90YSk6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRy YWNrZXI6OmRlbGV0ZU9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpEYXRhYmFzZVRyYWNrZXI6 OmRlbGV0ZURhdGFiYXNlKToKKyAgICAgICAgKFdlYkNvcmU6OkRhdGFiYXNlVHJhY2tlcjo6ZGVs ZXRlRGF0YWJhc2VGaWxlKToKKyAgICAgICAgKiBzdG9yYWdlL0RhdGFiYXNlVHJhY2tlci5oOgor ICAgICAgICAqIHN0b3JhZ2UvU1FMVHJhbnNhY3Rpb25DbGllbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U1FMVHJhbnNhY3Rpb25DbGllbnQ6OmRpZEV4ZWN1dGVTdGF0ZW1lbnQpOgorCiAyMDEw LTA0LTA4ICBDaHJpcyBFdmFucyAgPGNldmFuc0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFz ZVRyYWNrZXIuY3BwIGIvV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVHJhY2tlci5jcHAKaW5kZXgg NWEyZmU1Yy4uNDE0NmM0YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVHJh Y2tlci5jcHAKKysrIGIvV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVHJhY2tlci5jcHAKQEAgLTQ5 LDEzICs0OSwyMCBAQAogCiB1c2luZyBuYW1lc3BhY2Ugc3RkOwogCi1zdGF0aWMgV2ViQ29yZTo6 T3JpZ2luUXVvdGFNYW5hZ2VyJiBvcmlnaW5RdW90YU1hbmFnZXIoKQorbmFtZXNwYWNlIFdlYkNv cmUgeworCitPcmlnaW5RdW90YU1hbmFnZXImIERhdGFiYXNlVHJhY2tlcjo6b3JpZ2luUXVvdGFN YW5hZ2VyTm9Mb2NrKCkKIHsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKFdlYkNvcmU6Ok9yaWdp blF1b3RhTWFuYWdlciwgcXVvdGFNYW5hZ2VyLCAoKSk7Ci0gICAgcmV0dXJuIHF1b3RhTWFuYWdl cjsKKyAgICBBU1NFUlQobV9xdW90YU1hbmFnZXIpOworICAgIHJldHVybiAqbV9xdW90YU1hbmFn ZXI7CiB9CiAKLW5hbWVzcGFjZSBXZWJDb3JlIHsKK09yaWdpblF1b3RhTWFuYWdlciYgRGF0YWJh c2VUcmFja2VyOjpvcmlnaW5RdW90YU1hbmFnZXIoKQoreworICAgIE11dGV4TG9ja2VyIGxvY2tE YXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOworICAgIHBvcHVsYXRlT3JpZ2lucygpOworICAgIHJl dHVybiBvcmlnaW5RdW90YU1hbmFnZXJOb0xvY2soKTsKK30KIAogRGF0YWJhc2VUcmFja2VyJiBE YXRhYmFzZVRyYWNrZXI6OnRyYWNrZXIoKQogewpAQCAtNjcsOSArNzQsNiBAQCBEYXRhYmFzZVRy YWNrZXI6OkRhdGFiYXNlVHJhY2tlcigpCiAgICAgOiBtX2NsaWVudCgwKQogewogICAgIFNRTGl0 ZUZpbGVTeXN0ZW06OnJlZ2lzdGVyU1FMaXRlVkZTKCk7Ci0KLSAgICBNdXRleExvY2tlciBsb2Nr RGF0YWJhc2UobV9kYXRhYmFzZUd1YXJkKTsKLSAgICBwb3B1bGF0ZU9yaWdpbnMoKTsKIH0KIAog dm9pZCBEYXRhYmFzZVRyYWNrZXI6OnNldERhdGFiYXNlRGlyZWN0b3J5UGF0aChjb25zdCBTdHJp bmcmIHBhdGgpCkBAIC0xMjgsMTQgKzEzMiwxNiBAQCBib29sIERhdGFiYXNlVHJhY2tlcjo6Y2Fu RXN0YWJsaXNoRGF0YWJhc2UoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCogY29udGV4dCwgY29ucwog ICAgIHVuc2lnbmVkIGxvbmcgbG9uZyByZXF1aXJlbWVudDsKICAgICB1bnNpZ25lZCBsb25nIGxv bmcgdGVtcFVzYWdlOwogICAgIHsKKyAgICAgICAgTG9ja2VyPE9yaWdpblF1b3RhTWFuYWdlcj4g bG9ja2VyKG9yaWdpblF1b3RhTWFuYWdlcigpKTsKICAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja0Rh dGFiYXNlKG1fZGF0YWJhc2VHdWFyZCk7Ci0gICAgICAgIExvY2tlcjxPcmlnaW5RdW90YU1hbmFn ZXI+IHF1b3RhTWFuYWdlckxvY2tlcihvcmlnaW5RdW90YU1hbmFnZXIoKSk7CiAKICAgICAgICAg aWYgKCFjYW5DcmVhdGVEYXRhYmFzZShvcmlnaW4sIG5hbWUpKQogICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogCiAgICAgICAgIHJlY29yZENyZWF0aW5nRGF0YWJhc2Uob3JpZ2luLCBuYW1lKTsK IAorICAgICAgICBwb3B1bGF0ZU9yaWdpbnMoKTsKKwogICAgICAgICAvLyBTaW5jZSB3ZSdyZSBp bW1pbmVudGx5IG9wZW5pbmcgYSBkYXRhYmFzZSB3aXRoaW4gdGhpcyBjb250ZXh0J3Mgb3JpZ2lu LCBtYWtlIHN1cmUgdGhpcyBvcmlnaW4gaXMgYmVpbmcgdHJhY2tlZCBieSB0aGUgUXVvdGFUcmFj a2VyCiAgICAgICAgIC8vIGJ5IGZldGNoaW5nIGl0cyBjdXJyZW50IHVzYWdlIG5vdy4KICAgICAg ICAgdW5zaWduZWQgbG9uZyBsb25nIHVzYWdlID0gdXNhZ2VGb3JPcmlnaW5Ob0xvY2sob3JpZ2lu KTsKQEAgLTE4Niw2ICsxOTIsNyBAQCBib29sIERhdGFiYXNlVHJhY2tlcjo6aGFzRW50cnlGb3JP cmlnaW5Ob0xvY2soU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKIGJvb2wgRGF0YWJhc2VUcmFja2Vy OjpoYXNFbnRyeUZvck9yaWdpbihTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewogICAgIE11dGV4 TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOworICAgIHBvcHVsYXRlT3JpZ2lu cygpOwogICAgIHJldHVybiBoYXNFbnRyeUZvck9yaWdpbk5vTG9jayhvcmlnaW4pOwogfQogCkBA IC0yMTEsMTcgKzIxOCwxMSBAQCB1bnNpZ25lZCBsb25nIGxvbmcgRGF0YWJhc2VUcmFja2VyOjpn ZXRNYXhTaXplRm9yRGF0YWJhc2UoY29uc3QgRGF0YWJhc2UqIGRhdGFiYQogICAgIEFTU0VSVChj dXJyZW50VGhyZWFkKCkgPT0gZGF0YWJhc2UtPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKS0+ZGF0 YWJhc2VUaHJlYWQoKS0+Z2V0VGhyZWFkSUQoKSk7CiAgICAgLy8gVGhlIG1heGltdW0gc2l6ZSBm b3IgYSBkYXRhYmFzZSBpcyB0aGUgZnVsbCBxdW90YSBmb3IgaXRzIG9yaWdpbiwgbWludXMgdGhl IGN1cnJlbnQgdXNhZ2Ugd2l0aGluIHRoZSBvcmlnaW4sCiAgICAgLy8gcGx1cyB0aGUgY3VycmVu dCB1c2FnZSBvZiB0aGUgZ2l2ZW4gZGF0YWJhc2UKLSAgICBMb2NrZXI8T3JpZ2luUXVvdGFNYW5h Z2VyPiBxdW90YU1hbmFnZXJMb2NrZXIob3JpZ2luUXVvdGFNYW5hZ2VyKCkpOworICAgIExvY2tl cjxPcmlnaW5RdW90YU1hbmFnZXI+IGxvY2tlcihvcmlnaW5RdW90YU1hbmFnZXIoKSk7CiAgICAg U2VjdXJpdHlPcmlnaW4qIG9yaWdpbiA9IGRhdGFiYXNlLT5zZWN1cml0eU9yaWdpbigpOwogICAg IHJldHVybiBxdW90YUZvck9yaWdpbihvcmlnaW4pIC0gb3JpZ2luUXVvdGFNYW5hZ2VyKCkuZGlz a1VzYWdlKG9yaWdpbikgKyBTUUxpdGVGaWxlU3lzdGVtOjpnZXREYXRhYmFzZUZpbGVTaXplKGRh dGFiYXNlLT5maWxlTmFtZSgpKTsKIH0KIAotdm9pZCBEYXRhYmFzZVRyYWNrZXI6OmRhdGFiYXNl Q2hhbmdlZChEYXRhYmFzZSogZGF0YWJhc2UpCi17Ci0gICAgTG9ja2VyPE9yaWdpblF1b3RhTWFu YWdlcj4gcXVvdGFNYW5hZ2VyTG9ja2VyKG9yaWdpblF1b3RhTWFuYWdlcigpKTsKLSAgICBvcmln aW5RdW90YU1hbmFnZXIoKS5tYXJrRGF0YWJhc2UoZGF0YWJhc2UpOwotfQotCiBTdHJpbmcgRGF0 YWJhc2VUcmFja2VyOjpvcmlnaW5QYXRoKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4pIGNvbnN0CiB7 CiAgICAgcmV0dXJuIFNRTGl0ZUZpbGVTeXN0ZW06OmFwcGVuZERhdGFiYXNlRmlsZU5hbWVUb1Bh dGgobV9kYXRhYmFzZURpcmVjdG9yeVBhdGgudGhyZWFkc2FmZUNvcHkoKSwgb3JpZ2luLT5kYXRh YmFzZUlkZW50aWZpZXIoKSk7CkBAIC0yMzAsNyArMjMxLDcgQEAgU3RyaW5nIERhdGFiYXNlVHJh Y2tlcjo6b3JpZ2luUGF0aChTZWN1cml0eU9yaWdpbiogb3JpZ2luKSBjb25zdAogU3RyaW5nIERh dGFiYXNlVHJhY2tlcjo6ZnVsbFBhdGhGb3JEYXRhYmFzZU5vTG9jayhTZWN1cml0eU9yaWdpbiog b3JpZ2luLCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wgY3JlYXRlSWZOb3RFeGlzdHMpCiB7CiAg ICAgQVNTRVJUKCFtX2RhdGFiYXNlR3VhcmQudHJ5TG9jaygpKTsKLSAgICBBU1NFUlQoIW9yaWdp blF1b3RhTWFuYWdlcigpLnRyeUxvY2soKSk7CisgICAgQVNTRVJUKCFvcmlnaW5RdW90YU1hbmFn ZXJOb0xvY2soKS50cnlMb2NrKCkpOwogCiAgICAgZm9yIChIYXNoU2V0PFByb3Bvc2VkRGF0YWJh c2UqPjo6aXRlcmF0b3IgaXRlciA9IG1fcHJvcG9zZWREYXRhYmFzZXMuYmVnaW4oKTsgaXRlciAh PSBtX3Byb3Bvc2VkRGF0YWJhc2VzLmVuZCgpOyArK2l0ZXIpCiAgICAgICAgIGlmICgoKml0ZXIp LT5zZWNvbmQubmFtZSgpID09IG5hbWUgJiYgKCppdGVyKS0+Zmlyc3QtPmVxdWFsKG9yaWdpbikp CkBAIC0yNzQsMTYgKzI3NSwxNyBAQCBTdHJpbmcgRGF0YWJhc2VUcmFja2VyOjpmdWxsUGF0aEZv ckRhdGFiYXNlTm9Mb2NrKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4sIGNvbnN0CiAgICAgLy8gSWYg dGhpcyBvcmlnaW4ncyBxdW90YSBpcyBiZWluZyB0cmFja2VkIChvcGVuIGhhbmRsZSB0byBhIGRh dGFiYXNlIGluIHRoaXMgb3JpZ2luKSwgYWRkIHRoaXMgbmV3IGRhdGFiYXNlCiAgICAgLy8gdG8g dGhlIHF1b3RhIG1hbmFnZXIgbm93CiAgICAgU3RyaW5nIGZ1bGxGaWxlUGF0aCA9IFNRTGl0ZUZp bGVTeXN0ZW06OmFwcGVuZERhdGFiYXNlRmlsZU5hbWVUb1BhdGgob3JpZ2luUGF0aCwgZmlsZU5h bWUpOwotICAgIGlmIChvcmlnaW5RdW90YU1hbmFnZXIoKS50cmFja3NPcmlnaW4ob3JpZ2luKSkK LSAgICAgICAgb3JpZ2luUXVvdGFNYW5hZ2VyKCkuYWRkRGF0YWJhc2Uob3JpZ2luLCBuYW1lLCBm dWxsRmlsZVBhdGgpOworICAgIGlmIChvcmlnaW5RdW90YU1hbmFnZXJOb0xvY2soKS50cmFja3NP cmlnaW4ob3JpZ2luKSkKKyAgICAgICAgb3JpZ2luUXVvdGFNYW5hZ2VyTm9Mb2NrKCkuYWRkRGF0 YWJhc2Uob3JpZ2luLCBuYW1lLCBmdWxsRmlsZVBhdGgpOwogCiAgICAgcmV0dXJuIGZ1bGxGaWxl UGF0aDsKIH0KIAogU3RyaW5nIERhdGFiYXNlVHJhY2tlcjo6ZnVsbFBhdGhGb3JEYXRhYmFzZShT ZWN1cml0eU9yaWdpbiogb3JpZ2luLCBjb25zdCBTdHJpbmcmIG5hbWUsIGJvb2wgY3JlYXRlSWZO b3RFeGlzdHMpCiB7CisgICAgTG9ja2VyPE9yaWdpblF1b3RhTWFuYWdlcj4gbG9ja2VyKG9yaWdp blF1b3RhTWFuYWdlcigpKTsKICAgICBNdXRleExvY2tlciBsb2NrRGF0YWJhc2UobV9kYXRhYmFz ZUd1YXJkKTsKLSAgICBMb2NrZXI8T3JpZ2luUXVvdGFNYW5hZ2VyPiBxdW90YU1hbmFnZXJMb2Nr ZXIob3JpZ2luUXVvdGFNYW5hZ2VyKCkpOworICAgIHBvcHVsYXRlT3JpZ2lucygpOwogCiAgICAg cmV0dXJuIGZ1bGxQYXRoRm9yRGF0YWJhc2VOb0xvY2sob3JpZ2luLCBuYW1lLCBjcmVhdGVJZk5v dEV4aXN0cykudGhyZWFkc2FmZUNvcHkoKTsKIH0KQEAgLTI5NSw2ICsyOTcsOCBAQCB2b2lkIERh dGFiYXNlVHJhY2tlcjo6cG9wdWxhdGVPcmlnaW5zKCkKICAgICAgICAgcmV0dXJuOwogCiAgICAg bV9xdW90YU1hcC5zZXQobmV3IFF1b3RhTWFwKTsKKyAgICBpZiAoIW1fcXVvdGFNYW5hZ2VyKQor ICAgICAgICBtX3F1b3RhTWFuYWdlci5zZXQobmV3IE9yaWdpblF1b3RhTWFuYWdlcik7CiAKICAg ICBvcGVuVHJhY2tlckRhdGFiYXNlKGZhbHNlKTsKICAgICBpZiAoIW1fZGF0YWJhc2UuaXNPcGVu KCkpCkBAIC0zMjAsNiArMzI0LDcgQEAgdm9pZCBEYXRhYmFzZVRyYWNrZXI6OnBvcHVsYXRlT3Jp Z2lucygpCiB2b2lkIERhdGFiYXNlVHJhY2tlcjo6b3JpZ2lucyhWZWN0b3I8UmVmUHRyPFNlY3Vy aXR5T3JpZ2luPiA+JiByZXN1bHQpCiB7CiAgICAgTXV0ZXhMb2NrZXIgbG9ja0RhdGFiYXNlKG1f ZGF0YWJhc2VHdWFyZCk7CisgICAgcG9wdWxhdGVPcmlnaW5zKCk7CiAgICAgQVNTRVJUKG1fcXVv dGFNYXApOwogICAgIGNvcHlLZXlzVG9WZWN0b3IoKm1fcXVvdGFNYXAsIHJlc3VsdCk7CiB9CkBA IC0zNTIsMTIgKzM1NywxMCBAQCBib29sIERhdGFiYXNlVHJhY2tlcjo6ZGF0YWJhc2VOYW1lc0Zv ck9yaWdpbk5vTG9jayhTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBWZWN0bwogCiBib29sIERhdGFi YXNlVHJhY2tlcjo6ZGF0YWJhc2VOYW1lc0Zvck9yaWdpbihTZWN1cml0eU9yaWdpbiogb3JpZ2lu LCBWZWN0b3I8U3RyaW5nPiYgcmVzdWx0VmVjdG9yKQogeworICAgIE11dGV4TG9ja2VyIGxvY2tE YXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOwogICAgIFZlY3RvcjxTdHJpbmc+IHRlbXA7Ci0gICAg ewotICAgICAgICBNdXRleExvY2tlciBsb2NrRGF0YWJhc2UobV9kYXRhYmFzZUd1YXJkKTsKLSAg ICAgICAgaWYgKCFkYXRhYmFzZU5hbWVzRm9yT3JpZ2luTm9Mb2NrKG9yaWdpbiwgdGVtcCkpCi0g ICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgIH0KKyAgICBpZiAoIWRhdGFiYXNlTmFtZXNGb3JP cmlnaW5Ob0xvY2sob3JpZ2luLCB0ZW1wKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAg Zm9yIChWZWN0b3I8U3RyaW5nPjo6aXRlcmF0b3IgaXRlciA9IHRlbXAuYmVnaW4oKTsgaXRlciAh PSB0ZW1wLmVuZCgpOyArK2l0ZXIpCiAgICAgICAgIHJlc3VsdFZlY3Rvci5hcHBlbmQoaXRlci0+ dGhyZWFkc2FmZUNvcHkoKSk7CkBAIC00NzAsMjkgKzQ3MywyNyBAQCB2b2lkIERhdGFiYXNlVHJh Y2tlcjo6YWRkT3BlbkRhdGFiYXNlKERhdGFiYXNlKiBkYXRhYmFzZSkKICAgICBpZiAoIWRhdGFi YXNlKQogICAgICAgICByZXR1cm47CiAKLSAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIG9wZW5E YXRhYmFzZU1hcExvY2sobV9vcGVuRGF0YWJhc2VNYXBHdWFyZCk7CisgICAgTXV0ZXhMb2NrZXIg b3BlbkRhdGFiYXNlTWFwTG9jayhtX29wZW5EYXRhYmFzZU1hcEd1YXJkKTsKIAotICAgICAgICBp ZiAoIW1fb3BlbkRhdGFiYXNlTWFwKQotICAgICAgICAgICAgbV9vcGVuRGF0YWJhc2VNYXAuc2V0 KG5ldyBEYXRhYmFzZU9yaWdpbk1hcCk7CisgICAgaWYgKCFtX29wZW5EYXRhYmFzZU1hcCkKKyAg ICAgICAgbV9vcGVuRGF0YWJhc2VNYXAuc2V0KG5ldyBEYXRhYmFzZU9yaWdpbk1hcCk7CiAKLSAg ICAgICAgU3RyaW5nIG5hbWUoZGF0YWJhc2UtPnN0cmluZ0lkZW50aWZpZXIoKSk7Ci0gICAgICAg IERhdGFiYXNlTmFtZU1hcCogbmFtZU1hcCA9IG1fb3BlbkRhdGFiYXNlTWFwLT5nZXQoZGF0YWJh c2UtPnNlY3VyaXR5T3JpZ2luKCkpOwotICAgICAgICBpZiAoIW5hbWVNYXApIHsKLSAgICAgICAg ICAgIG5hbWVNYXAgPSBuZXcgRGF0YWJhc2VOYW1lTWFwOwotICAgICAgICAgICAgbV9vcGVuRGF0 YWJhc2VNYXAtPnNldChkYXRhYmFzZS0+c2VjdXJpdHlPcmlnaW4oKS0+dGhyZWFkc2FmZUNvcHko KSwgbmFtZU1hcCk7Ci0gICAgICAgIH0KKyAgICBTdHJpbmcgbmFtZShkYXRhYmFzZS0+c3RyaW5n SWRlbnRpZmllcigpKTsKKyAgICBEYXRhYmFzZU5hbWVNYXAqIG5hbWVNYXAgPSBtX29wZW5EYXRh YmFzZU1hcC0+Z2V0KGRhdGFiYXNlLT5zZWN1cml0eU9yaWdpbigpKTsKKyAgICBpZiAoIW5hbWVN YXApIHsKKyAgICAgICAgbmFtZU1hcCA9IG5ldyBEYXRhYmFzZU5hbWVNYXA7CisgICAgICAgIG1f b3BlbkRhdGFiYXNlTWFwLT5zZXQoZGF0YWJhc2UtPnNlY3VyaXR5T3JpZ2luKCktPnRocmVhZHNh ZmVDb3B5KCksIG5hbWVNYXApOworICAgIH0KIAotICAgICAgICBEYXRhYmFzZVNldCogZGF0YWJh c2VTZXQgPSBuYW1lTWFwLT5nZXQobmFtZSk7Ci0gICAgICAgIGlmICghZGF0YWJhc2VTZXQpIHsK LSAgICAgICAgICAgIGRhdGFiYXNlU2V0ID0gbmV3IERhdGFiYXNlU2V0OwotICAgICAgICAgICAg bmFtZU1hcC0+c2V0KG5hbWUudGhyZWFkc2FmZUNvcHkoKSwgZGF0YWJhc2VTZXQpOwotICAgICAg ICB9CisgICAgRGF0YWJhc2VTZXQqIGRhdGFiYXNlU2V0ID0gbmFtZU1hcC0+Z2V0KG5hbWUpOwor ICAgIGlmICghZGF0YWJhc2VTZXQpIHsKKyAgICAgICAgZGF0YWJhc2VTZXQgPSBuZXcgRGF0YWJh c2VTZXQ7CisgICAgICAgIG5hbWVNYXAtPnNldChuYW1lLnRocmVhZHNhZmVDb3B5KCksIGRhdGFi YXNlU2V0KTsKKyAgICB9CiAKLSAgICAgICAgZGF0YWJhc2VTZXQtPmFkZChkYXRhYmFzZSk7Cisg ICAgZGF0YWJhc2VTZXQtPmFkZChkYXRhYmFzZSk7CiAKLSAgICAgICAgTE9HKFN0b3JhZ2VBUEks ICJBZGRlZCBvcGVuIERhdGFiYXNlICVzICglcClcbiIsIGRhdGFiYXNlLT5zdHJpbmdJZGVudGlm aWVyKCkuYXNjaWkoKS5kYXRhKCksIGRhdGFiYXNlKTsKLSAgICB9CisgICAgTE9HKFN0b3JhZ2VB UEksICJBZGRlZCBvcGVuIERhdGFiYXNlICVzICglcClcbiIsIGRhdGFiYXNlLT5zdHJpbmdJZGVu dGlmaWVyKCkuYXNjaWkoKS5kYXRhKCksIGRhdGFiYXNlKTsKIAogICAgIE11dGV4TG9ja2VyIGxv Y2tEYXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOwogICAgIGRvbmVDcmVhdGluZ0RhdGFiYXNlKGRh dGFiYXNlLT5zZWN1cml0eU9yaWdpbigpLCBkYXRhYmFzZS0+c3RyaW5nSWRlbnRpZmllcigpKTsK QEAgLTUwMyw0NiArNTA0LDQ0IEBAIHZvaWQgRGF0YWJhc2VUcmFja2VyOjpyZW1vdmVPcGVuRGF0 YWJhc2UoRGF0YWJhc2UqIGRhdGFiYXNlKQogICAgIGlmICghZGF0YWJhc2UpCiAgICAgICAgIHJl dHVybjsKIAotICAgIHsKLSAgICAgICAgTXV0ZXhMb2NrZXIgb3BlbkRhdGFiYXNlTWFwTG9jayht X29wZW5EYXRhYmFzZU1hcEd1YXJkKTsKLQotICAgICAgICBpZiAoIW1fb3BlbkRhdGFiYXNlTWFw KSB7Ci0gICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKLSAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgfQorICAgIExvY2tlcjxPcmlnaW5RdW90YU1hbmFnZXI+IHF1b3RhTWFuYWdl ckxvY2tlcihvcmlnaW5RdW90YU1hbmFnZXIoKSk7CisgICAgTXV0ZXhMb2NrZXIgbG9ja0RhdGFi YXNlKG1fZGF0YWJhc2VHdWFyZCk7CisgICAgTXV0ZXhMb2NrZXIgb3BlbkRhdGFiYXNlTWFwTG9j ayhtX29wZW5EYXRhYmFzZU1hcEd1YXJkKTsKIAotICAgICAgICBTdHJpbmcgbmFtZShkYXRhYmFz ZS0+c3RyaW5nSWRlbnRpZmllcigpKTsKLSAgICAgICAgRGF0YWJhc2VOYW1lTWFwKiBuYW1lTWFw ID0gbV9vcGVuRGF0YWJhc2VNYXAtPmdldChkYXRhYmFzZS0+c2VjdXJpdHlPcmlnaW4oKSk7Ci0g ICAgICAgIGlmICghbmFtZU1hcCkgewotICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICBpZiAoIW1fb3BlbkRhdGFiYXNl TWFwKSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm47Cisg ICAgfQogCi0gICAgICAgIERhdGFiYXNlU2V0KiBkYXRhYmFzZVNldCA9IG5hbWVNYXAtPmdldChu YW1lKTsKLSAgICAgICAgaWYgKCFkYXRhYmFzZVNldCkgewotICAgICAgICAgICAgQVNTRVJUX05P VF9SRUFDSEVEKCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KKyAgICBTdHJpbmcg bmFtZShkYXRhYmFzZS0+c3RyaW5nSWRlbnRpZmllcigpKTsKKyAgICBEYXRhYmFzZU5hbWVNYXAq IG5hbWVNYXAgPSBtX29wZW5EYXRhYmFzZU1hcC0+Z2V0KGRhdGFiYXNlLT5zZWN1cml0eU9yaWdp bigpKTsKKyAgICBpZiAoIW5hbWVNYXApIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CiAKLSAgICAgICAgZGF0YWJhc2VTZXQtPnJlbW92ZShk YXRhYmFzZSk7CisgICAgRGF0YWJhc2VTZXQqIGRhdGFiYXNlU2V0ID0gbmFtZU1hcC0+Z2V0KG5h bWUpOworICAgIGlmICghZGF0YWJhc2VTZXQpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVE KCk7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAKLSAgICAgICAgTE9HKFN0b3JhZ2VBUEksICJS ZW1vdmVkIG9wZW4gRGF0YWJhc2UgJXMgKCVwKVxuIiwgZGF0YWJhc2UtPnN0cmluZ0lkZW50aWZp ZXIoKS5hc2NpaSgpLmRhdGEoKSwgZGF0YWJhc2UpOworICAgIGRhdGFiYXNlU2V0LT5yZW1vdmUo ZGF0YWJhc2UpOwogCi0gICAgICAgIGlmICghZGF0YWJhc2VTZXQtPmlzRW1wdHkoKSkKLSAgICAg ICAgICAgIHJldHVybjsKKyAgICBMT0coU3RvcmFnZUFQSSwgIlJlbW92ZWQgb3BlbiBEYXRhYmFz ZSAlcyAoJXApXG4iLCBkYXRhYmFzZS0+c3RyaW5nSWRlbnRpZmllcigpLmFzY2lpKCkuZGF0YSgp LCBkYXRhYmFzZSk7CiAKLSAgICAgICAgbmFtZU1hcC0+cmVtb3ZlKG5hbWUpOwotICAgICAgICBk ZWxldGUgZGF0YWJhc2VTZXQ7CisgICAgaWYgKCFkYXRhYmFzZVNldC0+aXNFbXB0eSgpKQorICAg ICAgICByZXR1cm47CiAKLSAgICAgICAgaWYgKCFuYW1lTWFwLT5pc0VtcHR5KCkpCi0gICAgICAg ICAgICByZXR1cm47CisgICAgbmFtZU1hcC0+cmVtb3ZlKG5hbWUpOworICAgIGRlbGV0ZSBkYXRh YmFzZVNldDsKIAotICAgICAgICBtX29wZW5EYXRhYmFzZU1hcC0+cmVtb3ZlKGRhdGFiYXNlLT5z ZWN1cml0eU9yaWdpbigpKTsKLSAgICAgICAgZGVsZXRlIG5hbWVNYXA7Ci0gICAgfQorICAgIGlm ICghbmFtZU1hcC0+aXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CiAKLSAgICBMb2NrZXI8T3Jp Z2luUXVvdGFNYW5hZ2VyPiBxdW90YU1hbmFnZXJMb2NrZXIob3JpZ2luUXVvdGFNYW5hZ2VyKCkp OwotICAgIG9yaWdpblF1b3RhTWFuYWdlcigpLnJlbW92ZU9yaWdpbihkYXRhYmFzZS0+c2VjdXJp dHlPcmlnaW4oKSk7CisgICAgbV9vcGVuRGF0YWJhc2VNYXAtPnJlbW92ZShkYXRhYmFzZS0+c2Vj dXJpdHlPcmlnaW4oKSk7CisgICAgZGVsZXRlIG5hbWVNYXA7CisgICAgb3JpZ2luUXVvdGFNYW5h Z2VyTm9Mb2NrKCkucmVtb3ZlT3JpZ2luKGRhdGFiYXNlLT5zZWN1cml0eU9yaWdpbigpKTsKIH0K IAogdm9pZCBEYXRhYmFzZVRyYWNrZXI6OmdldE9wZW5EYXRhYmFzZXMoU2VjdXJpdHlPcmlnaW4q IG9yaWdpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCBIYXNoU2V0PFJlZlB0cjxEYXRhYmFzZT4gPiog ZGF0YWJhc2VzKQpAQCAtNTY1LDMwICs1NjQsMzAgQEAgdm9pZCBEYXRhYmFzZVRyYWNrZXI6Omdl dE9wZW5EYXRhYmFzZXMoU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgY29uc3QgU3RyaW5nJiBuYW0K IAogdW5zaWduZWQgbG9uZyBsb25nIERhdGFiYXNlVHJhY2tlcjo6dXNhZ2VGb3JPcmlnaW5Ob0xv Y2soU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKIHsKLSAgICBBU1NFUlQoIW9yaWdpblF1b3RhTWFu YWdlcigpLnRyeUxvY2soKSk7CisgICAgQVNTRVJUKCFvcmlnaW5RdW90YU1hbmFnZXJOb0xvY2so KS50cnlMb2NrKCkpOwogCiAgICAgLy8gVXNlIHRoZSBPcmlnaW5RdW90YU1hbmFnZXIgbWVjaGFu aXNtIHRvIGNhbGN1bGF0ZSB0aGUgdXNhZ2UKLSAgICBpZiAob3JpZ2luUXVvdGFNYW5hZ2VyKCku dHJhY2tzT3JpZ2luKG9yaWdpbikpCi0gICAgICAgIHJldHVybiBvcmlnaW5RdW90YU1hbmFnZXIo KS5kaXNrVXNhZ2Uob3JpZ2luKTsKKyAgICBpZiAob3JpZ2luUXVvdGFNYW5hZ2VyTm9Mb2NrKCku dHJhY2tzT3JpZ2luKG9yaWdpbikpCisgICAgICAgIHJldHVybiBvcmlnaW5RdW90YU1hbmFnZXJO b0xvY2soKS5kaXNrVXNhZ2Uob3JpZ2luKTsKIAogICAgIC8vIElmIHRoZSBPcmlnaW5RdW90YU1h bmFnZXIgZG9lc24ndCB0cmFjayB0aGlzIG9yaWdpbiBhbHJlYWR5LCBwcmltZSBpdCB0byBkbyBz bwotICAgIG9yaWdpblF1b3RhTWFuYWdlcigpLnRyYWNrT3JpZ2luKG9yaWdpbik7CisgICAgb3Jp Z2luUXVvdGFNYW5hZ2VyTm9Mb2NrKCkudHJhY2tPcmlnaW4ob3JpZ2luKTsKIAogICAgIFZlY3Rv cjxTdHJpbmc+IG5hbWVzOwogICAgIGRhdGFiYXNlTmFtZXNGb3JPcmlnaW5Ob0xvY2sob3JpZ2lu LCBuYW1lcyk7CiAKICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbmFtZXMuc2l6ZSgpOyAr K2kpCi0gICAgICAgIG9yaWdpblF1b3RhTWFuYWdlcigpLmFkZERhdGFiYXNlKG9yaWdpbiwgbmFt ZXNbaV0sIGZ1bGxQYXRoRm9yRGF0YWJhc2VOb0xvY2sob3JpZ2luLCBuYW1lc1tpXSwgZmFsc2Up KTsKKyAgICAgICAgb3JpZ2luUXVvdGFNYW5hZ2VyTm9Mb2NrKCkuYWRkRGF0YWJhc2Uob3JpZ2lu LCBuYW1lc1tpXSwgZnVsbFBhdGhGb3JEYXRhYmFzZU5vTG9jayhvcmlnaW4sIG5hbWVzW2ldLCBm YWxzZSkpOwogCi0gICAgaWYgKCFvcmlnaW5RdW90YU1hbmFnZXIoKS50cmFja3NPcmlnaW4ob3Jp Z2luKSkKKyAgICBpZiAoIW9yaWdpblF1b3RhTWFuYWdlck5vTG9jaygpLnRyYWNrc09yaWdpbihv cmlnaW4pKQogICAgICAgICByZXR1cm4gMDsKLSAgICByZXR1cm4gb3JpZ2luUXVvdGFNYW5hZ2Vy KCkuZGlza1VzYWdlKG9yaWdpbik7CisgICAgcmV0dXJuIG9yaWdpblF1b3RhTWFuYWdlck5vTG9j aygpLmRpc2tVc2FnZShvcmlnaW4pOwogfQogCiB1bnNpZ25lZCBsb25nIGxvbmcgRGF0YWJhc2VU cmFja2VyOjp1c2FnZUZvck9yaWdpbihTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogewotICAgIE11 dGV4TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOwotICAgIExvY2tlcjxPcmln aW5RdW90YU1hbmFnZXI+IHF1b3RhTWFuYWdlckxvY2tlcihvcmlnaW5RdW90YU1hbmFnZXIoKSk7 CisgICAgTG9ja2VyPE9yaWdpblF1b3RhTWFuYWdlcj4gbG9ja2VyKG9yaWdpblF1b3RhTWFuYWdl cigpKTsKKwogICAgIHJldHVybiB1c2FnZUZvck9yaWdpbk5vTG9jayhvcmlnaW4pOwogfQogCkBA IC02MDIsNiArNjAxLDcgQEAgdW5zaWduZWQgbG9uZyBsb25nIERhdGFiYXNlVHJhY2tlcjo6cXVv dGFGb3JPcmlnaW5Ob0xvY2soU2VjdXJpdHlPcmlnaW4qIG9yaWdpbikKIHVuc2lnbmVkIGxvbmcg bG9uZyBEYXRhYmFzZVRyYWNrZXI6OnF1b3RhRm9yT3JpZ2luKFNlY3VyaXR5T3JpZ2luKiBvcmln aW4pCiB7CiAgICAgTXV0ZXhMb2NrZXIgbG9ja0RhdGFiYXNlKG1fZGF0YWJhc2VHdWFyZCk7Cisg ICAgcG9wdWxhdGVPcmlnaW5zKCk7CiAgICAgcmV0dXJuIHF1b3RhRm9yT3JpZ2luTm9Mb2NrKG9y aWdpbik7CiB9CiAKQEAgLTYwOSw2ICs2MDksNyBAQCB2b2lkIERhdGFiYXNlVHJhY2tlcjo6c2V0 UXVvdGEoU2VjdXJpdHlPcmlnaW4qIG9yaWdpbiwgdW5zaWduZWQgbG9uZyBsb25nIHF1b3RhKQog ewogICAgIE11dGV4TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNlR3VhcmQpOwogCisgICAg cG9wdWxhdGVPcmlnaW5zKCk7CiAgICAgaWYgKHF1b3RhRm9yT3JpZ2luTm9Mb2NrKG9yaWdpbikg PT0gcXVvdGEpCiAgICAgICAgIHJldHVybjsKIApAQCAtNzIwLDEwICs3MjEsMTMgQEAgYm9vbCBE YXRhYmFzZVRyYWNrZXI6OmRlbGV0ZU9yaWdpbihTZWN1cml0eU9yaWdpbiogb3JpZ2luKQogICAg IH0KIAogICAgIHsKKyAgICAgICAgLy8gVG8gc2F0aXNmeSB0aGUgbG9jayBoaWVyYXJjaHksIHdl IGhhdmUgdG8gbG9jayB0aGUgb3JpZ2luUXVvdGFNYW5hZ2VyIGJlZm9yZSBtX2RhdGFiYXNlR3Vh cmQgaWYgdGhlcmUncyBhbnkgY2hhbmNlIHdlJ2xsIHRvIGxvY2sgYm90aC4KKyAgICAgICAgTG9j a2VyPE9yaWdpblF1b3RhTWFuYWdlcj4gcXVvdGFNYW5hZ2VyTG9ja2VyKG9yaWdpblF1b3RhTWFu YWdlcigpKTsKICAgICAgICAgTXV0ZXhMb2NrZXIgbG9ja0RhdGFiYXNlKG1fZGF0YWJhc2VHdWFy ZCk7CisgICAgICAgIFNRTGl0ZVN0YXRlbWVudCBzdGF0ZW1lbnQobV9kYXRhYmFzZSwgIkRFTEVU RSBGUk9NIERhdGFiYXNlcyBXSEVSRSBvcmlnaW49PyIpOworCiAgICAgICAgIGRvbmVEZWxldGlu Z09yaWdpbihvcmlnaW4pOwogCi0gICAgICAgIFNRTGl0ZVN0YXRlbWVudCBzdGF0ZW1lbnQobV9k YXRhYmFzZSwgIkRFTEVURSBGUk9NIERhdGFiYXNlcyBXSEVSRSBvcmlnaW49PyIpOwogICAgICAg ICBpZiAoc3RhdGVtZW50LnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPaykgewogICAgICAgICAgICAg TE9HX0VSUk9SKCJVbmFibGUgdG8gcHJlcGFyZSBkZWxldGlvbiBvZiBkYXRhYmFzZXMgZnJvbSBv cmlnaW4gJXMgZnJvbSB0cmFja2VyIiwgb3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKS5hc2Np aSgpLmRhdGEoKSk7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC03NTQsMTAgKzc1OCw3 IEBAIGJvb2wgRGF0YWJhc2VUcmFja2VyOjpkZWxldGVPcmlnaW4oU2VjdXJpdHlPcmlnaW4qIG9y aWdpbikKICAgICAgICAgUmVmUHRyPFNlY3VyaXR5T3JpZ2luPiBvcmlnaW5Qb3NzaWJseUxhc3RS ZWZlcmVuY2UgPSBvcmlnaW47CiAgICAgICAgIG1fcXVvdGFNYXAtPnJlbW92ZShvcmlnaW4pOwog Ci0gICAgICAgIHsKLSAgICAgICAgICAgIExvY2tlcjxPcmlnaW5RdW90YU1hbmFnZXI+IHF1b3Rh TWFuYWdlckxvY2tlcihvcmlnaW5RdW90YU1hbmFnZXIoKSk7Ci0gICAgICAgICAgICBvcmlnaW5R dW90YU1hbmFnZXIoKS5yZW1vdmVPcmlnaW4ob3JpZ2luKTsKLSAgICAgICAgfQorICAgICAgICBv cmlnaW5RdW90YU1hbmFnZXJOb0xvY2soKS5yZW1vdmVPcmlnaW4ob3JpZ2luKTsKIAogICAgICAg ICAvLyBJZiB3ZSByZW1vdmVkIHRoZSBsYXN0IG9yaWdpbiwgZG8gc29tZSBhZGRpdGlvbmFsIGRl bGV0aW9uLgogICAgICAgICBpZiAobV9xdW90YU1hcC0+aXNFbXB0eSgpKSB7CkBAIC05MTIsNiAr OTEzLDggQEAgYm9vbCBEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURhdGFiYXNlKFNlY3VyaXR5T3Jp Z2luKiBvcmlnaW4sIGNvbnN0IFN0cmluZyYgbmFtZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgIH0KIAorICAgIC8vIFRvIHNhdGlzZnkgdGhlIGxvY2sgaGllcmFyY2h5LCB3ZSBoYXZlIHRv IGxvY2sgdGhlIG9yaWdpblF1b3RhTWFuYWdlciBiZWZvcmUgbV9kYXRhYmFzZUd1YXJkIGlmIHRo ZXJlJ3MgYW55IGNoYW5jZSB3ZSdsbCB0byBsb2NrIGJvdGguCisgICAgTG9ja2VyPE9yaWdpblF1 b3RhTWFuYWdlcj4gcXVvdGFNYW5hZ2VyTG9ja2VyKG9yaWdpblF1b3RhTWFuYWdlcigpKTsKICAg ICBNdXRleExvY2tlciBsb2NrRGF0YWJhc2UobV9kYXRhYmFzZUd1YXJkKTsKIAogICAgIFNRTGl0 ZVN0YXRlbWVudCBzdGF0ZW1lbnQobV9kYXRhYmFzZSwgIkRFTEVURSBGUk9NIERhdGFiYXNlcyBX SEVSRSBvcmlnaW49PyBBTkQgbmFtZT0/Iik7CkBAIC05MzAsMTAgKzkzMyw3IEBAIGJvb2wgRGF0 YWJhc2VUcmFja2VyOjpkZWxldGVEYXRhYmFzZShTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBjb25z dCBTdHJpbmcmIG5hbWUpCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKLSAgICB7Ci0g ICAgICAgIExvY2tlcjxPcmlnaW5RdW90YU1hbmFnZXI+IHF1b3RhTWFuYWdlckxvY2tlcihvcmln aW5RdW90YU1hbmFnZXIoKSk7Ci0gICAgICAgIG9yaWdpblF1b3RhTWFuYWdlcigpLnJlbW92ZURh dGFiYXNlKG9yaWdpbiwgbmFtZSk7Ci0gICAgfQorICAgIG9yaWdpblF1b3RhTWFuYWdlck5vTG9j aygpLnJlbW92ZURhdGFiYXNlKG9yaWdpbiwgbmFtZSk7CiAKICAgICBpZiAobV9jbGllbnQpIHsK ICAgICAgICAgbV9jbGllbnQtPmRpc3BhdGNoRGlkTW9kaWZ5T3JpZ2luKG9yaWdpbik7CkBAIC05 NTQsOCArOTU0LDggQEAgYm9vbCBEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZURhdGFiYXNlRmlsZShT ZWN1cml0eU9yaWdpbiogb3JpZ2luLCBjb25zdCBTdHJpbmcmIG4KIAogI2lmbmRlZiBOREVCVUcK ICAgICB7Ci0gICAgICAgIE11dGV4TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFiYXNlR3VhcmQp OwotICAgICAgICBBU1NFUlQoZGVsZXRpbmdEYXRhYmFzZShvcmlnaW4sIG5hbWUpIHx8IGRlbGV0 aW5nT3JpZ2luKG9yaWdpbikpOworICAgIE11dGV4TG9ja2VyIGxvY2tEYXRhYmFzZShtX2RhdGFi YXNlR3VhcmQpOworICAgIEFTU0VSVChkZWxldGluZ0RhdGFiYXNlKG9yaWdpbiwgbmFtZSkgfHwg ZGVsZXRpbmdPcmlnaW4ob3JpZ2luKSk7CiAgICAgfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1dl YkNvcmUvc3RvcmFnZS9EYXRhYmFzZVRyYWNrZXIuaCBiL1dlYkNvcmUvc3RvcmFnZS9EYXRhYmFz ZVRyYWNrZXIuaAppbmRleCA1YTQ5MjQ1Li5hMTUyZmRlIDEwMDY0NAotLS0gYS9XZWJDb3JlL3N0 b3JhZ2UvRGF0YWJhc2VUcmFja2VyLmgKKysrIGIvV2ViQ29yZS9zdG9yYWdlL0RhdGFiYXNlVHJh Y2tlci5oCkBAIC01Miw2ICs1Miw3IEBAIHN0cnVjdCBTZWN1cml0eU9yaWdpbkhhc2g7CiAKICNp ZiAhUExBVEZPUk0oQ0hST01JVU0pCiBjbGFzcyBEYXRhYmFzZVRyYWNrZXJDbGllbnQ7CitjbGFz cyBPcmlnaW5RdW90YU1hbmFnZXI7CiAKIHN0cnVjdCBTZWN1cml0eU9yaWdpblRyYWl0czsKICNl bmRpZiAvLyAhUExBVEZPUk0oQ0hST01JVU0pCkBAIC02MSw4ICs2Miw4IEBAIHB1YmxpYzoKICAg ICBzdGF0aWMgRGF0YWJhc2VUcmFja2VyJiB0cmFja2VyKCk7CiAgICAgLy8gVGhpcyBzaW5nbGV0 b24gd2lsbCBwb3RlbnRpYWxseSBiZSB1c2VkIGZyb20gbXVsdGlwbGUgd29ya2VyIHRocmVhZHMg YW5kIHRoZSBwYWdlJ3MgY29udGV4dCB0aHJlYWQgc2ltdWx0YW5lb3VzbHkuICBUbyBrZWVwIHRo aXMgc2FmZSwgaXQncwogICAgIC8vIGN1cnJlbnRseSB1c2luZyA0IGxvY2tzLiAgSW4gb3JkZXIg dG8gYXZvaWQgZGVhZGxvY2sgd2hlbiB0YWtpbmcgbXVsdGlwbGUgbG9ja3MsIHlvdSBtdXN0IHRh a2UgdGhlbSBpbiB0aGUgY29ycmVjdCBvcmRlcjoKLSAgICAvLyBtX2RhdGFiYXNlR3VhcmQgYmVm b3JlIG9yaWdpblF1b3RhTWFuYWdlcigpIGlmIGJvdGggbG9ja3MgYXJlIG5lZWRlZC4KLSAgICAv LyBtX29wZW5EYXRhYmFzZU1hcEd1YXJkIGlzIGN1cnJlbnRseSBpbmRlcGVuZGVudCBvZiB0aGUg b3RoZXIgbG9ja3MuCisgICAgLy8gb3JpZ2luUXVvdGFNYW5hZ2VyKCkgYmVmb3JlIG1fZGF0YWJh c2VHdWFyZCBvciBtX29wZW5EYXRhYmFzZU1hcEd1YXJkCisgICAgLy8gbV9kYXRhYmFzZUd1YXJk IGJlZm9yZSBtX29wZW5EYXRhYmFzZU1hcEd1YXJkCiAgICAgLy8gbm90aWZpY2F0aW9uTXV0ZXgo KSBpcyBjdXJyZW50bHkgaW5kZXBlbmRlbnQgb2YgdGhlIG90aGVyIGxvY2tzLgogCiAgICAgYm9v bCBjYW5Fc3RhYmxpc2hEYXRhYmFzZShTY3JpcHRFeGVjdXRpb25Db250ZXh0KiwgY29uc3QgU3Ry aW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIGRpc3BsYXlOYW1lLCB1bnNpZ25lZCBsb25nIGVzdGlt YXRlZFNpemUpOwpAQCAtNzQsNyArNzUsNiBAQCBwdWJsaWM6CiAgICAgdm9pZCBnZXRPcGVuRGF0 YWJhc2VzKFNlY3VyaXR5T3JpZ2luKiBvcmlnaW4sIGNvbnN0IFN0cmluZyYgbmFtZSwgSGFzaFNl dDxSZWZQdHI8RGF0YWJhc2U+ID4qIGRhdGFiYXNlcyk7CiAKICAgICB1bnNpZ25lZCBsb25nIGxv bmcgZ2V0TWF4U2l6ZUZvckRhdGFiYXNlKGNvbnN0IERhdGFiYXNlKik7Ci0gICAgdm9pZCBkYXRh YmFzZUNoYW5nZWQoRGF0YWJhc2UqKTsKIAogcHJpdmF0ZToKICAgICBEYXRhYmFzZVRyYWNrZXIo KTsKQEAgLTExMCw5ICsxMTAsMTMgQEAgcHVibGljOgogICAgIC8vIEZyb20gYSBzZWNvbmRhcnkg dGhyZWFkLCBtdXN0IGJlIHRocmVhZCBzYWZlIHdpdGggaXRzIGRhdGEKICAgICB2b2lkIHNjaGVk dWxlTm90aWZ5RGF0YWJhc2VDaGFuZ2VkKFNlY3VyaXR5T3JpZ2luKiwgY29uc3QgU3RyaW5nJiBu YW1lKTsKIAorICAgIE9yaWdpblF1b3RhTWFuYWdlciYgb3JpZ2luUXVvdGFNYW5hZ2VyKCk7CisK KwogICAgIGJvb2wgaGFzRW50cnlGb3JPcmlnaW4oU2VjdXJpdHlPcmlnaW4qKTsKIAogcHJpdmF0 ZToKKyAgICBPcmlnaW5RdW90YU1hbmFnZXImIG9yaWdpblF1b3RhTWFuYWdlck5vTG9jaygpOwog ICAgIGJvb2wgaGFzRW50cnlGb3JPcmlnaW5Ob0xvY2soU2VjdXJpdHlPcmlnaW4qIG9yaWdpbik7 CiAgICAgU3RyaW5nIGZ1bGxQYXRoRm9yRGF0YWJhc2VOb0xvY2soU2VjdXJpdHlPcmlnaW4qLCBj b25zdCBTdHJpbmcmIG5hbWUsIGJvb2wgY3JlYXRlSWZEb2VzTm90RXhpc3QpOwogICAgIGJvb2wg ZGF0YWJhc2VOYW1lc0Zvck9yaWdpbk5vTG9jayhTZWN1cml0eU9yaWdpbiogb3JpZ2luLCBWZWN0 b3I8U3RyaW5nPiYgcmVzdWx0VmVjdG9yKTsKQEAgLTEzOCw2ICsxNDIsOCBAQCBwcml2YXRlOgog ICAgIHR5cGVkZWYgSGFzaE1hcDxSZWZQdHI8U2VjdXJpdHlPcmlnaW4+LCB1bnNpZ25lZCBsb25n IGxvbmcsIFNlY3VyaXR5T3JpZ2luSGFzaD4gUXVvdGFNYXA7CiAgICAgbXV0YWJsZSBPd25QdHI8 UXVvdGFNYXA+IG1fcXVvdGFNYXA7CiAKKyAgICBPd25QdHI8T3JpZ2luUXVvdGFNYW5hZ2VyPiBt X3F1b3RhTWFuYWdlcjsKKwogICAgIFN0cmluZyBtX2RhdGFiYXNlRGlyZWN0b3J5UGF0aDsKIAog ICAgIERhdGFiYXNlVHJhY2tlckNsaWVudCogbV9jbGllbnQ7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L3N0b3JhZ2UvU1FMVHJhbnNhY3Rpb25DbGllbnQuY3BwIGIvV2ViQ29yZS9zdG9yYWdlL1NRTFRy YW5zYWN0aW9uQ2xpZW50LmNwcAppbmRleCAzMmM4ZTA3Li42MDY0Yzk5IDEwMDY0NAotLS0gYS9X ZWJDb3JlL3N0b3JhZ2UvU1FMVHJhbnNhY3Rpb25DbGllbnQuY3BwCisrKyBiL1dlYkNvcmUvc3Rv cmFnZS9TUUxUcmFuc2FjdGlvbkNsaWVudC5jcHAKQEAgLTM5LDYgKzM5LDcgQEAKICNpbmNsdWRl ICJEYXRhYmFzZVRocmVhZC5oIgogI2luY2x1ZGUgIkRhdGFiYXNlVHJhY2tlci5oIgogI2luY2x1 ZGUgIkRvY3VtZW50LmgiCisjaW5jbHVkZSAiT3JpZ2luUXVvdGFNYW5hZ2VyLmgiCiAjaW5jbHVk ZSAiUGFnZS5oIgogI2luY2x1ZGUgIlNRTFRyYW5zYWN0aW9uLmgiCiAKQEAgLTU1LDcgKzU2LDkg QEAgdm9pZCBTUUxUcmFuc2FjdGlvbkNsaWVudDo6ZGlkQ29tbWl0VHJhbnNhY3Rpb24oU1FMVHJh bnNhY3Rpb24qIHRyYW5zYWN0aW9uKQogdm9pZCBTUUxUcmFuc2FjdGlvbkNsaWVudDo6ZGlkRXhl Y3V0ZVN0YXRlbWVudChTUUxUcmFuc2FjdGlvbiogdHJhbnNhY3Rpb24pCiB7CiAgICAgQVNTRVJU KGN1cnJlbnRUaHJlYWQoKSA9PSB0cmFuc2FjdGlvbi0+ZGF0YWJhc2UoKS0+c2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpLT5kYXRhYmFzZVRocmVhZCgpLT5nZXRUaHJlYWRJRCgpKTsKLSAgICBEYXRh YmFzZVRyYWNrZXI6OnRyYWNrZXIoKS5kYXRhYmFzZUNoYW5nZWQodHJhbnNhY3Rpb24tPmRhdGFi YXNlKCkpOworICAgIE9yaWdpblF1b3RhTWFuYWdlciYgbWFuYWdlcihEYXRhYmFzZVRyYWNrZXI6 OnRyYWNrZXIoKS5vcmlnaW5RdW90YU1hbmFnZXIoKSk7CisgICAgTG9ja2VyPE9yaWdpblF1b3Rh TWFuYWdlcj4gbG9ja2VyKG1hbmFnZXIpOworICAgIG1hbmFnZXIubWFya0RhdGFiYXNlKHRyYW5z YWN0aW9uLT5kYXRhYmFzZSgpKTsKIH0KIAogYm9vbCBTUUxUcmFuc2FjdGlvbkNsaWVudDo6ZGlk RXhjZWVkUXVvdGEoU1FMVHJhbnNhY3Rpb24qIHRyYW5zYWN0aW9uKQo=