178324 2017-10-15 19:34:51 -0700 Make some asserts into release asserts 2017-10-20 17:42:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 fpizlo fpizlo buildbot cdumez dbates esprehn+autocc fpizlo kangil.han keith_miller mark.lam msaboff rniwa saam webkit-bug-importer oldest_to_newest 1360633 0 fpizlo 2017-10-15 19:34:51 -0700 Patch forthcoming. 1360634 1 323861 fpizlo 2017-10-15 19:36:23 -0700 Created attachment 323861 the patch 1360635 2 webkit-bug-importer 2017-10-15 19:36:47 -0700 <rdar://problem/35000510> 1360815 3 fpizlo 2017-10-16 10:19:28 -0700 Landed in http://trac.webkit.org/changeset/223415/webkit 1362944 4 323861 rniwa 2017-10-20 17:42:34 -0700 Comment on attachment 323861 the patch View in context: https://bugs.webkit.org/attachment.cgi?id=323861&action=review > Source/WebCore/dom/ContainerNodeAlgorithms.cpp:88 > - ASSERT_WITH_SECURITY_IMPLICATION(NoEventDispatchAssertion::isEventDispatchAllowedInSubtree(insertionPoint)); > + RELEASE_ASSERT(NoEventDispatchAssertion::isEventDispatchAllowedInSubtree(insertionPoint)); This is useless because NoEventDispatchAssertion is not enabled in release builds. 323861 2017-10-15 19:36:23 -0700 2017-10-16 00:19:27 -0700 the patch blah.patch text/plain 16814 fpizlo SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjIzMzMxKQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBA CisyMDE3LTEwLTE1ICBGaWxpcCBQaXpsbyAgPGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAg TWFrZSBzb21lIGFzc2VydHMgaW50byByZWxlYXNlIGFzc2VydHMKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODMyNAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgVGhlc2UgYXNzZXJ0cyBhcmUg bm90IG9uIHBlcmYgY3JpdGljYWwgcGF0aHMsIHNvIHRoZXkgbWlnaHQgYXMgd2VsbCBiZSByZWxl YXNlIGFzc2VydHMuCisKKyAgICAgICAgKiBydW50aW1lL0RhdGFWaWV3Lmg6CisgICAgICAgIChK U0M6OkRhdGFWaWV3OjpnZXQpOgorICAgICAgICAoSlNDOjpEYXRhVmlldzo6c2V0KToKKwogMjAx Ny0xMC0xNSAgWXVzdWtlIFN1enVraSAgPHV0YXRhbmUudGVhQGdtYWlsLmNvbT4KIAogICAgICAg ICBbSlNDXSBQZXJmb3JtIG1vZHVsZSBzcGVjaWZpZXIgdmFsaWRhdGlvbiBhdCBwYXJzaW5nIHRp bWUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL0RhdGFWaWV3LmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRGF0YVZpZXcuaAkocmV2aXNp b24gMjIzMzI5KQorKysgU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvRGF0YVZpZXcuaAko d29ya2luZyBjb3B5KQpAQCAtNjAsNyArNjAsNyBAQCBwdWJsaWM6CiAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAqc3RhdHVzID0gdHJ1ZTsKICAgICAgICAgfSBlbHNlCi0gICAgICAgICAgICBB U1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTihvZmZzZXQgKyBzaXplb2YoVCkgPD0gYnl0 ZUxlbmd0aCgpKTsKKyAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKG9mZnNldCArIHNpemVvZihU KSA8PSBieXRlTGVuZ3RoKCkpOwogICAgICAgICByZXR1cm4gZmxpcEJ5dGVzSWZMaXR0bGVFbmRp YW4oCiAgICAgICAgICAgICAqcmVpbnRlcnByZXRfY2FzdDxUKj4oc3RhdGljX2Nhc3Q8dWludDhf dCo+KG1fYmFzZUFkZHJlc3MuZ2V0KCkpICsgb2Zmc2V0KSwKICAgICAgICAgICAgIGxpdHRsZUVu ZGlhbik7CkBAIC04NSw3ICs4NSw3IEBAIHB1YmxpYzoKICAgICAgICAgICAgIH0KICAgICAgICAg ICAgICpzdGF0dXMgPSB0cnVlOwogICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIEFTU0VSVF9X SVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKG9mZnNldCArIHNpemVvZihUKSA8PSBieXRlTGVuZ3Ro KCkpOworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQob2Zmc2V0ICsgc2l6ZW9mKFQpIDw9IGJ5 dGVMZW5ndGgoKSk7CiAgICAgICAgICpyZWludGVycHJldF9jYXN0PFQqPihzdGF0aWNfY2FzdDx1 aW50OF90Kj4obV9iYXNlQWRkcmVzcy5nZXQoKSkgKyBvZmZzZXQpID0KICAgICAgICAgICAgIGZs aXBCeXRlc0lmTGl0dGxlRW5kaWFuKHZhbHVlLCBsaXR0bGVFbmRpYW4pOwogICAgIH0KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cJKHJldmlzaW9uIDIyMzMyOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwko d29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQyIEBACisyMDE3LTEwLTE1ICBGaWxpcCBQaXpsbyAg PGZwaXpsb0BhcHBsZS5jb20+CisKKyAgICAgICAgTWFrZSBzb21lIGFzc2VydHMgaW50byByZWxl YXNlIGFzc2VydHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE3ODMyNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIE5vIG5ldyB0ZXN0cyBiZWNhdXNlIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKyAgICAgICAg CisgICAgICAgIFRoaXMgaW50cm9kdWNlcyBzb21lIHJlbGVhc2UgYXNzZXJ0cy4gUGVyZiB0ZXN0 aW5nIHNob3dzIHRoYXQgaXQncyBuZXV0cmFsLiBTbywgd2UgZ2V0IHNvbWUgZXh0cmEKKyAgICAg ICAgc2FmZXR5IHdpdGhvdXQgbG9zaW5nIGFueSBwZXJmLgorCisgICAgICAgICogZG9tL0NvbnRh aW5lck5vZGVBbGdvcml0aG1zLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Om5vdGlmeUNoaWxkTm9k ZUluc2VydGVkKToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6OmFkb3B0Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZnJh bWVEZXN0cm95ZWQpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmF0dGFjaFRvQ2FjaGVk RnJhbWUpOgorICAgICAgICAoV2ViQ29yZTo6RG9jdW1lbnQ6OmRldGFjaEZyb21DYWNoZWRGcmFt ZSk6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6cHJlcGFyZUZvckRlc3RydWN0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50OjpkaXNwYXRjaFdpbmRvd0V2ZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OkRvY3VtZW50OjpkaXNwYXRjaFdpbmRvd0xvYWRFdmVudCk6CisgICAgICAg IChXZWJDb3JlOjpEb2N1bWVudDo6YXBwbHlRdWlja0xvb2tTYW5kYm94KToKKyAgICAgICAgKiBk b20vRG9jdW1lbnRPcmRlcmVkTWFwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50T3Jk ZXJlZE1hcDo6YWRkKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50T3JkZXJlZE1hcDo6cmVt b3ZlKToKKyAgICAgICAgKFdlYkNvcmU6OkRvY3VtZW50T3JkZXJlZE1hcDo6Z2V0IGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OiBjb25zdCk6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6Tm9kZTo6fk5vZGUpOgorICAgICAgICAoV2ViQ29yZTo6RGlkTW92ZVRv TmV3RG9jdW1lbnRBc3NlcnRpb25TY29wZTo6fkRpZE1vdmVUb05ld0RvY3VtZW50QXNzZXJ0aW9u U2NvcGUpOgorICAgICAgICAoV2ViQ29yZTo6RGlkTW92ZVRvTmV3RG9jdW1lbnRBc3NlcnRpb25T Y29wZTo6ZGlkUmVjaWV2ZUNhbGwpOgorICAgICAgICAoV2ViQ29yZTo6bW92ZU5vZGVUb05ld0Rv Y3VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6Om1vdmVTaGFkb3dUcmVlVG9OZXdEb2N1bWVudCk6 CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjptb3ZlVHJlZVRvTmV3U2NvcGUpOgorICAgICAgICAo V2ViQ29yZTo6Tm9kZTo6ZGlkTW92ZVRvTmV3RG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6 Tm9kZTo6ZGlzcGF0Y2hTdWJ0cmVlTW9kaWZpZWRFdmVudCk6CisgICAgICAgIChXZWJDb3JlOjpO b2RlOjpkaXNwYXRjaERPTUFjdGl2YXRlRXZlbnQpOgorCiAyMDE3LTEwLTE1ICBEYXJpbiBBZGxl ciAgPGRhcmluQGFwcGxlLmNvbT4KIAogICAgICAgICBVVEYtOCBkZWNvZGluZyBwcm9kdWNlcyBv bmUgcmVwbGFjZW1lbnQgY2hhcmFjdGVyIHBlciBieXRlOyBFbmNvZGluZyBzdGFuZGFyZCByZXF1 aXJlcyBvbmUgcmVwbGFjZW1lbnQgY2hhcmFjdGVyIHBlciBpbGxlZ2FsIHNlcXVlbmNlIGluc3Rl YWQKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2RvbS9Db250YWluZXJOb2RlQWxnb3JpdGhtcy5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5vZGVBbGdvcml0aG1z LmNwcAkocmV2aXNpb24gMjIzMzI5KQorKysgU291cmNlL1dlYkNvcmUvZG9tL0NvbnRhaW5lck5v ZGVBbGdvcml0aG1zLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODUsNyArODUsNyBAQCBzdGF0aWMg dm9pZCBub3RpZnlOb2RlSW5zZXJ0ZWRJbnRvVHJlZShDCiAKIHZvaWQgbm90aWZ5Q2hpbGROb2Rl SW5zZXJ0ZWQoQ29udGFpbmVyTm9kZSYgaW5zZXJ0aW9uUG9pbnQsIE5vZGUmIG5vZGUsIE5vZGVW ZWN0b3ImIHBvc3RJbnNlcnRpb25Ob3RpZmljYXRpb25UYXJnZXRzKQogewotICAgIEFTU0VSVF9X SVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVu dERpc3BhdGNoQWxsb3dlZEluU3VidHJlZShpbnNlcnRpb25Qb2ludCkpOworICAgIFJFTEVBU0Vf QVNTRVJUKE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoQWxsb3dlZElu U3VidHJlZShpbnNlcnRpb25Qb2ludCkpOwogCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9u OjpkaWRJbnNlcnRET01Ob2RlKG5vZGUuZG9jdW1lbnQoKSwgbm9kZSk7CiAKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcAkocmV2aXNpb24gMjIzMzI5KQorKysgU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAkod29ya2luZyBjb3B5KQpAQCAtOTgxLDggKzk4MSw4IEBAIEV4Y2VwdGlv bk9yPFJlZjxOb2RlPj4gRG9jdW1lbnQ6OmFkb3B0Tm8KICAgICAgICAgYXV0byByZXN1bHQgPSBz b3VyY2UucmVtb3ZlKCk7CiAgICAgICAgIGlmIChyZXN1bHQuaGFzRXhjZXB0aW9uKCkpCiAgICAg ICAgICAgICByZXR1cm4gcmVzdWx0LnJlbGVhc2VFeGNlcHRpb24oKTsKLSAgICAgICAgQVNTRVJU X1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIXNvdXJjZS5pc0Nvbm5lY3RlZCgpKTsKLSAgICAg ICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oIXNvdXJjZS5wYXJlbnROb2RlKCkp OworICAgICAgICBSRUxFQVNFX0FTU0VSVCghc291cmNlLmlzQ29ubmVjdGVkKCkpOworICAgICAg ICBSRUxFQVNFX0FTU0VSVCghc291cmNlLnBhcmVudE5vZGUoKSk7CiAgICAgfQogCiAgICAgc291 cmNlLnNldFRyZWVTY29wZVJlY3Vyc2l2ZWx5KCp0aGlzKTsKQEAgLTIyMDksMTMgKzIyMDksMTMg QEAgdm9pZCBEb2N1bWVudDo6ZGlkQmVjb21lQ3VycmVudERvY3VtZW50SQogdm9pZCBEb2N1bWVu dDo6ZnJhbWVEZXN0cm95ZWQoKQogewogICAgIC8vIGRldGFjaEZyb21GcmFtZSgpIG11c3QgYmUg Y2FsbGVkIGJlZm9yZSBkZXN0cm95aW5nIHRoZSBGcmFtZS4KLSAgICBBU1NFUlRfV0lUSF9TRUNV UklUWV9JTVBMSUNBVElPTighbV9mcmFtZSk7CisgICAgUkVMRUFTRV9BU1NFUlQoIW1fZnJhbWUp OwogICAgIEZyYW1lRGVzdHJ1Y3Rpb25PYnNlcnZlcjo6ZnJhbWVEZXN0cm95ZWQoKTsKIH0KIAog dm9pZCBEb2N1bWVudDo6YXR0YWNoVG9DYWNoZWRGcmFtZShDYWNoZWRGcmFtZUJhc2UmIGNhY2hl ZEZyYW1lKQogewotICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGNhY2hlZEZy YW1lLmRvY3VtZW50KCkgPT0gdGhpcyk7CisgICAgUkVMRUFTRV9BU1NFUlQoY2FjaGVkRnJhbWUu ZG9jdW1lbnQoKSA9PSB0aGlzKTsKICAgICBBU1NFUlQoY2FjaGVkRnJhbWUudmlldygpKTsKICAg ICBBU1NFUlQobV9wYWdlQ2FjaGVTdGF0ZSA9PSBEb2N1bWVudDo6SW5QYWdlQ2FjaGUpOwogICAg IG9ic2VydmVGcmFtZSgmY2FjaGVkRnJhbWUudmlldygpLT5mcmFtZSgpKTsKQEAgLTIyMjQsNyAr MjIyNCw3IEBAIHZvaWQgRG9jdW1lbnQ6OmF0dGFjaFRvQ2FjaGVkRnJhbWUoQ2FjaGUKIHZvaWQg RG9jdW1lbnQ6OmRldGFjaEZyb21DYWNoZWRGcmFtZShDYWNoZWRGcmFtZUJhc2UmIGNhY2hlZEZy YW1lKQogewogICAgIEFTU0VSVF9VTlVTRUQoY2FjaGVkRnJhbWUsIGNhY2hlZEZyYW1lLnZpZXco KSk7Ci0gICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oY2FjaGVkRnJhbWUuZG9j dW1lbnQoKSA9PSB0aGlzKTsKKyAgICBSRUxFQVNFX0FTU0VSVChjYWNoZWRGcmFtZS5kb2N1bWVu dCgpID09IHRoaXMpOwogICAgIEFTU0VSVChtX2ZyYW1lID09ICZjYWNoZWRGcmFtZS52aWV3KCkt PmZyYW1lKCkpOwogICAgIEFTU0VSVChtX3BhZ2VDYWNoZVN0YXRlID09IERvY3VtZW50OjpJblBh Z2VDYWNoZSk7CiAgICAgZGV0YWNoRnJvbUZyYW1lKCk7CkBAIC0yMzU4LDcgKzIzNTgsNyBAQCB2 b2lkIERvY3VtZW50OjpwcmVwYXJlRm9yRGVzdHJ1Y3Rpb24oKQogICAgIC8vIE5vdGUgdGhhdCBt X3BhZ2VDYWNoZVN0YXRlIGNhbiBiZSBEb2N1bWVudDo6QWJvdXRUb0VudGVyUGFnZUNhY2hlIGlm IG91ciBmcmFtZQogICAgIC8vIHdhcyByZW1vdmVkIGluIGFuIG9ucGFnZWhpZGUgZXZlbnQgaGFu ZGxlciBmaXJlZCB3aGVuIHRoZSB0b3AtbGV2ZWwgZnJhbWUgaXMKICAgICAvLyBhYm91dCB0byBl bnRlciB0aGUgcGFnZSBjYWNoZS4KLSAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElP TihtX3BhZ2VDYWNoZVN0YXRlICE9IERvY3VtZW50OjpJblBhZ2VDYWNoZSk7CisgICAgUkVMRUFT RV9BU1NFUlQobV9wYWdlQ2FjaGVTdGF0ZSAhPSBEb2N1bWVudDo6SW5QYWdlQ2FjaGUpOwogfQog CiB2b2lkIERvY3VtZW50OjpyZW1vdmVBbGxFdmVudExpc3RlbmVycygpCkBAIC00MjMwLDcgKzQy MzAsNyBAQCBFdmVudExpc3RlbmVyKiBEb2N1bWVudDo6Z2V0V2luZG93QXR0cmliCiAKIHZvaWQg RG9jdW1lbnQ6OmRpc3BhdGNoV2luZG93RXZlbnQoRXZlbnQmIGV2ZW50LCBFdmVudFRhcmdldCog dGFyZ2V0KQogewotICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKE5vRXZlbnRE aXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudEFsbG93ZWRJbk1haW5UaHJlYWQoKSk7CisgICAgUkVM RUFTRV9BU1NFUlQoTm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50QWxsb3dlZEluTWFp blRocmVhZCgpKTsKICAgICBpZiAoIW1fZG9tV2luZG93KQogICAgICAgICByZXR1cm47CiAgICAg bV9kb21XaW5kb3ctPmRpc3BhdGNoRXZlbnQoZXZlbnQsIHRhcmdldCk7CkBAIC00MjM4LDcgKzQy MzgsNyBAQCB2b2lkIERvY3VtZW50OjpkaXNwYXRjaFdpbmRvd0V2ZW50KEV2ZW50CiAKIHZvaWQg RG9jdW1lbnQ6OmRpc3BhdGNoV2luZG93TG9hZEV2ZW50KCkKIHsKLSAgICBBU1NFUlRfV0lUSF9T RUNVUklUWV9JTVBMSUNBVElPTihOb0V2ZW50RGlzcGF0Y2hBc3NlcnRpb246OmlzRXZlbnRBbGxv d2VkSW5NYWluVGhyZWFkKCkpOworICAgIFJFTEVBU0VfQVNTRVJUKE5vRXZlbnREaXNwYXRjaEFz c2VydGlvbjo6aXNFdmVudEFsbG93ZWRJbk1haW5UaHJlYWQoKSk7CiAgICAgaWYgKCFtX2RvbVdp bmRvdykKICAgICAgICAgcmV0dXJuOwogICAgIG1fZG9tV2luZG93LT5kaXNwYXRjaExvYWRFdmVu dCgpOwpAQCAtNzA4NSw3ICs3MDg1LDcgQEAgdm9pZCBEb2N1bWVudDo6YXBwbHlRdWlja0xvb2tT YW5kYm94KCkKICAgICBzZXRTZWN1cml0eU9yaWdpblBvbGljeShTZWN1cml0eU9yaWdpblBvbGlj eTo6Y3JlYXRlKFdURk1vdmUoc2VjdXJpdHlPcmlnaW4pKSk7CiAKICAgICBzdGF0aWMgTmV2ZXJE ZXN0cm95ZWQ8U3RyaW5nPiBxdWlja0xvb2tDU1AgPSBtYWtlU3RyaW5nKCJkZWZhdWx0LXNyYyAi LCBRTFByZXZpZXdQcm90b2NvbCgpLCAiOiAndW5zYWZlLWlubGluZSc7IGJhc2UtdXJpICdub25l Jzsgc2FuZGJveCBhbGxvdy1zYW1lLW9yaWdpbiBhbGxvdy1zY3JpcHRzIik7Ci0gICAgQVNTRVJU X1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oY29udGVudFNlY3VyaXR5UG9saWN5KCkpOworICAg IFJFTEVBU0VfQVNTRVJUKGNvbnRlbnRTZWN1cml0eVBvbGljeSgpKTsKICAgICAvLyBUaGUgc2Fu ZGJveCBkaXJlY3RpdmUgaXMgb25seSBhbGxvd2VkIGlmIHRoZSBwb2xpY3kgaXMgZnJvbSBhbiBI VFRQIGhlYWRlci4KICAgICBjb250ZW50U2VjdXJpdHlQb2xpY3koKS0+ZGlkUmVjZWl2ZUhlYWRl cihxdWlja0xvb2tDU1AsIENvbnRlbnRTZWN1cml0eVBvbGljeUhlYWRlclR5cGU6OkVuZm9yY2Us IENvbnRlbnRTZWN1cml0eVBvbGljeTo6UG9saWN5RnJvbTo6SFRUUEhlYWRlcik7CiAKSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE9yZGVyZWRNYXAuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudE9yZGVyZWRNYXAuY3BwCShyZXZpc2lvbiAyMjMz MjkpCisrKyBTb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnRPcmRlcmVkTWFwLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDksNyArNDksNyBAQCB2b2lkIERvY3VtZW50T3JkZXJlZE1hcDo6Y2xlYXIo KQogdm9pZCBEb2N1bWVudE9yZGVyZWRNYXA6OmFkZChjb25zdCBBdG9taWNTdHJpbmdJbXBsJiBr ZXksIEVsZW1lbnQmIGVsZW1lbnQsIGNvbnN0IFRyZWVTY29wZSYgdHJlZVNjb3BlKQogewogICAg IFVOVVNFRF9QQVJBTSh0cmVlU2NvcGUpOwotICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJ Q0FUSU9OKGVsZW1lbnQuaXNJblRyZWVTY29wZSgpKTsKKyAgICBSRUxFQVNFX0FTU0VSVChlbGVt ZW50LmlzSW5UcmVlU2NvcGUoKSk7CiAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJ T04odHJlZVNjb3BlLnJvb3ROb2RlKCkuY29udGFpbnNJbmNsdWRpbmdTaGFkb3dET00oJmVsZW1l bnQpKTsKIAogICAgIGlmICghZWxlbWVudC5pc0luVHJlZVNjb3BlKCkpCkBAIC02Nyw3ICs2Nyw3 IEBAIHZvaWQgRG9jdW1lbnRPcmRlcmVkTWFwOjphZGQoY29uc3QgQXRvbWkKICAgICBpZiAoYWRk UmVzdWx0LmlzTmV3RW50cnkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFTU0VSVF9XSVRIX1NF Q1VSSVRZX0lNUExJQ0FUSU9OKGVudHJ5LmNvdW50KTsKKyAgICBSRUxFQVNFX0FTU0VSVChlbnRy eS5jb3VudCk7CiAgICAgZW50cnkuZWxlbWVudCA9IG51bGxwdHI7CiAgICAgZW50cnkuY291bnQr KzsKICAgICBlbnRyeS5vcmRlcmVkTGlzdC5jbGVhcigpOwpAQCAtNzgsMTUgKzc4LDE1IEBAIHZv aWQgRG9jdW1lbnRPcmRlcmVkTWFwOjpyZW1vdmUoY29uc3QgQXQKICAgICBtX21hcC5jaGVja0Nv bnNpc3RlbmN5KCk7CiAgICAgYXV0byBpdCA9IG1fbWFwLmZpbmQoJmtleSk7CiAKLSAgICBBU1NF UlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTihpdCAhPSBtX21hcC5lbmQoKSk7CisgICAgUkVM RUFTRV9BU1NFUlQoaXQgIT0gbV9tYXAuZW5kKCkpOwogICAgIGlmIChpdCA9PSBtX21hcC5lbmQo KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgTWFwRW50cnkmIGVudHJ5ID0gaXQtPnZhbHVlOwog ICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGVudHJ5LnJlZ2lzdGVyZWRFbGVt ZW50cy5yZW1vdmUoJmVsZW1lbnQpKTsKLSAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNB VElPTihlbnRyeS5jb3VudCk7CisgICAgUkVMRUFTRV9BU1NFUlQoZW50cnkuY291bnQpOwogICAg IGlmIChlbnRyeS5jb3VudCA9PSAxKSB7Ci0gICAgICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lN UExJQ0FUSU9OKCFlbnRyeS5lbGVtZW50IHx8IGVudHJ5LmVsZW1lbnQgPT0gJmVsZW1lbnQpOwor ICAgICAgICBSRUxFQVNFX0FTU0VSVCghZW50cnkuZWxlbWVudCB8fCBlbnRyeS5lbGVtZW50ID09 ICZlbGVtZW50KTsKICAgICAgICAgbV9tYXAucmVtb3ZlKGl0KTsKICAgICB9IGVsc2UgewogICAg ICAgICBpZiAoZW50cnkuZWxlbWVudCA9PSAmZWxlbWVudCkKQEAgLTEwOCw4ICsxMDgsOCBAQCBp bmxpbmUgRWxlbWVudCogRG9jdW1lbnRPcmRlcmVkTWFwOjpnZXQoCiAgICAgTWFwRW50cnkmIGVu dHJ5ID0gaXQtPnZhbHVlOwogICAgIEFTU0VSVChlbnRyeS5jb3VudCk7CiAgICAgaWYgKGVudHJ5 LmVsZW1lbnQpIHsKLSAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oZW50 cnkuZWxlbWVudC0+aXNJblRyZWVTY29wZSgpKTsKLSAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJ VFlfSU1QTElDQVRJT04oJmVudHJ5LmVsZW1lbnQtPnRyZWVTY29wZSgpID09ICZzY29wZSk7Cisg ICAgICAgIFJFTEVBU0VfQVNTRVJUKGVudHJ5LmVsZW1lbnQtPmlzSW5UcmVlU2NvcGUoKSk7Cisg ICAgICAgIFJFTEVBU0VfQVNTRVJUKCZlbnRyeS5lbGVtZW50LT50cmVlU2NvcGUoKSA9PSAmc2Nv cGUpOwogICAgICAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTihlbnRyeS5yZWdp c3RlcmVkRWxlbWVudHMuY29udGFpbnMoZW50cnkuZWxlbWVudCkpOwogICAgICAgICByZXR1cm4g ZW50cnkuZWxlbWVudDsKICAgICB9CkBAIC0xMTksOCArMTE5LDggQEAgaW5saW5lIEVsZW1lbnQq IERvY3VtZW50T3JkZXJlZE1hcDo6Z2V0KAogICAgICAgICBpZiAoIWtleU1hdGNoZXMoa2V5LCBl bGVtZW50KSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICBlbnRyeS5lbGVtZW50ID0g JmVsZW1lbnQ7Ci0gICAgICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKGVsZW1l bnQuaXNJblRyZWVTY29wZSgpKTsKLSAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElD QVRJT04oJmVsZW1lbnQudHJlZVNjb3BlKCkgPT0gJnNjb3BlKTsKKyAgICAgICAgUkVMRUFTRV9B U1NFUlQoZWxlbWVudC5pc0luVHJlZVNjb3BlKCkpOworICAgICAgICBSRUxFQVNFX0FTU0VSVCgm ZWxlbWVudC50cmVlU2NvcGUoKSA9PSAmc2NvcGUpOwogICAgICAgICBBU1NFUlRfV0lUSF9TRUNV UklUWV9JTVBMSUNBVElPTihlbnRyeS5yZWdpc3RlcmVkRWxlbWVudHMuY29udGFpbnMoZW50cnku ZWxlbWVudCkpOwogICAgICAgICByZXR1cm4gJmVsZW1lbnQ7CiAgICAgfQpAQCAtMTg3LDcgKzE4 Nyw3IEBAIGNvbnN0IFZlY3RvcjxFbGVtZW50Kj4qIERvY3VtZW50T3JkZXJlZE0KICAgICAgICAg cmV0dXJuIG51bGxwdHI7CiAKICAgICBNYXBFbnRyeSYgZW50cnkgPSBpdC0+dmFsdWU7Ci0gICAg QVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oZW50cnkuY291bnQpOworICAgIFJFTEVB U0VfQVNTRVJUKGVudHJ5LmNvdW50KTsKICAgICBpZiAoIWVudHJ5LmNvdW50KQogICAgICAgICBy ZXR1cm4gbnVsbHB0cjsKIApAQCAtMjAyLDcgKzIwMiw3IEBAIGNvbnN0IFZlY3RvcjxFbGVtZW50 Kj4qIERvY3VtZW50T3JkZXJlZE0KICAgICAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAg ICAgIGVudHJ5Lm9yZGVyZWRMaXN0LmFwcGVuZCgmZWxlbWVudCk7CiAgICAgICAgIH0KLSAgICAg ICAgQVNTRVJUKGVudHJ5Lm9yZGVyZWRMaXN0LnNpemUoKSA9PSBlbnRyeS5jb3VudCk7CisgICAg ICAgIFJFTEVBU0VfQVNTRVJUKGVudHJ5Lm9yZGVyZWRMaXN0LnNpemUoKSA9PSBlbnRyeS5jb3Vu dCk7CiAgICAgfQogCiAgICAgcmV0dXJuICZlbnRyeS5vcmRlcmVkTGlzdDsKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9kb20v Tm9kZS5jcHAJKHJldmlzaW9uIDIyMzMyOSkKKysrIFNvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjg0LDcgKzI4NCw3IEBAIE5vZGU6On5Ob2RlKCkKICAgICBs aXZlTm9kZVNldC5yZW1vdmUodGhpcyk7CiAjZW5kaWYKIAotICAgIEFTU0VSVF9XSVRIX1NFQ1VS SVRZX0lNUExJQ0FUSU9OKCFyZW5kZXJlcigpKTsKKyAgICBSRUxFQVNFX0FTU0VSVCghcmVuZGVy ZXIoKSk7CiAgICAgQVNTRVJUKCFwYXJlbnROb2RlKCkpOwogICAgIEFTU0VSVCghbV9wcmV2aW91 cyk7CiAgICAgQVNTRVJUKCFtX25leHQpOwpAQCAtMTkzMSwxNyArMTkzMSwxNyBAQCBwdWJsaWM6 CiAKICAgICB+RGlkTW92ZVRvTmV3RG9jdW1lbnRBc3NlcnRpb25TY29wZSgpCiAgICAgewotICAg ICAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTihtX2NhbGxlZCk7CisgICAgICAg IFJFTEVBU0VfQVNTRVJUKG1fY2FsbGVkKTsKICAgICAgICAgc19zY29wZSA9IG1fcHJldmlvdXNT Y29wZTsKICAgICB9CiAKICAgICBzdGF0aWMgdm9pZCBkaWRSZWNpZXZlQ2FsbChOb2RlJiBub2Rl LCBEb2N1bWVudCYgb2xkRG9jdW1lbnQsIERvY3VtZW50JiBuZXdEb2N1bWVudCkKICAgICB7Ci0g ICAgICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKHNfc2NvcGUpOwotICAgICAg ICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTighc19zY29wZS0+bV9jYWxsZWQpOwot ICAgICAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTigmc19zY29wZS0+bV9ub2Rl ID09ICZub2RlKTsKLSAgICAgICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oJnNf c2NvcGUtPm1fb2xkRG9jdW1lbnQgPT0gJm9sZERvY3VtZW50KTsKLSAgICAgICAgQVNTRVJUX1dJ VEhfU0VDVVJJVFlfSU1QTElDQVRJT04oJnNfc2NvcGUtPm1fbmV3RG9jdW1lbnQgPT0gJm5ld0Rv Y3VtZW50KTsKKyAgICAgICAgUkVMRUFTRV9BU1NFUlQoc19zY29wZSk7CisgICAgICAgIFJFTEVB U0VfQVNTRVJUKCFzX3Njb3BlLT5tX2NhbGxlZCk7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKCZz X3Njb3BlLT5tX25vZGUgPT0gJm5vZGUpOworICAgICAgICBSRUxFQVNFX0FTU0VSVCgmc19zY29w ZS0+bV9vbGREb2N1bWVudCA9PSAmb2xkRG9jdW1lbnQpOworICAgICAgICBSRUxFQVNFX0FTU0VS VCgmc19zY29wZS0+bV9uZXdEb2N1bWVudCA9PSAmbmV3RG9jdW1lbnQpOwogICAgICAgICBzX3Nj b3BlLT5tX2NhbGxlZCA9IHRydWU7CiAgICAgfQogCkBAIC0xOTcwLDcgKzE5NzAsNyBAQCBzdGF0 aWMgQUxXQVlTX0lOTElORSB2b2lkIG1vdmVOb2RlVG9OZXdECiAgICAgQVNTRVJUKCFub2RlLmlz Q29ubmVjdGVkKCkgfHwgJm9sZERvY3VtZW50ICE9ICZuZXdEb2N1bWVudCk7CiAgICAgRGlkTW92 ZVRvTmV3RG9jdW1lbnRBc3NlcnRpb25TY29wZSBzY29wZShub2RlLCBvbGREb2N1bWVudCwgbmV3 RG9jdW1lbnQpOwogICAgIG5vZGUuZGlkTW92ZVRvTmV3RG9jdW1lbnQob2xkRG9jdW1lbnQsIG5l d0RvY3VtZW50KTsKLSAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTigmbm9kZS5k b2N1bWVudCgpID09ICZuZXdEb2N1bWVudCk7CisgICAgUkVMRUFTRV9BU1NFUlQoJm5vZGUuZG9j dW1lbnQoKSA9PSAmbmV3RG9jdW1lbnQpOwogfQogCiB0ZW1wbGF0ZSA8dHlwZW5hbWUgTW92ZU5v ZGVGdW5jdGlvbiwgdHlwZW5hbWUgTW92ZVNoYWRvd1Jvb3RGdW5jdGlvbj4KQEAgLTE5OTgsNyAr MTk5OCw3IEBAIHN0YXRpYyB2b2lkIG1vdmVTaGFkb3dUcmVlVG9OZXdEb2N1bWVudCgKICAgICB0 cmF2ZXJzZVN1YnRyZWVUb1VwZGF0ZVRyZWVTY29wZShzaGFkb3dSb290LCBbJm9sZERvY3VtZW50 LCAmbmV3RG9jdW1lbnRdKE5vZGUmIG5vZGUpIHsKICAgICAgICAgbW92ZU5vZGVUb05ld0RvY3Vt ZW50KG5vZGUsIG9sZERvY3VtZW50LCBuZXdEb2N1bWVudCk7CiAgICAgfSwgWyZvbGREb2N1bWVu dCwgJm5ld0RvY3VtZW50XShTaGFkb3dSb290JiBpbm5lclNoYWRvd1Jvb3QpIHsKLSAgICAgICAg QVNTRVJUX1dJVEhfU0VDVVJJVFlfSU1QTElDQVRJT04oJmlubmVyU2hhZG93Um9vdC5kb2N1bWVu dCgpID09ICZvbGREb2N1bWVudCk7CisgICAgICAgIFJFTEVBU0VfQVNTRVJUKCZpbm5lclNoYWRv d1Jvb3QuZG9jdW1lbnQoKSA9PSAmb2xkRG9jdW1lbnQpOwogICAgICAgICBtb3ZlU2hhZG93VHJl ZVRvTmV3RG9jdW1lbnQoaW5uZXJTaGFkb3dSb290LCBvbGREb2N1bWVudCwgbmV3RG9jdW1lbnQp OwogICAgIH0pOwogfQpAQCAtMjAwNiw3ICsyMDA2LDcgQEAgc3RhdGljIHZvaWQgbW92ZVNoYWRv d1RyZWVUb05ld0RvY3VtZW50KAogdm9pZCBOb2RlOjptb3ZlVHJlZVRvTmV3U2NvcGUoTm9kZSYg cm9vdCwgVHJlZVNjb3BlJiBvbGRTY29wZSwgVHJlZVNjb3BlJiBuZXdTY29wZSkKIHsKICAgICBB U1NFUlQoJm9sZFNjb3BlICE9ICZuZXdTY29wZSk7Ci0gICAgQVNTRVJUX1dJVEhfU0VDVVJJVFlf SU1QTElDQVRJT04oJnJvb3QudHJlZVNjb3BlKCkgPT0gJm9sZFNjb3BlKTsKKyAgICBSRUxFQVNF X0FTU0VSVCgmcm9vdC50cmVlU2NvcGUoKSA9PSAmb2xkU2NvcGUpOwogCiAgICAgRG9jdW1lbnQm IG9sZERvY3VtZW50ID0gb2xkU2NvcGUuZG9jdW1lbnRTY29wZSgpOwogICAgIERvY3VtZW50JiBu ZXdEb2N1bWVudCA9IG5ld1Njb3BlLmRvY3VtZW50U2NvcGUoKTsKQEAgLTIwMTQsOCArMjAxNCw4 IEBAIHZvaWQgTm9kZTo6bW92ZVRyZWVUb05ld1Njb3BlKE5vZGUmIHJvb3QKICAgICAgICAgb2xk RG9jdW1lbnQuaW5jcmVtZW50UmVmZXJlbmNpbmdOb2RlQ291bnQoKTsKICAgICAgICAgdHJhdmVy c2VTdWJ0cmVlVG9VcGRhdGVUcmVlU2NvcGUocm9vdCwgWyZdKE5vZGUmIG5vZGUpIHsKICAgICAg ICAgICAgIEFTU0VSVCghbm9kZS5pc1RyZWVTY29wZSgpKTsKLSAgICAgICAgICAgIEFTU0VSVF9X SVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKCZub2RlLnRyZWVTY29wZSgpID09ICZvbGRTY29wZSk7 Ci0gICAgICAgICAgICBBU1NFUlRfV0lUSF9TRUNVUklUWV9JTVBMSUNBVElPTigmbm9kZS5kb2N1 bWVudCgpID09ICZvbGREb2N1bWVudCk7CisgICAgICAgICAgICBSRUxFQVNFX0FTU0VSVCgmbm9k ZS50cmVlU2NvcGUoKSA9PSAmb2xkU2NvcGUpOworICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQo Jm5vZGUuZG9jdW1lbnQoKSA9PSAmb2xkRG9jdW1lbnQpOwogICAgICAgICAgICAgbm9kZS5zZXRU cmVlU2NvcGUobmV3U2NvcGUpOwogICAgICAgICAgICAgbW92ZU5vZGVUb05ld0RvY3VtZW50KG5v ZGUsIG9sZERvY3VtZW50LCBuZXdEb2N1bWVudCk7CiAgICAgICAgIH0sIFsmXShTaGFkb3dSb290 JiBzaGFkb3dSb290KSB7CkBAIC0yMDI3LDcgKzIwMjcsNyBAQCB2b2lkIE5vZGU6Om1vdmVUcmVl VG9OZXdTY29wZShOb2RlJiByb290CiAgICAgfSBlbHNlIHsKICAgICAgICAgdHJhdmVyc2VTdWJ0 cmVlVG9VcGRhdGVUcmVlU2NvcGUocm9vdCwgWyZdKE5vZGUmIG5vZGUpIHsKICAgICAgICAgICAg IEFTU0VSVCghbm9kZS5pc1RyZWVTY29wZSgpKTsKLSAgICAgICAgICAgIEFTU0VSVF9XSVRIX1NF Q1VSSVRZX0lNUExJQ0FUSU9OKCZub2RlLnRyZWVTY29wZSgpID09ICZvbGRTY29wZSk7CisgICAg ICAgICAgICBSRUxFQVNFX0FTU0VSVCgmbm9kZS50cmVlU2NvcGUoKSA9PSAmb2xkU2NvcGUpOwog ICAgICAgICAgICAgbm9kZS5zZXRUcmVlU2NvcGUobmV3U2NvcGUpOwogICAgICAgICAgICAgaWYg KCFub2RlLmhhc1JhcmVEYXRhKCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwpAQCAtMjA0MSw3 ICsyMDQxLDcgQEAgdm9pZCBOb2RlOjptb3ZlVHJlZVRvTmV3U2NvcGUoTm9kZSYgcm9vdAogCiB2 b2lkIE5vZGU6OmRpZE1vdmVUb05ld0RvY3VtZW50KERvY3VtZW50JiBvbGREb2N1bWVudCwgRG9j dW1lbnQmIG5ld0RvY3VtZW50KQogewotICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FU SU9OKCZkb2N1bWVudCgpID09ICZuZXdEb2N1bWVudCk7CisgICAgUkVMRUFTRV9BU1NFUlQoJmRv Y3VtZW50KCkgPT0gJm5ld0RvY3VtZW50KTsKICAgICBEaWRNb3ZlVG9OZXdEb2N1bWVudEFzc2Vy dGlvblNjb3BlOjpkaWRSZWNpZXZlQ2FsbCgqdGhpcywgb2xkRG9jdW1lbnQsIG5ld0RvY3VtZW50 KTsKIAogICAgIG5ld0RvY3VtZW50LmluY3JlbWVudFJlZmVyZW5jaW5nTm9kZUNvdW50KCk7CkBA IC0yMzgyLDcgKzIzODIsNyBAQCB2b2lkIE5vZGU6OmRpc3BhdGNoU3VidHJlZU1vZGlmaWVkRXZl bnQoCiAgICAgaWYgKGlzSW5TaGFkb3dUcmVlKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIEFT U0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FUSU9OKE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6 aXNFdmVudERpc3BhdGNoQWxsb3dlZEluU3VidHJlZSgqdGhpcykpOworICAgIFJFTEVBU0VfQVNT RVJUKE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudERpc3BhdGNoQWxsb3dlZEluU3Vi dHJlZSgqdGhpcykpOwogCiAgICAgaWYgKCFkb2N1bWVudCgpLmhhc0xpc3RlbmVyVHlwZShEb2N1 bWVudDo6RE9NU1VCVFJFRU1PRElGSUVEX0xJU1RFTkVSKSkKICAgICAgICAgcmV0dXJuOwpAQCAt MjM5NSw3ICsyMzk1LDcgQEAgdm9pZCBOb2RlOjpkaXNwYXRjaFN1YnRyZWVNb2RpZmllZEV2ZW50 KAogCiBib29sIE5vZGU6OmRpc3BhdGNoRE9NQWN0aXZhdGVFdmVudChpbnQgZGV0YWlsLCBFdmVu dCYgdW5kZXJseWluZ0V2ZW50KQogewotICAgIEFTU0VSVF9XSVRIX1NFQ1VSSVRZX0lNUExJQ0FU SU9OKE5vRXZlbnREaXNwYXRjaEFzc2VydGlvbjo6aXNFdmVudEFsbG93ZWRJbk1haW5UaHJlYWQo KSk7CisgICAgUkVMRUFTRV9BU1NFUlQoTm9FdmVudERpc3BhdGNoQXNzZXJ0aW9uOjppc0V2ZW50 QWxsb3dlZEluTWFpblRocmVhZCgpKTsKICAgICBSZWY8VUlFdmVudD4gZXZlbnQgPSBVSUV2ZW50 OjpjcmVhdGUoZXZlbnROYW1lcygpLkRPTUFjdGl2YXRlRXZlbnQsIHRydWUsIHRydWUsIGRvY3Vt ZW50KCkuZGVmYXVsdFZpZXcoKSwgZGV0YWlsKTsKICAgICBldmVudC0+c2V0VW5kZXJseWluZ0V2 ZW50KCZ1bmRlcmx5aW5nRXZlbnQpOwogICAgIGRpc3BhdGNoU2NvcGVkRXZlbnQoZXZlbnQpOwo=