64210 2011-07-08 15:53:27 -0700 REGRESSION(r90662): Introduced regressions in Chromium browser tests (Requested by rniwa on #webkit). 2011-07-08 15:57:18 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 64133 1 commit-queue commit-queue dglazkov rniwa webkit.review.bot oldest_to_newest 434347 0 commit-queue 2011-07-08 15:53:27 -0700 http://trac.webkit.org/changeset/90662 broke the build: Introduced regressions in Chromium browser tests (Requested by rniwa 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 434348 1 100173 commit-queue 2011-07-08 15:53:36 -0700 Created attachment 100173 ROLLOUT of r90662 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 --ignore-builders where ATTACHMENT_ID is the ID of this attachment. 434354 2 100173 webkit.review.bot 2011-07-08 15:57:14 -0700 Comment on attachment 100173 ROLLOUT of r90662 Clearing flags on attachment: 100173 Committed r90671: <http://trac.webkit.org/changeset/90671> 434355 3 webkit.review.bot 2011-07-08 15:57:18 -0700 All reviewed patches have been landed. Closing bug. 100173 2011-07-08 15:53:36 -0700 2011-07-08 15:57:14 -0700 ROLLOUT of r90662 bug-64210-20110708155335.patch text/plain 22420 commit-queue U3VidmVyc2lvbiBSZXZpc2lvbjogOTA2NzAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlYmJlYmIzYzRmYzMwYmY1 ZGUyZjdhMGMwYWQyMjk0YTE1YjI3Y2E5Li43ZWM2MmFmODdlYzQ5Y2RkOGM3ZmJkYjcyYzUzNDc1 MjY1M2UwMGQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMDctMDggIEFkYW0g QmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KKworICAgICAgICBVbnJldmlld2VkLCByb2xsaW5n IG91dCByOTA2NjIuCisgICAgICAgIGh0dHA6Ly90cmFjLndlYmtpdC5vcmcvY2hhbmdlc2V0Lzkw NjYyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NDIx MAorCisgICAgICAgIEludHJvZHVjZWQgcmVncmVzc2lvbnMgaW4gQ2hyb21pdW0gYnJvd3NlciB0 ZXN0cyAoUmVxdWVzdGVkIGJ5CisgICAgICAgIHJuaXdhIG9uICN3ZWJraXQpLgorCisgICAgICAg ICogYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OnNlbGVjdGVkVGV4dCk6CisgICAg ICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZWxlY3RlZFRleHRSYW5n ZSk6CisgICAgICAgIChXZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0OjpzZXRTZWxl Y3RlZFRleHRSYW5nZSk6CisgICAgICAgICogaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZXRTZWxl Y3Rpb25SYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVu dDo6c2VsZWN0aW9uU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6SFRNTFRleHRGb3JtQ29udHJv bEVsZW1lbnQ6OnNlbGVjdGlvbkVuZCk6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVGV4dEZvcm1D b250cm9sRWxlbWVudDo6c2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUZXh0Rm9y bUNvbnRyb2xFbGVtZW50OjpyZXN0b3JlQ2FjaGVkU2VsZWN0aW9uKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3Rpb25DaGFuZ2VkKToKKyAgICAg ICAgKiBodG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuaDoKKyAgICAgICAgKiBodG1sL0hUTUxJ bnB1dEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTElucHV0RWxlbWVudDo6c2V0 VmFsdWUpOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbDo6c2VsZWN0aW9uU3RhcnQpOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyVGV4dENvbnRyb2w6OnNlbGVjdGlvbkVuZCk6CisgICAgICAgIChX ZWJDb3JlOjpSZW5kZXJUZXh0Q29udHJvbDo6aGFzVmlzaWJsZVRleHRBcmVhKToKKyAgICAgICAg KFdlYkNvcmU6OnNldFNlbGVjdGlvblJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OnNldENvbnRh aW5lckFuZE9mZnNldEZvclJhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRleHRDb250 cm9sOjpzZWxlY3Rpb24pOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5o OgorCiAyMDExLTA3LTA4ICBCcmlhbiBTYWxvbW9uICA8YnNhbG9tb25AZ29vZ2xlLmNvbT4KIAog ICAgICAgICBNYWtlIEdMIGNvbnRleHQgY3VycmVudCBiZWZvcmUgdXBkYXRpbmcgbGF5ZXIgdGV4 dHVyZSB1c2luZyBza2lhLWdwdQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vz c2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHAKaW5kZXggNjZjYjMwMTk1NmZl MTBkOTliZWJkYTVmODBiY2VlMzllYmU0ODU5Yy4uZGRlZDhlNmE5NjQ4NTkxN2Y1MmJkN2NkZDcx NWNhM2YyYWY2MTg5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9B Y2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwCkBAIC0xOTk0LDggKzE5OTQsOCBA QCBTdHJpbmcgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2VsZWN0ZWRUZXh0KCkgY29uc3QK ICAgICAgICAgcmV0dXJuIFN0cmluZygpOyAvLyBuZWVkIHRvIHJldHVybiBzb21ldGhpbmcgZGlz dGluY3QgZnJvbSBlbXB0eSBzdHJpbmcKICAgICAKICAgICBpZiAoaXNOYXRpdmVUZXh0Q29udHJv bCgpKSB7Ci0gICAgICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50KiB0ZXh0Q29udHJvbCA9 IHRvUmVuZGVyVGV4dENvbnRyb2wobV9yZW5kZXJlciktPnRleHRGb3JtQ29udHJvbEVsZW1lbnQo KTsKLSAgICAgICAgcmV0dXJuIHRleHRDb250cm9sLT5zZWxlY3RlZFRleHQoKTsKKyAgICAgICAg UmVuZGVyVGV4dENvbnRyb2wqIHRleHRDb250cm9sID0gdG9SZW5kZXJUZXh0Q29udHJvbChtX3Jl bmRlcmVyKTsKKyAgICAgICAgcmV0dXJuIHRleHRDb250cm9sLT50ZXh0KCkuc3Vic3RyaW5nKHRl eHRDb250cm9sLT5zZWxlY3Rpb25TdGFydCgpLCB0ZXh0Q29udHJvbC0+c2VsZWN0aW9uRW5kKCkg LSB0ZXh0Q29udHJvbC0+c2VsZWN0aW9uU3RhcnQoKSk7CiAgICAgfQogICAgIAogICAgIGlmIChh cmlhUm9sZUF0dHJpYnV0ZSgpID09IFVua25vd25Sb2xlKQpAQCAtMjAyOCw3ICsyMDI4LDcgQEAg UGxhaW5UZXh0UmFuZ2UgQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdDo6c2VsZWN0ZWRUZXh0UmFu Z2UoKSBjb25zdAogICAgIAogICAgIEFjY2Vzc2liaWxpdHlSb2xlIGFyaWFSb2xlID0gYXJpYVJv bGVBdHRyaWJ1dGUoKTsKICAgICBpZiAoaXNOYXRpdmVUZXh0Q29udHJvbCgpICYmIGFyaWFSb2xl ID09IFVua25vd25Sb2xlKSB7Ci0gICAgICAgIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50KiB0 ZXh0Q29udHJvbCA9IHRvUmVuZGVyVGV4dENvbnRyb2wobV9yZW5kZXJlciktPnRleHRGb3JtQ29u dHJvbEVsZW1lbnQoKTsKKyAgICAgICAgUmVuZGVyVGV4dENvbnRyb2wqIHRleHRDb250cm9sID0g dG9SZW5kZXJUZXh0Q29udHJvbChtX3JlbmRlcmVyKTsKICAgICAgICAgcmV0dXJuIFBsYWluVGV4 dFJhbmdlKHRleHRDb250cm9sLT5zZWxlY3Rpb25TdGFydCgpLCB0ZXh0Q29udHJvbC0+c2VsZWN0 aW9uRW5kKCkgLSB0ZXh0Q29udHJvbC0+c2VsZWN0aW9uU3RhcnQoKSk7CiAgICAgfQogICAgIApA QCAtMjA0MSw4ICsyMDQxLDcgQEAgUGxhaW5UZXh0UmFuZ2UgQWNjZXNzaWJpbGl0eVJlbmRlck9i amVjdDo6c2VsZWN0ZWRUZXh0UmFuZ2UoKSBjb25zdAogdm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVy T2JqZWN0OjpzZXRTZWxlY3RlZFRleHRSYW5nZShjb25zdCBQbGFpblRleHRSYW5nZSYgcmFuZ2Up CiB7CiAgICAgaWYgKGlzTmF0aXZlVGV4dENvbnRyb2woKSkgewotICAgICAgICBIVE1MVGV4dEZv cm1Db250cm9sRWxlbWVudCogdGV4dENvbnRyb2wgPSB0b1JlbmRlclRleHRDb250cm9sKG1fcmVu ZGVyZXIpLT50ZXh0Rm9ybUNvbnRyb2xFbGVtZW50KCk7Ci0gICAgICAgIHRleHRDb250cm9sLT5z ZXRTZWxlY3Rpb25SYW5nZShyYW5nZS5zdGFydCwgcmFuZ2Uuc3RhcnQgKyByYW5nZS5sZW5ndGgp OworICAgICAgICBzZXRTZWxlY3Rpb25SYW5nZShtX3JlbmRlcmVyLT5ub2RlKCksIHJhbmdlLnN0 YXJ0LCByYW5nZS5zdGFydCArIHJhbmdlLmxlbmd0aCk7CiAgICAgICAgIHJldHVybjsKICAgICB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVu dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuY3BwCmlu ZGV4IGU4NjRlODA0NjcyMzA5ZDQ2YjYwMWViNDk4MjNhN2M2NzFhNTdjZmQuLjgyMmYwNmU2OWIz NzhhNjk4NGU4ZDUzMDlmMzQxMDQ2NzU0MWQ3Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTEZvcm1Db250cm9sRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmNwcApAQCAtNjYyLDE2ICs2NjIsNiBAQCB2b2lkIEhU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3QoKQogICAgIHNldFNlbGVjdGlvblJhbmdl KDAsIG51bWVyaWNfbGltaXRzPGludD46Om1heCgpKTsKIH0KIAotU3RyaW5nIEhUTUxUZXh0Rm9y bUNvbnRyb2xFbGVtZW50OjpzZWxlY3RlZFRleHQoKSBjb25zdAotewotICAgIC8vIEZJWE1FOiBX ZSBzaG91bGQgYmUgYWJsZSB0byBleHRyYWN0IHNlbGVjdGVkIGNvbnRlbnRzIGV2ZW4gaWYgdGhl cmUgd2VyZSBubyByZW5kZXJlci4KLSAgICBpZiAoIXJlbmRlcmVyKCkgfHwgcmVuZGVyZXIoKS0+ aXNUZXh0Q29udHJvbCgpKQotICAgICAgICByZXR1cm4gU3RyaW5nKCk7Ci0KLSAgICBSZW5kZXJU ZXh0Q29udHJvbCogdGV4dENvbnRyb2wgPSB0b1JlbmRlclRleHRDb250cm9sKHJlbmRlcmVyKCkp OwotICAgIHJldHVybiB0ZXh0Q29udHJvbC0+dGV4dCgpLnN1YnN0cmluZyhzZWxlY3Rpb25TdGFy dCgpLCBzZWxlY3Rpb25FbmQoKSAtIHNlbGVjdGlvblN0YXJ0KCkpOwotfQotCiB2b2lkIEhUTUxU ZXh0Rm9ybUNvbnRyb2xFbGVtZW50OjpkaXNwYXRjaEZvcm1Db250cm9sQ2hhbmdlRXZlbnQoKQog ewogICAgIGlmIChtX3RleHRBc09mTGFzdEZvcm1Db250cm9sQ2hhbmdlRXZlbnQgIT0gdmFsdWUo KSkgewpAQCAtNjgxLDQ2ICs2NzEsOSBAQCB2b2lkIEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50 OjpkaXNwYXRjaEZvcm1Db250cm9sQ2hhbmdlRXZlbnQoKQogICAgIHNldENoYW5nZWRTaW5jZUxh c3RGb3JtQ29udHJvbENoYW5nZUV2ZW50KGZhbHNlKTsKIH0KIAotc3RhdGljIGlubGluZSBib29s IGhhc1Zpc2libGVUZXh0QXJlYShSZW5kZXJUZXh0Q29udHJvbCogdGV4dENvbnRyb2wpCi17Ci0g ICAgQVNTRVJUKHRleHRDb250cm9sKTsKLSAgICBIVE1MRWxlbWVudCogaW5uZXJUZXh0ID0gdGV4 dENvbnRyb2wtPmlubmVyVGV4dEVsZW1lbnQoKTsKLSAgICByZXR1cm4gdGV4dENvbnRyb2wtPnN0 eWxlKCktPnZpc2liaWxpdHkoKSAhPSBISURERU4gJiYgaW5uZXJUZXh0ICYmIGlubmVyVGV4dC0+ cmVuZGVyZXIoKSAmJiBpbm5lclRleHQtPnJlbmRlckJveCgpLT5oZWlnaHQoKTsKLX0KLQogdm9p ZCBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2V0U2VsZWN0aW9uUmFuZ2UoaW50IHN0YXJ0 LCBpbnQgZW5kKQogewotICAgIGRvY3VtZW50KCktPnVwZGF0ZUxheW91dElnbm9yZVBlbmRpbmdT dHlsZXNoZWV0cygpOwotCi0gICAgaWYgKCFyZW5kZXJlcigpIHx8ICFyZW5kZXJlcigpLT5pc1Rl eHRDb250cm9sKCkpCi0gICAgICAgIHJldHVybjsKLQotICAgIGVuZCA9IG1heChlbmQsIDApOwot ICAgIHN0YXJ0ID0gbWluKG1heChzdGFydCwgMCksIGVuZCk7Ci0KLSAgICBSZW5kZXJUZXh0Q29u dHJvbCogY29udHJvbCA9IHRvUmVuZGVyVGV4dENvbnRyb2wocmVuZGVyZXIoKSk7Ci0gICAgaWYg KCFoYXNWaXNpYmxlVGV4dEFyZWEoY29udHJvbCkpIHsKLSAgICAgICAgY2FjaGVTZWxlY3Rpb24o c3RhcnQsIGVuZCk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAgICBWaXNpYmxlUG9zaXRp b24gc3RhcnRQb3NpdGlvbiA9IGNvbnRyb2wtPnZpc2libGVQb3NpdGlvbkZvckluZGV4KHN0YXJ0 KTsKLSAgICBWaXNpYmxlUG9zaXRpb24gZW5kUG9zaXRpb247Ci0gICAgaWYgKHN0YXJ0ID09IGVu ZCkKLSAgICAgICAgZW5kUG9zaXRpb24gPSBzdGFydFBvc2l0aW9uOwotICAgIGVsc2UKLSAgICAg ICAgZW5kUG9zaXRpb24gPSBjb250cm9sLT52aXNpYmxlUG9zaXRpb25Gb3JJbmRleChlbmQpOwot Ci0gICAgLy8gc3RhcnRQb3NpdGlvbiBhbmQgZW5kUG9zaXRpb24gY2FuIGJlIG51bGwgcG9zaXRp b24gZm9yIGV4YW1wbGUgd2hlbgotICAgIC8vICItd2Via2l0LXVzZXItc2VsZWN0OiBub25lIiBz dHlsZSBhdHRyaWJ1dGUgaXMgc3BlY2lmaWVkLgotICAgIGlmIChzdGFydFBvc2l0aW9uLmlzTm90 TnVsbCgpICYmIGVuZFBvc2l0aW9uLmlzTm90TnVsbCgpKSB7Ci0gICAgICAgIEFTU0VSVChzdGFy dFBvc2l0aW9uLmRlZXBFcXVpdmFsZW50KCkuZGVwcmVjYXRlZE5vZGUoKS0+c2hhZG93QW5jZXN0 b3JOb2RlKCkgPT0gdGhpcwotICAgICAgICAgICAgJiYgZW5kUG9zaXRpb24uZGVlcEVxdWl2YWxl bnQoKS5kZXByZWNhdGVkTm9kZSgpLT5zaGFkb3dBbmNlc3Rvck5vZGUoKSA9PSB0aGlzKTsKLSAg ICB9Ci0KLSAgICBWaXNpYmxlU2VsZWN0aW9uIG5ld1NlbGVjdGlvbiA9IFZpc2libGVTZWxlY3Rp b24oc3RhcnRQb3NpdGlvbiwgZW5kUG9zaXRpb24pOwotICAgIGlmIChGcmFtZSogZnJhbWUgPSBk b2N1bWVudCgpLT5mcmFtZSgpKQotICAgICAgICBmcmFtZS0+c2VsZWN0aW9uKCktPnNldFNlbGVj dGlvbihuZXdTZWxlY3Rpb24pOworICAgIFdlYkNvcmU6OnNldFNlbGVjdGlvblJhbmdlKHRoaXMs IHN0YXJ0LCBlbmQpOwogfQogCiBpbnQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnNlbGVj dGlvblN0YXJ0KCkgY29uc3QKQEAgLTcyOSwxNiArNjgyLDkgQEAgaW50IEhUTUxUZXh0Rm9ybUNv bnRyb2xFbGVtZW50OjpzZWxlY3Rpb25TdGFydCgpIGNvbnN0CiAgICAgICAgIHJldHVybiAwOwog ICAgIGlmIChkb2N1bWVudCgpLT5mb2N1c2VkTm9kZSgpICE9IHRoaXMgJiYgaGFzQ2FjaGVkU2Vs ZWN0aW9uU3RhcnQoKSkKICAgICAgICAgcmV0dXJuIG1fY2FjaGVkU2VsZWN0aW9uU3RhcnQ7Ci0K LSAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudCgpLT5mcmFtZSgpOwotICAgIGlmICghcmVuZGVy ZXIoKSB8fCAhZnJhbWUpCisgICAgaWYgKCFyZW5kZXJlcigpKQogICAgICAgICByZXR1cm4gMDsK LQotICAgIEhUTUxFbGVtZW50KiBpbm5lclRleHQgPSB0b1JlbmRlclRleHRDb250cm9sKHJlbmRl cmVyKCkpLT5pbm5lclRleHRFbGVtZW50KCk7Ci0gICAgLy8gRG8gbm90IGNhbGwgaW5uZXJUZXh0 RWxlbWVudCgpIGluIHRoZSBmdW5jdGlvbiBhcmd1bWVudHMgYXMgY3JlYXRpbmcgYSBWaXNpYmxl UG9zaXRpb24KLSAgICAvLyBmcm9tIGZyYW1lLT5zZWxlY3Rpb24tPnN0YXJ0KCkgY2FuIGJsb3cg dXMgZnJvbSB1bmRlcm5lYXRoLiBBbHNvLCBmdW5jdGlvbiBvcmRlcmluZyBpcwotICAgIC8vIHVz dWFsbHkgZGVwZW5kZW50IG9uIHRoZSBjb21waWxlci4KLSAgICByZXR1cm4gUmVuZGVyVGV4dENv bnRyb2w6OmluZGV4Rm9yVmlzaWJsZVBvc2l0aW9uKGlubmVyVGV4dCwgZnJhbWUtPnNlbGVjdGlv bigpLT5zdGFydCgpKTsKKyAgICByZXR1cm4gdG9SZW5kZXJUZXh0Q29udHJvbChyZW5kZXJlcigp KS0+c2VsZWN0aW9uU3RhcnQoKTsKIH0KIAogaW50IEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50 OjpzZWxlY3Rpb25FbmQoKSBjb25zdApAQCAtNzQ3LDY4ICs2OTMsMjEgQEAgaW50IEhUTUxUZXh0 Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3Rpb25FbmQoKSBjb25zdAogICAgICAgICByZXR1cm4g MDsKICAgICBpZiAoZG9jdW1lbnQoKS0+Zm9jdXNlZE5vZGUoKSAhPSB0aGlzICYmIGhhc0NhY2hl ZFNlbGVjdGlvbkVuZCgpKQogICAgICAgICByZXR1cm4gbV9jYWNoZWRTZWxlY3Rpb25FbmQ7Ci0K LSAgICBGcmFtZSogZnJhbWUgPSBkb2N1bWVudCgpLT5mcmFtZSgpOwotICAgIGlmICghcmVuZGVy ZXIoKSB8fCAhZnJhbWUpCisgICAgaWYgKCFyZW5kZXJlcigpKQogICAgICAgICByZXR1cm4gMDsK LQotICAgIEhUTUxFbGVtZW50KiBpbm5lclRleHQgPSB0b1JlbmRlclRleHRDb250cm9sKHJlbmRl cmVyKCkpLT5pbm5lclRleHRFbGVtZW50KCk7Ci0gICAgLy8gRG8gbm90IGNhbGwgaW5uZXJUZXh0 RWxlbWVudCgpIGluIHRoZSBmdW5jdGlvbiBhcmd1bWVudHMgYXMgY3JlYXRpbmcgYSBWaXNpYmxl UG9zaXRpb24KLSAgICAvLyBmcm9tIGZyYW1lLT5zZWxlY3Rpb24tPnN0YXJ0KCkgY2FuIGJsb3cg dXMgZnJvbSB1bmRlcm5lYXRoLiBBbHNvLCBmdW5jdGlvbiBvcmRlcmluZyBpcwotICAgIC8vIHVz dWFsbHkgZGVwZW5kZW50IG9uIHRoZSBjb21waWxlci4KLSAgICByZXR1cm4gUmVuZGVyVGV4dENv bnRyb2w6OmluZGV4Rm9yVmlzaWJsZVBvc2l0aW9uKGlubmVyVGV4dCwgZnJhbWUtPnNlbGVjdGlv bigpLT5lbmQoKSk7Ci19Ci0KLXN0YXRpYyBpbmxpbmUgdm9pZCBzZXRDb250YWluZXJBbmRPZmZz ZXRGb3JSYW5nZShOb2RlKiBub2RlLCBpbnQgb2Zmc2V0LCBOb2RlKiYgY29udGFpbmVyTm9kZSwg aW50JiBvZmZzZXRJbkNvbnRhaW5lcikKLXsKLSAgICBpZiAobm9kZS0+aXNUZXh0Tm9kZSgpKSB7 Ci0gICAgICAgIGNvbnRhaW5lck5vZGUgPSBub2RlOwotICAgICAgICBvZmZzZXRJbkNvbnRhaW5l ciA9IG9mZnNldDsKLSAgICB9IGVsc2UgewotICAgICAgICBjb250YWluZXJOb2RlID0gbm9kZS0+ cGFyZW50Tm9kZSgpOwotICAgICAgICBvZmZzZXRJbkNvbnRhaW5lciA9IG5vZGUtPm5vZGVJbmRl eCgpICsgb2Zmc2V0OwotICAgIH0KKyAgICByZXR1cm4gdG9SZW5kZXJUZXh0Q29udHJvbChyZW5k ZXJlcigpKS0+c2VsZWN0aW9uRW5kKCk7CiB9CiAKIFBhc3NSZWZQdHI8UmFuZ2U+IEhUTUxUZXh0 Rm9ybUNvbnRyb2xFbGVtZW50OjpzZWxlY3Rpb24oKSBjb25zdAogewogICAgIGlmICghcmVuZGVy ZXIoKSB8fCAhaXNUZXh0Rm9ybUNvbnRyb2woKSB8fCAhaGFzQ2FjaGVkU2VsZWN0aW9uU3RhcnQo KSB8fCAhaGFzQ2FjaGVkU2VsZWN0aW9uRW5kKCkpCiAgICAgICAgIHJldHVybiAwOwotICAgIAot ICAgIGludCBzdGFydCA9IG1fY2FjaGVkU2VsZWN0aW9uU3RhcnQ7Ci0gICAgaW50IGVuZCA9IG1f Y2FjaGVkU2VsZWN0aW9uRW5kOwotCi0gICAgQVNTRVJUKHN0YXJ0IDw9IGVuZCk7Ci0gICAgSFRN TEVsZW1lbnQqIGlubmVyVGV4dCA9IHRvUmVuZGVyVGV4dENvbnRyb2wocmVuZGVyZXIoKSktPmlu bmVyVGV4dEVsZW1lbnQoKTsKLSAgICBpZiAoIWlubmVyVGV4dCkKLSAgICAgICAgcmV0dXJuIDA7 Ci0KLSAgICBpZiAoIWlubmVyVGV4dC0+Zmlyc3RDaGlsZCgpKQotICAgICAgICByZXR1cm4gUmFu Z2U6OmNyZWF0ZShkb2N1bWVudCgpLCBpbm5lclRleHQsIDAsIGlubmVyVGV4dCwgMCk7Ci0KLSAg ICBpbnQgb2Zmc2V0ID0gMDsKLSAgICBOb2RlKiBzdGFydE5vZGUgPSAwOwotICAgIE5vZGUqIGVu ZE5vZGUgPSAwOwotICAgIGZvciAoTm9kZSogbm9kZSA9IGlubmVyVGV4dC0+Zmlyc3RDaGlsZCgp OyBub2RlOyBub2RlID0gbm9kZS0+dHJhdmVyc2VOZXh0Tm9kZShpbm5lclRleHQpKSB7Ci0gICAg ICAgIEFTU0VSVCghbm9kZS0+Zmlyc3RDaGlsZCgpKTsKLSAgICAgICAgQVNTRVJUKG5vZGUtPmlz VGV4dE5vZGUoKSB8fCBub2RlLT5oYXNUYWdOYW1lKGJyVGFnKSk7Ci0gICAgICAgIGludCBsZW5n dGggPSBub2RlLT5pc1RleHROb2RlKCkgPyBsYXN0T2Zmc2V0SW5Ob2RlKG5vZGUpIDogMTsKLQot ICAgICAgICBpZiAob2Zmc2V0IDw9IHN0YXJ0ICYmIHN0YXJ0IDw9IG9mZnNldCArIGxlbmd0aCkK LSAgICAgICAgICAgIHNldENvbnRhaW5lckFuZE9mZnNldEZvclJhbmdlKG5vZGUsIHN0YXJ0IC0g b2Zmc2V0LCBzdGFydE5vZGUsIHN0YXJ0KTsKLQotICAgICAgICBpZiAob2Zmc2V0IDw9IGVuZCAm JiBlbmQgPD0gb2Zmc2V0ICsgbGVuZ3RoKSB7Ci0gICAgICAgICAgICBzZXRDb250YWluZXJBbmRP ZmZzZXRGb3JSYW5nZShub2RlLCBlbmQgLSBvZmZzZXQsIGVuZE5vZGUsIGVuZCk7Ci0gICAgICAg ICAgICBicmVhazsKLSAgICAgICAgfQotCi0gICAgICAgIG9mZnNldCArPSBsZW5ndGg7Ci0gICAg fQotCi0gICAgaWYgKCFzdGFydE5vZGUgfHwgIWVuZE5vZGUpCi0gICAgICAgIHJldHVybiAwOwor ICAgIHJldHVybiB0b1JlbmRlclRleHRDb250cm9sKHJlbmRlcmVyKCkpLT5zZWxlY3Rpb24obV9j YWNoZWRTZWxlY3Rpb25TdGFydCwgbV9jYWNoZWRTZWxlY3Rpb25FbmQpOworfQogCi0gICAgcmV0 dXJuIFJhbmdlOjpjcmVhdGUoZG9jdW1lbnQoKSwgc3RhcnROb2RlLCBzdGFydCwgZW5kTm9kZSwg ZW5kKTsKK3ZvaWQgSFRNTFRleHRGb3JtQ29udHJvbEVsZW1lbnQ6OnJlc3RvcmVDYWNoZWRTZWxl Y3Rpb24oKQoreworICAgIFdlYkNvcmU6OnNldFNlbGVjdGlvblJhbmdlKHRoaXMsIG1fY2FjaGVk U2VsZWN0aW9uU3RhcnQsIG1fY2FjaGVkU2VsZWN0aW9uRW5kKTsKIH0KIAogdm9pZCBIVE1MVGV4 dEZvcm1Db250cm9sRWxlbWVudDo6c2VsZWN0aW9uQ2hhbmdlZChib29sIHVzZXJUcmlnZ2VyZWQp CkBAIC04MTYsNyArNzE1LDggQEAgdm9pZCBIVE1MVGV4dEZvcm1Db250cm9sRWxlbWVudDo6c2Vs ZWN0aW9uQ2hhbmdlZChib29sIHVzZXJUcmlnZ2VyZWQpCiAgICAgaWYgKCFyZW5kZXJlcigpIHx8 ICFpc1RleHRGb3JtQ29udHJvbCgpKQogICAgICAgICByZXR1cm47CiAKLSAgICBjYWNoZVNlbGVj dGlvbihzZWxlY3Rpb25TdGFydCgpLCBzZWxlY3Rpb25FbmQoKSk7CisgICAgUmVuZGVyVGV4dENv bnRyb2wqIHJlbmRlclRleHRDb250cm9sID0gdG9SZW5kZXJUZXh0Q29udHJvbChyZW5kZXJlcigp KTsKKyAgICBjYWNoZVNlbGVjdGlvbihyZW5kZXJUZXh0Q29udHJvbC0+c2VsZWN0aW9uU3RhcnQo KSwgcmVuZGVyVGV4dENvbnRyb2wtPnNlbGVjdGlvbkVuZCgpKTsKIAogICAgIGlmIChGcmFtZSog ZnJhbWUgPSBkb2N1bWVudCgpLT5mcmFtZSgpKSB7CiAgICAgICAgIGlmIChmcmFtZS0+c2VsZWN0 aW9uKCktPmlzUmFuZ2UoKSAmJiB1c2VyVHJpZ2dlcmVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MRm9ybUNvbnRyb2xFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuaAppbmRleCBjOWQwYTg3OGE0NmE5MWU1ZWQ0OGYxYTlm ZTE3MTA4NDA3YjQzMTZjLi5iNzkwOTY4YWI1N2FhYTVmN2U0MzczOGY5NTI0YTU1MmJhM2E5Mzhj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxGb3JtQ29udHJvbEVsZW1lbnQuaApAQCAt MjA3LDcgKzIwNyw2IEBAIHB1YmxpYzoKICAgICB2b2lkIHNlbGVjdCgpOwogICAgIHZvaWQgc2V0 U2VsZWN0aW9uUmFuZ2UoaW50IHN0YXJ0LCBpbnQgZW5kKTsKICAgICBQYXNzUmVmUHRyPFJhbmdl PiBzZWxlY3Rpb24oKSBjb25zdDsKLSAgICBTdHJpbmcgc2VsZWN0ZWRUZXh0KCkgY29uc3Q7CiAK ICAgICB2aXJ0dWFsIHZvaWQgZGlzcGF0Y2hGb3JtQ29udHJvbENoYW5nZUV2ZW50KCk7CiAKQEAg LTIzMSw3ICsyMzAsNyBAQCBwcm90ZWN0ZWQ6CiAKICAgICB2b2lkIHNldFRleHRBc09mTGFzdEZv cm1Db250cm9sQ2hhbmdlRXZlbnQoY29uc3QgU3RyaW5nJiB0ZXh0KSB7IG1fdGV4dEFzT2ZMYXN0 Rm9ybUNvbnRyb2xDaGFuZ2VFdmVudCA9IHRleHQ7IH0KIAotICAgIHZvaWQgcmVzdG9yZUNhY2hl ZFNlbGVjdGlvbigpIHsgc2V0U2VsZWN0aW9uUmFuZ2UobV9jYWNoZWRTZWxlY3Rpb25TdGFydCwg bV9jYWNoZWRTZWxlY3Rpb25FbmQpOyB9CisgICAgdm9pZCByZXN0b3JlQ2FjaGVkU2VsZWN0aW9u KCk7CiAgICAgYm9vbCBoYXNDYWNoZWRTZWxlY3Rpb25TdGFydCgpIGNvbnN0IHsgcmV0dXJuIG1f Y2FjaGVkU2VsZWN0aW9uU3RhcnQgPj0gMDsgfQogICAgIGJvb2wgaGFzQ2FjaGVkU2VsZWN0aW9u RW5kKCkgY29uc3QgeyByZXR1cm4gbV9jYWNoZWRTZWxlY3Rpb25FbmQgPj0gMDsgfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1lbnQuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MSW5wdXRFbGVtZW50LmNwcAppbmRleCBhYTFiNzYzZjZkNDhmZjNj M2U4MDIzMTQ4YzEzNDg2ZGY1NDk1YjNlLi4wOTdlN2YzYWM1MzZkYzNiYmZkYzNiYzY3NGUxZjc4 MDkxNzg3YWM2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJbnB1dEVsZW1l bnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElucHV0RWxlbWVudC5jcHAKQEAg LTEwMTYsNyArMTAxNiw3IEBAIHZvaWQgSFRNTElucHV0RWxlbWVudDo6c2V0VmFsdWUoY29uc3Qg U3RyaW5nJiB2YWx1ZSwgYm9vbCBzZW5kQ2hhbmdlRXZlbnQpCiAgICAgaWYgKGlzVGV4dEZpZWxk KCkpIHsKICAgICAgICAgdW5zaWduZWQgbWF4ID0gdmlzaWJsZVZhbHVlKCkubGVuZ3RoKCk7CiAg ICAgICAgIGlmIChkb2N1bWVudCgpLT5mb2N1c2VkTm9kZSgpID09IHRoaXMpCi0gICAgICAgICAg ICBzZXRTZWxlY3Rpb25SYW5nZShtYXgsIG1heCk7CisgICAgICAgICAgICBXZWJDb3JlOjpzZXRT ZWxlY3Rpb25SYW5nZSh0aGlzLCBtYXgsIG1heCk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAg IGNhY2hlU2VsZWN0aW9uKG1heCwgbWF4KTsKICAgICAgICAgbV9zdWdnZXN0ZWRWYWx1ZSA9IFN0 cmluZygpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRD b250cm9sLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5j cHAKaW5kZXggM2FlOWEyMDc2MWI4NzhkMjJjYmQ4MmU4OWU5ZGEyMzc2NGZhZDM0NS4uM2NhNzg2 MGQ2ZjhiYzFiZDlkZDI4ODBkZTM4NDRkMjAwZWFmNDNmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyVGV4dENvbnRyb2wuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAjaW5j bHVkZSAiRXZlbnQuaCIKICNpbmNsdWRlICJFdmVudE5hbWVzLmgiCiAjaW5jbHVkZSAiRnJhbWUu aCIKKyNpbmNsdWRlICJGcmFtZVNlbGVjdGlvbi5oIgogI2luY2x1ZGUgIkhUTUxCUkVsZW1lbnQu aCIKICNpbmNsdWRlICJIVE1MRm9ybUNvbnRyb2xFbGVtZW50LmgiCiAjaW5jbHVkZSAiSFRNTElu cHV0RWxlbWVudC5oIgpAQCAtODEsMTEgKzgyLDYgQEAgUmVuZGVyVGV4dENvbnRyb2w6On5SZW5k ZXJUZXh0Q29udHJvbCgpCiB7CiB9CiAKLUhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50KiBSZW5k ZXJUZXh0Q29udHJvbDo6dGV4dEZvcm1Db250cm9sRWxlbWVudCgpCi17Ci0gICAgcmV0dXJuIHN0 YXRpY19jYXN0PEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50Kj4obm9kZSgpKTsKLX0KLQogdm9p ZCBSZW5kZXJUZXh0Q29udHJvbDo6c3R5bGVEaWRDaGFuZ2UoU3R5bGVEaWZmZXJlbmNlIGRpZmYs IGNvbnN0IFJlbmRlclN0eWxlKiBvbGRTdHlsZSkKIHsKICAgICBSZW5kZXJCbG9jazo6c3R5bGVE aWRDaGFuZ2UoZGlmZiwgb2xkU3R5bGUpOwpAQCAtMTc3LDYgKzE3Myw3MyBAQCB2b2lkIFJlbmRl clRleHRDb250cm9sOjpzZXRMYXN0Q2hhbmdlV2FzVXNlckVkaXQoYm9vbCBsYXN0Q2hhbmdlV2Fz VXNlckVkaXQpCiAgICAgZG9jdW1lbnQoKS0+c2V0SWdub3JlQXV0b2ZvY3VzKGxhc3RDaGFuZ2VX YXNVc2VyRWRpdCk7CiB9CiAKK2ludCBSZW5kZXJUZXh0Q29udHJvbDo6c2VsZWN0aW9uU3RhcnQo KSBjb25zdAoreworICAgIEZyYW1lKiBmcmFtZSA9IHRoaXMtPmZyYW1lKCk7CisgICAgaWYgKCFm cmFtZSkKKyAgICAgICAgcmV0dXJuIDA7CisgICAgCisgICAgSFRNTEVsZW1lbnQqIGlubmVyVGV4 dCA9IGlubmVyVGV4dEVsZW1lbnQoKTsKKyAgICAvLyBEbyBub3QgY2FsbCBpbm5lclRleHRFbGVt ZW50KCkgaW4gdGhlIGZ1bmN0aW9uIGFyZ3VtZW50cyBhcyBjcmVhdGluZyBhIFZpc2libGVQb3Np dGlvbgorICAgIC8vIGZyb20gZnJhbWUtPnNlbGVjdGlvbi0+c3RhcnQoKSBjYW4gYmxvdyB1cyBm cm9tIHVuZGVybmVhdGguIEFsc28sIGZ1bmN0aW9uIG9yZGVyaW5nIGlzCisgICAgLy8gdXN1YWxs eSBkZXBlbmRlbnQgb24gdGhlIGNvbXBpbGVyLgorICAgIHJldHVybiBSZW5kZXJUZXh0Q29udHJv bDo6aW5kZXhGb3JWaXNpYmxlUG9zaXRpb24oaW5uZXJUZXh0LCBmcmFtZS0+c2VsZWN0aW9uKCkt PnN0YXJ0KCkpOworfQorCitpbnQgUmVuZGVyVGV4dENvbnRyb2w6OnNlbGVjdGlvbkVuZCgpIGNv bnN0Cit7CisgICAgRnJhbWUqIGZyYW1lID0gdGhpcy0+ZnJhbWUoKTsKKyAgICBpZiAoIWZyYW1l KQorICAgICAgICByZXR1cm4gMDsKKworICAgIEhUTUxFbGVtZW50KiBpbm5lclRleHQgPSBpbm5l clRleHRFbGVtZW50KCk7CisgICAgLy8gRG8gbm90IGNhbGwgaW5uZXJUZXh0RWxlbWVudCgpIGlu IHRoZSBmdW5jdGlvbiBhcmd1bWVudHMgYXMgY3JlYXRpbmcgYSBWaXNpYmxlUG9zaXRpb24KKyAg ICAvLyBmcm9tIGZyYW1lLT5zZWxlY3Rpb24tPmVuZCgpIGNhbiBibG93IHVzIGZyb20gdW5kZXJu ZWF0aC4gQWxzbywgZnVuY3Rpb24gb3JkZXJpbmcgaXMKKyAgICAvLyB1c3VhbGx5IGRlcGVuZGVu dCBvbiB0aGUgY29tcGlsZXIuCisgICAgcmV0dXJuIFJlbmRlclRleHRDb250cm9sOjppbmRleEZv clZpc2libGVQb3NpdGlvbihpbm5lclRleHQsIGZyYW1lLT5zZWxlY3Rpb24oKS0+ZW5kKCkpOwor fQorCitib29sIFJlbmRlclRleHRDb250cm9sOjpoYXNWaXNpYmxlVGV4dEFyZWEoKSBjb25zdAor eworICAgIEhUTUxFbGVtZW50KiBpbm5lclRleHQgPSBpbm5lclRleHRFbGVtZW50KCk7CisgICAg cmV0dXJuIHN0eWxlKCktPnZpc2liaWxpdHkoKSA9PSBISURERU4gfHwgIWlubmVyVGV4dCB8fCAh aW5uZXJUZXh0LT5yZW5kZXJlcigpIHx8ICFpbm5lclRleHQtPnJlbmRlckJveCgpLT5oZWlnaHQo KTsKK30KKwordm9pZCBzZXRTZWxlY3Rpb25SYW5nZShOb2RlKiBub2RlLCBpbnQgc3RhcnQsIGlu dCBlbmQpCit7CisgICAgQVNTRVJUKG5vZGUpOworICAgIG5vZGUtPmRvY3VtZW50KCktPnVwZGF0 ZUxheW91dElnbm9yZVBlbmRpbmdTdHlsZXNoZWV0cygpOworCisgICAgaWYgKCFub2RlLT5yZW5k ZXJlcigpIHx8ICFub2RlLT5yZW5kZXJlcigpLT5pc1RleHRDb250cm9sKCkpCisgICAgICAgIHJl dHVybjsKKworICAgIGVuZCA9IG1heChlbmQsIDApOworICAgIHN0YXJ0ID0gbWluKG1heChzdGFy dCwgMCksIGVuZCk7CisKKyAgICBSZW5kZXJUZXh0Q29udHJvbCogY29udHJvbCA9IHRvUmVuZGVy VGV4dENvbnRyb2wobm9kZS0+cmVuZGVyZXIoKSk7CisKKyAgICBpZiAoY29udHJvbC0+aGFzVmlz aWJsZVRleHRBcmVhKCkpIHsKKyAgICAgICAgc3RhdGljX2Nhc3Q8SFRNTFRleHRGb3JtQ29udHJv bEVsZW1lbnQqPihub2RlKS0+Y2FjaGVTZWxlY3Rpb24oc3RhcnQsIGVuZCk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgVmlzaWJsZVBvc2l0aW9uIHN0YXJ0UG9zaXRpb24gPSBjb250cm9s LT52aXNpYmxlUG9zaXRpb25Gb3JJbmRleChzdGFydCk7CisgICAgVmlzaWJsZVBvc2l0aW9uIGVu ZFBvc2l0aW9uOworICAgIGlmIChzdGFydCA9PSBlbmQpCisgICAgICAgIGVuZFBvc2l0aW9uID0g c3RhcnRQb3NpdGlvbjsKKyAgICBlbHNlCisgICAgICAgIGVuZFBvc2l0aW9uID0gY29udHJvbC0+ dmlzaWJsZVBvc2l0aW9uRm9ySW5kZXgoZW5kKTsKKworICAgIC8vIHN0YXJ0UG9zaXRpb24gYW5k IGVuZFBvc2l0aW9uIGNhbiBiZSBudWxsIHBvc2l0aW9uIGZvciBleGFtcGxlIHdoZW4KKyAgICAv LyAiLXdlYmtpdC11c2VyLXNlbGVjdDogbm9uZSIgc3R5bGUgYXR0cmlidXRlIGlzIHNwZWNpZmll ZC4KKyAgICBpZiAoc3RhcnRQb3NpdGlvbi5pc05vdE51bGwoKSAmJiBlbmRQb3NpdGlvbi5pc05v dE51bGwoKSkgeworICAgICAgICBBU1NFUlQoc3RhcnRQb3NpdGlvbi5kZWVwRXF1aXZhbGVudCgp LmRlcHJlY2F0ZWROb2RlKCktPnNoYWRvd0FuY2VzdG9yTm9kZSgpID09IG5vZGUgJiYgZW5kUG9z aXRpb24uZGVlcEVxdWl2YWxlbnQoKS5kZXByZWNhdGVkTm9kZSgpLT5zaGFkb3dBbmNlc3Rvck5v ZGUoKSA9PSBub2RlKTsKKyAgICB9CisgICAgVmlzaWJsZVNlbGVjdGlvbiBuZXdTZWxlY3Rpb24g PSBWaXNpYmxlU2VsZWN0aW9uKHN0YXJ0UG9zaXRpb24sIGVuZFBvc2l0aW9uKTsKKworICAgIGlm IChGcmFtZSogZnJhbWUgPSBub2RlLT5kb2N1bWVudCgpLT5mcmFtZSgpKQorICAgICAgICBmcmFt ZS0+c2VsZWN0aW9uKCktPnNldFNlbGVjdGlvbihuZXdTZWxlY3Rpb24pOworfQorCiBib29sIFJl bmRlclRleHRDb250cm9sOjppc1NlbGVjdGFibGVFbGVtZW50KEhUTUxFbGVtZW50KiBpbm5lclRl eHQsIE5vZGUqIG5vZGUpCiB7CiAgICAgaWYgKCFub2RlIHx8ICFpbm5lclRleHQpCkBAIC0xOTMs NiArMjU2LDUyIEBAIGJvb2wgUmVuZGVyVGV4dENvbnRyb2w6OmlzU2VsZWN0YWJsZUVsZW1lbnQo SFRNTEVsZW1lbnQqIGlubmVyVGV4dCwgTm9kZSogbm9kZSkKICAgICAgICAgfHwgKHNoYWRvd0Fu Y2VzdG9yLT5oYXNUYWdOYW1lKGlucHV0VGFnKSAmJiBzdGF0aWNfY2FzdDxIVE1MSW5wdXRFbGVt ZW50Kj4oc2hhZG93QW5jZXN0b3IpLT5pc1RleHRGaWVsZCgpKSk7CiB9CiAKK3N0YXRpYyBpbmxp bmUgdm9pZCBzZXRDb250YWluZXJBbmRPZmZzZXRGb3JSYW5nZShOb2RlKiBub2RlLCBpbnQgb2Zm c2V0LCBOb2RlKiYgY29udGFpbmVyTm9kZSwgaW50JiBvZmZzZXRJbkNvbnRhaW5lcikKK3sKKyAg ICBpZiAobm9kZS0+aXNUZXh0Tm9kZSgpKSB7CisgICAgICAgIGNvbnRhaW5lck5vZGUgPSBub2Rl OworICAgICAgICBvZmZzZXRJbkNvbnRhaW5lciA9IG9mZnNldDsKKyAgICB9IGVsc2UgeworICAg ICAgICBjb250YWluZXJOb2RlID0gbm9kZS0+cGFyZW50Tm9kZSgpOworICAgICAgICBvZmZzZXRJ bkNvbnRhaW5lciA9IG5vZGUtPm5vZGVJbmRleCgpICsgb2Zmc2V0OworICAgIH0KK30KKworUGFz c1JlZlB0cjxSYW5nZT4gUmVuZGVyVGV4dENvbnRyb2w6OnNlbGVjdGlvbihpbnQgc3RhcnQsIGlu dCBlbmQpIGNvbnN0Cit7CisgICAgQVNTRVJUKHN0YXJ0IDw9IGVuZCk7CisgICAgSFRNTEVsZW1l bnQqIGlubmVyVGV4dCA9IGlubmVyVGV4dEVsZW1lbnQoKTsKKyAgICBpZiAoIWlubmVyVGV4dCkK KyAgICAgICAgcmV0dXJuIDA7CisKKyAgICBpZiAoIWlubmVyVGV4dC0+Zmlyc3RDaGlsZCgpKQor ICAgICAgICByZXR1cm4gUmFuZ2U6OmNyZWF0ZShkb2N1bWVudCgpLCBpbm5lclRleHQsIDAsIGlu bmVyVGV4dCwgMCk7CisKKyAgICBpbnQgb2Zmc2V0ID0gMDsKKyAgICBOb2RlKiBzdGFydE5vZGUg PSAwOworICAgIE5vZGUqIGVuZE5vZGUgPSAwOworICAgIGZvciAoTm9kZSogbm9kZSA9IGlubmVy VGV4dC0+Zmlyc3RDaGlsZCgpOyBub2RlOyBub2RlID0gbm9kZS0+dHJhdmVyc2VOZXh0Tm9kZShp bm5lclRleHQpKSB7CisgICAgICAgIEFTU0VSVCghbm9kZS0+Zmlyc3RDaGlsZCgpKTsKKyAgICAg ICAgQVNTRVJUKG5vZGUtPmlzVGV4dE5vZGUoKSB8fCBub2RlLT5oYXNUYWdOYW1lKGJyVGFnKSk7 CisgICAgICAgIGludCBsZW5ndGggPSBub2RlLT5pc1RleHROb2RlKCkgPyBsYXN0T2Zmc2V0SW5O b2RlKG5vZGUpIDogMTsKKyAgICAKKyAgICAgICAgaWYgKG9mZnNldCA8PSBzdGFydCAmJiBzdGFy dCA8PSBvZmZzZXQgKyBsZW5ndGgpCisgICAgICAgICAgICBzZXRDb250YWluZXJBbmRPZmZzZXRG b3JSYW5nZShub2RlLCBzdGFydCAtIG9mZnNldCwgc3RhcnROb2RlLCBzdGFydCk7CisKKyAgICAg ICAgaWYgKG9mZnNldCA8PSBlbmQgJiYgZW5kIDw9IG9mZnNldCArIGxlbmd0aCkgeworICAgICAg ICAgICAgc2V0Q29udGFpbmVyQW5kT2Zmc2V0Rm9yUmFuZ2Uobm9kZSwgZW5kIC0gb2Zmc2V0LCBl bmROb2RlLCBlbmQpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBv ZmZzZXQgKz0gbGVuZ3RoOworICAgIH0KKyAgICAKKyAgICBpZiAoIXN0YXJ0Tm9kZSB8fCAhZW5k Tm9kZSkKKyAgICAgICAgcmV0dXJuIDA7CisKKyAgICByZXR1cm4gUmFuZ2U6OmNyZWF0ZShkb2N1 bWVudCgpLCBzdGFydE5vZGUsIHN0YXJ0LCBlbmROb2RlLCBlbmQpOworfQorCiBWaXNpYmxlUG9z aXRpb24gUmVuZGVyVGV4dENvbnRyb2w6OnZpc2libGVQb3NpdGlvbkZvckluZGV4KGludCBpbmRl eCkgY29uc3QKIHsKICAgICBpZiAoaW5kZXggPD0gMCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJUZXh0Q29udHJvbC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlclRleHRDb250cm9sLmgKaW5kZXggY2QwZTFkZjhlZGFkMTg1ODdlZWNlZmFmZDJl MTA5YWI1NTZjMDFlOC4uOGRmZTFkMmE0YTUwYmY0MmQ3Y2Q1ZWRkMTFkMDExNWJhYjM2NGUxMyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRleHRDb250cm9sLmgKQEAgLTI2 LDcgKzI2LDYgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1jbGFzcyBIVE1MVGV4dEZvcm1D b250cm9sRWxlbWVudDsKIGNsYXNzIFZpc2libGVTZWxlY3Rpb247CiBjbGFzcyBUZXh0Q29udHJv bElubmVyRWxlbWVudDsKIGNsYXNzIFRleHRDb250cm9sSW5uZXJUZXh0RWxlbWVudDsKQEAgLTM1 LDEzICszNCwxNiBAQCBjbGFzcyBSZW5kZXJUZXh0Q29udHJvbCA6IHB1YmxpYyBSZW5kZXJCbG9j ayB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+UmVuZGVyVGV4dENvbnRyb2woKTsKIAotICAgIEhU TUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50KiB0ZXh0Rm9ybUNvbnRyb2xFbGVtZW50KCk7CiAgICAg dmlydHVhbCBIVE1MRWxlbWVudCogaW5uZXJUZXh0RWxlbWVudCgpIGNvbnN0ID0gMDsKICAgICB2 aXJ0dWFsIFBhc3NSZWZQdHI8UmVuZGVyU3R5bGU+IGNyZWF0ZUlubmVyVGV4dFN0eWxlKGNvbnN0 IFJlbmRlclN0eWxlKiBzdGFydFN0eWxlKSBjb25zdCA9IDA7CiAKICAgICBib29sIGxhc3RDaGFu Z2VXYXNVc2VyRWRpdCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdENoYW5nZVdhc1VzZXJFZGl0OyB9 CiAgICAgdm9pZCBzZXRMYXN0Q2hhbmdlV2FzVXNlckVkaXQoYm9vbCBsYXN0Q2hhbmdlV2FzVXNl ckVkaXQpOwogCisgICAgaW50IHNlbGVjdGlvblN0YXJ0KCkgY29uc3Q7CisgICAgaW50IHNlbGVj dGlvbkVuZCgpIGNvbnN0OworICAgIFBhc3NSZWZQdHI8UmFuZ2U+IHNlbGVjdGlvbihpbnQgc3Rh cnQsIGludCBlbmQpIGNvbnN0OworCiAgICAgdmlydHVhbCB2b2lkIHN1YnRyZWVIYXNDaGFuZ2Vk KCk7CiAgICAgU3RyaW5nIHRleHQoKTsKICAgICBTdHJpbmcgdGV4dFdpdGhIYXJkTGluZUJyZWFr cygpOwpAQCAtOTQsNiArOTYsNyBAQCBwcml2YXRlOgogCiAgICAgdmlydHVhbCBib29sIHJlcXVp cmVzRm9yY2VkU3R5bGVSZWNhbGNQcm9wYWdhdGlvbigpIGNvbnN0IHsgcmV0dXJuIHRydWU7IH0K IAorICAgIGJvb2wgaGFzVmlzaWJsZVRleHRBcmVhKCkgY29uc3Q7CiAgICAgZnJpZW5kIHZvaWQg c2V0U2VsZWN0aW9uUmFuZ2UoTm9kZSosIGludCBzdGFydCwgaW50IGVuZCk7CiAgICAgc3RhdGlj IGJvb2wgaXNTZWxlY3RhYmxlRWxlbWVudChIVE1MRWxlbWVudCosIE5vZGUqKTsKICAgICAKQEAg LTEwNiw2ICsxMDksOCBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9sYXN0Q2hhbmdlV2FzVXNlckVk aXQ7CiB9OwogCit2b2lkIHNldFNlbGVjdGlvblJhbmdlKE5vZGUqLCBpbnQgc3RhcnQsIGludCBl bmQpOworCiBpbmxpbmUgUmVuZGVyVGV4dENvbnRyb2wqIHRvUmVuZGVyVGV4dENvbnRyb2woUmVu ZGVyT2JqZWN0KiBvYmplY3QpCiB7IAogICAgIEFTU0VSVCghb2JqZWN0IHx8IG9iamVjdC0+aXNU ZXh0Q29udHJvbCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdl LmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvQXBpL3F3ZWJwYWdlLmNwcAppbmRleCBjNzU5NDNjYmJm Y2FjNDM3MWJkMmU4MDBlZmJkNWUwY2ZiYzYwNDg0Li5lOGU4ZmJlMTVkOTQxZDI1ZTE3N2Q4MDEz ZThlMGYxZDk1YzRmOGFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3F0L0FwaS9xd2VicGFn ZS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9BcGkvcXdlYnBhZ2UuY3BwCkBAIC0xMTExLDEw ICsxMTExLDggQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmlucHV0TWV0aG9kRXZlbnQoUUlucHV0 TWV0aG9kRXZlbnQgKmV2KQogICAgICAgICBjYXNlIFFJbnB1dE1ldGhvZEV2ZW50OjpTZWxlY3Rp b246IHsKICAgICAgICAgICAgIGhhc1NlbGVjdGlvbiA9IHRydWU7CiAgICAgICAgICAgICAvLyBB IHNlbGVjdGlvbiBpbiB0aGUgaW5wdXRNZXRob2RFdmVudCBpcyBhbHdheXMgcmVmbGVjdGVkIGlu IHRoZSB2aXNpYmxlIHRleHQKLSAgICAgICAgICAgIGlmIChub2RlKSB7Ci0gICAgICAgICAgICAg ICAgaWYgKEhUTUxUZXh0Rm9ybUNvbnRyb2xFbGVtZW50KiB0ZXh0Q29udHJvbCA9IHRvVGV4dEZv cm1Db250cm9sKG5vZGUpKQotICAgICAgICAgICAgICAgICAgICB0ZXh0Q29udHJvbC0+c2V0U2Vs ZWN0aW9uUmFuZ2UocU1pbihhLnN0YXJ0LCAoYS5zdGFydCArIGEubGVuZ3RoKSksIHFNYXgoYS5z dGFydCwgKGEuc3RhcnQgKyBhLmxlbmd0aCkpKTsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAg IGlmIChub2RlKQorICAgICAgICAgICAgICAgIHNldFNlbGVjdGlvblJhbmdlKG5vZGUsIHFNaW4o YS5zdGFydCwgKGEuc3RhcnQgKyBhLmxlbmd0aCkpLCBxTWF4KGEuc3RhcnQsIChhLnN0YXJ0ICsg YS5sZW5ndGgpKSk7CiAKICAgICAgICAgICAgIGlmICghZXYtPnByZWVkaXRTdHJpbmcoKS5pc0Vt cHR5KCkpCiAgICAgICAgICAgICAgICAgZWRpdG9yLT5zZXRDb21wb3NpdGlvbihldi0+cHJlZWRp dFN0cmluZygpLCB1bmRlcmxpbmVzLCBxTWluKGEuc3RhcnQsIChhLnN0YXJ0ICsgYS5sZW5ndGgp KSwgcU1heChhLnN0YXJ0LCAoYS5zdGFydCArIGEubGVuZ3RoKSkpOwpAQCAtMTEzNCw4ICsxMTMy LDcgQEAgdm9pZCBRV2ViUGFnZVByaXZhdGU6OmlucHV0TWV0aG9kRXZlbnQoUUlucHV0TWV0aG9k RXZlbnQgKmV2KQogICAgIGlmIChub2RlICYmIGV2LT5yZXBsYWNlbWVudExlbmd0aCgpID4gMCkg ewogICAgICAgICBpbnQgY3Vyc29yUG9zID0gZnJhbWUtPnNlbGVjdGlvbigpLT5leHRlbnQoKS5v ZmZzZXRJbkNvbnRhaW5lck5vZGUoKTsKICAgICAgICAgaW50IHN0YXJ0ID0gY3Vyc29yUG9zICsg ZXYtPnJlcGxhY2VtZW50U3RhcnQoKTsKLSAgICAgICAgaWYgKEhUTUxUZXh0Rm9ybUNvbnRyb2xF bGVtZW50KiB0ZXh0Q29udHJvbCA9IHRvVGV4dEZvcm1Db250cm9sKG5vZGUpKQotICAgICAgICAg ICAgdGV4dENvbnRyb2wtPnNldFNlbGVjdGlvblJhbmdlKHN0YXJ0LCBzdGFydCArIGV2LT5yZXBs YWNlbWVudExlbmd0aCgpKTsKKyAgICAgICAgc2V0U2VsZWN0aW9uUmFuZ2Uobm9kZSwgc3RhcnQs IHN0YXJ0ICsgZXYtPnJlcGxhY2VtZW50TGVuZ3RoKCkpOwogICAgICAgICAvLyBDb21taXQgcmVn YXJkbGVzcyBvZiB3aGV0aGVyIGNvbW1pdFN0cmluZyBpcyBlbXB0eSwgdG8gZ2V0IHJpZCBvZiBz ZWxlY3Rpb24uCiAgICAgICAgIGVkaXRvci0+Y29uZmlybUNvbXBvc2l0aW9uKGV2LT5jb21taXRT dHJpbmcoKSk7CiAgICAgfSBlbHNlIGlmICghZXYtPmNvbW1pdFN0cmluZygpLmlzRW1wdHkoKSkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9xdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0 L3F0L0NoYW5nZUxvZwppbmRleCA5NWJkMGU1NDM2YWJjNWE1YzU2MDU1MzFlZjE5NzY0ZWMyMDRj OTQ5Li5mNTZmOTdmNjNiMmJkOGE0MzkzMzhiM2FkMWM0ZmIwMTQ5YzAyYzdhIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L3F0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTA3LTA4ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CisKKyAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjkwNjYyLgorICAg ICAgICBodHRwOi8vdHJhYy53ZWJraXQub3JnL2NoYW5nZXNldC85MDY2MgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjQyMTAKKworICAgICAgICBJbnRy b2R1Y2VkIHJlZ3Jlc3Npb25zIGluIENocm9taXVtIGJyb3dzZXIgdGVzdHMgKFJlcXVlc3RlZCBi eQorICAgICAgICBybml3YSBvbiAjd2Via2l0KS4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5j cHA6CisgICAgICAgIChRV2ViUGFnZVByaXZhdGU6OmlucHV0TWV0aG9kRXZlbnQpOgorCiAyMDEx LTA3LTA4ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAgIE1vdmUg c2VsZWN0aW9uIHJlbGF0ZWQgY29kZSBmcm9tIFJlbmRlclRleHRDb250cm9sIHRvIEhUTUxUZXh0 Rm9ybUNvbnRyb2xFbGVtZW50Cg==