41324 2010-06-28 18:41:28 -0700 Rename ContainerNode::addChild to legacyParserAddChild to indicate its parser-only indended use 2010-06-30 16:36:00 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 41123 1 eric eric abarth commit-queue dbates eric hyatt webkit.review.bot oldest_to_newest 244031 0 eric 2010-06-28 18:41:28 -0700 Rename ContainerNode::addChild to legacyParserAddChild to indicate its parser-only indended use 244033 1 59972 eric 2010-06-28 18:44:11 -0700 Created attachment 59972 Patch 244040 2 59975 eric 2010-06-28 19:07:53 -0700 Created attachment 59975 Patch 244044 3 59975 abarth 2010-06-28 19:11:35 -0700 Comment on attachment 59975 Patch ok. Thanks for doing this. 244054 4 59975 commit-queue 2010-06-28 20:25:34 -0700 Comment on attachment 59975 Patch Clearing flags on attachment: 59975 Committed r62079: <http://trac.webkit.org/changeset/62079> 244055 5 commit-queue 2010-06-28 20:25:39 -0700 All reviewed patches have been landed. Closing bug. 244057 6 dbates 2010-06-28 20:35:18 -0700 This broke the Qt Release bot. See <http://build.webkit.org/builders/Qt%20Linux%20Release/builds/14207/steps/compile-webkit/logs/stdio> 244058 7 webkit.review.bot 2010-06-28 20:38:24 -0700 http://trac.webkit.org/changeset/62079 might have broken Qt Linux ARMv5 Release and Qt Linux ARMv7 Release 244061 8 dbates 2010-06-28 20:58:30 -0700 Attempt to fix the Qt bots committed in changeset 62081 <https://trac.webkit.org/changeset/62081>. 59972 2010-06-28 18:44:11 -0700 2010-06-28 19:07:48 -0700 Patch bug-41324-20100628184409.patch text/plain 15022 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Y2NlODIyNjlmYTFiOGMyY2M1NjYxOWY0ZmNjZTg3NjkwYzU0NTcyNi4uZTNjNWQ3ZDQyN2I2ZjFj M2M1NzU0NTFjMjlkNmM4Mzg3YTU3MDZiMSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MiBAQAorMjAxMC0wNi0yOCAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIENvbnRhaW5lck5vZGU6OmFkZENoaWxkIHRvIGxl Z2FjeVBhcnNlckFkZENoaWxkIHRvIGluZGljYXRlIGl0cyBwYXJzZXItb25seSBpbnRlbmRlZCB1 c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMzI0 CisKKyAgICAgICAgQSBidW5jaCBvZiBwbGFjZXMgaW4gdGhlIGNvZGUgd2VyZSBjYWxsaW5nIENv bnRhaW5lck5vZGU6OmFkZENoaWxkLgorICAgICAgICBJIGRvbid0IHRoaW5rIHRoZXkgYWN0dWFs bHkgd2FudCB0byBiZSBkb2luZyB0aGF0LCBhcyBpdCBoYXMgc3BlY2lhbAorICAgICAgICBmb3Jt LXJlbGF0ZWQgaGFuZGxpbmcgd2hpY2ggaXMgcGFydCBvZiBMZWdhY3lIVE1MVHJlZUJ1aWxkZXIu CisKKyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLCB0aHVzIG5vIHRlc3RzLgorCisgICAg ICAgICogZG9tL0NvbnRhaW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVy Tm9kZTo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQpOgorICAgICAgICAqIGRvbS9Db250YWluZXJOb2Rl Lmg6CisgICAgICAgICogZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRPTUltcGxlbWVudGF0aW9uOjpjcmVhdGVEb2N1bWVudCk6CisgICAgICAgICogZG9tL05v ZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQpOgor ICAgICAgICAqIGRvbS9Ob2RlLmg6CisgICAgICAgICogaHRtbC9IVE1MS2V5Z2VuRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MS2V5Z2VuRWxlbWVudDo6SFRNTEtleWdlbkVsZW1l bnQpOgorICAgICAgICAqIGh0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVGFibGVFbGVtZW50OjpsZWdhY3lQYXJzZXJBZGRDaGlsZCk6CisgICAgICAgICog aHRtbC9IVE1MVGFibGVFbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MVGFibGVSb3dFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUYWJsZVJvd0VsZW1lbnQ6OmxlZ2FjeVBh cnNlckFkZENoaWxkKToKKyAgICAgICAgKiBodG1sL0hUTUxUYWJsZVJvd0VsZW1lbnQuaDoKKyAg ICAgICAgKiBodG1sL0hUTUxUYWJsZVNlY3Rpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUYWJsZVNlY3Rpb25FbGVtZW50OjpsZWdhY3lQYXJzZXJBZGRDaGlsZCk6CisgICAg ICAgICogaHRtbC9IVE1MVGFibGVTZWN0aW9uRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRN TFZpZXdTb3VyY2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJj ZURvY3VtZW50OjpjcmVhdGVDb250YWluaW5nVGFibGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkU3BhbldpdGhDbGFzc05hbWUpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkTGluZSk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZExpbmspOgorCiAyMDEwLTA2LTI4ICBEYXZpZCBMZXZp biAgPGxldmluQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKGNo cm9taXVtIGJ1aWxkIGZpeCkuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2Rl LmNwcCBiL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCmluZGV4IGZkZGNjZGQ2Njc2ZTAy OTU3NmIxNDNjZjI2NzM4ODg1YjJmYTYxMjkuLmEwZGQwYWZjN2E4NTAwNGMzNDVkMGRlMTI1Yjg0 MWE3N2Y2NjY1MTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCisr KyBiL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCkBAIC01MzcsNyArNTM3LDcgQEAgYm9v bCBDb250YWluZXJOb2RlOjphcHBlbmRDaGlsZChQYXNzUmVmUHRyPE5vZGU+IG5ld0NoaWxkLCBF eGNlcHRpb25Db2RlJiBlYywgYm8KICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotQ29udGFpbmVyTm9k ZSogQ29udGFpbmVyTm9kZTo6YWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPiBuZXdDaGlsZCkKK0Nv bnRhaW5lck5vZGUqIENvbnRhaW5lck5vZGU6OmxlZ2FjeVBhcnNlckFkZENoaWxkKFBhc3NSZWZQ dHI8Tm9kZT4gbmV3Q2hpbGQpCiB7CiAgICAgQVNTRVJUKG5ld0NoaWxkKTsKICAgICAvLyBUaGlz IGZ1bmN0aW9uIGlzIG9ubHkgdXNlZCBkdXJpbmcgcGFyc2luZy4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvZG9tL0NvbnRhaW5lck5vZGUuaCBiL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuaAppbmRl eCA5Nzg5ZjFmMjJmZjA1NWIxZmU4ZTU0NzdhY2ZmZmJjN2IwNmQ0ZDcwLi41MDY1OTEyMzRiNGVh NGU0ODAyMWE2ZjI5YTRkYzRkMjY2ZTZmODdkIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Db250 YWluZXJOb2RlLmgKKysrIGIvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5oCkBAIC00OCw3ICs0 OCw3IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIGJvb2wgcmVtb3ZlQ2hpbGQoTm9kZSogY2hpbGQs IEV4Y2VwdGlvbkNvZGUmKTsKICAgICB2aXJ0dWFsIGJvb2wgYXBwZW5kQ2hpbGQoUGFzc1JlZlB0 cjxOb2RlPiBuZXdDaGlsZCwgRXhjZXB0aW9uQ29kZSYsIGJvb2wgc2hvdWxkTGF6eUF0dGFjaCA9 IGZhbHNlKTsKIAotICAgIHZpcnR1YWwgQ29udGFpbmVyTm9kZSogYWRkQ2hpbGQoUGFzc1JlZlB0 cjxOb2RlPik7CisgICAgdmlydHVhbCBDb250YWluZXJOb2RlKiBsZWdhY3lQYXJzZXJBZGRDaGls ZChQYXNzUmVmUHRyPE5vZGU+KTsKICAgICBib29sIGhhc0NoaWxkTm9kZXMoKSBjb25zdCB7IHJl dHVybiBtX2ZpcnN0Q2hpbGQ7IH0KICAgICB2aXJ0dWFsIHZvaWQgYXR0YWNoKCk7CiAgICAgdmly dHVhbCB2b2lkIGRldGFjaCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50 YXRpb24uY3BwIGIvV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCmluZGV4IDM0ODNi MjMyNjE0NmMxMGU0NGVjYjI1Yzg1YTRjZGU3MTE5Y2RhNTAuLjQ2N2YxZmMzZmY5YTk2MmI5ODI4 ZTk1OTdkMWJlNGJhYzk2ODBlYmEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVu dGF0aW9uLmNwcAorKysgYi9XZWJDb3JlL2RvbS9ET01JbXBsZW1lbnRhdGlvbi5jcHAKQEAgLTI1 NiwxMCArMjU2LDExIEBAIFBhc3NSZWZQdHI8RG9jdW1lbnQ+IERPTUltcGxlbWVudGF0aW9uOjpj cmVhdGVEb2N1bWVudChjb25zdCBTdHJpbmcmIG5hbWVzcGFjZVVSCiAgICAgICAgIHJldHVybiAw OwogICAgIH0KIAorICAgIC8vIEZJWE1FOiBTaG91bGRuJ3QgdGhpcyBjYWxsIGFwcGVuZENoaWxk IGluc3RlYWQ/CiAgICAgaWYgKGRvY3R5cGUpCi0gICAgICAgIGRvYy0+YWRkQ2hpbGQoZG9jdHlw ZSk7CisgICAgICAgIGRvYy0+bGVnYWN5UGFyc2VyQWRkQ2hpbGQoZG9jdHlwZSk7CiAgICAgaWYg KGRvY3VtZW50RWxlbWVudCkKLSAgICAgICAgZG9jLT5hZGRDaGlsZChkb2N1bWVudEVsZW1lbnQu cmVsZWFzZSgpKTsKKyAgICAgICAgZG9jLT5sZWdhY3lQYXJzZXJBZGRDaGlsZChkb2N1bWVudEVs ZW1lbnQucmVsZWFzZSgpKTsKIAogICAgIHJldHVybiBkb2MucmVsZWFzZSgpOwogfQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9kb20vTm9kZS5jcHAgYi9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCBm NzZmZjMwMWJjOTVhYzY4MWYzMDczZTk0NjJmNTkxM2EzYWU1MWIxLi45M2JkMDk0M2VhNjEzNzNl ZmQ3NmRkODllZDEzZjJmOTYwZjZmNzVhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Ob2RlLmNw cAorKysgYi9XZWJDb3JlL2RvbS9Ob2RlLmNwcApAQCAtNjM5LDcgKzYzOSw3IEBAIGNvbnN0IEF0 b21pY1N0cmluZyYgTm9kZTo6dmlydHVhbE5hbWVzcGFjZVVSSSgpIGNvbnN0CiAgICAgcmV0dXJu IG51bGxBdG9tOwogfQogCi1Db250YWluZXJOb2RlKiBOb2RlOjphZGRDaGlsZChQYXNzUmVmUHRy PE5vZGU+KQorQ29udGFpbmVyTm9kZSogTm9kZTo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQoUGFzc1Jl ZlB0cjxOb2RlPikKIHsKICAgICByZXR1cm4gMDsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9t L05vZGUuaCBiL1dlYkNvcmUvZG9tL05vZGUuaAppbmRleCA2YzA2NzU0NjIxMjUyNWU2ZDNmNmNk NGQxYTljNjk1ZDdhYjI4ZWM5Li4yZGZiZWUyOWVlN2E0ZDMzNjViMGVhNGQxNjJjMGQ5NDY5OGQ1 NGU5IDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvV2ViQ29yZS9kb20vTm9k ZS5oCkBAIC0yNjQsNyArMjY0LDcgQEAgcHVibGljOgogICAgIC8vIFVzZWQgYnkgdGhlIHBhcnNl ci4gQ2hlY2tzIGFnYWluc3QgdGhlIERURCwgdW5saWtlIERPTSBvcGVyYXRpb25zIGxpa2UgYXBw ZW5kQ2hpbGQoKS4KICAgICAvLyBBbHNvIGRvZXMgbm90IGRpc3BhdGNoIERPTSBtdXRhdGlvbiBl dmVudHMuCiAgICAgLy8gUmV0dXJucyB0aGUgYXBwcm9wcmlhdGUgY29udGFpbmVyIG5vZGUgZm9y IGZ1dHVyZSBpbnNlcnRpb25zIGFzIHlvdSBwYXJzZSwgb3IgMCBmb3IgZmFpbHVyZS4KLSAgICB2 aXJ0dWFsIENvbnRhaW5lck5vZGUqIGFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4pOworICAgIHZp cnR1YWwgQ29udGFpbmVyTm9kZSogbGVnYWN5UGFyc2VyQWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2Rl Pik7CiAKICAgICAvLyBDYWxsZWQgYnkgdGhlIHBhcnNlciB3aGVuIHRoaXMgZWxlbWVudCdzIGNs b3NlIHRhZyBpcyByZWFjaGVkLAogICAgIC8vIHNpZ25hbGluZyB0aGF0IGFsbCBjaGlsZCB0YWdz IGhhdmUgYmVlbiBwYXJzZWQgYW5kIGFkZGVkLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hU TUxLZXlnZW5FbGVtZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MS2V5Z2VuRWxlbWVudC5jcHAK aW5kZXggNzRiM2EwZjIwZDZhZWNkNTViMWE0MDE4ZjA1ZGUyZjVlZDI3YzUyMi4uNTE4NWY1MWE5 YTU3NTJiZDEzZDVhNzI3ODk1ODFiMTU0YTYxNzEyNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1s L0hUTUxLZXlnZW5FbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTEtleWdlbkVsZW1l bnQuY3BwCkBAIC01MCw4ICs1MCw4IEBAIGlubGluZSBIVE1MS2V5Z2VuRWxlbWVudDo6SFRNTEtl eWdlbkVsZW1lbnQoY29uc3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSwgRG9jdW1lCiAgICAgZ2V0 U3VwcG9ydGVkS2V5U2l6ZXMoa2V5cyk7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBrZXlz LnNpemUoKTsgKytpKSB7CiAgICAgICAgIFJlZlB0cjxIVE1MT3B0aW9uRWxlbWVudD4gb3B0aW9u ID0gSFRNTE9wdGlvbkVsZW1lbnQ6OmNyZWF0ZShkb2N1bWVudCwgdGhpcy0+Zm9ybSgpKTsKLSAg ICAgICAgYWRkQ2hpbGQob3B0aW9uKTsKLSAgICAgICAgb3B0aW9uLT5hZGRDaGlsZChUZXh0Ojpj cmVhdGUoZG9jdW1lbnQsIGtleXNbaV0pKTsKKyAgICAgICAgbGVnYWN5UGFyc2VyQWRkQ2hpbGQo b3B0aW9uKTsKKyAgICAgICAgb3B0aW9uLT5sZWdhY3lQYXJzZXJBZGRDaGlsZChUZXh0OjpjcmVh dGUoZG9jdW1lbnQsIGtleXNbaV0pKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUv aHRtbC9IVE1MVGFibGVFbGVtZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVFbGVtZW50 LmNwcAppbmRleCBlMGFmMWE0YjQ2MTVlNzYwMTk2ZDA5NjU2ZjIxZWI0Mzc4NzBhZWVlLi41NmNi MzJhMjdjZmJlZjZiOWU4NWIwMzFlZWZmODRlMjU2OTM1NGEwIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2h0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVs ZW1lbnQuY3BwCkBAIC0yNTEsMTggKzI1MSwxOCBAQCB2b2lkIEhUTUxUYWJsZUVsZW1lbnQ6OmRl bGV0ZVJvdyhpbnQgaW5kZXgsIEV4Y2VwdGlvbkNvZGUmIGVjKQogICAgIHJvdy0+cmVtb3ZlKGVj KTsKIH0KIAotQ29udGFpbmVyTm9kZSogSFRNTFRhYmxlRWxlbWVudDo6YWRkQ2hpbGQoUGFzc1Jl ZlB0cjxOb2RlPiBjaGlsZCkKK0NvbnRhaW5lck5vZGUqIEhUTUxUYWJsZUVsZW1lbnQ6OmxlZ2Fj eVBhcnNlckFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4gY2hpbGQpCiB7CiAgICAgaWYgKGNoaWxk LT5oYXNUYWdOYW1lKGZvcm1UYWcpKSB7CiAgICAgICAgIC8vIEZpcnN0IGFkZCB0aGUgY2hpbGQu Ci0gICAgICAgIEhUTUxFbGVtZW50OjphZGRDaGlsZChjaGlsZCk7CisgICAgICAgIEhUTUxFbGVt ZW50OjpsZWdhY3lQYXJzZXJBZGRDaGlsZChjaGlsZCk7CiAKICAgICAgICAgLy8gTm93IHNpbXBs eSByZXR1cm4gb3Vyc2VsdmVzIGFzIHRoZSBjb250YWluZXIgdG8gaW5zZXJ0IGludG8uCiAgICAg ICAgIC8vIFRoaXMgaGFzIHRoZSBlZmZlY3Qgb2YgZGVtb3RpbmcgdGhlIGZvcm0gdG8gYSBsZWFm IGFuZCBtb3ZpbmcgaXQgc2FmZWx5IG91dCBvZiB0aGUgd2F5LgogICAgICAgICByZXR1cm4gdGhp czsKICAgICB9CiAKLSAgICByZXR1cm4gSFRNTEVsZW1lbnQ6OmFkZENoaWxkKGNoaWxkLmdldCgp KTsKKyAgICByZXR1cm4gSFRNTEVsZW1lbnQ6OmxlZ2FjeVBhcnNlckFkZENoaWxkKGNoaWxkLmdl dCgpKTsKIH0KIAogYm9vbCBIVE1MVGFibGVFbGVtZW50OjptYXBUb0VudHJ5KGNvbnN0IFF1YWxp ZmllZE5hbWUmIGF0dHJOYW1lLCBNYXBwZWRBdHRyaWJ1dGVFbnRyeSYgcmVzdWx0KSBjb25zdApk aWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuaCBiL1dlYkNvcmUvaHRt bC9IVE1MVGFibGVFbGVtZW50LmgKaW5kZXggNTliNjRmY2Y5Y2FiMWQ0YjYyOTU0MTUzNDI3OGE0 N2E5YWFiMjc0ZC4uYzQ4ZmVlNWVkZTZjODk1YWJlNzFiM2Y4ZTcyNzNkOTkzY2I3NjA2MSAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuaAorKysgYi9XZWJDb3JlL2h0 bWwvSFRNTFRhYmxlRWxlbWVudC5oCkBAIC02Myw3ICs2Myw3IEBAIHB1YmxpYzoKICAgICBTdHJp bmcgcnVsZXMoKSBjb25zdDsKICAgICBTdHJpbmcgc3VtbWFyeSgpIGNvbnN0OwogCi0gICAgdmly dHVhbCBDb250YWluZXJOb2RlKiBhZGRDaGlsZChQYXNzUmVmUHRyPE5vZGU+KTsKKyAgICB2aXJ0 dWFsIENvbnRhaW5lck5vZGUqIGxlZ2FjeVBhcnNlckFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4p OwogCiAgICAgdmlydHVhbCB2b2lkIGF0dGFjaCgpOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0 bWwvSFRNTFRhYmxlUm93RWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlUm93RWxl bWVudC5jcHAKaW5kZXggYTJjNGY4OTQ4M2JhYTMwYjgxMzk5MGJkMmUzZDI1YmMyZjE2OTBiYi4u MGJhZmIxMjYwZjQzNTlmNGYxNWVjYTdlMzRhNjJhYmVkZjU1NjA3MyAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9odG1sL0hUTUxUYWJsZVJvd0VsZW1lbnQuY3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1M VGFibGVSb3dFbGVtZW50LmNwcApAQCAtNjIsMTggKzYyLDE4IEBAIGJvb2wgSFRNTFRhYmxlUm93 RWxlbWVudDo6Y2hlY2tEVEQoY29uc3QgTm9kZSogbmV3Q2hpbGQpCiAgICAgICAgICAgIG5ld0No aWxkLT5oYXNUYWdOYW1lKGZvcm1UYWcpIHx8IG5ld0NoaWxkLT5oYXNUYWdOYW1lKHNjcmlwdFRh Zyk7CiB9CiAKLUNvbnRhaW5lck5vZGUqIEhUTUxUYWJsZVJvd0VsZW1lbnQ6OmFkZENoaWxkKFBh c3NSZWZQdHI8Tm9kZT4gY2hpbGQpCitDb250YWluZXJOb2RlKiBIVE1MVGFibGVSb3dFbGVtZW50 OjpsZWdhY3lQYXJzZXJBZGRDaGlsZChQYXNzUmVmUHRyPE5vZGU+IGNoaWxkKQogewogICAgIGlm IChjaGlsZC0+aGFzVGFnTmFtZShmb3JtVGFnKSkgewogICAgICAgICAvLyBGaXJzdCBhZGQgdGhl IGNoaWxkLgotICAgICAgICBIVE1MVGFibGVQYXJ0RWxlbWVudDo6YWRkQ2hpbGQoY2hpbGQpOwor ICAgICAgICBIVE1MVGFibGVQYXJ0RWxlbWVudDo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQoY2hpbGQp OwogCiAgICAgICAgIC8vIE5vdyBzaW1wbHkgcmV0dXJuIG91cnNlbHZlcyBhcyB0aGUgY29udGFp bmVyIHRvIGluc2VydCBpbnRvLgogICAgICAgICAvLyBUaGlzIGhhcyB0aGUgZWZmZWN0IG9mIGRl bW90aW5nIHRoZSBmb3JtIHRvIGEgbGVhZiBhbmQgbW92aW5nIGl0IHNhZmVseSBvdXQgb2YgdGhl IHdheS4KICAgICAgICAgcmV0dXJuIHRoaXM7CiAgICAgfQogCi0gICAgcmV0dXJuIEhUTUxUYWJs ZVBhcnRFbGVtZW50OjphZGRDaGlsZChjaGlsZCk7CisgICAgcmV0dXJuIEhUTUxUYWJsZVBhcnRF bGVtZW50OjpsZWdhY3lQYXJzZXJBZGRDaGlsZChjaGlsZCk7CiB9CiAKIGludCBIVE1MVGFibGVS b3dFbGVtZW50Ojpyb3dJbmRleCgpIGNvbnN0CmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRN TFRhYmxlUm93RWxlbWVudC5oIGIvV2ViQ29yZS9odG1sL0hUTUxUYWJsZVJvd0VsZW1lbnQuaApp bmRleCBiNjlhMWMwYjQxNTI1NDYwMzgzZGI4YWJlZjA4NjJmMjI5N2ZlODM1Li44MjVkNzYzN2Ux OGE5ODRkMDU2MTk4ZDcxZmQzYjczZjQ1NGFmZDJmIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwv SFRNTFRhYmxlUm93RWxlbWVudC5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVSb3dFbGVt ZW50LmgKQEAgLTM1LDcgKzM1LDcgQEAgcHVibGljOgogICAgIHN0YXRpYyBQYXNzUmVmUHRyPEhU TUxUYWJsZVJvd0VsZW1lbnQ+IGNyZWF0ZShEb2N1bWVudCopOwogICAgIHN0YXRpYyBQYXNzUmVm UHRyPEhUTUxUYWJsZVJvd0VsZW1lbnQ+IGNyZWF0ZShjb25zdCBRdWFsaWZpZWROYW1lJiwgRG9j dW1lbnQqKTsKIAotICAgIHZpcnR1YWwgQ29udGFpbmVyTm9kZSogYWRkQ2hpbGQoUGFzc1JlZlB0 cjxOb2RlPik7CisgICAgdmlydHVhbCBDb250YWluZXJOb2RlKiBsZWdhY3lQYXJzZXJBZGRDaGls ZChQYXNzUmVmUHRyPE5vZGU+KTsKIAogICAgIGludCByb3dJbmRleCgpIGNvbnN0OwogICAgIHZv aWQgc2V0Um93SW5kZXgoaW50KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVT ZWN0aW9uRWxlbWVudC5jcHAgYi9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQu Y3BwCmluZGV4IDEyMmFmOGE2ODkzOGRmNTA0MTgxOWRjMmM1YWE5MDIxY2M2OTZmZjkuLjkzYmZl ZjIxOGY3MWE4NDBmNjEwYWY2ODNjMzMzZGEzMjNiOTg5MTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUv aHRtbC9IVE1MVGFibGVTZWN0aW9uRWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxU YWJsZVNlY3Rpb25FbGVtZW50LmNwcApAQCAtNTUsMTggKzU1LDE4IEBAIGJvb2wgSFRNTFRhYmxl U2VjdGlvbkVsZW1lbnQ6OmNoZWNrRFREKGNvbnN0IE5vZGUqIG5ld0NoaWxkKQogICAgICAgICAg ICBuZXdDaGlsZC0+aGFzVGFnTmFtZShzY3JpcHRUYWcpOwogfQogCi1Db250YWluZXJOb2RlKiBI VE1MVGFibGVTZWN0aW9uRWxlbWVudDo6YWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPiBjaGlsZCkK K0NvbnRhaW5lck5vZGUqIEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50OjpsZWdhY3lQYXJzZXJBZGRD aGlsZChQYXNzUmVmUHRyPE5vZGU+IGNoaWxkKQogewogICAgIGlmIChjaGlsZC0+aGFzVGFnTmFt ZShmb3JtVGFnKSkgewogICAgICAgICAvLyBGaXJzdCBhZGQgdGhlIGNoaWxkLgotICAgICAgICBI VE1MVGFibGVQYXJ0RWxlbWVudDo6YWRkQ2hpbGQoY2hpbGQpOworICAgICAgICBIVE1MVGFibGVQ YXJ0RWxlbWVudDo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQoY2hpbGQpOwogCiAgICAgICAgIC8vIE5v dyBzaW1wbHkgcmV0dXJuIG91cnNlbHZlcyBhcyB0aGUgY29udGFpbmVyIHRvIGluc2VydCBpbnRv LgogICAgICAgICAvLyBUaGlzIGhhcyB0aGUgZWZmZWN0IG9mIGRlbW90aW5nIHRoZSBmb3JtIHRv IGEgbGVhZiBhbmQgbW92aW5nIGl0IHNhZmVseSBvdXQgb2YgdGhlIHdheS4KICAgICAgICAgcmV0 dXJuIHRoaXM7CiAgICAgfQogCi0gICAgcmV0dXJuIEhUTUxUYWJsZVBhcnRFbGVtZW50OjphZGRD aGlsZChjaGlsZCk7CisgICAgcmV0dXJuIEhUTUxUYWJsZVBhcnRFbGVtZW50OjpsZWdhY3lQYXJz ZXJBZGRDaGlsZChjaGlsZCk7CiB9CiAKIC8vIHVzZWQgYnkgdGFibGUgcm93IGdyb3VwcyB0byBz aGFyZSBzdHlsZSBkZWNscyBjcmVhdGVkIGJ5IHRoZSBlbmNsb3NpbmcgdGFibGUuCmRpZmYgLS1n aXQgYS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQuaCBiL1dlYkNvcmUvaHRt bC9IVE1MVGFibGVTZWN0aW9uRWxlbWVudC5oCmluZGV4IGY3YzFkOGE4NmQzMmJlMTc4YmQ5MDdl N2I5MmI5ZmZhYzc4MDBkNmYuLjNlMzU2ZGExY2Q5M2UyYWY3OGNkY2VhMzE2MTI2ZmMxMzkzMGU3 YjggMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVTZWN0aW9uRWxlbWVudC5oCisr KyBiL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVTZWN0aW9uRWxlbWVudC5oCkBAIC0zNCw3ICszNCw3 IEBAIGNsYXNzIEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50IDogcHVibGljIEhUTUxUYWJsZVBhcnRF bGVtZW50IHsKIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc1JlZlB0cjxIVE1MVGFibGVTZWN0aW9u RWxlbWVudD4gY3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCopOwogCi0gICAg dmlydHVhbCBDb250YWluZXJOb2RlKiBhZGRDaGlsZChQYXNzUmVmUHRyPE5vZGU+KTsKKyAgICB2 aXJ0dWFsIENvbnRhaW5lck5vZGUqIGxlZ2FjeVBhcnNlckFkZENoaWxkKFBhc3NSZWZQdHI8Tm9k ZT4pOwogCiAgICAgUGFzc1JlZlB0cjxIVE1MRWxlbWVudD4gaW5zZXJ0Um93KGludCBpbmRleCwg RXhjZXB0aW9uQ29kZSYpOwogICAgIHZvaWQgZGVsZXRlUm93KGludCBpbmRleCwgRXhjZXB0aW9u Q29kZSYpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQu Y3BwIGIvV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCmluZGV4IGY2Njcw M2FkNGYzYjYxNmFkYzM5MGQzMjhjYTZiYTkxOTBkMWIxOWYuLjZjZWUyN2M2NWYxM2ViNTI0MmM2 ZWVkMWJhY2FiNzRkZWYxMWE4MjEgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVmlld1Nv dXJjZURvY3VtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVu dC5jcHAKQEAgLTY5LDEwICs2OSwxMCBAQCBEb2N1bWVudFBhcnNlciogSFRNTFZpZXdTb3VyY2VE b2N1bWVudDo6Y3JlYXRlUGFyc2VyKCkKIHZvaWQgSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6Y3Jl YXRlQ29udGFpbmluZ1RhYmxlKCkKIHsKICAgICBSZWZQdHI8SFRNTEh0bWxFbGVtZW50PiBodG1s ID0gSFRNTEh0bWxFbGVtZW50OjpjcmVhdGUodGhpcyk7Ci0gICAgYWRkQ2hpbGQoaHRtbCk7Cisg ICAgbGVnYWN5UGFyc2VyQWRkQ2hpbGQoaHRtbCk7CiAgICAgaHRtbC0+YXR0YWNoKCk7CiAgICAg UmVmUHRyPEhUTUxCb2R5RWxlbWVudD4gYm9keSA9IEhUTUxCb2R5RWxlbWVudDo6Y3JlYXRlKHRo aXMpOwotICAgIGh0bWwtPmFkZENoaWxkKGJvZHkpOworICAgIGh0bWwtPmxlZ2FjeVBhcnNlckFk ZENoaWxkKGJvZHkpOwogICAgIGJvZHktPmF0dGFjaCgpOwogICAgIAogICAgIC8vIENyZWF0ZSBh IGxpbmUgZ3V0dGVyIGRpdiB0aGF0IGNhbiBiZSB1c2VkIHRvIG1ha2Ugc3VyZSB0aGUgZ3V0dGVy IGV4dGVuZHMgZG93biB0aGUgaGVpZ2h0IG9mIHRoZSB3aG9sZQpAQCAtODEsMTQgKzgxLDE0IEBA IHZvaWQgSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6Y3JlYXRlQ29udGFpbmluZ1RhYmxlKCkKICAg ICBSZWZQdHI8TmFtZWROb2RlTWFwPiBhdHRycyA9IE5hbWVkTm9kZU1hcDo6Y3JlYXRlKCk7CiAg ICAgYXR0cnMtPmFkZEF0dHJpYnV0ZShBdHRyaWJ1dGU6OmNyZWF0ZU1hcHBlZChjbGFzc0F0dHIs ICJ3ZWJraXQtbGluZS1ndXR0ZXItYmFja2Ryb3AiKSk7CiAgICAgZGl2LT5zZXRBdHRyaWJ1dGVN YXAoYXR0cnMucmVsZWFzZSgpKTsKLSAgICBib2R5LT5hZGRDaGlsZChkaXYpOworICAgIGJvZHkt PmxlZ2FjeVBhcnNlckFkZENoaWxkKGRpdik7CiAgICAgZGl2LT5hdHRhY2goKTsKIAogICAgIFJl ZlB0cjxIVE1MVGFibGVFbGVtZW50PiB0YWJsZSA9IEhUTUxUYWJsZUVsZW1lbnQ6OmNyZWF0ZSh0 aGlzKTsKLSAgICBib2R5LT5hZGRDaGlsZCh0YWJsZSk7CisgICAgYm9keS0+bGVnYWN5UGFyc2Vy QWRkQ2hpbGQodGFibGUpOwogICAgIHRhYmxlLT5hdHRhY2goKTsKICAgICBtX3Rib2R5ID0gSFRN TFRhYmxlU2VjdGlvbkVsZW1lbnQ6OmNyZWF0ZSh0Ym9keVRhZywgdGhpcyk7Ci0gICAgdGFibGUt PmFkZENoaWxkKG1fdGJvZHkpOworICAgIHRhYmxlLT5sZWdhY3lQYXJzZXJBZGRDaGlsZChtX3Ri b2R5KTsKICAgICBtX3Rib2R5LT5hdHRhY2goKTsKICAgICBtX2N1cnJlbnQgPSBtX3Rib2R5Owog fQpAQCAtMjE0LDcgKzIxNCw3IEBAIFBhc3NSZWZQdHI8RWxlbWVudD4gSFRNTFZpZXdTb3VyY2VE b2N1bWVudDo6YWRkU3BhbldpdGhDbGFzc05hbWUoY29uc3QgU3RyaW5nJiBjCiAgICAgUmVmUHRy PE5hbWVkTm9kZU1hcD4gYXR0cnMgPSBOYW1lZE5vZGVNYXA6OmNyZWF0ZSgpOwogICAgIGF0dHJz LT5hZGRBdHRyaWJ1dGUoQXR0cmlidXRlOjpjcmVhdGVNYXBwZWQoY2xhc3NBdHRyLCBjbGFzc05h bWUpKTsKICAgICBzcGFuLT5zZXRBdHRyaWJ1dGVNYXAoYXR0cnMucmVsZWFzZSgpKTsKLSAgICBt X2N1cnJlbnQtPmFkZENoaWxkKHNwYW4pOworICAgIG1fY3VycmVudC0+bGVnYWN5UGFyc2VyQWRk Q2hpbGQoc3Bhbik7CiAgICAgc3Bhbi0+YXR0YWNoKCk7CiAgICAgcmV0dXJuIHNwYW4ucmVsZWFz ZSgpOwogfQpAQCAtMjIzLDcgKzIyMyw3IEBAIHZvaWQgSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6 YWRkTGluZShjb25zdCBTdHJpbmcmIGNsYXNzTmFtZSkKIHsKICAgICAvLyBDcmVhdGUgYSB0YWJs ZSByb3cuCiAgICAgUmVmUHRyPEhUTUxUYWJsZVJvd0VsZW1lbnQ+IHRyb3cgPSBIVE1MVGFibGVS b3dFbGVtZW50OjpjcmVhdGUodGhpcyk7Ci0gICAgbV90Ym9keS0+YWRkQ2hpbGQodHJvdyk7Cisg ICAgbV90Ym9keS0+bGVnYWN5UGFyc2VyQWRkQ2hpbGQodHJvdyk7CiAgICAgdHJvdy0+YXR0YWNo KCk7CiAgICAgCiAgICAgLy8gQ3JlYXRlIGEgY2VsbCB0aGF0IHdpbGwgaG9sZCB0aGUgbGluZSBu dW1iZXIgKGl0IGlzIGdlbmVyYXRlZCBpbiB0aGUgc3R5bGVzaGVldCB1c2luZyBjb3VudGVycyku CkBAIC0yMzEsNyArMjMxLDcgQEAgdm9pZCBIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRMaW5l KGNvbnN0IFN0cmluZyYgY2xhc3NOYW1lKQogICAgIFJlZlB0cjxOYW1lZE5vZGVNYXA+IGF0dHJz ID0gTmFtZWROb2RlTWFwOjpjcmVhdGUoKTsKICAgICBhdHRycy0+YWRkQXR0cmlidXRlKEF0dHJp YnV0ZTo6Y3JlYXRlTWFwcGVkKGNsYXNzQXR0ciwgIndlYmtpdC1saW5lLW51bWJlciIpKTsKICAg ICB0ZC0+c2V0QXR0cmlidXRlTWFwKGF0dHJzLnJlbGVhc2UoKSk7Ci0gICAgdHJvdy0+YWRkQ2hp bGQodGQpOworICAgIHRyb3ctPmxlZ2FjeVBhcnNlckFkZENoaWxkKHRkKTsKICAgICB0ZC0+YXR0 YWNoKCk7CiAKICAgICAvLyBDcmVhdGUgYSBzZWNvbmQgY2VsbCBmb3IgdGhlIGxpbmUgY29udGVu dHMKQEAgLTIzOSw3ICsyMzksNyBAQCB2b2lkIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZExp bmUoY29uc3QgU3RyaW5nJiBjbGFzc05hbWUpCiAgICAgYXR0cnMgPSBOYW1lZE5vZGVNYXA6OmNy ZWF0ZSgpOwogICAgIGF0dHJzLT5hZGRBdHRyaWJ1dGUoQXR0cmlidXRlOjpjcmVhdGVNYXBwZWQo Y2xhc3NBdHRyLCAid2Via2l0LWxpbmUtY29udGVudCIpKTsKICAgICB0ZC0+c2V0QXR0cmlidXRl TWFwKGF0dHJzLnJlbGVhc2UoKSk7Ci0gICAgdHJvdy0+YWRkQ2hpbGQodGQpOworICAgIHRyb3ct PmxlZ2FjeVBhcnNlckFkZENoaWxkKHRkKTsKICAgICB0ZC0+YXR0YWNoKCk7CiAgICAgbV9jdXJy ZW50ID0gbV90ZCA9IHRkOwogCkBAIC0yNzYsNyArMjc2LDcgQEAgdm9pZCBIVE1MVmlld1NvdXJj ZURvY3VtZW50OjphZGRUZXh0KGNvbnN0IFN0cmluZyYgdGV4dCwgY29uc3QgU3RyaW5nJiBjbGFz c05hbWUKICAgICAgICAgaWYgKG1fY3VycmVudCA9PSBtX3Rib2R5KQogICAgICAgICAgICAgYWRk TGluZShjbGFzc05hbWUpOwogICAgICAgICBSZWZQdHI8VGV4dD4gdCA9IFRleHQ6OmNyZWF0ZSh0 aGlzLCBzdWJzdHJpbmcpOwotICAgICAgICBtX2N1cnJlbnQtPmFkZENoaWxkKHQpOworICAgICAg ICBtX2N1cnJlbnQtPmxlZ2FjeVBhcnNlckFkZENoaWxkKHQpOwogICAgICAgICB0LT5hdHRhY2go KTsKICAgICAgICAgaWYgKGkgPCBzaXplIC0gMSkKICAgICAgICAgICAgIG1fY3VycmVudCA9IG1f dGJvZHk7CkBAIC0zMDQsNyArMzA0LDcgQEAgUGFzc1JlZlB0cjxFbGVtZW50PiBIVE1MVmlld1Nv dXJjZURvY3VtZW50OjphZGRMaW5rKGNvbnN0IFN0cmluZyYgdXJsLCBib29sIGlzQW4KICAgICBh dHRycy0+YWRkQXR0cmlidXRlKEF0dHJpYnV0ZTo6Y3JlYXRlTWFwcGVkKHRhcmdldEF0dHIsICJf YmxhbmsiKSk7CiAgICAgYXR0cnMtPmFkZEF0dHJpYnV0ZShBdHRyaWJ1dGU6OmNyZWF0ZU1hcHBl ZChocmVmQXR0ciwgdXJsKSk7CiAgICAgYW5jaG9yLT5zZXRBdHRyaWJ1dGVNYXAoYXR0cnMucmVs ZWFzZSgpKTsKLSAgICBtX2N1cnJlbnQtPmFkZENoaWxkKGFuY2hvcik7CisgICAgbV9jdXJyZW50 LT5sZWdhY3lQYXJzZXJBZGRDaGlsZChhbmNob3IpOwogICAgIGFuY2hvci0+YXR0YWNoKCk7CiAg ICAgcmV0dXJuIGFuY2hvci5yZWxlYXNlKCk7CiB9Cg== 59975 2010-06-28 19:07:53 -0700 2010-06-28 20:25:34 -0700 Patch bug-41324-20100628190751.patch text/plain 23484 eric ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OWU4NzZjNmFkZjgwZTFkMTM1YjViYzIzNjcyZmMyMGEwNmZmNTNhNi4uZTU4ZGEzNzQyMGM0ZWE4 ZGNmZDY4OGJjOGY4MjUwZGE5YTJjZTllMyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MiBAQAorMjAxMC0wNi0yOCAgRXJp YyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVuYW1lIENvbnRhaW5lck5vZGU6OmFkZENoaWxkIHRvIGxl Z2FjeVBhcnNlckFkZENoaWxkIHRvIGluZGljYXRlIGl0cyBwYXJzZXItb25seSBpbnRlbmRlZCB1 c2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQxMzI0 CisKKyAgICAgICAgQSBidW5jaCBvZiBwbGFjZXMgaW4gdGhlIGNvZGUgd2VyZSBjYWxsaW5nIENv bnRhaW5lck5vZGU6OmFkZENoaWxkLgorICAgICAgICBJIGRvbid0IHRoaW5rIHRoZXkgYWN0dWFs bHkgd2FudCB0byBiZSBkb2luZyB0aGF0LCBhcyBpdCBoYXMgc3BlY2lhbAorICAgICAgICBmb3Jt LXJlbGF0ZWQgaGFuZGxpbmcgd2hpY2ggaXMgcGFydCBvZiBMZWdhY3lIVE1MVHJlZUJ1aWxkZXIu CisKKyAgICAgICAgTm8gZnVuY3Rpb25hbCBjaGFuZ2VzLCB0aHVzIG5vIHRlc3RzLgorCisgICAg ICAgICogZG9tL0NvbnRhaW5lck5vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFpbmVy Tm9kZTo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQpOgorICAgICAgICAqIGRvbS9Db250YWluZXJOb2Rl Lmg6CisgICAgICAgICogZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkRPTUltcGxlbWVudGF0aW9uOjpjcmVhdGVEb2N1bWVudCk6CisgICAgICAgICogZG9tL05v ZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQpOgor ICAgICAgICAqIGRvbS9Ob2RlLmg6CisgICAgICAgICogaHRtbC9IVE1MS2V5Z2VuRWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MS2V5Z2VuRWxlbWVudDo6SFRNTEtleWdlbkVsZW1l bnQpOgorICAgICAgICAqIGh0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVGFibGVFbGVtZW50OjpsZWdhY3lQYXJzZXJBZGRDaGlsZCk6CisgICAgICAgICog aHRtbC9IVE1MVGFibGVFbGVtZW50Lmg6CisgICAgICAgICogaHRtbC9IVE1MVGFibGVSb3dFbGVt ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxUYWJsZVJvd0VsZW1lbnQ6OmxlZ2FjeVBh cnNlckFkZENoaWxkKToKKyAgICAgICAgKiBodG1sL0hUTUxUYWJsZVJvd0VsZW1lbnQuaDoKKyAg ICAgICAgKiBodG1sL0hUTUxUYWJsZVNlY3Rpb25FbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUYWJsZVNlY3Rpb25FbGVtZW50OjpsZWdhY3lQYXJzZXJBZGRDaGlsZCk6CisgICAg ICAgICogaHRtbC9IVE1MVGFibGVTZWN0aW9uRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvSFRN TFZpZXdTb3VyY2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1NvdXJj ZURvY3VtZW50OjpjcmVhdGVDb250YWluaW5nVGFibGUpOgorICAgICAgICAoV2ViQ29yZTo6SFRN TFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkU3BhbldpdGhDbGFzc05hbWUpOgorICAgICAgICAoV2Vi Q29yZTo6SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkTGluZSk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRUZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkhU TUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZExpbmspOgorCiAyMDEwLTA2LTI4ICBBZGFtIEJhcnRo ICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwu CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmNwcCBiL1dlYkNvcmUvZG9t L0NvbnRhaW5lck5vZGUuY3BwCmluZGV4IDkwMmExMjgxMDIwOTk5NDRiYTYyZjcxZjc0ZjY3YTdi YjczY2Q1MWQuLjlmNTRhMmIzYjRhZWQ3ZTA1N2UxYzViYWYzZTIxMzNkMmUzNmE4ODIgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCisrKyBiL1dlYkNvcmUvZG9tL0Nv bnRhaW5lck5vZGUuY3BwCkBAIC01NTQsNyArNTU0LDcgQEAgdm9pZCBDb250YWluZXJOb2RlOjpw YXJzZXJBZGRDaGlsZChQYXNzUmVmUHRyPE5vZGU+IG5ld0NoaWxkKQogICAgIGNoaWxkcmVuQ2hh bmdlZCh0cnVlLCBsYXN0LCAwLCAxKTsKIH0KIAotQ29udGFpbmVyTm9kZSogQ29udGFpbmVyTm9k ZTo6YWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPiBuZXdDaGlsZCkKK0NvbnRhaW5lck5vZGUqIENv bnRhaW5lck5vZGU6OmxlZ2FjeVBhcnNlckFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4gbmV3Q2hp bGQpCiB7CiAgICAgQVNTRVJUKG5ld0NoaWxkKTsKICAgICAvLyBUaGlzIGZ1bmN0aW9uIGlzIG9u bHkgdXNlZCBkdXJpbmcgcGFyc2luZy4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0NvbnRhaW5l ck5vZGUuaCBiL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuaAppbmRleCA4MzU5ODc4M2FmMjgx ZjI2OGQ0M2MxNzA3MDkzMzE3ZmM0MmQwYmRmLi45YTk4MTEwODExMjBkZmYzMzUxMDhlNDAzNmZi NTgxOThlMWYwNTFlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmgKKysr IGIvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5oCkBAIC00OCw3ICs0OCw3IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIGJvb2wgcmVtb3ZlQ2hpbGQoTm9kZSogY2hpbGQsIEV4Y2VwdGlvbkNvZGUm KTsKICAgICB2aXJ0dWFsIGJvb2wgYXBwZW5kQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPiBuZXdDaGls ZCwgRXhjZXB0aW9uQ29kZSYsIGJvb2wgc2hvdWxkTGF6eUF0dGFjaCA9IGZhbHNlKTsKIAotICAg IHZpcnR1YWwgQ29udGFpbmVyTm9kZSogYWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPik7CisgICAg dmlydHVhbCBDb250YWluZXJOb2RlKiBsZWdhY3lQYXJzZXJBZGRDaGlsZChQYXNzUmVmUHRyPE5v ZGU+KTsKICAgICB2aXJ0dWFsIHZvaWQgcGFyc2VyQWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPik7 CiAKICAgICBib29sIGhhc0NoaWxkTm9kZXMoKSBjb25zdCB7IHJldHVybiBtX2ZpcnN0Q2hpbGQ7 IH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcCBiL1dlYkNv cmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcAppbmRleCAzNDgzYjIzMjYxNDZjMTBlNDRlY2Iy NWM4NWE0Y2RlNzExOWNkYTUwLi40NjdmMWZjM2ZmOWE5NjJiOTgyOGU5NTk3ZDFiZTRiYWM5Njgw ZWJhIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9ET01JbXBsZW1lbnRhdGlvbi5jcHAKKysrIGIv V2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCkBAIC0yNTYsMTAgKzI1NiwxMSBAQCBQ YXNzUmVmUHRyPERvY3VtZW50PiBET01JbXBsZW1lbnRhdGlvbjo6Y3JlYXRlRG9jdW1lbnQoY29u c3QgU3RyaW5nJiBuYW1lc3BhY2VVUgogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKKyAgICAv LyBGSVhNRTogU2hvdWxkbid0IHRoaXMgY2FsbCBhcHBlbmRDaGlsZCBpbnN0ZWFkPwogICAgIGlm IChkb2N0eXBlKQotICAgICAgICBkb2MtPmFkZENoaWxkKGRvY3R5cGUpOworICAgICAgICBkb2Mt PmxlZ2FjeVBhcnNlckFkZENoaWxkKGRvY3R5cGUpOwogICAgIGlmIChkb2N1bWVudEVsZW1lbnQp Ci0gICAgICAgIGRvYy0+YWRkQ2hpbGQoZG9jdW1lbnRFbGVtZW50LnJlbGVhc2UoKSk7CisgICAg ICAgIGRvYy0+bGVnYWN5UGFyc2VyQWRkQ2hpbGQoZG9jdW1lbnRFbGVtZW50LnJlbGVhc2UoKSk7 CiAKICAgICByZXR1cm4gZG9jLnJlbGVhc2UoKTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvZG9t L05vZGUuY3BwIGIvV2ViQ29yZS9kb20vTm9kZS5jcHAKaW5kZXggYjVkMDJjMzU1ZTczMDZjOTcx ZTkyN2M2ZWE2NmU1OTU5ZDMyZGJkMy4uNjA5YTUzYjJkNzE1ODYyMGI2NmFkM2EwMDNjMmRlMjE5 N2MxMWIwYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vTm9kZS5jcHAKKysrIGIvV2ViQ29yZS9k b20vTm9kZS5jcHAKQEAgLTYzOSw3ICs2MzksNyBAQCBjb25zdCBBdG9taWNTdHJpbmcmIE5vZGU6 OnZpcnR1YWxOYW1lc3BhY2VVUkkoKSBjb25zdAogICAgIHJldHVybiBudWxsQXRvbTsKIH0KIAot Q29udGFpbmVyTm9kZSogTm9kZTo6YWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPikKK0NvbnRhaW5l ck5vZGUqIE5vZGU6OmxlZ2FjeVBhcnNlckFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4pCiB7CiAg ICAgcmV0dXJuIDA7CiB9CmRpZmYgLS1naXQgYS9XZWJDb3JlL2RvbS9Ob2RlLmggYi9XZWJDb3Jl L2RvbS9Ob2RlLmgKaW5kZXggZGI0OTMyZTFkMDE1MWJkZDMwNGE4Mzg3MjZiZDMyYTcxZmNiZmY0 NS4uZWJjNmU1ZjBlMWZkNWIwOGUyZTk2MDMyZmRjMDU4Mzk2MTExYTNmMCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9kb20vTm9kZS5oCisrKyBiL1dlYkNvcmUvZG9tL05vZGUuaApAQCAtMjY0LDcgKzI2 NCw3IEBAIHB1YmxpYzoKICAgICAvLyBVc2VkIGJ5IHRoZSBwYXJzZXIuIENoZWNrcyBhZ2FpbnN0 IHRoZSBEVEQsIHVubGlrZSBET00gb3BlcmF0aW9ucyBsaWtlIGFwcGVuZENoaWxkKCkuCiAgICAg Ly8gQWxzbyBkb2VzIG5vdCBkaXNwYXRjaCBET00gbXV0YXRpb24gZXZlbnRzLgogICAgIC8vIFJl dHVybnMgdGhlIGFwcHJvcHJpYXRlIGNvbnRhaW5lciBub2RlIGZvciBmdXR1cmUgaW5zZXJ0aW9u cyBhcyB5b3UgcGFyc2UsIG9yIDAgZm9yIGZhaWx1cmUuCi0gICAgdmlydHVhbCBDb250YWluZXJO b2RlKiBhZGRDaGlsZChQYXNzUmVmUHRyPE5vZGU+KTsKKyAgICB2aXJ0dWFsIENvbnRhaW5lck5v ZGUqIGxlZ2FjeVBhcnNlckFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4pOwogICAgIC8vIGFkZENo aWxkIGlzIHRpZWQgaW50byB0aGUgbG9naWMgb2YgdGhlIExlZ2FjeUhUTUxUcmVlQnVpbGRlci4g IFdlIG5lZWQKICAgICAvLyBhICJjbGVhbiIgdmVyc2lvbiB0byB1c2UgZm9yIHRoZSBIVE1MNSB2 ZXJzaW9uIG9mIHRoZSBIVE1MVHJlZUJ1aWxkZXIuCiAgICAgdmlydHVhbCB2b2lkIHBhcnNlckFk ZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4pOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vWE1MRG9j dW1lbnRQYXJzZXIuY3BwIGIvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXIuY3BwCmluZGV4 IDNkZGQ2NmJjNmY2MDEzODRiYjBhZTg1MTMwM2NlNDAyNGNhNmRhZjkuLjNkMmYzMjQzMzAzOTkz OGQzZTU4OThkNmQ1MzVhODI5NGMyOTdkYjkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1hNTERv Y3VtZW50UGFyc2VyLmNwcAorKysgYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNlci5jcHAK QEAgLTE3Niw3ICsxNzYsNyBAQCBib29sIFhNTERvY3VtZW50UGFyc2VyOjplbnRlclRleHQoKQog ICAgIEFTU0VSVChtX2J1ZmZlcmVkVGV4dC5zaXplKCkgPT0gMCk7CiAjZW5kaWYKICAgICBSZWZQ dHI8Tm9kZT4gbmV3Tm9kZSA9IFRleHQ6OmNyZWF0ZShkb2N1bWVudCgpLCAiIik7Ci0gICAgaWYg KCFtX2N1cnJlbnROb2RlLT5hZGRDaGlsZChuZXdOb2RlLmdldCgpKSkKKyAgICBpZiAoIW1fY3Vy cmVudE5vZGUtPmxlZ2FjeVBhcnNlckFkZENoaWxkKG5ld05vZGUuZ2V0KCkpKQogICAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgcHVzaEN1cnJlbnROb2RlKG5ld05vZGUuZ2V0KCkpOwogICAgIHJl dHVybiB0cnVlOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9kb20vWE1MRG9jdW1lbnRQYXJzZXJMaWJ4 bWwyLmNwcCBiL1dlYkNvcmUvZG9tL1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5jcHAKaW5kZXgg Y2RjNThmYzY4OTBmZmExZjE5YmFmNDE4ZjcxYzYxMDE4M2M5OTQyZC4uYTZlOWNkMDdiODgwOTM1 MTJjMzVlZWJjODE1Mjg3YTkxMDBiYjBkYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vWE1MRG9j dW1lbnRQYXJzZXJMaWJ4bWwyLmNwcAorKysgYi9XZWJDb3JlL2RvbS9YTUxEb2N1bWVudFBhcnNl ckxpYnhtbDIuY3BwCkBAIC03OTAsNyArNzkwLDcgQEAgdm9pZCBYTUxEb2N1bWVudFBhcnNlcjo6 c3RhcnRFbGVtZW50TnMoY29uc3QgeG1sQ2hhciogeG1sTG9jYWxOYW1lLCBjb25zdCB4bWxDaGEK ICAgICBpZiAoc2NyaXB0RWxlbWVudCkKICAgICAgICAgbV9zY3JpcHRTdGFydExpbmUgPSBsaW5l TnVtYmVyKCk7CiAKLSAgICBpZiAoIW1fY3VycmVudE5vZGUtPmFkZENoaWxkKG5ld0VsZW1lbnQu Z2V0KCkpKSB7CisgICAgaWYgKCFtX2N1cnJlbnROb2RlLT5sZWdhY3lQYXJzZXJBZGRDaGlsZChu ZXdFbGVtZW50LmdldCgpKSkgewogICAgICAgICBzdG9wUGFyc2luZygpOwogICAgICAgICByZXR1 cm47CiAgICAgfQpAQCAtOTM1LDcgKzkzNSw3IEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OnBy b2Nlc3NpbmdJbnN0cnVjdGlvbihjb25zdCB4bWxDaGFyKiB0YXJnZXQsIGNvbnN0IHhtbENoCiAK ICAgICBwaS0+c2V0Q3JlYXRlZEJ5UGFyc2VyKHRydWUpOwogCi0gICAgaWYgKCFtX2N1cnJlbnRO b2RlLT5hZGRDaGlsZChwaS5nZXQoKSkpCisgICAgaWYgKCFtX2N1cnJlbnROb2RlLT5sZWdhY3lQ YXJzZXJBZGRDaGlsZChwaS5nZXQoKSkpCiAgICAgICAgIHJldHVybjsKICAgICBpZiAobV92aWV3 ICYmICFwaS0+YXR0YWNoZWQoKSkKICAgICAgICAgcGktPmF0dGFjaCgpOwpAQCAtOTYyLDcgKzk2 Miw3IEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OmNkYXRhQmxvY2soY29uc3QgeG1sQ2hhciog cywgaW50IGxlbikKICAgICBleGl0VGV4dCgpOwogCiAgICAgUmVmUHRyPE5vZGU+IG5ld05vZGUg PSBDREFUQVNlY3Rpb246OmNyZWF0ZShkb2N1bWVudCgpLCB0b1N0cmluZyhzLCBsZW4pKTsKLSAg ICBpZiAoIW1fY3VycmVudE5vZGUtPmFkZENoaWxkKG5ld05vZGUuZ2V0KCkpKQorICAgIGlmICgh bV9jdXJyZW50Tm9kZS0+bGVnYWN5UGFyc2VyQWRkQ2hpbGQobmV3Tm9kZS5nZXQoKSkpCiAgICAg ICAgIHJldHVybjsKICAgICBpZiAobV92aWV3ICYmICFuZXdOb2RlLT5hdHRhY2hlZCgpKQogICAg ICAgICBuZXdOb2RlLT5hdHRhY2goKTsKQEAgLTk4MSw3ICs5ODEsNyBAQCB2b2lkIFhNTERvY3Vt ZW50UGFyc2VyOjpjb21tZW50KGNvbnN0IHhtbENoYXIqIHMpCiAgICAgZXhpdFRleHQoKTsKIAog ICAgIFJlZlB0cjxOb2RlPiBuZXdOb2RlID0gQ29tbWVudDo6Y3JlYXRlKGRvY3VtZW50KCksIHRv U3RyaW5nKHMpKTsKLSAgICBtX2N1cnJlbnROb2RlLT5hZGRDaGlsZChuZXdOb2RlLmdldCgpKTsK KyAgICBtX2N1cnJlbnROb2RlLT5sZWdhY3lQYXJzZXJBZGRDaGlsZChuZXdOb2RlLmdldCgpKTsK ICAgICBpZiAobV92aWV3ICYmICFuZXdOb2RlLT5hdHRhY2hlZCgpKQogICAgICAgICBuZXdOb2Rl LT5hdHRhY2goKTsKIH0KQEAgLTEwNDUsNyArMTA0NSw3IEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJz ZXI6OmludGVybmFsU3Vic2V0KGNvbnN0IHhtbENoYXIqIG5hbWUsIGNvbnN0IHhtbENoYXIqIGV4 dGVyCiAgICAgICAgIH0KICNlbmRpZgogCi0gICAgICAgIGRvY3VtZW50KCktPmFkZENoaWxkKERv Y3VtZW50VHlwZTo6Y3JlYXRlKGRvY3VtZW50KCksIHRvU3RyaW5nKG5hbWUpLCB0b1N0cmluZyhl eHRlcm5hbElEKSwgdG9TdHJpbmcoc3lzdGVtSUQpKSk7CisgICAgICAgIGRvY3VtZW50KCktPmxl Z2FjeVBhcnNlckFkZENoaWxkKERvY3VtZW50VHlwZTo6Y3JlYXRlKGRvY3VtZW50KCksIHRvU3Ry aW5nKG5hbWUpLCB0b1N0cmluZyhleHRlcm5hbElEKSwgdG9TdHJpbmcoc3lzdGVtSUQpKSk7CiAg ICAgfQogfQogCmRpZmYgLS1naXQgYS9XZWJDb3JlL2h0bWwvSFRNTEtleWdlbkVsZW1lbnQuY3Bw IGIvV2ViQ29yZS9odG1sL0hUTUxLZXlnZW5FbGVtZW50LmNwcAppbmRleCA3NGIzYTBmMjBkNmFl Y2Q1NWIxYTQwMThmMDVkZTJmNWVkMjdjNTIyLi41MTg1ZjUxYTlhNTc1MmJkMTNkNWE3Mjc4OTU4 MWIxNTRhNjE3MTI3IDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTEtleWdlbkVsZW1lbnQu Y3BwCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MS2V5Z2VuRWxlbWVudC5jcHAKQEAgLTUwLDggKzUw LDggQEAgaW5saW5lIEhUTUxLZXlnZW5FbGVtZW50OjpIVE1MS2V5Z2VuRWxlbWVudChjb25zdCBR dWFsaWZpZWROYW1lJiB0YWdOYW1lLCBEb2N1bWUKICAgICBnZXRTdXBwb3J0ZWRLZXlTaXplcyhr ZXlzKTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGtleXMuc2l6ZSgpOyArK2kpIHsKICAg ICAgICAgUmVmUHRyPEhUTUxPcHRpb25FbGVtZW50PiBvcHRpb24gPSBIVE1MT3B0aW9uRWxlbWVu dDo6Y3JlYXRlKGRvY3VtZW50LCB0aGlzLT5mb3JtKCkpOwotICAgICAgICBhZGRDaGlsZChvcHRp b24pOwotICAgICAgICBvcHRpb24tPmFkZENoaWxkKFRleHQ6OmNyZWF0ZShkb2N1bWVudCwga2V5 c1tpXSkpOworICAgICAgICBsZWdhY3lQYXJzZXJBZGRDaGlsZChvcHRpb24pOworICAgICAgICBv cHRpb24tPmxlZ2FjeVBhcnNlckFkZENoaWxkKFRleHQ6OmNyZWF0ZShkb2N1bWVudCwga2V5c1tp XSkpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1l bnQuY3BwIGIvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQuY3BwCmluZGV4IGUwYWYxYTRi NDYxNWU3NjAxOTZkMDk2NTZmMjFlYjQzNzg3MGFlZWUuLjU2Y2IzMmEyN2NmYmVmNmI5ZTg1YjAz MWVlZmY4NGUyNTY5MzU0YTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVFbGVt ZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlRWxlbWVudC5jcHAKQEAgLTI1MSwx OCArMjUxLDE4IEBAIHZvaWQgSFRNTFRhYmxlRWxlbWVudDo6ZGVsZXRlUm93KGludCBpbmRleCwg RXhjZXB0aW9uQ29kZSYgZWMpCiAgICAgcm93LT5yZW1vdmUoZWMpOwogfQogCi1Db250YWluZXJO b2RlKiBIVE1MVGFibGVFbGVtZW50OjphZGRDaGlsZChQYXNzUmVmUHRyPE5vZGU+IGNoaWxkKQor Q29udGFpbmVyTm9kZSogSFRNTFRhYmxlRWxlbWVudDo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQoUGFz c1JlZlB0cjxOb2RlPiBjaGlsZCkKIHsKICAgICBpZiAoY2hpbGQtPmhhc1RhZ05hbWUoZm9ybVRh ZykpIHsKICAgICAgICAgLy8gRmlyc3QgYWRkIHRoZSBjaGlsZC4KLSAgICAgICAgSFRNTEVsZW1l bnQ6OmFkZENoaWxkKGNoaWxkKTsKKyAgICAgICAgSFRNTEVsZW1lbnQ6OmxlZ2FjeVBhcnNlckFk ZENoaWxkKGNoaWxkKTsKIAogICAgICAgICAvLyBOb3cgc2ltcGx5IHJldHVybiBvdXJzZWx2ZXMg YXMgdGhlIGNvbnRhaW5lciB0byBpbnNlcnQgaW50by4KICAgICAgICAgLy8gVGhpcyBoYXMgdGhl IGVmZmVjdCBvZiBkZW1vdGluZyB0aGUgZm9ybSB0byBhIGxlYWYgYW5kIG1vdmluZyBpdCBzYWZl bHkgb3V0IG9mIHRoZSB3YXkuCiAgICAgICAgIHJldHVybiB0aGlzOwogICAgIH0KIAotICAgIHJl dHVybiBIVE1MRWxlbWVudDo6YWRkQ2hpbGQoY2hpbGQuZ2V0KCkpOworICAgIHJldHVybiBIVE1M RWxlbWVudDo6bGVnYWN5UGFyc2VyQWRkQ2hpbGQoY2hpbGQuZ2V0KCkpOwogfQogCiBib29sIEhU TUxUYWJsZUVsZW1lbnQ6Om1hcFRvRW50cnkoY29uc3QgUXVhbGlmaWVkTmFtZSYgYXR0ck5hbWUs IE1hcHBlZEF0dHJpYnV0ZUVudHJ5JiByZXN1bHQpIGNvbnN0CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2h0bWwvSFRNTFRhYmxlRWxlbWVudC5oIGIvV2ViQ29yZS9odG1sL0hUTUxUYWJsZUVsZW1lbnQu aAppbmRleCA1OWI2NGZjZjljYWIxZDRiNjI5NTQxNTM0Mjc4YTQ3YTlhYWIyNzRkLi5jNDhmZWU1 ZWRlNmM4OTVhYmU3MWIzZjhlNzI3M2Q5OTNjYjc2MDYxIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0 bWwvSFRNTFRhYmxlRWxlbWVudC5oCisrKyBiL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVFbGVtZW50 LmgKQEAgLTYzLDcgKzYzLDcgQEAgcHVibGljOgogICAgIFN0cmluZyBydWxlcygpIGNvbnN0Owog ICAgIFN0cmluZyBzdW1tYXJ5KCkgY29uc3Q7CiAKLSAgICB2aXJ0dWFsIENvbnRhaW5lck5vZGUq IGFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4pOworICAgIHZpcnR1YWwgQ29udGFpbmVyTm9kZSog bGVnYWN5UGFyc2VyQWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPik7CiAKICAgICB2aXJ0dWFsIHZv aWQgYXR0YWNoKCk7CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVSb3dFbGVt ZW50LmNwcCBiL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVSb3dFbGVtZW50LmNwcAppbmRleCBhMmM0 Zjg5NDgzYmFhMzBiODEzOTkwYmQyZTNkMjViYzJmMTY5MGJiLi4wYmFmYjEyNjBmNDM1OWY0ZjE1 ZWNhN2UzNGE2MmFiZWRmNTU2MDczIDEwMDY0NAotLS0gYS9XZWJDb3JlL2h0bWwvSFRNTFRhYmxl Um93RWxlbWVudC5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUYWJsZVJvd0VsZW1lbnQuY3Bw CkBAIC02MiwxOCArNjIsMTggQEAgYm9vbCBIVE1MVGFibGVSb3dFbGVtZW50OjpjaGVja0RURChj b25zdCBOb2RlKiBuZXdDaGlsZCkKICAgICAgICAgICAgbmV3Q2hpbGQtPmhhc1RhZ05hbWUoZm9y bVRhZykgfHwgbmV3Q2hpbGQtPmhhc1RhZ05hbWUoc2NyaXB0VGFnKTsKIH0KIAotQ29udGFpbmVy Tm9kZSogSFRNTFRhYmxlUm93RWxlbWVudDo6YWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPiBjaGls ZCkKK0NvbnRhaW5lck5vZGUqIEhUTUxUYWJsZVJvd0VsZW1lbnQ6OmxlZ2FjeVBhcnNlckFkZENo aWxkKFBhc3NSZWZQdHI8Tm9kZT4gY2hpbGQpCiB7CiAgICAgaWYgKGNoaWxkLT5oYXNUYWdOYW1l KGZvcm1UYWcpKSB7CiAgICAgICAgIC8vIEZpcnN0IGFkZCB0aGUgY2hpbGQuCi0gICAgICAgIEhU TUxUYWJsZVBhcnRFbGVtZW50OjphZGRDaGlsZChjaGlsZCk7CisgICAgICAgIEhUTUxUYWJsZVBh cnRFbGVtZW50OjpsZWdhY3lQYXJzZXJBZGRDaGlsZChjaGlsZCk7CiAKICAgICAgICAgLy8gTm93 IHNpbXBseSByZXR1cm4gb3Vyc2VsdmVzIGFzIHRoZSBjb250YWluZXIgdG8gaW5zZXJ0IGludG8u CiAgICAgICAgIC8vIFRoaXMgaGFzIHRoZSBlZmZlY3Qgb2YgZGVtb3RpbmcgdGhlIGZvcm0gdG8g YSBsZWFmIGFuZCBtb3ZpbmcgaXQgc2FmZWx5IG91dCBvZiB0aGUgd2F5LgogICAgICAgICByZXR1 cm4gdGhpczsKICAgICB9CiAKLSAgICByZXR1cm4gSFRNTFRhYmxlUGFydEVsZW1lbnQ6OmFkZENo aWxkKGNoaWxkKTsKKyAgICByZXR1cm4gSFRNTFRhYmxlUGFydEVsZW1lbnQ6OmxlZ2FjeVBhcnNl ckFkZENoaWxkKGNoaWxkKTsKIH0KIAogaW50IEhUTUxUYWJsZVJvd0VsZW1lbnQ6OnJvd0luZGV4 KCkgY29uc3QKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVSb3dFbGVtZW50Lmgg Yi9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlUm93RWxlbWVudC5oCmluZGV4IGI2OWExYzBiNDE1MjU0 NjAzODNkYjhhYmVmMDg2MmYyMjk3ZmU4MzUuLjgyNWQ3NjM3ZTE4YTk4NGQwNTYxOThkNzFmZDNi NzNmNDU0YWZkMmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaHRtbC9IVE1MVGFibGVSb3dFbGVtZW50 LmgKKysrIGIvV2ViQ29yZS9odG1sL0hUTUxUYWJsZVJvd0VsZW1lbnQuaApAQCAtMzUsNyArMzUs NyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SFRNTFRhYmxlUm93RWxlbWVudD4g Y3JlYXRlKERvY3VtZW50Kik7CiAgICAgc3RhdGljIFBhc3NSZWZQdHI8SFRNTFRhYmxlUm93RWxl bWVudD4gY3JlYXRlKGNvbnN0IFF1YWxpZmllZE5hbWUmLCBEb2N1bWVudCopOwogCi0gICAgdmly dHVhbCBDb250YWluZXJOb2RlKiBhZGRDaGlsZChQYXNzUmVmUHRyPE5vZGU+KTsKKyAgICB2aXJ0 dWFsIENvbnRhaW5lck5vZGUqIGxlZ2FjeVBhcnNlckFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4p OwogCiAgICAgaW50IHJvd0luZGV4KCkgY29uc3Q7CiAgICAgdm9pZCBzZXRSb3dJbmRleChpbnQp OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9odG1sL0hUTUxUYWJsZVNlY3Rpb25FbGVtZW50LmNwcCBi L1dlYkNvcmUvaHRtbC9IVE1MVGFibGVTZWN0aW9uRWxlbWVudC5jcHAKaW5kZXggMTIyYWY4YTY4 OTM4ZGY1MDQxODE5ZGMyYzVhYTkwMjFjYzY5NmZmOS4uOTNiZmVmMjE4ZjcxYTg0MGY2MTBhZjY4 M2MzMzNkYTMyM2I5ODkxNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxUYWJsZVNlY3Rp b25FbGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2h0bWwvSFRNTFRhYmxlU2VjdGlvbkVsZW1lbnQu Y3BwCkBAIC01NSwxOCArNTUsMTggQEAgYm9vbCBIVE1MVGFibGVTZWN0aW9uRWxlbWVudDo6Y2hl Y2tEVEQoY29uc3QgTm9kZSogbmV3Q2hpbGQpCiAgICAgICAgICAgIG5ld0NoaWxkLT5oYXNUYWdO YW1lKHNjcmlwdFRhZyk7CiB9CiAKLUNvbnRhaW5lck5vZGUqIEhUTUxUYWJsZVNlY3Rpb25FbGVt ZW50OjphZGRDaGlsZChQYXNzUmVmUHRyPE5vZGU+IGNoaWxkKQorQ29udGFpbmVyTm9kZSogSFRN TFRhYmxlU2VjdGlvbkVsZW1lbnQ6OmxlZ2FjeVBhcnNlckFkZENoaWxkKFBhc3NSZWZQdHI8Tm9k ZT4gY2hpbGQpCiB7CiAgICAgaWYgKGNoaWxkLT5oYXNUYWdOYW1lKGZvcm1UYWcpKSB7CiAgICAg ICAgIC8vIEZpcnN0IGFkZCB0aGUgY2hpbGQuCi0gICAgICAgIEhUTUxUYWJsZVBhcnRFbGVtZW50 OjphZGRDaGlsZChjaGlsZCk7CisgICAgICAgIEhUTUxUYWJsZVBhcnRFbGVtZW50OjpsZWdhY3lQ YXJzZXJBZGRDaGlsZChjaGlsZCk7CiAKICAgICAgICAgLy8gTm93IHNpbXBseSByZXR1cm4gb3Vy c2VsdmVzIGFzIHRoZSBjb250YWluZXIgdG8gaW5zZXJ0IGludG8uCiAgICAgICAgIC8vIFRoaXMg aGFzIHRoZSBlZmZlY3Qgb2YgZGVtb3RpbmcgdGhlIGZvcm0gdG8gYSBsZWFmIGFuZCBtb3Zpbmcg aXQgc2FmZWx5IG91dCBvZiB0aGUgd2F5LgogICAgICAgICByZXR1cm4gdGhpczsKICAgICB9CiAK LSAgICByZXR1cm4gSFRNTFRhYmxlUGFydEVsZW1lbnQ6OmFkZENoaWxkKGNoaWxkKTsKKyAgICBy ZXR1cm4gSFRNTFRhYmxlUGFydEVsZW1lbnQ6OmxlZ2FjeVBhcnNlckFkZENoaWxkKGNoaWxkKTsK IH0KIAogLy8gdXNlZCBieSB0YWJsZSByb3cgZ3JvdXBzIHRvIHNoYXJlIHN0eWxlIGRlY2xzIGNy ZWF0ZWQgYnkgdGhlIGVuY2xvc2luZyB0YWJsZS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9I VE1MVGFibGVTZWN0aW9uRWxlbWVudC5oIGIvV2ViQ29yZS9odG1sL0hUTUxUYWJsZVNlY3Rpb25F bGVtZW50LmgKaW5kZXggZjdjMWQ4YTg2ZDMyYmUxNzhiZDkwN2U3YjkyYjlmZmFjNzgwMGQ2Zi4u M2UzNTZkYTFjZDkzZTJhZjc4Y2RjZWEzMTYxMjZmYzEzOTMwZTdiOCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9odG1sL0hUTUxUYWJsZVNlY3Rpb25FbGVtZW50LmgKKysrIGIvV2ViQ29yZS9odG1sL0hU TUxUYWJsZVNlY3Rpb25FbGVtZW50LmgKQEAgLTM0LDcgKzM0LDcgQEAgY2xhc3MgSFRNTFRhYmxl U2VjdGlvbkVsZW1lbnQgOiBwdWJsaWMgSFRNTFRhYmxlUGFydEVsZW1lbnQgewogcHVibGljOgog ICAgIHN0YXRpYyBQYXNzUmVmUHRyPEhUTUxUYWJsZVNlY3Rpb25FbGVtZW50PiBjcmVhdGUoY29u c3QgUXVhbGlmaWVkTmFtZSYsIERvY3VtZW50Kik7CiAKLSAgICB2aXJ0dWFsIENvbnRhaW5lck5v ZGUqIGFkZENoaWxkKFBhc3NSZWZQdHI8Tm9kZT4pOworICAgIHZpcnR1YWwgQ29udGFpbmVyTm9k ZSogbGVnYWN5UGFyc2VyQWRkQ2hpbGQoUGFzc1JlZlB0cjxOb2RlPik7CiAKICAgICBQYXNzUmVm UHRyPEhUTUxFbGVtZW50PiBpbnNlcnRSb3coaW50IGluZGV4LCBFeGNlcHRpb25Db2RlJik7CiAg ICAgdm9pZCBkZWxldGVSb3coaW50IGluZGV4LCBFeGNlcHRpb25Db2RlJik7CmRpZmYgLS1naXQg YS9XZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHAgYi9XZWJDb3JlL2h0bWwv SFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHAKaW5kZXggZjY2NzAzYWQ0ZjNiNjE2YWRjMzkwZDMy OGNhNmJhOTE5MGQxYjE5Zi4uNmNlZTI3YzY1ZjEzZWI1MjQyYzZlZWQxYmFjYWI3NGRlZjExYTgy MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0hUTUxWaWV3U291cmNlRG9jdW1lbnQuY3BwCisr KyBiL1dlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50LmNwcApAQCAtNjksMTAgKzY5 LDEwIEBAIERvY3VtZW50UGFyc2VyKiBIVE1MVmlld1NvdXJjZURvY3VtZW50OjpjcmVhdGVQYXJz ZXIoKQogdm9pZCBIVE1MVmlld1NvdXJjZURvY3VtZW50OjpjcmVhdGVDb250YWluaW5nVGFibGUo KQogewogICAgIFJlZlB0cjxIVE1MSHRtbEVsZW1lbnQ+IGh0bWwgPSBIVE1MSHRtbEVsZW1lbnQ6 OmNyZWF0ZSh0aGlzKTsKLSAgICBhZGRDaGlsZChodG1sKTsKKyAgICBsZWdhY3lQYXJzZXJBZGRD aGlsZChodG1sKTsKICAgICBodG1sLT5hdHRhY2goKTsKICAgICBSZWZQdHI8SFRNTEJvZHlFbGVt ZW50PiBib2R5ID0gSFRNTEJvZHlFbGVtZW50OjpjcmVhdGUodGhpcyk7Ci0gICAgaHRtbC0+YWRk Q2hpbGQoYm9keSk7CisgICAgaHRtbC0+bGVnYWN5UGFyc2VyQWRkQ2hpbGQoYm9keSk7CiAgICAg Ym9keS0+YXR0YWNoKCk7CiAgICAgCiAgICAgLy8gQ3JlYXRlIGEgbGluZSBndXR0ZXIgZGl2IHRo YXQgY2FuIGJlIHVzZWQgdG8gbWFrZSBzdXJlIHRoZSBndXR0ZXIgZXh0ZW5kcyBkb3duIHRoZSBo ZWlnaHQgb2YgdGhlIHdob2xlCkBAIC04MSwxNCArODEsMTQgQEAgdm9pZCBIVE1MVmlld1NvdXJj ZURvY3VtZW50OjpjcmVhdGVDb250YWluaW5nVGFibGUoKQogICAgIFJlZlB0cjxOYW1lZE5vZGVN YXA+IGF0dHJzID0gTmFtZWROb2RlTWFwOjpjcmVhdGUoKTsKICAgICBhdHRycy0+YWRkQXR0cmli dXRlKEF0dHJpYnV0ZTo6Y3JlYXRlTWFwcGVkKGNsYXNzQXR0ciwgIndlYmtpdC1saW5lLWd1dHRl ci1iYWNrZHJvcCIpKTsKICAgICBkaXYtPnNldEF0dHJpYnV0ZU1hcChhdHRycy5yZWxlYXNlKCkp OwotICAgIGJvZHktPmFkZENoaWxkKGRpdik7CisgICAgYm9keS0+bGVnYWN5UGFyc2VyQWRkQ2hp bGQoZGl2KTsKICAgICBkaXYtPmF0dGFjaCgpOwogCiAgICAgUmVmUHRyPEhUTUxUYWJsZUVsZW1l bnQ+IHRhYmxlID0gSFRNTFRhYmxlRWxlbWVudDo6Y3JlYXRlKHRoaXMpOwotICAgIGJvZHktPmFk ZENoaWxkKHRhYmxlKTsKKyAgICBib2R5LT5sZWdhY3lQYXJzZXJBZGRDaGlsZCh0YWJsZSk7CiAg ICAgdGFibGUtPmF0dGFjaCgpOwogICAgIG1fdGJvZHkgPSBIVE1MVGFibGVTZWN0aW9uRWxlbWVu dDo6Y3JlYXRlKHRib2R5VGFnLCB0aGlzKTsKLSAgICB0YWJsZS0+YWRkQ2hpbGQobV90Ym9keSk7 CisgICAgdGFibGUtPmxlZ2FjeVBhcnNlckFkZENoaWxkKG1fdGJvZHkpOwogICAgIG1fdGJvZHkt PmF0dGFjaCgpOwogICAgIG1fY3VycmVudCA9IG1fdGJvZHk7CiB9CkBAIC0yMTQsNyArMjE0LDcg QEAgUGFzc1JlZlB0cjxFbGVtZW50PiBIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRTcGFuV2l0 aENsYXNzTmFtZShjb25zdCBTdHJpbmcmIGMKICAgICBSZWZQdHI8TmFtZWROb2RlTWFwPiBhdHRy cyA9IE5hbWVkTm9kZU1hcDo6Y3JlYXRlKCk7CiAgICAgYXR0cnMtPmFkZEF0dHJpYnV0ZShBdHRy aWJ1dGU6OmNyZWF0ZU1hcHBlZChjbGFzc0F0dHIsIGNsYXNzTmFtZSkpOwogICAgIHNwYW4tPnNl dEF0dHJpYnV0ZU1hcChhdHRycy5yZWxlYXNlKCkpOwotICAgIG1fY3VycmVudC0+YWRkQ2hpbGQo c3Bhbik7CisgICAgbV9jdXJyZW50LT5sZWdhY3lQYXJzZXJBZGRDaGlsZChzcGFuKTsKICAgICBz cGFuLT5hdHRhY2goKTsKICAgICByZXR1cm4gc3Bhbi5yZWxlYXNlKCk7CiB9CkBAIC0yMjMsNyAr MjIzLDcgQEAgdm9pZCBIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRMaW5lKGNvbnN0IFN0cmlu ZyYgY2xhc3NOYW1lKQogewogICAgIC8vIENyZWF0ZSBhIHRhYmxlIHJvdy4KICAgICBSZWZQdHI8 SFRNTFRhYmxlUm93RWxlbWVudD4gdHJvdyA9IEhUTUxUYWJsZVJvd0VsZW1lbnQ6OmNyZWF0ZSh0 aGlzKTsKLSAgICBtX3Rib2R5LT5hZGRDaGlsZCh0cm93KTsKKyAgICBtX3Rib2R5LT5sZWdhY3lQ YXJzZXJBZGRDaGlsZCh0cm93KTsKICAgICB0cm93LT5hdHRhY2goKTsKICAgICAKICAgICAvLyBD cmVhdGUgYSBjZWxsIHRoYXQgd2lsbCBob2xkIHRoZSBsaW5lIG51bWJlciAoaXQgaXMgZ2VuZXJh dGVkIGluIHRoZSBzdHlsZXNoZWV0IHVzaW5nIGNvdW50ZXJzKS4KQEAgLTIzMSw3ICsyMzEsNyBA QCB2b2lkIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZExpbmUoY29uc3QgU3RyaW5nJiBjbGFz c05hbWUpCiAgICAgUmVmUHRyPE5hbWVkTm9kZU1hcD4gYXR0cnMgPSBOYW1lZE5vZGVNYXA6OmNy ZWF0ZSgpOwogICAgIGF0dHJzLT5hZGRBdHRyaWJ1dGUoQXR0cmlidXRlOjpjcmVhdGVNYXBwZWQo Y2xhc3NBdHRyLCAid2Via2l0LWxpbmUtbnVtYmVyIikpOwogICAgIHRkLT5zZXRBdHRyaWJ1dGVN YXAoYXR0cnMucmVsZWFzZSgpKTsKLSAgICB0cm93LT5hZGRDaGlsZCh0ZCk7CisgICAgdHJvdy0+ bGVnYWN5UGFyc2VyQWRkQ2hpbGQodGQpOwogICAgIHRkLT5hdHRhY2goKTsKIAogICAgIC8vIENy ZWF0ZSBhIHNlY29uZCBjZWxsIGZvciB0aGUgbGluZSBjb250ZW50cwpAQCAtMjM5LDcgKzIzOSw3 IEBAIHZvaWQgSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkTGluZShjb25zdCBTdHJpbmcmIGNs YXNzTmFtZSkKICAgICBhdHRycyA9IE5hbWVkTm9kZU1hcDo6Y3JlYXRlKCk7CiAgICAgYXR0cnMt PmFkZEF0dHJpYnV0ZShBdHRyaWJ1dGU6OmNyZWF0ZU1hcHBlZChjbGFzc0F0dHIsICJ3ZWJraXQt bGluZS1jb250ZW50IikpOwogICAgIHRkLT5zZXRBdHRyaWJ1dGVNYXAoYXR0cnMucmVsZWFzZSgp KTsKLSAgICB0cm93LT5hZGRDaGlsZCh0ZCk7CisgICAgdHJvdy0+bGVnYWN5UGFyc2VyQWRkQ2hp bGQodGQpOwogICAgIHRkLT5hdHRhY2goKTsKICAgICBtX2N1cnJlbnQgPSBtX3RkID0gdGQ7CiAK QEAgLTI3Niw3ICsyNzYsNyBAQCB2b2lkIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZFRleHQo Y29uc3QgU3RyaW5nJiB0ZXh0LCBjb25zdCBTdHJpbmcmIGNsYXNzTmFtZQogICAgICAgICBpZiAo bV9jdXJyZW50ID09IG1fdGJvZHkpCiAgICAgICAgICAgICBhZGRMaW5lKGNsYXNzTmFtZSk7CiAg ICAgICAgIFJlZlB0cjxUZXh0PiB0ID0gVGV4dDo6Y3JlYXRlKHRoaXMsIHN1YnN0cmluZyk7Ci0g ICAgICAgIG1fY3VycmVudC0+YWRkQ2hpbGQodCk7CisgICAgICAgIG1fY3VycmVudC0+bGVnYWN5 UGFyc2VyQWRkQ2hpbGQodCk7CiAgICAgICAgIHQtPmF0dGFjaCgpOwogICAgICAgICBpZiAoaSA8 IHNpemUgLSAxKQogICAgICAgICAgICAgbV9jdXJyZW50ID0gbV90Ym9keTsKQEAgLTMwNCw3ICsz MDQsNyBAQCBQYXNzUmVmUHRyPEVsZW1lbnQ+IEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZExp bmsoY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgaXNBbgogICAgIGF0dHJzLT5hZGRBdHRyaWJ1dGUo QXR0cmlidXRlOjpjcmVhdGVNYXBwZWQodGFyZ2V0QXR0ciwgIl9ibGFuayIpKTsKICAgICBhdHRy cy0+YWRkQXR0cmlidXRlKEF0dHJpYnV0ZTo6Y3JlYXRlTWFwcGVkKGhyZWZBdHRyLCB1cmwpKTsK ICAgICBhbmNob3ItPnNldEF0dHJpYnV0ZU1hcChhdHRycy5yZWxlYXNlKCkpOwotICAgIG1fY3Vy cmVudC0+YWRkQ2hpbGQoYW5jaG9yKTsKKyAgICBtX2N1cnJlbnQtPmxlZ2FjeVBhcnNlckFkZENo aWxkKGFuY2hvcik7CiAgICAgYW5jaG9yLT5hdHRhY2goKTsKICAgICByZXR1cm4gYW5jaG9yLnJl bGVhc2UoKTsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvaHRtbC9MZWdhY3lIVE1MVHJlZUJ1aWxk ZXIuY3BwIGIvV2ViQ29yZS9odG1sL0xlZ2FjeUhUTUxUcmVlQnVpbGRlci5jcHAKaW5kZXggMWM4 NTU4YmQyYmJlOTRkMDQwNmZiYzMxZmYxMjZhZWYwNzVmYzQ5Zi4uNTY3YTc5YTVmYTBjZjdhYWY3 MmMxYWUyNzIxYzhlMmI2OGRlZDJlMiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9odG1sL0xlZ2FjeUhU TUxUcmVlQnVpbGRlci5jcHAKKysrIGIvV2ViQ29yZS9odG1sL0xlZ2FjeUhUTUxUcmVlQnVpbGRl ci5jcHAKQEAgLTM0NCw3ICszNDQsNyBAQCB2b2lkIExlZ2FjeUhUTUxUcmVlQnVpbGRlcjo6cGFy c2VEb2N0eXBlVG9rZW4oRG9jdHlwZVRva2VuKiB0KQogICAgICAgICByZXR1cm47CiAKICAgICAv LyBNYWtlIGEgbmV3IGRvY3R5cGUgbm9kZSBhbmQgc2V0IGl0IGFzIG91ciBkb2N0eXBlLgotICAg IG1fZG9jdW1lbnQtPmFkZENoaWxkKERvY3VtZW50VHlwZTo6Y3JlYXRlKG1fZG9jdW1lbnQsIFN0 cmluZzo6YWRvcHQodC0+bV9uYW1lKSwgU3RyaW5nOjphZG9wdCh0LT5tX3B1YmxpY0lEKSwgU3Ry aW5nOjphZG9wdCh0LT5tX3N5c3RlbUlEKSkpOworICAgIG1fZG9jdW1lbnQtPmxlZ2FjeVBhcnNl ckFkZENoaWxkKERvY3VtZW50VHlwZTo6Y3JlYXRlKG1fZG9jdW1lbnQsIFN0cmluZzo6YWRvcHQo dC0+bV9uYW1lKSwgU3RyaW5nOjphZG9wdCh0LT5tX3B1YmxpY0lEKSwgU3RyaW5nOjphZG9wdCh0 LT5tX3N5c3RlbUlEKSkpOwogICAgIGlmICh0LT5tX2ZvcmNlUXVpcmtzKQogICAgICAgICBtX2Rv Y3VtZW50LT5zZXRQYXJzZU1vZGUoRG9jdW1lbnQ6OkNvbXBhdCk7CiB9CkBAIC0zOTAsNyArMzkw LDcgQEAgYm9vbCBMZWdhY3lIVE1MVHJlZUJ1aWxkZXI6Omluc2VydE5vZGUoTm9kZSogbiwgYm9v bCBmbGF0KQogCiAgICAgLy8gbGV0J3MgYmUgc3R1cGlkIGFuZCBqdXN0IHRyeSB0byBpbnNlcnQg aXQuCiAgICAgLy8gdGhpcyBzaG91bGQgd29yayBpZiB0aGUgZG9jdW1lbnQgaXMgd2VsbC1mb3Jt ZWQKLSAgICBOb2RlKiBuZXdOb2RlID0gbV9jdXJyZW50LT5hZGRDaGlsZChuKTsKKyAgICBOb2Rl KiBuZXdOb2RlID0gbV9jdXJyZW50LT5sZWdhY3lQYXJzZXJBZGRDaGlsZChuKTsKICAgICBpZiAo IW5ld05vZGUpCiAgICAgICAgIHJldHVybiBoYW5kbGVFcnJvcihuLCBmbGF0LCBsb2NhbE5hbWUs IHRhZ1ByaW9yaXR5KTsgLy8gVHJ5IHRvIGhhbmRsZSB0aGUgZXJyb3IuCiAKQEAgLTQ1OSwxMiAr NDU5LDEyIEBAIGJvb2wgTGVnYWN5SFRNTFRyZWVCdWlsZGVyOjpoYW5kbGVFcnJvcihOb2RlKiBu LCBib29sIGZsYXQsIGNvbnN0IEF0b21pY1N0cmluZyYKICAgICAgICAgICAgIGlmIChtX2hlYWQp IHsKICAgICAgICAgICAgICAgICBpZiAoIWNyZWF0ZWRIZWFkKQogICAgICAgICAgICAgICAgICAg ICByZXBvcnRFcnJvcihNaXNwbGFjZWRIZWFkQ29udGVudEVycm9yLCAmbG9jYWxOYW1lLCAmbV9j dXJyZW50LT5sb2NhbE5hbWUoKSk7Ci0gICAgICAgICAgICAgICAgaWYgKG1faGVhZC0+YWRkQ2hp bGQobikpIHsKKyAgICAgICAgICAgICAgICBpZiAobV9oZWFkLT5sZWdhY3lQYXJzZXJBZGRDaGls ZChuKSkgewogICAgICAgICAgICAgICAgICAgICBpZiAoIW4tPmF0dGFjaGVkKCkgJiYgIW1faXNQ YXJzaW5nRnJhZ21lbnQpCiAgICAgICAgICAgICAgICAgICAgICAgICBuLT5hdHRhY2goKTsKICAg ICAgICAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgICAgICAgICAgICAgfSBlbHNlCi0g ICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAgICAgICAgICAgICB9CisgICAg ICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2Ug aWYgKGgtPmhhc0xvY2FsTmFtZShodG1sVGFnKSkgewogICAgICAgICAgICAgaWYgKCFtX2N1cnJl bnQtPmlzRG9jdW1lbnROb2RlKCkgKSB7CkBAIC00OTAsNyArNDkwLDcgQEAgYm9vbCBMZWdhY3lI VE1MVHJlZUJ1aWxkZXI6OmhhbmRsZUVycm9yKE5vZGUqIG4sIGJvb2wgZmxhdCwgY29uc3QgQXRv bWljU3RyaW5nJgogICAgICAgICAgICAgICAgIGNyZWF0ZWRIZWFkID0gdHJ1ZTsKICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIGlmIChtX2hlYWQpIHsKLSAgICAgICAgICAgICAgICBOb2RlKiBu ZXdOb2RlID0gbV9oZWFkLT5hZGRDaGlsZChuKTsKKyAgICAgICAgICAgICAgICBOb2RlKiBuZXdO b2RlID0gbV9oZWFkLT5sZWdhY3lQYXJzZXJBZGRDaGlsZChuKTsKICAgICAgICAgICAgICAgICBp ZiAoIW5ld05vZGUpIHsKICAgICAgICAgICAgICAgICAgICAgc2V0U2tpcE1vZGUoaC0+dGFnUU5h bWUoKSk7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTUzMCw3ICs1MzAs NyBAQCBib29sIExlZ2FjeUhUTUxUcmVlQnVpbGRlcjo6aGFuZGxlRXJyb3IoTm9kZSogbiwgYm9v bCBmbGF0LCBjb25zdCBBdG9taWNTdHJpbmcmCiAgICAgICAgIH0gZWxzZSBpZiAoaC0+aGFzTG9j YWxOYW1lKGFyZWFUYWcpKSB7CiAgICAgICAgICAgICBpZiAobV9jdXJyZW50TWFwRWxlbWVudCkg ewogICAgICAgICAgICAgICAgIHJlcG9ydEVycm9yKE1pc3BsYWNlZEFyZWFFcnJvciwgJm1fY3Vy cmVudC0+bG9jYWxOYW1lKCkpOwotICAgICAgICAgICAgICAgIG1fY3VycmVudE1hcEVsZW1lbnQt PmFkZENoaWxkKG4pOworICAgICAgICAgICAgICAgIG1fY3VycmVudE1hcEVsZW1lbnQtPmxlZ2Fj eVBhcnNlckFkZENoaWxkKG4pOwogICAgICAgICAgICAgICAgIGlmICghbi0+YXR0YWNoZWQoKSAm JiAhbV9pc1BhcnNpbmdGcmFnbWVudCkKICAgICAgICAgICAgICAgICAgICAgbi0+YXR0YWNoKCk7 CiAgICAgICAgICAgICAgICAgaGFuZGxlZCA9IHRydWU7CkBAIC0xNjA2LDEwICsxNjA2LDEwIEBA IFBhc3NSZWZQdHI8Tm9kZT4gTGVnYWN5SFRNTFRyZWVCdWlsZGVyOjpoYW5kbGVJc2luZGV4KFRv a2VuKiB0KQogICAgICAgICB0LT5hdHRycyA9IDA7CiAgICAgfQogCi0gICAgbi0+YWRkQ2hpbGQo SFRNTEhSRWxlbWVudDo6Y3JlYXRlKG1fZG9jdW1lbnQpKTsKLSAgICBuLT5hZGRDaGlsZChUZXh0 OjpjcmVhdGUobV9kb2N1bWVudCwgdGV4dCkpOwotICAgIG4tPmFkZENoaWxkKGlzSW5kZXgucmVs ZWFzZSgpKTsKLSAgICBuLT5hZGRDaGlsZChIVE1MSFJFbGVtZW50OjpjcmVhdGUobV9kb2N1bWVu dCkpOworICAgIG4tPmxlZ2FjeVBhcnNlckFkZENoaWxkKEhUTUxIUkVsZW1lbnQ6OmNyZWF0ZSht X2RvY3VtZW50KSk7CisgICAgbi0+bGVnYWN5UGFyc2VyQWRkQ2hpbGQoVGV4dDo6Y3JlYXRlKG1f ZG9jdW1lbnQsIHRleHQpKTsKKyAgICBuLT5sZWdhY3lQYXJzZXJBZGRDaGlsZChpc0luZGV4LnJl bGVhc2UoKSk7CisgICAgbi0+bGVnYWN5UGFyc2VyQWRkQ2hpbGQoSFRNTEhSRWxlbWVudDo6Y3Jl YXRlKG1fZG9jdW1lbnQpKTsKIAogICAgIHJldHVybiBuLnJlbGVhc2UoKTsKIH0KZGlmZiAtLWdp dCBhL1dlYkNvcmUvcmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcCBiL1dlYkNvcmUv cmVuZGVyaW5nL01lZGlhQ29udHJvbEVsZW1lbnRzLmNwcAppbmRleCAzODNhOGNmOWQ5N2ExZmU5 Y2M3NDVkYTRjYzk2N2RjYTQ5NDY4MWEzLi5kNWNiMTg3MzliOTAwNDcxNzNmZjllZjBiNzVhMzM1 YTQ1NjU4OTQxIDEwMDY0NAotLS0gYS9XZWJDb3JlL3JlbmRlcmluZy9NZWRpYUNvbnRyb2xFbGVt ZW50cy5jcHAKKysrIGIvV2ViQ29yZS9yZW5kZXJpbmcvTWVkaWFDb250cm9sRWxlbWVudHMuY3Bw CkBAIC0xMzUsNyArMTM1LDcgQEAgUGFzc1JlZlB0cjxNZWRpYUNvbnRyb2xFbGVtZW50PiBNZWRp YUNvbnRyb2xFbGVtZW50OjpjcmVhdGUoSFRNTE1lZGlhRWxlbWVudCogbWUKIAogdm9pZCBNZWRp YUNvbnRyb2xFbGVtZW50OjphdHRhY2hUb1BhcmVudChFbGVtZW50KiBwYXJlbnQpCiB7Ci0gICAg cGFyZW50LT5hZGRDaGlsZCh0aGlzKTsKKyAgICBwYXJlbnQtPmxlZ2FjeVBhcnNlckFkZENoaWxk KHRoaXMpOwogfQogCiB2b2lkIE1lZGlhQ29udHJvbEVsZW1lbnQ6OnVwZGF0ZSgpCkBAIC0zODks NyArMzg5LDcgQEAgTWVkaWFDb250cm9sSW5wdXRFbGVtZW50OjpNZWRpYUNvbnRyb2xJbnB1dEVs ZW1lbnQoSFRNTE1lZGlhRWxlbWVudCogbWVkaWFFbGVtZW4KIAogdm9pZCBNZWRpYUNvbnRyb2xJ bnB1dEVsZW1lbnQ6OmF0dGFjaFRvUGFyZW50KEVsZW1lbnQqIHBhcmVudCkKIHsKLSAgICBwYXJl bnQtPmFkZENoaWxkKHRoaXMpOworICAgIHBhcmVudC0+bGVnYWN5UGFyc2VyQWRkQ2hpbGQodGhp cyk7CiB9CiAKIHZvaWQgTWVkaWFDb250cm9sSW5wdXRFbGVtZW50Ojp1cGRhdGUoKQpkaWZmIC0t Z2l0IGEvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dENvbnRyb2xJbm5lckVsZW1lbnRzLmNwcCBiL1dl YkNvcmUvcmVuZGVyaW5nL1RleHRDb250cm9sSW5uZXJFbGVtZW50cy5jcHAKaW5kZXggNjFjODVl NzAxMzk3ZjRmNzFjZDgyZWYxY2I3ODc5NTUzM2YyMWI5MC4uMzZlMzBhZmU0Y2Q0MTg2ZjNlZWVm ZDlkOTBkNmFjZDlhNTc5NDBkNSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9yZW5kZXJpbmcvVGV4dENv bnRyb2xJbm5lckVsZW1lbnRzLmNwcAorKysgYi9XZWJDb3JlL3JlbmRlcmluZy9UZXh0Q29udHJv bElubmVyRWxlbWVudHMuY3BwCkBAIC0xMTEsNyArMTExLDcgQEAgdm9pZCBUZXh0Q29udHJvbElu bmVyRWxlbWVudDo6YXR0YWNoSW5uZXJFbGVtZW50KE5vZGUqIHBhcmVudCwgUGFzc1JlZlB0cjxS ZW5kZXIKICAgICAKICAgICAvLyBGb3IgZWxlbWVudHMgd2l0aG91dCBhIHNoYWRvdyBwYXJlbnQs IGFkZCB0aGUgbm9kZSB0byB0aGUgRE9NIG5vcm1hbGx5LgogICAgIGlmICghbV9zaGFkb3dQYXJl bnQpCi0gICAgICAgIHBhcmVudC0+YWRkQ2hpbGQodGhpcyk7CisgICAgICAgIHBhcmVudC0+bGVn YWN5UGFyc2VyQWRkQ2hpbGQodGhpcyk7CiAgICAgCiAgICAgLy8gQWRkIHRoZSByZW5kZXJlciB0 byB0aGUgcmVuZGVyIHRyZWUKICAgICBpZiAocmVuZGVyZXIpCmRpZmYgLS1naXQgYS9XZWJDb3Jl L3htbC9YU0xUUHJvY2Vzc29yLmNwcCBiL1dlYkNvcmUveG1sL1hTTFRQcm9jZXNzb3IuY3BwCmlu ZGV4IDYxZjQxNGUzOTY5NDI4ODQ2NjJkNmZmZWU3NWUxYjUyMmY3YzQwYmEuLmY5NDkxNjM4MWMy Y2Y5ZTRiNTQwOGRjOTRkOTU0NWI1MjhhYzFlZDYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUveG1sL1hT TFRQcm9jZXNzb3IuY3BwCisrKyBiL1dlYkNvcmUveG1sL1hTTFRQcm9jZXNzb3IuY3BwCkBAIC0x MDIsNyArMTAyLDcgQEAgc3RhdGljIGlubGluZSBSZWZQdHI8RG9jdW1lbnRGcmFnbWVudD4gY3Jl YXRlRnJhZ21lbnRGcm9tU291cmNlKGNvbnN0IFN0cmluZyYgc28KICAgICBpZiAoc291cmNlTUlN RVR5cGUgPT0gInRleHQvaHRtbCIpCiAgICAgICAgIGZyYWdtZW50LT5wYXJzZUhUTUwoc291cmNl U3RyaW5nKTsKICAgICBlbHNlIGlmIChzb3VyY2VNSU1FVHlwZSA9PSAidGV4dC9wbGFpbiIpCi0g ICAgICAgIGZyYWdtZW50LT5hZGRDaGlsZChUZXh0OjpjcmVhdGUob3V0cHV0RG9jLCBzb3VyY2VT dHJpbmcpKTsKKyAgICAgICAgZnJhZ21lbnQtPmxlZ2FjeVBhcnNlckFkZENoaWxkKFRleHQ6OmNy ZWF0ZShvdXRwdXREb2MsIHNvdXJjZVN0cmluZykpOwogICAgIGVsc2UgewogICAgICAgICBib29s IHN1Y2Nlc3NmdWxQYXJzZSA9IGZyYWdtZW50LT5wYXJzZVhNTChzb3VyY2VTdHJpbmcsIG91dHB1 dERvYy0+ZG9jdW1lbnRFbGVtZW50KCkpOwogICAgICAgICBpZiAoIXN1Y2Nlc3NmdWxQYXJzZSkK