68146 2011-09-15 00:41:10 -0700 REGRESSION(r95174): Broke Chromium builds in a way that wasn't obviously fixable. (Requested by dave_levin on #webkit). 2011-09-15 00:48:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 68137 1 webkit.review.bot webkit.review.bot levin mdelaney7 simon.fraser oldest_to_newest 467693 0 webkit.review.bot 2011-09-15 00:41:10 -0700 http://trac.webkit.org/changeset/95174 broke the build: Broke Chromium builds in a way that wasn't obviously fixable. (Requested by dave_levin 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 467694 1 107473 webkit.review.bot 2011-09-15 00:41:36 -0700 Created attachment 107473 ROLLOUT of r95174 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 where ATTACHMENT_ID is the ID of this attachment. 467697 2 107473 levin 2011-09-15 00:48:31 -0700 Comment on attachment 107473 ROLLOUT of r95174 The fix was pretty simple after all. I should obviously go to sleep. 107473 2011-09-15 00:41:36 -0700 2011-09-15 00:48:31 -0700 ROLLOUT of r95174 bug-68146-20110915074020.patch text/plain 10998 webkit.review.bot U3VidmVyc2lvbiBSZXZpc2lvbjogOTUxNzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBkMzA3NTBkM2QxYzZjNjU2 OTgwNzAzZTY2MTY4YmZhZTljMGU1NmEyLi5iNTQxYTQ0NmNlNGVmMzhhYWEyOGRjM2RiMDk2ZWZh Y2Q3ZTZhZGU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjggQEAKKzIwMTEtMDktMTUgIFNoZXJp ZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgorCisgICAgICAgIFVucmV2aWV3 ZWQsIHJvbGxpbmcgb3V0IHI5NTE3NC4KKyAgICAgICAgaHR0cDovL3RyYWMud2Via2l0Lm9yZy9j aGFuZ2VzZXQvOTUxNzQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTY4MTQ2CisKKyAgICAgICAgQnJva2UgQ2hyb21pdW0gYnVpbGRzIGluIGEgd2F5IHRo YXQgd2Fzbid0IG9idmlvdXNseSBmaXhhYmxlLgorICAgICAgICAoUmVxdWVzdGVkIGJ5IGRhdmVf bGV2aW4gb24gI3dlYmtpdCkuCisKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJp bmdDb250ZXh0MkQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4 dDJEOjppc0FjY2VsZXJhdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRDo6ZmlsbEFuZERpc3BsYXlUcmFuc3BhcmVuY3lFbHNld2hlcmUpOgorICAgICAgICAq IHBsYXRmb3JtL2dyYXBoaWNzL0ltYWdlQnVmZmVyLmg6CisgICAgICAgIChXZWJDb3JlOjpJbWFn ZUJ1ZmZlcjo6aXNBY2NlbGVyYXRlZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2cv SW1hZ2VCdWZmZXJDRy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6SW1hZ2VC dWZmZXIpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VCdWZmZXI6OmNvcHlOYXRpdmVJbWFnZSk6 CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6ZHJhd1BhdHRlcm4pOgorICAgICAgICAo V2ViQ29yZTo6SW1hZ2VCdWZmZXI6OmdldFVubXVsdGlwbGllZEltYWdlRGF0YSk6CisgICAgICAg IChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6Z2V0UHJlbXVsdGlwbGllZEltYWdlRGF0YSk6CisgICAg ICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6cHV0VW5tdWx0aXBsaWVkSW1hZ2VEYXRhKToKKyAg ICAgICAgKFdlYkNvcmU6OkltYWdlQnVmZmVyOjpwdXRQcmVtdWx0aXBsaWVkSW1hZ2VEYXRhKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJbWFnZUJ1ZmZlcjo6SW1hZ2VCdWZmZXIpOgorCiAyMDExLTA5LTE1 ICBZdXRhIEtpdGFtdXJhICA8eXV0YWtAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFRocmVhZGFi bGVXZWJTb2NrZXRDaGFubmVsQ2xpZW50V3JhcHBlciBzaG91bGRuJ3QgaGF2ZSBhIFN0cmluZyBp biBpdC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRl cmluZ0NvbnRleHQyRC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5k ZXJpbmdDb250ZXh0MkQuY3BwCmluZGV4IDY4ZjQ5MmM3OTdmOTA1NWZlNDMyOWQ0MWJmNTM0NmQ3 ZjJmY2I4OGIuLjM5OTI0ZDlkYWJhMjIzZjY4ZTBmMjY1NDIwY2RjMWFmZDJiZDhmMjEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQy RC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29u dGV4dDJELmNwcApAQCAtMTUwLDcgKzE1MCwxMCBAQCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6 On5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQoKQogCiBib29sIENhbnZhc1JlbmRlcmluZ0NvbnRl eHQyRDo6aXNBY2NlbGVyYXRlZCgpIGNvbnN0CiB7Ci0jaWYgVVNFKElPU1VSRkFDRV9DQU5WQVNf QkFDS0lOR19TVE9SRSkgfHwgRU5BQkxFKEFDQ0VMRVJBVEVEXzJEX0NBTlZBUykKKyNpZiBVU0Uo SU9TVVJGQUNFX0NBTlZBU19CQUNLSU5HX1NUT1JFKQorICAgIEltYWdlQnVmZmVyKiBidWZmZXIg PSBjYW52YXMoKS0+YnVmZmVyKCk7CisgICAgcmV0dXJuIGJ1ZmZlciA/IGJ1ZmZlci0+aXNBY2Nl bGVyYXRlZCgpIDogZmFsc2U7CisjZWxpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQog ICAgIHJldHVybiBjYW52YXMoKS0+aGFzQ3JlYXRlZEltYWdlQnVmZmVyKCkgJiYgZHJhd2luZ0Nv bnRleHQoKSAmJiBkcmF3aW5nQ29udGV4dCgpLT5pc0FjY2VsZXJhdGVkQ29udGV4dCgpOwogI2Vs c2UKICAgICByZXR1cm4gZmFsc2U7CkBAIC0xNTA4LDcgKzE1MTEsNyBAQCB0ZW1wbGF0ZTxjbGFz cyBUPiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZmlsbEFuZERpc3BsYXlUcmFuc3Bh cmVuY3lFbHNldwogICAgIEludFJlY3QgYnVmZmVyUmVjdCA9IGVuY2xvc2luZ0ludFJlY3QocGF0 aC5ib3VuZGluZ1JlY3QoKSk7CiAgICAgcGF0aC50cmFuc2xhdGUoRmxvYXRTaXplKC1idWZmZXJS ZWN0LngoKSwgLWJ1ZmZlclJlY3QueSgpKSk7CiAKLSAgICBSZW5kZXJpbmdNb2RlIHJlbmRlck1v ZGUgPSBpc0FjY2VsZXJhdGVkKCkgPyBBY2NlbGVyYXRlZCA6IFVuYWNjZWxlcmF0ZWQ7CisgICAg UmVuZGVyaW5nTW9kZSByZW5kZXJNb2RlID0gY2FudmFzKCktPmJ1ZmZlcigpLT5pc0FjY2VsZXJh dGVkKCkgPyBBY2NlbGVyYXRlZCA6IFVuYWNjZWxlcmF0ZWQ7CiAgICAgT3duUHRyPEltYWdlQnVm ZmVyPiBidWZmZXIgPSBJbWFnZUJ1ZmZlcjo6Y3JlYXRlKGJ1ZmZlclJlY3Quc2l6ZSgpLCBDb2xv clNwYWNlRGV2aWNlUkdCLCByZW5kZXJNb2RlKTsKICAgICBidWZmZXItPmNvbnRleHQoKS0+c2V0 Q29tcG9zaXRlT3BlcmF0aW9uKENvbXBvc2l0ZVNvdXJjZU92ZXIpOwogICAgIHN0YXRlKCkubV9m aWxsU3R5bGUtPmFwcGx5RmlsbENvbG9yKGJ1ZmZlci0+Y29udGV4dCgpKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlQnVmZmVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9JbWFnZUJ1ZmZlci5oCmluZGV4IDY2YjZjYzMwMDVk NjNkNTJkMTU4ODk4ZWU0N2RhODY3YjVlNDBlNjIuLmRlMmRlOTMzODViZmZiMDAzYjI5M2VlOGEw NzQ4MTEzMDg4MTc5YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0ltYWdlQnVmZmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv SW1hZ2VCdWZmZXIuaApAQCAtOTAsNiArOTAsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg ICAgIAogICAgICAgICBHcmFwaGljc0NvbnRleHQqIGNvbnRleHQoKSBjb25zdDsKIAorICAgICAg ICBib29sIGlzQWNjZWxlcmF0ZWQoKSBjb25zdCB7IHJldHVybiBtX2FjY2VsZXJhdGVSZW5kZXJp bmc7IH0KICAgICAgICAgUGFzc1JlZlB0cjxJbWFnZT4gY29weUltYWdlKEJhY2tpbmdTdG9yZUNv cHkgPSBDb3B5QmFja2luZ1N0b3JlKSBjb25zdDsKIAogICAgICAgICBQYXNzUmVmUHRyPEJ5dGVB cnJheT4gZ2V0VW5tdWx0aXBsaWVkSW1hZ2VEYXRhKGNvbnN0IEludFJlY3QmKSBjb25zdDsKQEAg LTEzMSw2ICsxMzIsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgICAgIEltYWdlQnVmZmVy RGF0YSBtX2RhdGE7CiAKICAgICAgICAgSW50U2l6ZSBtX3NpemU7CisgICAgICAgIGJvb2wgbV9h Y2NlbGVyYXRlUmVuZGVyaW5nOwogICAgICAgICBPd25QdHI8R3JhcGhpY3NDb250ZXh0PiBtX2Nv bnRleHQ7CiAKICNpZiAhVVNFKENHKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2cvSW1hZ2VCdWZmZXJDRy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jZy9JbWFnZUJ1ZmZlckNHLmNwcAppbmRleCA3YjU1ZDE2ZDgwZWU5OTJiNTZj NTdmMTIxZmViYTQxMmVkNjQ4NjIyLi5iODMxN2U0NWM1NzIyYzJlNmVlNmRkZWYxMDU2ZTQ5YTY5 MWE0MzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jZy9J bWFnZUJ1ZmZlckNHLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j Zy9JbWFnZUJ1ZmZlckNHLmNwcApAQCAtMTA2LDkgKzEwNiw5IEBAIHN0YXRpYyB2b2lkIHJlbGVh c2VJbWFnZURhdGEodm9pZCosIGNvbnN0IHZvaWQqIGRhdGEsIHNpemVfdCkKIEltYWdlQnVmZmVy OjpJbWFnZUJ1ZmZlcihjb25zdCBJbnRTaXplJiBzaXplLCBDb2xvclNwYWNlIGltYWdlQ29sb3JT cGFjZSwgUmVuZGVyaW5nTW9kZSByZW5kZXJpbmdNb2RlLCBib29sJiBzdWNjZXNzKQogICAgIDog bV9kYXRhKHNpemUpCiAgICAgLCBtX3NpemUoc2l6ZSkKKyAgICAsIG1fYWNjZWxlcmF0ZVJlbmRl cmluZyhyZW5kZXJpbmdNb2RlID09IEFjY2VsZXJhdGVkKQogewogICAgIHN1Y2Nlc3MgPSBmYWxz ZTsgIC8vIE1ha2UgZWFybHkgcmV0dXJuIG1lYW4gZmFpbHVyZS4KLSAgICBib29sIGFjY2VsZXJh dGVSZW5kZXJpbmcgPSByZW5kZXJpbmdNb2RlID09IEFjY2VsZXJhdGVkOwogICAgIGlmIChzaXpl LndpZHRoKCkgPD0gMCB8fCBzaXplLmhlaWdodCgpIDw9IDApCiAgICAgICAgIHJldHVybjsKIApA QCAtMTIzLDcgKzEyMyw3IEBAIEltYWdlQnVmZmVyOjpJbWFnZUJ1ZmZlcihjb25zdCBJbnRTaXpl JiBzaXplLCBDb2xvclNwYWNlIGltYWdlQ29sb3JTcGFjZSwgUmVuZGVyCiAKICNpZiBVU0UoSU9T VVJGQUNFX0NBTlZBU19CQUNLSU5HX1NUT1JFKQogICAgIGlmICh3aWR0aC51bnNhZmVHZXQoKSA+ PSBtYXhJT1N1cmZhY2VEaW1lbnNpb24gfHwgaGVpZ2h0LnVuc2FmZUdldCgpID49IG1heElPU3Vy ZmFjZURpbWVuc2lvbiB8fCAod2lkdGggKiBoZWlnaHQpLnVuc2FmZUdldCgpIDwgbWluSU9TdXJm YWNlQXJlYSkKLSAgICAgICAgYWNjZWxlcmF0ZVJlbmRlcmluZyA9IGZhbHNlOworICAgICAgICBt X2FjY2VsZXJhdGVSZW5kZXJpbmcgPSBmYWxzZTsKICNlbHNlCiAgICAgQVNTRVJUKHJlbmRlcmlu Z01vZGUgPT0gVW5hY2NlbGVyYXRlZCk7CiAjZW5kaWYKQEAgLTE0MSwxNiArMTQxLDE2IEBAIElt YWdlQnVmZmVyOjpJbWFnZUJ1ZmZlcihjb25zdCBJbnRTaXplJiBzaXplLCBDb2xvclNwYWNlIGlt YWdlQ29sb3JTcGFjZSwgUmVuZGVyCiAgICAgfQogCiAgICAgUmV0YWluUHRyPENHQ29udGV4dFJl Zj4gY2dDb250ZXh0OwotICAgIGlmIChhY2NlbGVyYXRlUmVuZGVyaW5nKSB7CisgICAgaWYgKG1f YWNjZWxlcmF0ZVJlbmRlcmluZykgewogI2lmIFVTRShJT1NVUkZBQ0VfQ0FOVkFTX0JBQ0tJTkdf U1RPUkUpCiAgICAgICAgIG1fZGF0YS5tX3N1cmZhY2UgPSBjcmVhdGVJT1N1cmZhY2Uoc2l6ZSk7 CiAgICAgICAgIGNnQ29udGV4dC5hZG9wdENGKHdrSU9TdXJmYWNlQ29udGV4dENyZWF0ZShtX2Rh dGEubV9zdXJmYWNlLmdldCgpLCB3aWR0aC51bnNhZmVHZXQoKSwgaGVpZ2h0LnVuc2FmZUdldCgp LCBtX2RhdGEubV9jb2xvclNwYWNlKSk7CiAjZW5kaWYKICAgICAgICAgaWYgKCFjZ0NvbnRleHQp Ci0gICAgICAgICAgICBhY2NlbGVyYXRlUmVuZGVyaW5nID0gZmFsc2U7IC8vIElmIGFsbG9jYXRp b24gZmFpbHMsIGZhbGwgYmFjayB0byBub24tYWNjZWxlcmF0ZWQgcGF0aC4KKyAgICAgICAgICAg IG1fYWNjZWxlcmF0ZVJlbmRlcmluZyA9IGZhbHNlOyAvLyBJZiBhbGxvY2F0aW9uIGZhaWxzLCBm YWxsIGJhY2sgdG8gbm9uLWFjY2VsZXJhdGVkIHBhdGguCiAgICAgfQogCi0gICAgaWYgKCFhY2Nl bGVyYXRlUmVuZGVyaW5nKSB7CisgICAgaWYgKCFtX2FjY2VsZXJhdGVSZW5kZXJpbmcpIHsKICAg ICAgICAgaWYgKCF0cnlGYXN0Q2FsbG9jKGhlaWdodC51bnNhZmVHZXQoKSwgbV9kYXRhLm1fYnl0 ZXNQZXJSb3cudW5zYWZlR2V0KCkpLmdldFZhbHVlKG1fZGF0YS5tX2RhdGEpKQogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICBBU1NFUlQoIShyZWludGVycHJldF9jYXN0PHNpemVfdD4obV9k YXRhLm1fZGF0YSkgJiAyKSk7CkBAIC0xNjcsNyArMTY3LDYgQEAgSW1hZ2VCdWZmZXI6OkltYWdl QnVmZmVyKGNvbnN0IEludFNpemUmIHNpemUsIENvbG9yU3BhY2UgaW1hZ2VDb2xvclNwYWNlLCBS ZW5kZXIKICAgICBtX2NvbnRleHQ9IGFkb3B0UHRyKG5ldyBHcmFwaGljc0NvbnRleHQoY2dDb250 ZXh0LmdldCgpKSk7CiAgICAgbV9jb250ZXh0LT5zY2FsZShGbG9hdFNpemUoMSwgLTEpKTsKICAg ICBtX2NvbnRleHQtPnRyYW5zbGF0ZSgwLCAtaGVpZ2h0LnVuc2FmZUdldCgpKTsKLSAgICBtX2Nv bnRleHQtPnNldElzQWNjZWxlcmF0ZWRDb250ZXh0KGFjY2VsZXJhdGVSZW5kZXJpbmcpOwogICAg IHN1Y2Nlc3MgPSB0cnVlOwogfQogCkBAIC0xOTgsNyArMTk3LDcgQEAgUGFzc1JlZlB0cjxJbWFn ZT4gSW1hZ2VCdWZmZXI6OmNvcHlJbWFnZShCYWNraW5nU3RvcmVDb3B5IGNvcHlCZWhhdmlvcikg Y29uc3QKIE5hdGl2ZUltYWdlUHRyIEltYWdlQnVmZmVyOjpjb3B5TmF0aXZlSW1hZ2UoQmFja2lu Z1N0b3JlQ29weSBjb3B5QmVoYXZpb3IpIGNvbnN0CiB7CiAgICAgQ0dJbWFnZVJlZiBpbWFnZSA9 IDA7Ci0gICAgaWYgKCFtX2NvbnRleHQtPmlzQWNjZWxlcmF0ZWRDb250ZXh0KCkpIHsKKyAgICBp ZiAoIW1fYWNjZWxlcmF0ZVJlbmRlcmluZykgewogICAgICAgICBzd2l0Y2ggKGNvcHlCZWhhdmlv cikgewogICAgICAgICBjYXNlIERvbnRDb3B5QmFja2luZ1N0b3JlOgogICAgICAgICAgICAgaW1h Z2UgPSBDR0ltYWdlQ3JlYXRlKG1fc2l6ZS53aWR0aCgpLCBtX3NpemUuaGVpZ2h0KCksIDgsIDMy LCBtX2RhdGEubV9ieXRlc1BlclJvdy51bnNhZmVHZXQoKSwgbV9kYXRhLm1fY29sb3JTcGFjZSwg bV9kYXRhLm1fYml0bWFwSW5mbywgbV9kYXRhLm1fZGF0YVByb3ZpZGVyLmdldCgpLCAwLCB0cnVl LCBrQ0dSZW5kZXJpbmdJbnRlbnREZWZhdWx0KTsKQEAgLTIzNSw3ICsyMzQsNyBAQCB2b2lkIElt YWdlQnVmZmVyOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogZGVzdENvbnRleHQsIENvbG9yU3BhY2Ug c3R5bGVDb2xvclNwYWNlLAogCiB2b2lkIEltYWdlQnVmZmVyOjpkcmF3UGF0dGVybihHcmFwaGlj c0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgQWZmaW5l VHJhbnNmb3JtJiBwYXR0ZXJuVHJhbnNmb3JtLCBjb25zdCBGbG9hdFBvaW50JiBwaGFzZSwgQ29s b3JTcGFjZSBzdHlsZUNvbG9yU3BhY2UsIENvbXBvc2l0ZU9wZXJhdG9yIG9wLCBjb25zdCBGbG9h dFJlY3QmIGRlc3RSZWN0KQogewotICAgIGlmICghbV9jb250ZXh0LT5pc0FjY2VsZXJhdGVkQ29u dGV4dCgpKSB7CisgICAgaWYgKCFtX2FjY2VsZXJhdGVSZW5kZXJpbmcpIHsKICAgICAgICAgaWYg KGNvbnRleHQgPT0gbV9jb250ZXh0KSB7CiAgICAgICAgICAgICBSZWZQdHI8SW1hZ2U+IGNvcHkg PSBjb3B5SW1hZ2UoQ29weUJhY2tpbmdTdG9yZSk7IC8vIERyYXdpbmcgaW50byBvdXIgb3duIGJ1 ZmZlciwgbmVlZCB0byBkZWVwIGNvcHkuCiAgICAgICAgICAgICBjb3B5LT5kcmF3UGF0dGVybihj b250ZXh0LCBzcmNSZWN0LCBwYXR0ZXJuVHJhbnNmb3JtLCBwaGFzZSwgc3R5bGVDb2xvclNwYWNl LCBvcCwgZGVzdFJlY3QpOwpAQCAtMjYyLDMwICsyNjEsMzAgQEAgdm9pZCBJbWFnZUJ1ZmZlcjo6 Y2xpcChHcmFwaGljc0NvbnRleHQqIGNvbnRleHRUb0NsaXAsIGNvbnN0IEZsb2F0UmVjdCYgcmVj dCkgY28KIAogUGFzc1JlZlB0cjxCeXRlQXJyYXk+IEltYWdlQnVmZmVyOjpnZXRVbm11bHRpcGxp ZWRJbWFnZURhdGEoY29uc3QgSW50UmVjdCYgcmVjdCkgY29uc3QKIHsKLSAgICBpZiAobV9jb250 ZXh0LT5pc0FjY2VsZXJhdGVkQ29udGV4dCgpKQorICAgIGlmIChtX2FjY2VsZXJhdGVSZW5kZXJp bmcpCiAgICAgICAgIENHQ29udGV4dEZsdXNoKGNvbnRleHQoKS0+cGxhdGZvcm1Db250ZXh0KCkp OwotICAgIHJldHVybiBtX2RhdGEuZ2V0RGF0YShyZWN0LCBtX3NpemUsIG1fY29udGV4dC0+aXNB Y2NlbGVyYXRlZENvbnRleHQoKSwgdHJ1ZSk7CisgICAgcmV0dXJuIG1fZGF0YS5nZXREYXRhKHJl Y3QsIG1fc2l6ZSwgbV9hY2NlbGVyYXRlUmVuZGVyaW5nLCB0cnVlKTsKIH0KIAogUGFzc1JlZlB0 cjxCeXRlQXJyYXk+IEltYWdlQnVmZmVyOjpnZXRQcmVtdWx0aXBsaWVkSW1hZ2VEYXRhKGNvbnN0 IEludFJlY3QmIHJlY3QpIGNvbnN0CiB7Ci0gICAgaWYgKG1fY29udGV4dC0+aXNBY2NlbGVyYXRl ZENvbnRleHQoKSkKKyAgICBpZiAobV9hY2NlbGVyYXRlUmVuZGVyaW5nKQogICAgICAgICBDR0Nv bnRleHRGbHVzaChjb250ZXh0KCktPnBsYXRmb3JtQ29udGV4dCgpKTsKLSAgICByZXR1cm4gbV9k YXRhLmdldERhdGEocmVjdCwgbV9zaXplLCBtX2NvbnRleHQtPmlzQWNjZWxlcmF0ZWRDb250ZXh0 KCksIGZhbHNlKTsKKyAgICByZXR1cm4gbV9kYXRhLmdldERhdGEocmVjdCwgbV9zaXplLCBtX2Fj Y2VsZXJhdGVSZW5kZXJpbmcsIGZhbHNlKTsKIH0KIAogdm9pZCBJbWFnZUJ1ZmZlcjo6cHV0VW5t dWx0aXBsaWVkSW1hZ2VEYXRhKEJ5dGVBcnJheSogc291cmNlLCBjb25zdCBJbnRTaXplJiBzb3Vy Y2VTaXplLCBjb25zdCBJbnRSZWN0JiBzb3VyY2VSZWN0LCBjb25zdCBJbnRQb2ludCYgZGVzdFBv aW50KQogewotICAgIGlmIChtX2NvbnRleHQtPmlzQWNjZWxlcmF0ZWRDb250ZXh0KCkpCisgICAg aWYgKG1fYWNjZWxlcmF0ZVJlbmRlcmluZykKICAgICAgICAgQ0dDb250ZXh0Rmx1c2goY29udGV4 dCgpLT5wbGF0Zm9ybUNvbnRleHQoKSk7Ci0gICAgbV9kYXRhLnB1dERhdGEoc291cmNlLCBzb3Vy Y2VTaXplLCBzb3VyY2VSZWN0LCBkZXN0UG9pbnQsIG1fc2l6ZSwgbV9jb250ZXh0LT5pc0FjY2Vs ZXJhdGVkQ29udGV4dCgpLCB0cnVlKTsKKyAgICBtX2RhdGEucHV0RGF0YShzb3VyY2UsIHNvdXJj ZVNpemUsIHNvdXJjZVJlY3QsIGRlc3RQb2ludCwgbV9zaXplLCBtX2FjY2VsZXJhdGVSZW5kZXJp bmcsIHRydWUpOwogfQogCiB2b2lkIEltYWdlQnVmZmVyOjpwdXRQcmVtdWx0aXBsaWVkSW1hZ2VE YXRhKEJ5dGVBcnJheSogc291cmNlLCBjb25zdCBJbnRTaXplJiBzb3VyY2VTaXplLCBjb25zdCBJ bnRSZWN0JiBzb3VyY2VSZWN0LCBjb25zdCBJbnRQb2ludCYgZGVzdFBvaW50KQogewotICAgIGlm IChtX2NvbnRleHQtPmlzQWNjZWxlcmF0ZWRDb250ZXh0KCkpCisgICAgaWYgKG1fYWNjZWxlcmF0 ZVJlbmRlcmluZykKICAgICAgICAgQ0dDb250ZXh0Rmx1c2goY29udGV4dCgpLT5wbGF0Zm9ybUNv bnRleHQoKSk7Ci0gICAgbV9kYXRhLnB1dERhdGEoc291cmNlLCBzb3VyY2VTaXplLCBzb3VyY2VS ZWN0LCBkZXN0UG9pbnQsIG1fc2l6ZSwgbV9jb250ZXh0LT5pc0FjY2VsZXJhdGVkQ29udGV4dCgp LCBmYWxzZSk7CisgICAgbV9kYXRhLnB1dERhdGEoc291cmNlLCBzb3VyY2VTaXplLCBzb3VyY2VS ZWN0LCBkZXN0UG9pbnQsIG1fc2l6ZSwgbV9hY2NlbGVyYXRlUmVuZGVyaW5nLCBmYWxzZSk7CiB9 CiAKIHN0YXRpYyBpbmxpbmUgQ0ZTdHJpbmdSZWYganBlZ1VUSSgpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0ltYWdlQnVmZmVyU2tpYS5jcHAK aW5kZXggYjVkOWQ5NDQ1NmI2NjI2NzFmNTQ5NmUyOWE1NGYwOGU4N2E2Y2VmNS4uOGI1MzljMDc0 MTM1YTYwZDE0ODJkMGU2NDA3Y2RjOTgzMmQ1NDllOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9JbWFnZUJ1ZmZlclNraWEuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvSW1hZ2VCdWZmZXJTa2lhLmNwcApAQCAt NjcsNiArNjcsNyBAQCBJbWFnZUJ1ZmZlckRhdGE6OkltYWdlQnVmZmVyRGF0YShjb25zdCBJbnRT aXplJiBzaXplKQogSW1hZ2VCdWZmZXI6OkltYWdlQnVmZmVyKGNvbnN0IEludFNpemUmIHNpemUs IENvbG9yU3BhY2UsIFJlbmRlcmluZ01vZGUgcmVuZGVyaW5nTW9kZSwgYm9vbCYgc3VjY2VzcykK ICAgICA6IG1fZGF0YShzaXplKQogICAgICwgbV9zaXplKHNpemUpCisgICAgLCBtX2FjY2VsZXJh dGVSZW5kZXJpbmcoZmFsc2UpCiB7CiAgICAgT3duUHRyPFNrQ2FudmFzPiBjYW52YXMgPSBhZG9w dFB0cihza2lhOjpUcnlDcmVhdGVCaXRtYXBDYW52YXMoc2l6ZS53aWR0aCgpLCBzaXplLmhlaWdo dCgpLCBmYWxzZSkpOwogICAgIGlmICghY2FudmFzKSB7CkBAIC0xMDAsNyArMTAxLDcgQEAgSW1h Z2VCdWZmZXI6OkltYWdlQnVmZmVyKGNvbnN0IEludFNpemUmIHNpemUsIENvbG9yU3BhY2UsIFJl bmRlcmluZ01vZGUgcmVuZGVyaW4KICAgICAgICAgICAgICAgICBpZiAodGV4dHVyZS5nZXQoKSkg ewogICAgICAgICAgICAgICAgICAgICBtX2RhdGEubV9jYW52YXMtPnNldERldmljZShuZXcgU2tH cHVEZXZpY2UoZ3IsIHRleHR1cmUuZ2V0KCkpKS0+dW5yZWYoKTsKICAgICAgICAgICAgICAgICAg ICAgbV9jb250ZXh0LT5wbGF0Zm9ybUNvbnRleHQoKS0+c2V0R3JhcGhpY3NDb250ZXh0M0QoY29u dGV4dDNEKTsKLSAgICAgICAgICAgICAgICAgICAgbV9jb250ZXh0LT5zZXRJc0FjY2VsZXJhdGVk Q29udGV4dCh0cnVlKTsKKyAgICAgICAgICAgICAgICAgICAgbV9hY2NlbGVyYXRlUmVuZGVyaW5n ID0gdHJ1ZTsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgICAgICAgICAg ICAgICAgIG1fZGF0YS5tX3BsYXRmb3JtTGF5ZXIgPSBDYW52YXMyRExheWVyQ2hyb21pdW06OmNy ZWF0ZShjb250ZXh0M0QpOwogICAgICAgICAgICAgICAgICAgICBtX2RhdGEubV9wbGF0Zm9ybUxh eWVyLT5zZXRUZXh0dXJlSWQodGV4dHVyZS5nZXQoKS0+Z2V0VGV4dHVyZUhhbmRsZSgpKTsK