97254 2012-09-20 13:03:23 -0700 Rename ContainerNode::parserAddChild "parserAppendChild" for consistency 2012-09-20 13:47:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 adamk adamk abarth mifenton webkit.review.bot oldest_to_newest 724775 0 adamk 2012-09-20 13:03:23 -0700 Rename ContainerNode::parserAddChild "parserAppendChild" for consistency 724778 1 164968 adamk 2012-09-20 13:04:24 -0700 Created attachment 164968 Patch 724828 2 164968 webkit.review.bot 2012-09-20 13:47:20 -0700 Comment on attachment 164968 Patch Clearing flags on attachment: 164968 Committed r129164: <http://trac.webkit.org/changeset/129164> 724829 3 webkit.review.bot 2012-09-20 13:47:22 -0700 All reviewed patches have been landed. Closing bug. 164968 2012-09-20 13:04:24 -0700 2012-09-20 13:47:19 -0700 Patch bug-97254-20120920130349.patch text/plain 26901 adamk U3VidmVyc2lvbiBSZXZpc2lvbjogMTI5MDI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjlmYjczNTExMmRhYWUx ZjQ0MmQ0MmMzMzllZjFkMjUwYThhNDk4ZC4uOTNlNDQyNjEzNWUyY2U4MDMyOTc1ODYzZTQ5NjVh OTE2NjE3ZjRiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU4IEBACisyMDEyLTA5LTIwICBBZGFt IEtsZWluICA8YWRhbWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbmFtZSBDb250YWluZXJO b2RlOjpwYXJzZXJBZGRDaGlsZCAicGFyc2VyQXBwZW5kQ2hpbGQiIGZvciBjb25zaXN0ZW5jeQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTcyNTQKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBObyBmdW5jdGlv bmFsIGNoYW5nZSwgYWxsIHRoZSBiZWxvdyBjaGFuZ2VzIGFyZSBzaW1wbGUgcmVuYW1lcy4KKwor ICAgICAgICAqIGRvbS9Db250YWluZXJOb2RlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRh aW5lck5vZGU6OnRha2VBbGxDaGlsZHJlbkZyb20pOgorICAgICAgICAoV2ViQ29yZTo6Q29udGFp bmVyTm9kZTo6cGFyc2VyQXBwZW5kQ2hpbGQpOgorICAgICAgICAqIGRvbS9Db250YWluZXJOb2Rl Lmg6CisgICAgICAgIChDb250YWluZXJOb2RlKToKKyAgICAgICAgKiBkb20vRE9NSW1wbGVtZW50 YXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NSW1wbGVtZW50YXRpb246OmNyZWF0ZURv Y3VtZW50KToKKyAgICAgICAgKiBlZGl0aW5nL21hcmt1cC5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpjcmVhdGVGcmFnbWVudEZvclRyYW5zZm9ybVRvRnJhZ21lbnQpOgorICAgICAgICAqIGh0bWwv SFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MVmlld1Nv dXJjZURvY3VtZW50OjpjcmVhdGVDb250YWluaW5nVGFibGUpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkU3BhbldpdGhDbGFzc05hbWUpOgorICAgICAgICAo V2ViQ29yZTo6SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkTGluZSk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MVmlld1NvdXJjZURvY3VtZW50OjpmaW5pc2hMaW5lKToKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZFRleHQpOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6YWRkQmFzZSk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M Vmlld1NvdXJjZURvY3VtZW50OjphZGRMaW5rKToKKyAgICAgICAgKiBodG1sL3BhcnNlci9IVE1M Q29uc3RydWN0aW9uU2l0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpleGVjdXRlVGFzayk6Cisg ICAgICAgICogaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KToKKyAgICAgICAgKiBo dG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJWVFRQYXJz ZXI6OmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4pOgorICAgICAgICAqIHhtbC9YTUxFcnJvcnMuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Y3JlYXRlWEhUTUxQYXJzZXJFcnJvckhlYWRlcik6CisgICAg ICAgIChXZWJDb3JlOjpYTUxFcnJvcnM6Omluc2VydEVycm9yTWVzc2FnZUJsb2NrKToKKyAgICAg ICAgKiB4bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlhNTERvY3VtZW50UGFyc2VyOjplbnRlclRleHQpOgorICAgICAgICAoV2ViQ29yZTo6WE1MRG9j dW1lbnRQYXJzZXI6OnBhcnNlRG9jdW1lbnRGcmFnbWVudCk6CisgICAgICAgICogeG1sL3BhcnNl ci9YTUxEb2N1bWVudFBhcnNlckxpYnhtbDIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WE1MRG9j dW1lbnRQYXJzZXI6OnN0YXJ0RWxlbWVudE5zKToKKyAgICAgICAgKFdlYkNvcmU6OlhNTERvY3Vt ZW50UGFyc2VyOjpwcm9jZXNzaW5nSW5zdHJ1Y3Rpb24pOgorICAgICAgICAoV2ViQ29yZTo6WE1M RG9jdW1lbnRQYXJzZXI6OmNkYXRhQmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6WE1MRG9jdW1l bnRQYXJzZXI6OmNvbW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6WE1MRG9jdW1lbnRQYXJzZXI6 OmludGVybmFsU3Vic2V0KToKKyAgICAgICAgKiB4bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2Vy UXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6WE1MRG9jdW1lbnRQYXJzZXI6OnBhcnNlU3RhcnRF bGVtZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlhNTERvY3VtZW50UGFyc2VyOjpwYXJzZVByb2Nl c3NpbmdJbnN0cnVjdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpYTUxEb2N1bWVudFBhcnNlcjo6 cGFyc2VDZGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpYTUxEb2N1bWVudFBhcnNlcjo6cGFyc2VD b21tZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlhNTERvY3VtZW50UGFyc2VyOjpwYXJzZUR0ZCk6 CisgICAgICAgICogeG1sL3BhcnNlci9YTUxUcmVlQnVpbGRlci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpYTUxUcmVlQnVpbGRlcjo6cHJvY2Vzc0RPQ1RZUEUpOgorICAgICAgICAoV2ViQ29yZTo6 WE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NTdGFydFRhZyk6CisgICAgICAgIChXZWJDb3JlOjpYTUxU cmVlQnVpbGRlcjo6YWRkKToKKwogMjAxMi0wOS0xOSAgUm9iIEJ1aXMgIDxyYnVpc0ByaW0uY29t PgogCiAgICAgICAgIFtCbGFja0JlcnJ5XSBSZW1vdmUgY3VzdG9tIHBhaW50aW5nIGNvZGUgZm9y IHNlYXJjaENhbmNlbApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5v ZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuY3BwCmluZGV4IDdlMDIy ODRjZTAwMDZhZGYxMTM0N2RlNTFhZWNjYWUxM2E4M2UyYjQuLmNkMTE4ZjE3ZDMyYTg2MjZlNTNj ZGI2MGQ4MzM0YmZjNmFmYWE4YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250 YWluZXJOb2RlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5jcHAK QEAgLTEwMyw3ICsxMDMsNyBAQCB2b2lkIENvbnRhaW5lck5vZGU6OnRha2VBbGxDaGlsZHJlbkZy b20oQ29udGFpbmVyTm9kZSogb2xkUGFyZW50KQogICAgICAgICAvLyBGSVhNRTogV2UgbmVlZCBh IG5vIG11dGF0aW9uIGV2ZW50IHZlcnNpb24gb2YgYWRvcHROb2RlLgogICAgICAgICBSZWZQdHI8 Tm9kZT4gY2hpbGQgPSBkb2N1bWVudCgpLT5hZG9wdE5vZGUoY2hpbGRyZW5baV0ucmVsZWFzZSgp LCBlYyk7CiAgICAgICAgIEFTU0VSVCghZWMpOwotICAgICAgICBwYXJzZXJBZGRDaGlsZChjaGls ZC5nZXQoKSk7CisgICAgICAgIHBhcnNlckFwcGVuZENoaWxkKGNoaWxkLmdldCgpKTsKICAgICAg ICAgLy8gRklYTUU6IFRvZ2V0aGVyIHdpdGggYWRvcHROb2RlIGFib3ZlLCB0aGUgdHJlZSBzY29w ZSBtaWdodCBnZXQgdXBkYXRlZCByZWN1cnNpdmVseSB0d2ljZQogICAgICAgICAvLyAoaWYgdGhl IGRvY3VtZW50IGNoYW5nZWQgb3Igb2xkUGFyZW50IHdhcyBpbiBhIHNoYWRvdyB0cmVlLCBBTkQg KnRoaXMgaXMgaW4gYSBzaGFkb3cgdHJlZSkuCiAgICAgICAgIC8vIENhbiB3ZSBkbyBiZXR0ZXI/ CkBAIC02MDAsNyArNjAwLDcgQEAgYm9vbCBDb250YWluZXJOb2RlOjphcHBlbmRDaGlsZChQYXNz UmVmUHRyPE5vZGU+IG5ld0NoaWxkLCBFeGNlcHRpb25Db2RlJiBlYywgYm8KICAgICByZXR1cm4g dHJ1ZTsKIH0KIAotdm9pZCBDb250YWluZXJOb2RlOjpwYXJzZXJBZGRDaGlsZChQYXNzUmVmUHRy PE5vZGU+IG5ld0NoaWxkKQordm9pZCBDb250YWluZXJOb2RlOjpwYXJzZXJBcHBlbmRDaGlsZChQ YXNzUmVmUHRyPE5vZGU+IG5ld0NoaWxkKQogewogICAgIEFTU0VSVChuZXdDaGlsZCk7CiAgICAg QVNTRVJUKCFuZXdDaGlsZC0+cGFyZW50Tm9kZSgpKTsgLy8gVXNlIGFwcGVuZENoaWxkIGlmIHlv dSBuZWVkIHRvIGhhbmRsZSByZXBhcmVudGluZyAoYW5kIHdhbnQgRE9NIG11dGF0aW9uIGV2ZW50 cykuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5oIGIvU291 cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGUuaAppbmRleCBmOWVjMzc3OThjOTRmY2JkYmU0 MGFkNjgxNzdlZDA5ODQzYjQxZGI4Li5jMTQ3ZDAxNTUwZWQ1MTI0Njk5NjYwM2MxYTU0OTc5ZDcz OTlkMmExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vQ29udGFpbmVyTm9kZS5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlLmgKQEAgLTYwLDcgKzYwLDcgQEAg cHVibGljOgogICAgIC8vIFRoZXNlIG1ldGhvZHMgYXJlIG9ubHkgdXNlZCBkdXJpbmcgcGFyc2lu Zy4KICAgICAvLyBUaGV5IGRvbid0IHNlbmQgRE9NIG11dGF0aW9uIGV2ZW50cyBvciBoYW5kbGUg cmVwYXJlbnRpbmcuCiAgICAgLy8gSG93ZXZlciwgYXJiaXRyYXJ5IGNvZGUgbWF5IGJlIHJ1biBi eSBiZWZvcmVsb2FkIGhhbmRsZXJzLgotICAgIHZvaWQgcGFyc2VyQWRkQ2hpbGQoUGFzc1JlZlB0 cjxOb2RlPik7CisgICAgdm9pZCBwYXJzZXJBcHBlbmRDaGlsZChQYXNzUmVmUHRyPE5vZGU+KTsK ICAgICB2b2lkIHBhcnNlclJlbW92ZUNoaWxkKE5vZGUqKTsKICAgICB2b2lkIHBhcnNlckluc2Vy dEJlZm9yZShQYXNzUmVmUHRyPE5vZGU+IG5ld0NoaWxkLCBOb2RlKiByZWZDaGlsZCk7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9ET01JbXBsZW1lbnRhdGlvbi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRE9NSW1wbGVtZW50YXRpb24uY3BwCmluZGV4IDNiYmY5YjYwMGFjZWE0 MDIzMGJkMjJkODdmNmIwZTVjYzcwMGQ5YzYuLjhiNWVlYjI4NGQxMjc0MDc5ZTI2ZGY3NzQ3OTdi OWViYzZmOWQ2OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9ET01JbXBsZW1lbnRh dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RPTUltcGxlbWVudGF0aW9uLmNwcApA QCAtMzE3LDkgKzMxNyw5IEBAIFBhc3NSZWZQdHI8RG9jdW1lbnQ+IERPTUltcGxlbWVudGF0aW9u OjpjcmVhdGVEb2N1bWVudChjb25zdCBTdHJpbmcmIG5hbWVzcGFjZVVSCiAKICAgICAvLyBGSVhN RTogU2hvdWxkbid0IHRoaXMgY2FsbCBhcHBlbmRDaGlsZCBpbnN0ZWFkPwogICAgIGlmIChkb2N0 eXBlKQotICAgICAgICBkb2MtPnBhcnNlckFkZENoaWxkKGRvY3R5cGUpOworICAgICAgICBkb2Mt PnBhcnNlckFwcGVuZENoaWxkKGRvY3R5cGUpOwogICAgIGlmIChkb2N1bWVudEVsZW1lbnQpCi0g ICAgICAgIGRvYy0+cGFyc2VyQWRkQ2hpbGQoZG9jdW1lbnRFbGVtZW50LnJlbGVhc2UoKSk7Cisg ICAgICAgIGRvYy0+cGFyc2VyQXBwZW5kQ2hpbGQoZG9jdW1lbnRFbGVtZW50LnJlbGVhc2UoKSk7 CiAKICAgICByZXR1cm4gZG9jLnJlbGVhc2UoKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvbWFya3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNw cAppbmRleCAxMGVlYTAxNmI1NzQ4ZmEyZWEzNWU4YzZjZDgwMDIzNTBmNzQ2NGRlLi4zZmVjZDkx NzU2YTM0ZDM2ZWE1ODEzYzlmYTZiYTBhY2UwODYzMzc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL21hcmt1cC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9tYXJr dXAuY3BwCkBAIC0xMDI2LDcgKzEwMjYsNyBAQCBQYXNzUmVmUHRyPERvY3VtZW50RnJhZ21lbnQ+ IGNyZWF0ZUZyYWdtZW50Rm9yVHJhbnNmb3JtVG9GcmFnbWVudChjb25zdCBTdHJpbmcmCiAgICAg ICAgIFJlZlB0cjxIVE1MQm9keUVsZW1lbnQ+IGZha2VCb2R5ID0gSFRNTEJvZHlFbGVtZW50Ojpj cmVhdGUob3V0cHV0RG9jKTsKICAgICAgICAgZnJhZ21lbnQtPnBhcnNlSFRNTChzb3VyY2VTdHJp bmcsIGZha2VCb2R5LmdldCgpKTsKICAgICB9IGVsc2UgaWYgKHNvdXJjZU1JTUVUeXBlID09ICJ0 ZXh0L3BsYWluIikKLSAgICAgICAgZnJhZ21lbnQtPnBhcnNlckFkZENoaWxkKFRleHQ6OmNyZWF0 ZShvdXRwdXREb2MsIHNvdXJjZVN0cmluZykpOworICAgICAgICBmcmFnbWVudC0+cGFyc2VyQXBw ZW5kQ2hpbGQoVGV4dDo6Y3JlYXRlKG91dHB1dERvYywgc291cmNlU3RyaW5nKSk7CiAgICAgZWxz ZSB7CiAgICAgICAgIGJvb2wgc3VjY2Vzc2Z1bFBhcnNlID0gZnJhZ21lbnQtPnBhcnNlWE1MKHNv dXJjZVN0cmluZywgMCk7CiAgICAgICAgIGlmICghc3VjY2Vzc2Z1bFBhcnNlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmlld1NvdXJjZURvY3VtZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTFZpZXdTb3VyY2VEb2N1bWVudC5jcHAKaW5kZXggODBjZGQ2OWNk YmJkNDI5YTg2MDZmYWJiMzllOTRlMTMzYjFlODUyZC4uM2RlODEzNzcwYTBlYzE5YjQ3OWY5Y2Jh NTkzNTBkMjQ0MzBmYjU0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MVmll d1NvdXJjZURvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxWaWV3U291 cmNlRG9jdW1lbnQuY3BwCkBAIC03MCwyNCArNzAsMjQgQEAgUGFzc1JlZlB0cjxEb2N1bWVudFBh cnNlcj4gSFRNTFZpZXdTb3VyY2VEb2N1bWVudDo6Y3JlYXRlUGFyc2VyKCkKIHZvaWQgSFRNTFZp ZXdTb3VyY2VEb2N1bWVudDo6Y3JlYXRlQ29udGFpbmluZ1RhYmxlKCkKIHsKICAgICBSZWZQdHI8 SFRNTEh0bWxFbGVtZW50PiBodG1sID0gSFRNTEh0bWxFbGVtZW50OjpjcmVhdGUodGhpcyk7Ci0g ICAgcGFyc2VyQWRkQ2hpbGQoaHRtbCk7CisgICAgcGFyc2VyQXBwZW5kQ2hpbGQoaHRtbCk7CiAg ICAgaHRtbC0+YXR0YWNoKCk7CiAgICAgUmVmUHRyPEhUTUxCb2R5RWxlbWVudD4gYm9keSA9IEhU TUxCb2R5RWxlbWVudDo6Y3JlYXRlKHRoaXMpOwotICAgIGh0bWwtPnBhcnNlckFkZENoaWxkKGJv ZHkpOworICAgIGh0bWwtPnBhcnNlckFwcGVuZENoaWxkKGJvZHkpOwogICAgIGJvZHktPmF0dGFj aCgpOwogCiAgICAgLy8gQ3JlYXRlIGEgbGluZSBndXR0ZXIgZGl2IHRoYXQgY2FuIGJlIHVzZWQg dG8gbWFrZSBzdXJlIHRoZSBndXR0ZXIgZXh0ZW5kcyBkb3duIHRoZSBoZWlnaHQgb2YgdGhlIHdo b2xlCiAgICAgLy8gZG9jdW1lbnQuCiAgICAgUmVmUHRyPEhUTUxEaXZFbGVtZW50PiBkaXYgPSBI VE1MRGl2RWxlbWVudDo6Y3JlYXRlKHRoaXMpOwogICAgIGRpdi0+c2V0QXR0cmlidXRlKGNsYXNz QXR0ciwgIndlYmtpdC1saW5lLWd1dHRlci1iYWNrZHJvcCIpOwotICAgIGJvZHktPnBhcnNlckFk ZENoaWxkKGRpdik7CisgICAgYm9keS0+cGFyc2VyQXBwZW5kQ2hpbGQoZGl2KTsKICAgICBkaXYt PmF0dGFjaCgpOwogCiAgICAgUmVmUHRyPEhUTUxUYWJsZUVsZW1lbnQ+IHRhYmxlID0gSFRNTFRh YmxlRWxlbWVudDo6Y3JlYXRlKHRoaXMpOwotICAgIGJvZHktPnBhcnNlckFkZENoaWxkKHRhYmxl KTsKKyAgICBib2R5LT5wYXJzZXJBcHBlbmRDaGlsZCh0YWJsZSk7CiAgICAgdGFibGUtPmF0dGFj aCgpOwogICAgIG1fdGJvZHkgPSBIVE1MVGFibGVTZWN0aW9uRWxlbWVudDo6Y3JlYXRlKHRib2R5 VGFnLCB0aGlzKTsKLSAgICB0YWJsZS0+cGFyc2VyQWRkQ2hpbGQobV90Ym9keSk7CisgICAgdGFi bGUtPnBhcnNlckFwcGVuZENoaWxkKG1fdGJvZHkpOwogICAgIG1fdGJvZHktPmF0dGFjaCgpOwog ICAgIG1fY3VycmVudCA9IG1fdGJvZHk7CiB9CkBAIC0xODYsNyArMTg2LDcgQEAgUGFzc1JlZlB0 cjxFbGVtZW50PiBIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRTcGFuV2l0aENsYXNzTmFtZShj b25zdCBBdG9taWNTdHIKIAogICAgIFJlZlB0cjxIVE1MRWxlbWVudD4gc3BhbiA9IEhUTUxFbGVt ZW50OjpjcmVhdGUoc3BhblRhZywgdGhpcyk7CiAgICAgc3Bhbi0+c2V0QXR0cmlidXRlKGNsYXNz QXR0ciwgY2xhc3NOYW1lKTsKLSAgICBtX2N1cnJlbnQtPnBhcnNlckFkZENoaWxkKHNwYW4pOwor ICAgIG1fY3VycmVudC0+cGFyc2VyQXBwZW5kQ2hpbGQoc3Bhbik7CiAgICAgc3Bhbi0+YXR0YWNo KCk7CiAgICAgcmV0dXJuIHNwYW4ucmVsZWFzZSgpOwogfQpAQCAtMTk1LDE5ICsxOTUsMTkgQEAg dm9pZCBIVE1MVmlld1NvdXJjZURvY3VtZW50OjphZGRMaW5lKGNvbnN0IEF0b21pY1N0cmluZyYg Y2xhc3NOYW1lKQogewogICAgIC8vIENyZWF0ZSBhIHRhYmxlIHJvdy4KICAgICBSZWZQdHI8SFRN TFRhYmxlUm93RWxlbWVudD4gdHJvdyA9IEhUTUxUYWJsZVJvd0VsZW1lbnQ6OmNyZWF0ZSh0aGlz KTsKLSAgICBtX3Rib2R5LT5wYXJzZXJBZGRDaGlsZCh0cm93KTsKKyAgICBtX3Rib2R5LT5wYXJz ZXJBcHBlbmRDaGlsZCh0cm93KTsKICAgICB0cm93LT5hdHRhY2goKTsKIAogICAgIC8vIENyZWF0 ZSBhIGNlbGwgdGhhdCB3aWxsIGhvbGQgdGhlIGxpbmUgbnVtYmVyIChpdCBpcyBnZW5lcmF0ZWQg aW4gdGhlIHN0eWxlc2hlZXQgdXNpbmcgY291bnRlcnMpLgogICAgIFJlZlB0cjxIVE1MVGFibGVD ZWxsRWxlbWVudD4gdGQgPSBIVE1MVGFibGVDZWxsRWxlbWVudDo6Y3JlYXRlKHRkVGFnLCB0aGlz KTsKICAgICB0ZC0+c2V0QXR0cmlidXRlKGNsYXNzQXR0ciwgIndlYmtpdC1saW5lLW51bWJlciIp OwotICAgIHRyb3ctPnBhcnNlckFkZENoaWxkKHRkKTsKKyAgICB0cm93LT5wYXJzZXJBcHBlbmRD aGlsZCh0ZCk7CiAgICAgdGQtPmF0dGFjaCgpOwogCiAgICAgLy8gQ3JlYXRlIGEgc2Vjb25kIGNl bGwgZm9yIHRoZSBsaW5lIGNvbnRlbnRzCiAgICAgdGQgPSBIVE1MVGFibGVDZWxsRWxlbWVudDo6 Y3JlYXRlKHRkVGFnLCB0aGlzKTsKICAgICB0ZC0+c2V0QXR0cmlidXRlKGNsYXNzQXR0ciwgIndl YmtpdC1saW5lLWNvbnRlbnQiKTsKLSAgICB0cm93LT5wYXJzZXJBZGRDaGlsZCh0ZCk7CisgICAg dHJvdy0+cGFyc2VyQXBwZW5kQ2hpbGQodGQpOwogICAgIHRkLT5hdHRhY2goKTsKICAgICBtX2N1 cnJlbnQgPSBtX3RkID0gdGQ7CiAKQEAgLTIyOSw3ICsyMjksNyBAQCB2b2lkIEhUTUxWaWV3U291 cmNlRG9jdW1lbnQ6OmZpbmlzaExpbmUoKQogewogICAgIGlmICghbV9jdXJyZW50LT5oYXNDaGls ZE5vZGVzKCkpIHsKICAgICAgICAgUmVmUHRyPEhUTUxCUkVsZW1lbnQ+IGJyID0gSFRNTEJSRWxl bWVudDo6Y3JlYXRlKHRoaXMpOwotICAgICAgICBtX2N1cnJlbnQtPnBhcnNlckFkZENoaWxkKGJy KTsKKyAgICAgICAgbV9jdXJyZW50LT5wYXJzZXJBcHBlbmRDaGlsZChicik7CiAgICAgICAgIGJy LT5hdHRhY2goKTsKICAgICB9CiAgICAgbV9jdXJyZW50ID0gbV90Ym9keTsKQEAgLTI1NSw3ICsy NTUsNyBAQCB2b2lkIEhUTUxWaWV3U291cmNlRG9jdW1lbnQ6OmFkZFRleHQoY29uc3QgU3RyaW5n JiB0ZXh0LCBjb25zdCBBdG9taWNTdHJpbmcmIGNsYQogICAgICAgICAgICAgY29udGludWU7CiAg ICAgICAgIH0KICAgICAgICAgUmVmUHRyPFRleHQ+IHQgPSBUZXh0OjpjcmVhdGUodGhpcywgc3Vi c3RyaW5nKTsKLSAgICAgICAgbV9jdXJyZW50LT5wYXJzZXJBZGRDaGlsZCh0KTsKKyAgICAgICAg bV9jdXJyZW50LT5wYXJzZXJBcHBlbmRDaGlsZCh0KTsKICAgICAgICAgdC0+YXR0YWNoKCk7CiAg ICAgICAgIGlmIChpIDwgc2l6ZSAtIDEpCiAgICAgICAgICAgICBmaW5pc2hMaW5lKCk7CkBAIC0y ODUsNyArMjg1LDcgQEAgUGFzc1JlZlB0cjxFbGVtZW50PiBIVE1MVmlld1NvdXJjZURvY3VtZW50 OjphZGRCYXNlKGNvbnN0IEF0b21pY1N0cmluZyYgaHJlZikKIHsKICAgICBSZWZQdHI8SFRNTEJh c2VFbGVtZW50PiBiYXNlID0gSFRNTEJhc2VFbGVtZW50OjpjcmVhdGUoYmFzZVRhZywgdGhpcyk7 CiAgICAgYmFzZS0+c2V0QXR0cmlidXRlKGhyZWZBdHRyLCBocmVmKTsKLSAgICBtX2N1cnJlbnQt PnBhcnNlckFkZENoaWxkKGJhc2UpOworICAgIG1fY3VycmVudC0+cGFyc2VyQXBwZW5kQ2hpbGQo YmFzZSk7CiAgICAgYmFzZS0+YXR0YWNoKCk7CiAgICAgcmV0dXJuIGJhc2UucmVsZWFzZSgpOwog fQpAQCAtMzA1LDcgKzMwNSw3IEBAIFBhc3NSZWZQdHI8RWxlbWVudD4gSFRNTFZpZXdTb3VyY2VE b2N1bWVudDo6YWRkTGluayhjb25zdCBBdG9taWNTdHJpbmcmIHVybCwgYm9vCiAgICAgYW5jaG9y LT5zZXRBdHRyaWJ1dGUoY2xhc3NBdHRyLCBjbGFzc1ZhbHVlKTsKICAgICBhbmNob3ItPnNldEF0 dHJpYnV0ZSh0YXJnZXRBdHRyLCAiX2JsYW5rIik7CiAgICAgYW5jaG9yLT5zZXRBdHRyaWJ1dGUo aHJlZkF0dHIsIHVybCk7Ci0gICAgbV9jdXJyZW50LT5wYXJzZXJBZGRDaGlsZChhbmNob3IpOwor ICAgIG1fY3VycmVudC0+cGFyc2VyQXBwZW5kQ2hpbGQoYW5jaG9yKTsKICAgICBhbmNob3ItPmF0 dGFjaCgpOwogICAgIHJldHVybiBhbmNob3IucmVsZWFzZSgpOwogfQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTENvbnN0cnVjdGlvblNpdGUuY3BwIGIvU291cmNl L1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTENvbnN0cnVjdGlvblNpdGUuY3BwCmluZGV4IGZjOWQ3 YzY2NDhhMmM0YTc1NTQ4ZmU5NmZmZTc5Zjc0OWUyYjAyZTYuLjBkNjZiZTQ3MWZmMjQwNzZmMzdl M2U4NjM5ZTNmOTgzZTFkZjEyYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvcGFy c2VyL0hUTUxDb25zdHJ1Y3Rpb25TaXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3Bh cnNlci9IVE1MQ29uc3RydWN0aW9uU2l0ZS5jcHAKQEAgLTgwLDcgKzgwLDcgQEAgc3RhdGljIGlu bGluZSB2b2lkIGV4ZWN1dGVUYXNrKEhUTUxDb25zdHJ1Y3Rpb25TaXRlVGFzayYgdGFzaykKICAg ICBpZiAodGFzay5uZXh0Q2hpbGQpCiAgICAgICAgIHRhc2sucGFyZW50LT5wYXJzZXJJbnNlcnRC ZWZvcmUodGFzay5jaGlsZC5nZXQoKSwgdGFzay5uZXh0Q2hpbGQuZ2V0KCkpOwogICAgIGVsc2UK LSAgICAgICAgdGFzay5wYXJlbnQtPnBhcnNlckFkZENoaWxkKHRhc2suY2hpbGQuZ2V0KCkpOwor ICAgICAgICB0YXNrLnBhcmVudC0+cGFyc2VyQXBwZW5kQ2hpbGQodGFzay5jaGlsZC5nZXQoKSk7 CiAKICAgICAvLyBKYXZhU2NyaXB0IHJ1biBmcm9tIGJlZm9yZWxvYWQgKG9yIERPTSBNdXRhdGlv biBvciBldmVudCBoYW5kbGVycykKICAgICAvLyBtaWdodCBoYXZlIHJlbW92ZWQgdGhlIGNoaWxk LCBpbiB3aGljaCBjYXNlIHdlIHNob3VsZCBub3QgYXR0YWNoIGl0LgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRyZWVCdWlsZGVyLmNwcCBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvcGFyc2VyL0hUTUxUcmVlQnVpbGRlci5jcHAKaW5kZXggM2U5YjMwM2M2OTg4YTBm NzAxMzlkMzE2Mjc4YzQ2ZGIwOTQ3YjdkNC4uMTMxY2RiZmY2MGU2NWNiMTM0YWEzMjEwY2NjZGU0 M2ZjMGU5ODY4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9wYXJzZXIvSFRNTFRy ZWVCdWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3BhcnNlci9IVE1MVHJlZUJ1 aWxkZXIuY3BwCkBAIC0xNDg4LDcgKzE0ODgsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y2Fs bFRoZUFkb3B0aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tlbiogdG9rZW4pCiAgICAgICAgICAgICAv LyA5LjkKICAgICAgICAgICAgIGlmIChDb250YWluZXJOb2RlKiBwYXJlbnQgPSBsYXN0Tm9kZS0+ ZWxlbWVudCgpLT5wYXJlbnROb2RlKCkpCiAgICAgICAgICAgICAgICAgcGFyZW50LT5wYXJzZXJS ZW1vdmVDaGlsZChsYXN0Tm9kZS0+ZWxlbWVudCgpKTsKLSAgICAgICAgICAgIG5vZGUtPmVsZW1l bnQoKS0+cGFyc2VyQWRkQ2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7CisgICAgICAgICAgICBu b2RlLT5lbGVtZW50KCktPnBhcnNlckFwcGVuZENoaWxkKGxhc3ROb2RlLT5lbGVtZW50KCkpOwog ICAgICAgICAgICAgaWYgKGxhc3ROb2RlLT5lbGVtZW50KCktPnBhcmVudEVsZW1lbnQoKS0+YXR0 YWNoZWQoKSAmJiAhbGFzdE5vZGUtPmVsZW1lbnQoKS0+YXR0YWNoZWQoKSkKICAgICAgICAgICAg ICAgICBsYXN0Tm9kZS0+ZWxlbWVudCgpLT5sYXp5QXR0YWNoKCk7CiAgICAgICAgICAgICAvLyA5 LjEwCkBAIC0xNTAwLDcgKzE1MDAsNyBAQCB2b2lkIEhUTUxUcmVlQnVpbGRlcjo6Y2FsbFRoZUFk b3B0aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tlbiogdG9rZW4pCiAgICAgICAgIGlmIChjb21tb25B bmNlc3Rvci0+Y2F1c2VzRm9zdGVyUGFyZW50aW5nKCkpCiAgICAgICAgICAgICBtX3RyZWUuZm9z dGVyUGFyZW50KGxhc3ROb2RlLT5lbGVtZW50KCkpOwogICAgICAgICBlbHNlIHsKLSAgICAgICAg ICAgIGNvbW1vbkFuY2VzdG9yLT5ub2RlKCktPnBhcnNlckFkZENoaWxkKGxhc3ROb2RlLT5lbGVt ZW50KCkpOworICAgICAgICAgICAgY29tbW9uQW5jZXN0b3ItPm5vZGUoKS0+cGFyc2VyQXBwZW5k Q2hpbGQobGFzdE5vZGUtPmVsZW1lbnQoKSk7CiAgICAgICAgICAgICBBU1NFUlQobGFzdE5vZGUt PnN0YWNrSXRlbSgpLT5pc0VsZW1lbnROb2RlKCkpOwogICAgICAgICAgICAgQVNTRVJUKGxhc3RO b2RlLT5lbGVtZW50KCktPnBhcmVudE5vZGUoKSk7CiAgICAgICAgICAgICBpZiAobGFzdE5vZGUt PmVsZW1lbnQoKS0+cGFyZW50Tm9kZSgpLT5hdHRhY2hlZCgpICYmICFsYXN0Tm9kZS0+ZWxlbWVu dCgpLT5hdHRhY2hlZCgpKQpAQCAtMTUxMiwxMCArMTUxMiwxMCBAQCB2b2lkIEhUTUxUcmVlQnVp bGRlcjo6Y2FsbFRoZUFkb3B0aW9uQWdlbmN5KEF0b21pY0hUTUxUb2tlbiogdG9rZW4pCiAgICAg ICAgIG5ld0l0ZW0tPmVsZW1lbnQoKS0+dGFrZUFsbENoaWxkcmVuRnJvbShmdXJ0aGVzdEJsb2Nr LT5lbGVtZW50KCkpOwogICAgICAgICAvLyAxMy4KICAgICAgICAgRWxlbWVudCogZnVydGhlc3RC bG9ja0VsZW1lbnQgPSBmdXJ0aGVzdEJsb2NrLT5lbGVtZW50KCk7Ci0gICAgICAgIC8vIEZJWE1F OiBBbGwgdGhpcyBjcmVhdGlvbiAvIHBhcnNlckFkZENoaWxkIC8gYXR0YWNoIGJ1c2luZXNzIHNo b3VsZAorICAgICAgICAvLyBGSVhNRTogQWxsIHRoaXMgY3JlYXRpb24gLyBwYXJzZXJBcHBlbmRD aGlsZCAvIGF0dGFjaCBidXNpbmVzcyBzaG91bGQKICAgICAgICAgLy8gICAgICAgIGJlIGluIEhU TUxDb25zdHJ1Y3Rpb25TaXRlLiBNeSBndWVzcyBpcyB0aGF0IHN0ZXBzIDExLS0xNQogICAgICAg ICAvLyAgICAgICAgc2hvdWxkIGFsbCBiZSBpbiBzb21lIEhUTUxDb25zdHJ1Y3Rpb25TaXRlIGZ1 bmN0aW9uLgotICAgICAgICBmdXJ0aGVzdEJsb2NrRWxlbWVudC0+cGFyc2VyQWRkQ2hpbGQobmV3 SXRlbS0+ZWxlbWVudCgpKTsKKyAgICAgICAgZnVydGhlc3RCbG9ja0VsZW1lbnQtPnBhcnNlckFw cGVuZENoaWxkKG5ld0l0ZW0tPmVsZW1lbnQoKSk7CiAgICAgICAgIC8vIEZJWE1FOiBXaHkgaXMg dGhpcyBhdHRhY2ggbG9naWMgbmVjZXNzYXJ5PyBTdHlsZSByZXNvbHZlIHNob3VsZCBhdHRhY2gg dXMgaWYgbmVlZGVkLgogICAgICAgICBpZiAoZnVydGhlc3RCbG9ja0VsZW1lbnQtPmF0dGFjaGVk KCkgJiYgIW5ld0l0ZW0tPmVsZW1lbnQoKS0+YXR0YWNoZWQoKSkgewogICAgICAgICAgICAgLy8g Tm90aWNlIHRoYXQgbmV3SXRlbS0+ZWxlbWVudCgpIG1pZ2h0IGFscmVhZHkgYmUgYXR0YWNoZWQg aWYsIGZvciBleGFtcGxlLCBvbmUgb2YgdGhlIHJlcGFyZW50ZWQKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvdHJhY2svV2ViVlRUUGFyc2VyLmNwcAppbmRleCBmZTQ3ZDIyNTg3MjFhOTE5MzlhN2Q0OTA0 OTkyNGEwNjRmYjQzN2FmLi4yOTdlNTk5NmIyZWZmYmVmNDNkNDU3ZmUzY2ViZGYxODM4MWI5NGMy IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3RyYWNrL1dlYlZUVFBhcnNlci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC90cmFjay9XZWJWVFRQYXJzZXIuY3BwCkBAIC0zNTEs NyArMzUxLDcgQEAgdm9pZCBXZWJWVFRQYXJzZXI6OmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4oRG9j dW1lbnQqIGRvY3VtZW50KQogICAgIGNhc2UgV2ViVlRUVG9rZW5UeXBlczo6Q2hhcmFjdGVyOiB7 CiAgICAgICAgIFN0cmluZyBjb250ZW50KG1fdG9rZW4uY2hhcmFjdGVycygpLmRhdGEoKSwgbV90 b2tlbi5jaGFyYWN0ZXJzKCkuc2l6ZSgpKTsKICAgICAgICAgUmVmUHRyPFRleHQ+IGNoaWxkID0g VGV4dDo6Y3JlYXRlKGRvY3VtZW50LCBjb250ZW50KTsKLSAgICAgICAgbV9jdXJyZW50Tm9kZS0+ cGFyc2VyQWRkQ2hpbGQoY2hpbGQpOworICAgICAgICBtX2N1cnJlbnROb2RlLT5wYXJzZXJBcHBl bmRDaGlsZChjaGlsZCk7CiAgICAgICAgIGJyZWFrOwogICAgIH0KICAgICBjYXNlIFdlYlZUVFRv a2VuVHlwZXM6OlN0YXJ0VGFnOiB7CkBAIC0zNjgsNyArMzY4LDcgQEAgdm9pZCBXZWJWVFRQYXJz ZXI6OmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4oRG9jdW1lbnQqIGRvY3VtZW50KQogICAgICAgICAg ICAgICAgIGNoaWxkLT5zZXRBdHRyaWJ1dGUoY2xhc3NBdHRyLCBBdG9taWNTdHJpbmcobV90b2tl bi5jbGFzc2VzKCkuZGF0YSgpLCBtX3Rva2VuLmNsYXNzZXMoKS5zaXplKCkpKTsKICAgICAgICAg ICAgIGlmIChjaGlsZC0+aGFzVGFnTmFtZShxVGFnKSkKICAgICAgICAgICAgICAgICBjaGlsZC0+ c2V0QXR0cmlidXRlKHRpdGxlQXR0ciwgQXRvbWljU3RyaW5nKG1fdG9rZW4uYW5ub3RhdGlvbigp LmRhdGEoKSwgbV90b2tlbi5hbm5vdGF0aW9uKCkuc2l6ZSgpKSk7Ci0gICAgICAgICAgICBtX2N1 cnJlbnROb2RlLT5wYXJzZXJBZGRDaGlsZChjaGlsZCk7CisgICAgICAgICAgICBtX2N1cnJlbnRO b2RlLT5wYXJzZXJBcHBlbmRDaGlsZChjaGlsZCk7CiAgICAgICAgICAgICBtX2N1cnJlbnROb2Rl ID0gY2hpbGQ7CiAgICAgICAgIH0KICAgICAgICAgYnJlYWs7CkBAIC0zODUsNyArMzg1LDcgQEAg dm9pZCBXZWJWVFRQYXJzZXI6OmNvbnN0cnVjdFRyZWVGcm9tVG9rZW4oRG9jdW1lbnQqIGRvY3Vt ZW50KQogICAgICAgICB1bnNpZ25lZCBwb3NpdGlvbiA9IDA7CiAgICAgICAgIGRvdWJsZSB0aW1l ID0gY29sbGVjdFRpbWVTdGFtcChtX3Rva2VuLmNoYXJhY3RlcnMoKS5kYXRhKCksICZwb3NpdGlv bik7CiAgICAgICAgIGlmICh0aW1lICE9IG1hbGZvcm1lZFRpbWUpCi0gICAgICAgICAgICBtX2N1 cnJlbnROb2RlLT5wYXJzZXJBZGRDaGlsZChQcm9jZXNzaW5nSW5zdHJ1Y3Rpb246OmNyZWF0ZShk b2N1bWVudCwgInRpbWVzdGFtcCIsIFN0cmluZyhtX3Rva2VuLmNoYXJhY3RlcnMoKS5kYXRhKCks IG1fdG9rZW4uY2hhcmFjdGVycygpLnNpemUoKSkpKTsKKyAgICAgICAgICAgIG1fY3VycmVudE5v ZGUtPnBhcnNlckFwcGVuZENoaWxkKFByb2Nlc3NpbmdJbnN0cnVjdGlvbjo6Y3JlYXRlKGRvY3Vt ZW50LCAidGltZXN0YW1wIiwgU3RyaW5nKG1fdG9rZW4uY2hhcmFjdGVycygpLmRhdGEoKSwgbV90 b2tlbi5jaGFyYWN0ZXJzKCkuc2l6ZSgpKSkpOwogICAgICAgICBicmVhazsKICAgICB9CiAgICAg ZGVmYXVsdDoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3htbC9YTUxFcnJvcnMuY3BwIGIv U291cmNlL1dlYkNvcmUveG1sL1hNTEVycm9ycy5jcHAKaW5kZXggODA3ZmM2Y2E2OWM0NWU3YWUz YTJhMDIxM2NhYTJiNjQ1YTY3ZjNjNi4uZWMzYTI3MDEyZTk4NWRhMTE5NGQ0MzQzYmYzZDViOTNk MDdmZTY3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL1hNTEVycm9ycy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUveG1sL1hNTEVycm9ycy5jcHAKQEAgLTk2LDIwICs5NiwyMCBAQCBz dGF0aWMgaW5saW5lIFBhc3NSZWZQdHI8RWxlbWVudD4gY3JlYXRlWEhUTUxQYXJzZXJFcnJvckhl YWRlcihEb2N1bWVudCogZG9jLCBjbwogICAgIHJlcG9ydEVsZW1lbnQtPnBhcnNlclNldEF0dHJp YnV0ZXMocmVwb3J0QXR0cmlidXRlcywgRGlzYWxsb3dTY3JpcHRpbmdDb250ZW50KTsKIAogICAg IFJlZlB0cjxFbGVtZW50PiBoMyA9IGRvYy0+Y3JlYXRlRWxlbWVudChoM1RhZywgdHJ1ZSk7Ci0g ICAgcmVwb3J0RWxlbWVudC0+cGFyc2VyQWRkQ2hpbGQoaDMuZ2V0KCkpOwotICAgIGgzLT5wYXJz ZXJBZGRDaGlsZChkb2MtPmNyZWF0ZVRleHROb2RlKCJUaGlzIHBhZ2UgY29udGFpbnMgdGhlIGZv bGxvd2luZyBlcnJvcnM6IikpOworICAgIHJlcG9ydEVsZW1lbnQtPnBhcnNlckFwcGVuZENoaWxk KGgzLmdldCgpKTsKKyAgICBoMy0+cGFyc2VyQXBwZW5kQ2hpbGQoZG9jLT5jcmVhdGVUZXh0Tm9k ZSgiVGhpcyBwYWdlIGNvbnRhaW5zIHRoZSBmb2xsb3dpbmcgZXJyb3JzOiIpKTsKIAogICAgIFJl ZlB0cjxFbGVtZW50PiBmaXhlZCA9IGRvYy0+Y3JlYXRlRWxlbWVudChkaXZUYWcsIHRydWUpOwog ICAgIFZlY3RvcjxBdHRyaWJ1dGU+IGZpeGVkQXR0cmlidXRlczsKICAgICBmaXhlZEF0dHJpYnV0 ZXMuYXBwZW5kKEF0dHJpYnV0ZShzdHlsZUF0dHIsICJmb250LWZhbWlseTptb25vc3BhY2U7Zm9u dC1zaXplOjEycHgiKSk7CiAgICAgZml4ZWQtPnBhcnNlclNldEF0dHJpYnV0ZXMoZml4ZWRBdHRy aWJ1dGVzLCBEaXNhbGxvd1NjcmlwdGluZ0NvbnRlbnQpOwotICAgIHJlcG9ydEVsZW1lbnQtPnBh cnNlckFkZENoaWxkKGZpeGVkLmdldCgpKTsKKyAgICByZXBvcnRFbGVtZW50LT5wYXJzZXJBcHBl bmRDaGlsZChmaXhlZC5nZXQoKSk7CiAKLSAgICBmaXhlZC0+cGFyc2VyQWRkQ2hpbGQoZG9jLT5j cmVhdGVUZXh0Tm9kZShlcnJvck1lc3NhZ2VzKSk7CisgICAgZml4ZWQtPnBhcnNlckFwcGVuZENo aWxkKGRvYy0+Y3JlYXRlVGV4dE5vZGUoZXJyb3JNZXNzYWdlcykpOwogCiAgICAgaDMgPSBkb2Mt PmNyZWF0ZUVsZW1lbnQoaDNUYWcsIHRydWUpOwotICAgIHJlcG9ydEVsZW1lbnQtPnBhcnNlckFk ZENoaWxkKGgzLmdldCgpKTsKLSAgICBoMy0+cGFyc2VyQWRkQ2hpbGQoZG9jLT5jcmVhdGVUZXh0 Tm9kZSgiQmVsb3cgaXMgYSByZW5kZXJpbmcgb2YgdGhlIHBhZ2UgdXAgdG8gdGhlIGZpcnN0IGVy cm9yLiIpKTsKKyAgICByZXBvcnRFbGVtZW50LT5wYXJzZXJBcHBlbmRDaGlsZChoMy5nZXQoKSk7 CisgICAgaDMtPnBhcnNlckFwcGVuZENoaWxkKGRvYy0+Y3JlYXRlVGV4dE5vZGUoIkJlbG93IGlz IGEgcmVuZGVyaW5nIG9mIHRoZSBwYWdlIHVwIHRvIHRoZSBmaXJzdCBlcnJvci4iKSk7CiAKICAg ICByZXR1cm4gcmVwb3J0RWxlbWVudC5yZWxlYXNlKCk7CiB9CkBAIC0xMjUsOCArMTI1LDggQEAg dm9pZCBYTUxFcnJvcnM6Omluc2VydEVycm9yTWVzc2FnZUJsb2NrKCkKICAgICBpZiAoIWRvY3Vt ZW50RWxlbWVudCkgewogICAgICAgICBSZWZQdHI8RWxlbWVudD4gcm9vdEVsZW1lbnQgPSBtX2Rv Y3VtZW50LT5jcmVhdGVFbGVtZW50KGh0bWxUYWcsIHRydWUpOwogICAgICAgICBSZWZQdHI8RWxl bWVudD4gYm9keSA9IG1fZG9jdW1lbnQtPmNyZWF0ZUVsZW1lbnQoYm9keVRhZywgdHJ1ZSk7Ci0g ICAgICAgIHJvb3RFbGVtZW50LT5wYXJzZXJBZGRDaGlsZChib2R5KTsKLSAgICAgICAgbV9kb2N1 bWVudC0+cGFyc2VyQWRkQ2hpbGQocm9vdEVsZW1lbnQpOworICAgICAgICByb290RWxlbWVudC0+ cGFyc2VyQXBwZW5kQ2hpbGQoYm9keSk7CisgICAgICAgIG1fZG9jdW1lbnQtPnBhcnNlckFwcGVu ZENoaWxkKHJvb3RFbGVtZW50KTsKICAgICAgICAgaWYgKG1fZG9jdW1lbnQtPmF0dGFjaGVkKCkg JiYgIXJvb3RFbGVtZW50LT5hdHRhY2hlZCgpKQogICAgICAgICAgICAgcm9vdEVsZW1lbnQtPmF0 dGFjaCgpOwogICAgICAgICBkb2N1bWVudEVsZW1lbnQgPSBib2R5LmdldCgpOwpAQCAtMTM1LDE0 ICsxMzUsMTQgQEAgdm9pZCBYTUxFcnJvcnM6Omluc2VydEVycm9yTWVzc2FnZUJsb2NrKCkKICAg ICBlbHNlIGlmIChkb2N1bWVudEVsZW1lbnQtPm5hbWVzcGFjZVVSSSgpID09IFNWR05hbWVzOjpz dmdOYW1lc3BhY2VVUkkpIHsKICAgICAgICAgUmVmUHRyPEVsZW1lbnQ+IHJvb3RFbGVtZW50ID0g bV9kb2N1bWVudC0+Y3JlYXRlRWxlbWVudChodG1sVGFnLCB0cnVlKTsKICAgICAgICAgUmVmUHRy PEVsZW1lbnQ+IGJvZHkgPSBtX2RvY3VtZW50LT5jcmVhdGVFbGVtZW50KGJvZHlUYWcsIHRydWUp OwotICAgICAgICByb290RWxlbWVudC0+cGFyc2VyQWRkQ2hpbGQoYm9keSk7CisgICAgICAgIHJv b3RFbGVtZW50LT5wYXJzZXJBcHBlbmRDaGlsZChib2R5KTsKIAogICAgICAgICBkb2N1bWVudEVs ZW1lbnQtPnBhcmVudE5vZGUoKS0+cGFyc2VyUmVtb3ZlQ2hpbGQoZG9jdW1lbnRFbGVtZW50Lmdl dCgpKTsKICAgICAgICAgaWYgKGRvY3VtZW50RWxlbWVudC0+YXR0YWNoZWQoKSkKICAgICAgICAg ICAgIGRvY3VtZW50RWxlbWVudC0+ZGV0YWNoKCk7CiAKLSAgICAgICAgYm9keS0+cGFyc2VyQWRk Q2hpbGQoZG9jdW1lbnRFbGVtZW50KTsKLSAgICAgICAgbV9kb2N1bWVudC0+cGFyc2VyQWRkQ2hp bGQocm9vdEVsZW1lbnQuZ2V0KCkpOworICAgICAgICBib2R5LT5wYXJzZXJBcHBlbmRDaGlsZChk b2N1bWVudEVsZW1lbnQpOworICAgICAgICBtX2RvY3VtZW50LT5wYXJzZXJBcHBlbmRDaGlsZChy b290RWxlbWVudC5nZXQoKSk7CiAKICAgICAgICAgaWYgKG1fZG9jdW1lbnQtPmF0dGFjaGVkKCkp CiAgICAgICAgICAgICAvLyBJbiBnZW5lcmFsLCByb290RWxlbWVudCBzaG91bGRuJ3QgYmUgYXR0 YWNoZWQgcmlnaHQgbm93LCBidXQgaXQgd2lsbCBiZSBpZiB0aGVyZSBpcyBhIHN0eWxlIGVsZW1l bnQKQEAgLTE2Miw4ICsxNjIsOCBAQCB2b2lkIFhNTEVycm9yczo6aW5zZXJ0RXJyb3JNZXNzYWdl QmxvY2soKQogICAgICAgICBhdHRyaWJ1dGVzLmFwcGVuZChBdHRyaWJ1dGUoc3R5bGVBdHRyLCAi d2hpdGUtc3BhY2U6IG5vcm1hbCIpKTsKICAgICAgICAgUmVmUHRyPEVsZW1lbnQ+IHBhcmFncmFw aCA9IG1fZG9jdW1lbnQtPmNyZWF0ZUVsZW1lbnQocFRhZywgdHJ1ZSk7CiAgICAgICAgIHBhcmFn cmFwaC0+cGFyc2VyU2V0QXR0cmlidXRlcyhhdHRyaWJ1dGVzLCBEaXNhbGxvd1NjcmlwdGluZ0Nv bnRlbnQpOwotICAgICAgICBwYXJhZ3JhcGgtPnBhcnNlckFkZENoaWxkKG1fZG9jdW1lbnQtPmNy ZWF0ZVRleHROb2RlKCJUaGlzIGRvY3VtZW50IHdhcyBjcmVhdGVkIGFzIHRoZSByZXN1bHQgb2Yg YW4gWFNMIHRyYW5zZm9ybWF0aW9uLiBUaGUgbGluZSBhbmQgY29sdW1uIG51bWJlcnMgZ2l2ZW4g YXJlIGZyb20gdGhlIHRyYW5zZm9ybWVkIHJlc3VsdC4iKSk7Ci0gICAgICAgIHJlcG9ydEVsZW1l bnQtPnBhcnNlckFkZENoaWxkKHBhcmFncmFwaC5yZWxlYXNlKCkpOworICAgICAgICBwYXJhZ3Jh cGgtPnBhcnNlckFwcGVuZENoaWxkKG1fZG9jdW1lbnQtPmNyZWF0ZVRleHROb2RlKCJUaGlzIGRv Y3VtZW50IHdhcyBjcmVhdGVkIGFzIHRoZSByZXN1bHQgb2YgYW4gWFNMIHRyYW5zZm9ybWF0aW9u LiBUaGUgbGluZSBhbmQgY29sdW1uIG51bWJlcnMgZ2l2ZW4gYXJlIGZyb20gdGhlIHRyYW5zZm9y bWVkIHJlc3VsdC4iKSk7CisgICAgICAgIHJlcG9ydEVsZW1lbnQtPnBhcnNlckFwcGVuZENoaWxk KHBhcmFncmFwaC5yZWxlYXNlKCkpOwogICAgIH0KICNlbmRpZgogCkBAIC0xNzEsNyArMTcxLDcg QEAgdm9pZCBYTUxFcnJvcnM6Omluc2VydEVycm9yTWVzc2FnZUJsb2NrKCkKICAgICBpZiAoZmly c3RDaGlsZCkKICAgICAgICAgZG9jdW1lbnRFbGVtZW50LT5wYXJzZXJJbnNlcnRCZWZvcmUocmVw b3J0RWxlbWVudCwgZG9jdW1lbnRFbGVtZW50LT5maXJzdENoaWxkKCkpOwogICAgIGVsc2UKLSAg ICAgICAgZG9jdW1lbnRFbGVtZW50LT5wYXJzZXJBZGRDaGlsZChyZXBvcnRFbGVtZW50KTsKKyAg ICAgICAgZG9jdW1lbnRFbGVtZW50LT5wYXJzZXJBcHBlbmRDaGlsZChyZXBvcnRFbGVtZW50KTsK IAogICAgIGlmIChkb2N1bWVudEVsZW1lbnQtPmF0dGFjaGVkKCkgJiYgIXJlcG9ydEVsZW1lbnQt PmF0dGFjaGVkKCkpCiAgICAgICAgIHJlcG9ydEVsZW1lbnQtPmF0dGFjaCgpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUveG1sL3BhcnNlci9YTUxEb2N1bWVudFBhcnNlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTERvY3VtZW50UGFyc2VyLmNwcAppbmRleCA2OWVmNmE1 MmM2ZjgzYWU5NGQ4YmVhNmU4ZDViYTg0YThlNjAyMzc4Li41YWEwZTA4OTA2Y2Q1ZWIxYTMwNmI0 ODM0MWY5OTMxNDQ1ZWU5MTkyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2Vy L1hNTERvY3VtZW50UGFyc2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hN TERvY3VtZW50UGFyc2VyLmNwcApAQCAtMTQ3LDcgKzE0Nyw3IEBAIHZvaWQgWE1MRG9jdW1lbnRQ YXJzZXI6OmVudGVyVGV4dCgpCiAjZW5kaWYKICAgICBBU1NFUlQoIW1fbGVhZlRleHROb2RlKTsK ICAgICBtX2xlYWZUZXh0Tm9kZSA9IFRleHQ6OmNyZWF0ZShkb2N1bWVudCgpLCAiIik7Ci0gICAg bV9jdXJyZW50Tm9kZS0+cGFyc2VyQWRkQ2hpbGQobV9sZWFmVGV4dE5vZGUuZ2V0KCkpOworICAg IG1fY3VycmVudE5vZGUtPnBhcnNlckFwcGVuZENoaWxkKG1fbGVhZlRleHROb2RlLmdldCgpKTsK IH0KIAogI2lmICFVU0UoUVhNTFNUUkVBTSkKQEAgLTI5NSw3ICsyOTUsNyBAQCBib29sIFhNTERv Y3VtZW50UGFyc2VyOjpwYXJzZURvY3VtZW50RnJhZ21lbnQoY29uc3QgU3RyaW5nJiBjaHVuaywg RG9jdW1lbnRGcmFnbQogICAgIC8vIGh0dHA6Ly93d3cud2hhdHdnLm9yZy9zcGVjcy93ZWItYXBw cy9jdXJyZW50LXdvcmsvbXVsdGlwYWdlL3RoZS14aHRtbC1zeW50YXguaHRtbCN4bWwtZnJhZ21l bnQtcGFyc2luZy1hbGdvcml0aG0KICAgICAvLyBGb3Igbm93IHdlIGhhdmUgYSBoYWNrIGZvciBz Y3JpcHQvc3R5bGUgaW5uZXJIVE1MIHN1cHBvcnQ6CiAgICAgaWYgKGNvbnRleHRFbGVtZW50ICYm IChjb250ZXh0RWxlbWVudC0+aGFzTG9jYWxOYW1lKEhUTUxOYW1lczo6c2NyaXB0VGFnKSB8fCBj b250ZXh0RWxlbWVudC0+aGFzTG9jYWxOYW1lKEhUTUxOYW1lczo6c3R5bGVUYWcpKSkgewotICAg ICAgICBmcmFnbWVudC0+cGFyc2VyQWRkQ2hpbGQoZnJhZ21lbnQtPmRvY3VtZW50KCktPmNyZWF0 ZVRleHROb2RlKGNodW5rKSk7CisgICAgICAgIGZyYWdtZW50LT5wYXJzZXJBcHBlbmRDaGlsZChm cmFnbWVudC0+ZG9jdW1lbnQoKS0+Y3JlYXRlVGV4dE5vZGUoY2h1bmspKTsKICAgICAgICAgcmV0 dXJuIHRydWU7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2Vy L1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2Vy L1hNTERvY3VtZW50UGFyc2VyTGlieG1sMi5jcHAKaW5kZXggM2E0YTQ3Mzc0ZmMyMDI2MmU1NTIw N2Q3YWJkNGU0MmZhNWVlNTk0NS4uNzgxM2FkMzA4MTllMjIzNzg0MThjODVmMjU1ZWU3YWU2MjFi NDgzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUveG1sL3BhcnNlci9YTUxEb2N1bWVudFBh cnNlckxpYnhtbDIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3htbC9wYXJzZXIvWE1MRG9jdW1l bnRQYXJzZXJMaWJ4bWwyLmNwcApAQCAtODE2LDcgKzgxNiw3IEBAIHZvaWQgWE1MRG9jdW1lbnRQ YXJzZXI6OnN0YXJ0RWxlbWVudE5zKGNvbnN0IHhtbENoYXIqIHhtbExvY2FsTmFtZSwgY29uc3Qg eG1sQ2hhCiAgICAgaWYgKHNjcmlwdEVsZW1lbnQpCiAgICAgICAgIG1fc2NyaXB0U3RhcnRQb3Np dGlvbiA9IHRleHRQb3NpdGlvbigpOwogCi0gICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQWRkQ2hp bGQobmV3RWxlbWVudC5nZXQoKSk7CisgICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQXBwZW5kQ2hp bGQobmV3RWxlbWVudC5nZXQoKSk7CiAKICAgICBwdXNoQ3VycmVudE5vZGUobmV3RWxlbWVudC5n ZXQoKSk7CiAgICAgaWYgKG1fdmlldyAmJiAhbmV3RWxlbWVudC0+YXR0YWNoZWQoKSkKQEAgLTk2 OCw3ICs5NjgsNyBAQCB2b2lkIFhNTERvY3VtZW50UGFyc2VyOjpwcm9jZXNzaW5nSW5zdHJ1Y3Rp b24oY29uc3QgeG1sQ2hhciogdGFyZ2V0LCBjb25zdCB4bWxDaAogCiAgICAgcGktPnNldENyZWF0 ZWRCeVBhcnNlcih0cnVlKTsKIAotICAgIG1fY3VycmVudE5vZGUtPnBhcnNlckFkZENoaWxkKHBp LmdldCgpKTsKKyAgICBtX2N1cnJlbnROb2RlLT5wYXJzZXJBcHBlbmRDaGlsZChwaS5nZXQoKSk7 CiAgICAgaWYgKG1fdmlldyAmJiAhcGktPmF0dGFjaGVkKCkpCiAgICAgICAgIHBpLT5hdHRhY2go KTsKIApAQCAtOTk2LDcgKzk5Niw3IEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OmNkYXRhQmxv Y2soY29uc3QgeG1sQ2hhciogcywgaW50IGxlbikKICAgICBleGl0VGV4dCgpOwogCiAgICAgUmVm UHRyPENEQVRBU2VjdGlvbj4gbmV3Tm9kZSA9IENEQVRBU2VjdGlvbjo6Y3JlYXRlKGRvY3VtZW50 KCksIHRvU3RyaW5nKHMsIGxlbikpOwotICAgIG1fY3VycmVudE5vZGUtPnBhcnNlckFkZENoaWxk KG5ld05vZGUuZ2V0KCkpOworICAgIG1fY3VycmVudE5vZGUtPnBhcnNlckFwcGVuZENoaWxkKG5l d05vZGUuZ2V0KCkpOwogICAgIGlmIChtX3ZpZXcgJiYgIW5ld05vZGUtPmF0dGFjaGVkKCkpCiAg ICAgICAgIG5ld05vZGUtPmF0dGFjaCgpOwogfQpAQCAtMTAxNCw3ICsxMDE0LDcgQEAgdm9pZCBY TUxEb2N1bWVudFBhcnNlcjo6Y29tbWVudChjb25zdCB4bWxDaGFyKiBzKQogICAgIGV4aXRUZXh0 KCk7CiAKICAgICBSZWZQdHI8Q29tbWVudD4gbmV3Tm9kZSA9IENvbW1lbnQ6OmNyZWF0ZShkb2N1 bWVudCgpLCB0b1N0cmluZyhzKSk7Ci0gICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQWRkQ2hpbGQo bmV3Tm9kZS5nZXQoKSk7CisgICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQXBwZW5kQ2hpbGQobmV3 Tm9kZS5nZXQoKSk7CiAgICAgaWYgKG1fdmlldyAmJiAhbmV3Tm9kZS0+YXR0YWNoZWQoKSkKICAg ICAgICAgbmV3Tm9kZS0+YXR0YWNoKCk7CiB9CkBAIC0xMDU5LDcgKzEwNTksNyBAQCB2b2lkIFhN TERvY3VtZW50UGFyc2VyOjppbnRlcm5hbFN1YnNldChjb25zdCB4bWxDaGFyKiBuYW1lLCBjb25z dCB4bWxDaGFyKiBleHRlcgogICAgIH0KIAogICAgIGlmIChkb2N1bWVudCgpKQotICAgICAgICBk b2N1bWVudCgpLT5wYXJzZXJBZGRDaGlsZChEb2N1bWVudFR5cGU6OmNyZWF0ZShkb2N1bWVudCgp LCB0b1N0cmluZyhuYW1lKSwgdG9TdHJpbmcoZXh0ZXJuYWxJRCksIHRvU3RyaW5nKHN5c3RlbUlE KSkpOworICAgICAgICBkb2N1bWVudCgpLT5wYXJzZXJBcHBlbmRDaGlsZChEb2N1bWVudFR5cGU6 OmNyZWF0ZShkb2N1bWVudCgpLCB0b1N0cmluZyhuYW1lKSwgdG9TdHJpbmcoZXh0ZXJuYWxJRCks IHRvU3RyaW5nKHN5c3RlbUlEKSkpOwogfQogCiBzdGF0aWMgaW5saW5lIFhNTERvY3VtZW50UGFy c2VyKiBnZXRQYXJzZXIodm9pZCogY2xvc3VyZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3htbC9wYXJzZXIvWE1MRG9jdW1lbnRQYXJzZXJRdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwv cGFyc2VyL1hNTERvY3VtZW50UGFyc2VyUXQuY3BwCmluZGV4IGMwYmE5Y2VkNmFlOTg0Y2JmMDFh MjZkNjVkMDUyZmE0ZmM5YzdlM2MuLjk0NzNhYjc5NTIzMzhlMzc5MDA3ZjBmMDk4Y2IxMjkwYTVi MjhkODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3htbC9wYXJzZXIvWE1MRG9jdW1lbnRQ YXJzZXJRdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUveG1sL3BhcnNlci9YTUxEb2N1bWVudFBh cnNlclF0LmNwcApAQCAtNDgwLDcgKzQ4MCw3IEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OnBh cnNlU3RhcnRFbGVtZW50KCkKICAgICBpZiAoc2NyaXB0RWxlbWVudCkKICAgICAgICAgbV9zY3Jp cHRTdGFydFBvc2l0aW9uID0gdGV4dFBvc2l0aW9uKCk7CiAKLSAgICBtX2N1cnJlbnROb2RlLT5w YXJzZXJBZGRDaGlsZChuZXdFbGVtZW50LmdldCgpKTsKKyAgICBtX2N1cnJlbnROb2RlLT5wYXJz ZXJBcHBlbmRDaGlsZChuZXdFbGVtZW50LmdldCgpKTsKIAogICAgIHB1c2hDdXJyZW50Tm9kZShu ZXdFbGVtZW50LmdldCgpKTsKICAgICBpZiAobV92aWV3ICYmICFuZXdFbGVtZW50LT5hdHRhY2hl ZCgpKQpAQCAtNTcyLDcgKzU3Miw3IEBAIHZvaWQgWE1MRG9jdW1lbnRQYXJzZXI6OnBhcnNlUHJv Y2Vzc2luZ0luc3RydWN0aW9uKCkKIAogICAgIHBpLT5zZXRDcmVhdGVkQnlQYXJzZXIodHJ1ZSk7 CiAKLSAgICBtX2N1cnJlbnROb2RlLT5wYXJzZXJBZGRDaGlsZChwaS5nZXQoKSk7CisgICAgbV9j dXJyZW50Tm9kZS0+cGFyc2VyQXBwZW5kQ2hpbGQocGkuZ2V0KCkpOwogICAgIGlmIChtX3ZpZXcg JiYgIXBpLT5hdHRhY2hlZCgpKQogICAgICAgICBwaS0+YXR0YWNoKCk7CiAKQEAgLTU5Myw3ICs1 OTMsNyBAQCB2b2lkIFhNTERvY3VtZW50UGFyc2VyOjpwYXJzZUNkYXRhKCkKIAogICAgIFJlZlB0 cjxDREFUQVNlY3Rpb24+IG5ld05vZGUgPSBDREFUQVNlY3Rpb246OmNyZWF0ZShkb2N1bWVudCgp LCBtX3N0cmVhbS50ZXh0KCkpOwogCi0gICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQWRkQ2hpbGQo bmV3Tm9kZS5nZXQoKSk7CisgICAgbV9jdXJyZW50Tm9kZS0+cGFyc2VyQXBwZW5kQ2hpbGQobmV3 Tm9kZS5nZXQoKSk7CiAgICAgaWYgKG1fdmlldyAmJiAhbmV3Tm9kZS0+YXR0YWNoZWQoKSkKICAg ICAgICAgbmV3Tm9kZS0+YXR0YWNoKCk7CiB9CkBAIC02MDQsNyArNjA0LDcgQEAgdm9pZCBYTUxE b2N1bWVudFBhcnNlcjo6cGFyc2VDb21tZW50KCkKIAogICAgIFJlZlB0cjxDb21tZW50PiBuZXdO b2RlID0gQ29tbWVudDo6Y3JlYXRlKGRvY3VtZW50KCksIG1fc3RyZWFtLnRleHQoKSk7CiAKLSAg ICBtX2N1cnJlbnROb2RlLT5wYXJzZXJBZGRDaGlsZChuZXdOb2RlLmdldCgpKTsKKyAgICBtX2N1 cnJlbnROb2RlLT5wYXJzZXJBcHBlbmRDaGlsZChuZXdOb2RlLmdldCgpKTsKICAgICBpZiAobV92 aWV3ICYmICFuZXdOb2RlLT5hdHRhY2hlZCgpKQogICAgICAgICBuZXdOb2RlLT5hdHRhY2goKTsK IH0KQEAgLTYzNiw3ICs2MzYsNyBAQCB2b2lkIFhNTERvY3VtZW50UGFyc2VyOjpwYXJzZUR0ZCgp CiAgICAgICAgKQogICAgICAgICBzZXRJc1hIVE1MRG9jdW1lbnQodHJ1ZSk7IC8vIGNvbnRyb2xz IGlmIHdlIHJlcGxhY2UgZW50aXRpZXMgb3Igbm90LgogICAgIGlmICghbV9wYXJzaW5nRnJhZ21l bnQpCi0gICAgICAgIGRvY3VtZW50KCktPnBhcnNlckFkZENoaWxkKERvY3VtZW50VHlwZTo6Y3Jl YXRlKGRvY3VtZW50KCksIG5hbWUsIHB1YmxpY0lkLCBzeXN0ZW1JZCkpOworICAgICAgICBkb2N1 bWVudCgpLT5wYXJzZXJBcHBlbmRDaGlsZChEb2N1bWVudFR5cGU6OmNyZWF0ZShkb2N1bWVudCgp LCBuYW1lLCBwdWJsaWNJZCwgc3lzdGVtSWQpKTsKIAogfQogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUveG1sL3BhcnNlci9YTUxUcmVlQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94 bWwvcGFyc2VyL1hNTFRyZWVCdWlsZGVyLmNwcAppbmRleCBjYzBkNzIyZDU2Yjc3MDM5MzNhZGMz MmQxNzFmMGRlMTc5MWQ0Y2Y4Li4xMmRlZmU1ODY3NzVmMDBhZTk0ZGNiNmQ1ZjU5MzM5NDMwYzFh NGFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTFRyZWVCdWlsZGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS94bWwvcGFyc2VyL1hNTFRyZWVCdWlsZGVyLmNwcApA QCAtMjE0LDcgKzIxNCw3IEBAIHZvaWQgWE1MVHJlZUJ1aWxkZXI6OnByb2Nlc3NET0NUWVBFKGNv bnN0IEF0b21pY1hNTFRva2VuJiB0b2tlbikKICAgICBBdG9taWNTdHJpbmcgc3lzdGVtSWRlbnRp Zmllcih0b2tlbi5zeXN0ZW1JZGVudGlmaWVyKCkuZGF0YSgpLCB0b2tlbi5zeXN0ZW1JZGVudGlm aWVyKCkuc2l6ZSgpKTsKICAgICBSZWZQdHI8RG9jdW1lbnRUeXBlPiBkb2N0eXBlID0gRG9jdW1l bnRUeXBlOjpjcmVhdGUobV9kb2N1bWVudCwgdG9rZW4ubmFtZSgpLCBwdWJsaWNJZGVudGlmaWVy LCBzeXN0ZW1JZGVudGlmaWVyKTsKICAgICBtX2RvY3VtZW50LT5zZXREb2NUeXBlKGRvY3R5cGUp OwotICAgIG1fZG9jdW1lbnQtPnBhcnNlckFkZENoaWxkKGRvY3R5cGUpOworICAgIG1fZG9jdW1l bnQtPnBhcnNlckFwcGVuZENoaWxkKGRvY3R5cGUpOwogCiAgICAgaWYgKChwdWJsaWNJZGVudGlm aWVyID09IHhodG1sVHJhbnNpdGlvbmFsKQogICAgICAgICB8fCAocHVibGljSWRlbnRpZmllciA9 PSB4aHRtbDExKQpAQCAtMjQ0LDcgKzI0NCw3IEBAIHZvaWQgWE1MVHJlZUJ1aWxkZXI6OnByb2Nl c3NTdGFydFRhZyhjb25zdCBBdG9taWNYTUxUb2tlbiYgdG9rZW4pCiAgICAgcHJvY2Vzc0F0dHJp YnV0ZXModG9rZW4sIHRvcCwgbmV3RWxlbWVudCk7CiAKICAgICBuZXdFbGVtZW50LT5iZWdpblBh cnNpbmdDaGlsZHJlbigpOwotICAgIG1fY3VycmVudE5vZGVTdGFjay5sYXN0KCkubm9kZSgpLT5w YXJzZXJBZGRDaGlsZChuZXdFbGVtZW50LmdldCgpKTsKKyAgICBtX2N1cnJlbnROb2RlU3RhY2su bGFzdCgpLm5vZGUoKS0+cGFyc2VyQXBwZW5kQ2hpbGQobmV3RWxlbWVudC5nZXQoKSk7CiAKICAg ICB0b3Auc2V0Tm9kZShuZXdFbGVtZW50KTsKICAgICBwdXNoQ3VycmVudE5vZGUodG9wKTsKQEAg LTM4OCw3ICszODgsNyBAQCB2b2lkIFhNTFRyZWVCdWlsZGVyOjpwcm9jZXNzSFRNTEVudGl0eShj b25zdCBBdG9taWNYTUxUb2tlbiYgdG9rZW4pCiAKIGlubGluZSB2b2lkIFhNTFRyZWVCdWlsZGVy OjphZGQoUGFzc1JlZlB0cjxOb2RlPiBub2RlKQogewotICAgIG1fY3VycmVudE5vZGVTdGFjay5s YXN0KCkubm9kZSgpLT5wYXJzZXJBZGRDaGlsZChub2RlLmdldCgpKTsKKyAgICBtX2N1cnJlbnRO b2RlU3RhY2subGFzdCgpLm5vZGUoKS0+cGFyc2VyQXBwZW5kQ2hpbGQobm9kZS5nZXQoKSk7CiAg ICAgaWYgKCFub2RlLT5hdHRhY2hlZCgpKQogICAgICAgICBub2RlLT5hdHRhY2goKTsKIH0K