86449 2012-05-15 00:03:12 -0700 Rename Node::shadowTreeRootNode() to Node::shadowRoot() 2012-05-15 20:06:33 -0700 1 1 1 Unclassified WebKit DOM 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 86428 1 shinyak shinyak dominicc hayato morrita tasak webkit.review.bot oldest_to_newest 623716 0 shinyak 2012-05-15 00:03:12 -0700 In the discussion for Bug 86428, we concluded that we should rename Node::shadowTreeRootNode() to shadowRoot(). 623795 1 141891 shinyak 2012-05-15 01:37:04 -0700 Created attachment 141891 Patch 624834 2 141891 webkit.review.bot 2012-05-15 18:43:14 -0700 Comment on attachment 141891 Patch Rejecting attachment 141891 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: g rejects to file Source/WebCore/html/shadow/HTMLContentElement.cpp.rej patching file Source/WebCore/html/shadow/InsertionPoint.cpp patching file Source/WebCore/page/EventHandler.cpp patching file Source/WebCore/svg/SVGElement.cpp patching file Source/WebKit/chromium/src/WebFrameImpl.cpp Hunk #1 succeeded at 1784 (offset 18 lines). Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Darin Adler']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12709261 624875 3 142130 shinyak 2012-05-15 19:29:15 -0700 Created attachment 142130 Patch for landing 624887 4 142132 shinyak 2012-05-15 19:43:55 -0700 Created attachment 142132 Patch for landing 624899 5 shinyak 2012-05-15 20:06:33 -0700 Committed r117210: <http://trac.webkit.org/changeset/117210> 141891 2012-05-15 01:37:04 -0700 2012-05-15 19:29:10 -0700 Patch bug-86449-20120515173702.patch text/plain 15795 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MDQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGRlZjU4MGY4MTc2MDYx M2YzNWQ4NTdjMGVkZTVkYTg3ZWVjOTg3Yy4uMTI0NWU2Y2NmOGFlMmRkYTg5YjIwZmUyMGY3OTkx NmE3YzNmMzhjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDEyLTA1LTE1ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5hbWUgTm9k ZTo6c2hhZG93VHJlZVJvb3ROb2RlKCkgdG8gTm9kZTo6c2hhZG93Um9vdCgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjQ0OQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNpbmNlIE5vZGU6OnNoYWRvd1Ry ZWVSb290Tm9kZSgpIHJldHVybnMgYWx3YXlzIGEgU2hhZG93Um9vdCBub3csIHNoYWRvd1Jvb3Qo KSBpcworICAgICAgICBtdXJlIHN1aXRhYmxlIHRoYW4gc2hhZG93VHJlZVJvb3ROb2RlKCkuCisK KyAgICAgICAgVGhpcyBwYXRjaCBjaGFuZ2VzIHRoZSBtZXRob2QgbmFtZS4KKworICAgICAgICBO byBuZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIFdlYkNvcmUu b3JkZXI6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6 cmVuZGVyZXJJc0VkaXRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnNoYWRvd0FuY2Vz dG9yTm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpzaGFkb3dSb290KToKKyAgICAgICAg KFdlYkNvcmU6Omluc3RhbmNlc0ZvclNWR0VsZW1lbnQpOgorICAgICAgICAqIGRvbS9Ob2RlLmg6 CisgICAgICAgIChOb2RlKToKKyAgICAgICAgKiBkb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Tm9kZVJlbmRlcmluZ0NvbnRleHQ6Ok5vZGVSZW5kZXJpbmdD b250ZXh0KToKKyAgICAgICAgKiBkb20vUmFuZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmFu Z2U6OnNoYWRvd1Jvb3QpOgorICAgICAgICAqIGRvbS9SYW5nZS5oOgorICAgICAgICAoUmFuZ2Up OgorICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRv cjo6bmV4dFZpc2libGVSYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OmNvdW50TWF0 Y2hlc0ZvclRleHQpOgorICAgICAgICAqIGVkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OlRleHRJdGVyYXRvcjo6aGFuZGxlUmVwbGFjZWRFbGVtZW50KToKKyAgICAg ICAgKiBlZGl0aW5nL2h0bWxlZGl0aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluZGV4Rm9y VmlzaWJsZVBvc2l0aW9uKToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9Db250ZW50U2VsZWN0b3JR dWVyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VsZWN0b3JRdWVyeTo6bWF0Y2hl cyk6CisgICAgICAgICogaHRtbC9zaGFkb3cvSFRNTENvbnRlbnRFbGVtZW50LmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxDb250ZW50RWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAg ICAqIGh0bWwvc2hhZG93L0luc2VydGlvblBvaW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c2VydGlvblBvaW50OjpkZXRhY2gpOgorICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Omluc3RhbmNlQXNzb2NpYXRlZFdpdGhTaGFkb3dUcmVlRWxlbWVu dCk6CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZH RWxlbWVudDo6Y29ycmVzcG9uZGluZ0VsZW1lbnQpOgorCiAyMDEyLTA1LTE0ICBTaGlueWEgS2F3 YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4gCiAKICAgICAgICAgZG9jdW1lbnQuZXhlY0Nv bW1hbmQoJ0luZGVudCcpIGluIHRoZSBkaXJlY3QgY2hpbGQgb2YgU2hhZG93Um9vdCBjYXVzZXMg YSBjcmFzaC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggOTVjZjgxNThlNjhmYjE2Mjcx NGNlNTQwZjI2MGYyMDQ2OTFiODIxNC4uNDQwZTZkMWVkMTQ4YzdiN2MxODQ2M2ZlZmJkYzdmYjY2 NjQ2YTZlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAx Mi0wNS0xNSAgU2hpbnlhIEthd2FuYWthICA8c2hpbnlha0BjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmVuYW1lIE5vZGU6OnNoYWRvd1RyZWVSb290Tm9kZSgpIHRvIE5vZGU6OnNoYWRvd1Jvb3Qo KQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODY0NDkK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHNyYy9X ZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUltcGw6OnNjb3BlU3Ry aW5nTWF0Y2hlcyk6CisKIDIwMTItMDUtMTQgIFNoaW55YSBLYXdhbmFrYSAgPHNoaW55YWtAY2hy b21pdW0ub3JnPiAKIAogICAgICAgICBkb2N1bWVudC5leGVjQ29tbWFuZCgnSW5kZW50JykgaW4g dGhlIGRpcmVjdCBjaGlsZCBvZiBTaGFkb3dSb290IGNhdXNlcyBhIGNyYXNoLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRlciBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu b3JkZXIKaW5kZXggYjI3NjU5YWM5MjY0MzY4ZmJlMzJhMWVmNDFhNGQ4ZjQ3NjBmMTNjNi4uMmRj M2UzMjNhM2E1YjYzZWU1M2Q4MzE1MjE1ODlkMmQyY2M4YTAwMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5vcmRlcgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9yZGVy CkBAIC00NjU4LDcgKzQ2NTgsNyBAQCBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rpb24zM3Nl dEJhc2VBbmRFeHRlbnRUb0RlZXBFcXVpdmFsZW50c0V2CiBfX1pON1dlYkNvcmUxNmNvbXBhcmVQ b3NpdGlvbnNFUktOU184UG9zaXRpb25FUzJfCiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rp b241MnNldFN0YXJ0QW5kRW5kRnJvbUJhc2VBbmRFeHRlbnRSZXNwZWN0aW5nR3JhbnVsYXJpdHlF TlNfMTVUZXh0R3JhbnVsYXJpdHlFCiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rpb240NmFk anVzdFNlbGVjdGlvblRvQXZvaWRDcm9zc2luZ1NoYWRvd0JvdW5kYXJpZXNFdgotX19aTjdXZWJD b3JlNE5vZGUxOHNoYWRvd1RyZWVSb290Tm9kZUV2CitfX1pON1dlYkNvcmU0Tm9kZTEwc2hhZG93 Um9vdEV2CiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rpb240N2FkanVzdFNlbGVjdGlvblRv QXZvaWRDcm9zc2luZ0VkaXRpbmdCb3VuZGFyaWVzRXYKIF9fWk43V2ViQ29yZTIybG93ZXN0RWRp dGFibGVBbmNlc3RvckVQTlNfNE5vZGVFCiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rpb24x OXVwZGF0ZVNlbGVjdGlvblR5cGVFdgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05v ZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IGUwY2M1NmZjNDgzZWMx OGNiNWIzN2JmYWQ4ZjM1YzFhZjI2OTMwZGEuLjRjN2I0MTQ5NDU4YmFmODE4NmJhZTJiZGYzNGZj MjdlZmNiODc3ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTczMiw3ICs3MzIsNyBAQCB2b2lkIE5v ZGU6Omluc3BlY3QoKQogCiBib29sIE5vZGU6OnJlbmRlcmVySXNFZGl0YWJsZShFZGl0YWJsZUxl dmVsIGVkaXRhYmxlTGV2ZWwpIGNvbnN0CiB7Ci0gICAgaWYgKGRvY3VtZW50KCktPmZyYW1lKCkg JiYgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+cGFnZSgpICYmIGRvY3VtZW50KCktPmZyYW1lKCktPnBh Z2UoKS0+aXNFZGl0YWJsZSgpICYmICFzaGFkb3dUcmVlUm9vdE5vZGUoKSkKKyAgICBpZiAoZG9j dW1lbnQoKS0+ZnJhbWUoKSAmJiBkb2N1bWVudCgpLT5mcmFtZSgpLT5wYWdlKCkgJiYgZG9jdW1l bnQoKS0+ZnJhbWUoKS0+cGFnZSgpLT5pc0VkaXRhYmxlKCkgJiYgIXNoYWRvd1Jvb3QoKSkKICAg ICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAvLyBJZGVhbGx5IHdlJ2QgY2FsbCBBU1NFUlQoIW5l ZWRzU3R5bGVSZWNhbGMoKSkgaGVyZSwgYnV0CkBAIC0xNTAwLDEzICsxNTAwLDEzIEBAIE5vZGUq IE5vZGU6OnNoYWRvd0FuY2VzdG9yTm9kZSgpIGNvbnN0CiAgICAgICAgIHJldHVybiBjb25zdF9j YXN0PE5vZGUqPih0aGlzKTsKICNlbmRpZgogCi0gICAgaWYgKFNoYWRvd1Jvb3QqIHJvb3QgPSBz aGFkb3dUcmVlUm9vdE5vZGUoKSkKKyAgICBpZiAoU2hhZG93Um9vdCogcm9vdCA9IHNoYWRvd1Jv b3QoKSkKICAgICAgICAgcmV0dXJuIHJvb3QtPmhvc3QoKTsKIAogICAgIHJldHVybiBjb25zdF9j YXN0PE5vZGUqPih0aGlzKTsKIH0KIAotU2hhZG93Um9vdCogTm9kZTo6c2hhZG93VHJlZVJvb3RO b2RlKCkgY29uc3QKK1NoYWRvd1Jvb3QqIE5vZGU6OnNoYWRvd1Jvb3QoKSBjb25zdAogewogICAg IE5vZGUqIHJvb3QgPSBjb25zdF9jYXN0PE5vZGUqPih0aGlzKTsKICAgICB3aGlsZSAocm9vdCkg ewpAQCAtMjQ0OSw3ICsyNDQ5LDcgQEAgc3RhdGljIGlubGluZSBIYXNoU2V0PFNWR0VsZW1lbnRJ bnN0YW5jZSo+IGluc3RhbmNlc0ZvclNWR0VsZW1lbnQoTm9kZSogbm9kZSkKICAgICBIYXNoU2V0 PFNWR0VsZW1lbnRJbnN0YW5jZSo+IGluc3RhbmNlczsKICAKICAgICBBU1NFUlQobm9kZSk7Ci0g ICAgaWYgKCFub2RlLT5pc1NWR0VsZW1lbnQoKSB8fCBub2RlLT5zaGFkb3dUcmVlUm9vdE5vZGUo KSkKKyAgICBpZiAoIW5vZGUtPmlzU1ZHRWxlbWVudCgpIHx8IG5vZGUtPnNoYWRvd1Jvb3QoKSkK ICAgICAgICAgcmV0dXJuIEhhc2hTZXQ8U1ZHRWxlbWVudEluc3RhbmNlKj4oKTsKIAogICAgIFNW R0VsZW1lbnQqIGVsZW1lbnQgPSBzdGF0aWNfY2FzdDxTVkdFbGVtZW50Kj4obm9kZSk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL05v ZGUuaAppbmRleCA0MjI3MWU3ZDE5MDMyMmYxNjY0MDU0NTc4YjkwMWI1OGRlZTYwMzVjLi5mMzhk ODQ5MDM3ODQwNDQwMDI2N2NlZDNhNjQyYTU2MjIxOTY1Y2UyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9kb20vTm9kZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKQEAgLTIy MSw4ICsyMjEsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBpc0ZyYW1lT3duZXJFbGVtZW50KCkgY29u c3QgeyByZXR1cm4gZ2V0RmxhZyhJc0ZyYW1lT3duZXJFbGVtZW50RmxhZyk7IH0KIAogICAgIE5v ZGUqIHNoYWRvd0FuY2VzdG9yTm9kZSgpIGNvbnN0OwotICAgIC8vIFJldHVybnMgMCwgYSBTaGFk b3dSb290LCBvciBhIGxlZ2FjeSBzaGFkb3cgcm9vdC4KLSAgICBTaGFkb3dSb290KiBzaGFkb3dU cmVlUm9vdE5vZGUoKSBjb25zdDsKKyAgICBTaGFkb3dSb290KiBzaGFkb3dSb290KCkgY29uc3Q7 CiAgICAgLy8gUmV0dXJucyAwLCBhIGNoaWxkIG9mIFNoYWRvd1Jvb3QsIG9yIGEgbGVnYWN5IHNo YWRvdyByb290LgogICAgIE5vZGUqIG5vbkJvdW5kYXJ5U2hhZG93VHJlZVJvb3ROb2RlKCk7CiAg ICAgYm9vbCBpc0luU2hhZG93VHJlZSgpIGNvbnN0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZG9tL05vZGVSZW5kZXJpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2Rl UmVuZGVyaW5nQ29udGV4dC5jcHAKaW5kZXggMjk0ODExMjQzNjczODhhNzhlY2E4NWQ2OWMyZDdl NzE0YjAwZmRmNi4uYzY3OWJjOGM0MTkxNjFkNDQzYmUwZWMyMjJhZDI3ZjFhYjgyYjNiZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJpbmdDb250ZXh0LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC03OCw3ICs3 OCw3IEBAIE5vZGVSZW5kZXJpbmdDb250ZXh0OjpOb2RlUmVuZGVyaW5nQ29udGV4dChOb2RlKiBu b2RlKQogCiAgICAgICAgIGlmIChtX3Zpc3VhbFBhcmVudFNoYWRvdykgewogICAgICAgICAgICAg aWYgKChtX2luc2VydGlvblBvaW50ID0gbV92aXN1YWxQYXJlbnRTaGFkb3ctPmluc2VydGlvblBv aW50Rm9yKG1fbm9kZSkpKSB7Ci0gICAgICAgICAgICAgICAgaWYgKG1faW5zZXJ0aW9uUG9pbnQt PnNoYWRvd1RyZWVSb290Tm9kZSgpLT5pc1VzZWRGb3JSZW5kZXJpbmcoKSkgeworICAgICAgICAg ICAgICAgIGlmIChtX2luc2VydGlvblBvaW50LT5zaGFkb3dSb290KCktPmlzVXNlZEZvclJlbmRl cmluZygpKSB7CiAgICAgICAgICAgICAgICAgICAgIG1fcGhhc2UgPSBBdHRhY2hpbmdEaXN0cmli dXRlZDsKICAgICAgICAgICAgICAgICAgICAgbV9wYXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5 bGUgPSBOb2RlUmVuZGVyaW5nQ29udGV4dChtX2luc2VydGlvblBvaW50KS5wYXJlbnROb2RlRm9y UmVuZGVyaW5nQW5kU3R5bGUoKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwpAQCAtOTEs NyArOTEsNyBAQCBOb2RlUmVuZGVyaW5nQ29udGV4dDo6Tm9kZVJlbmRlcmluZ0NvbnRleHQoTm9k ZSogbm9kZSkKICAgICAgICAgfQogCiAgICAgICAgIGlmIChpc1NoYWRvd0JvdW5kYXJ5KHBhcmVu dCkpIHsKLSAgICAgICAgICAgIGlmICghcGFyZW50LT5zaGFkb3dUcmVlUm9vdE5vZGUoKS0+aXNV c2VkRm9yUmVuZGVyaW5nKCkpIHsKKyAgICAgICAgICAgIGlmICghcGFyZW50LT5zaGFkb3dSb290 KCktPmlzVXNlZEZvclJlbmRlcmluZygpKSB7CiAgICAgICAgICAgICAgICAgbV9waGFzZSA9IEF0 dGFjaGluZ05vdERpc3RyaWJ1dGVkOwogICAgICAgICAgICAgICAgIG1fcGFyZW50Tm9kZUZvclJl bmRlcmluZ0FuZFN0eWxlID0gcGFyZW50OwogICAgICAgICAgICAgICAgIHJldHVybjsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v UmFuZ2UuY3BwCmluZGV4IDE4MTYwZGJkZjJlN2RmOGJkZTM2ZjcxMGRiNWU5MTE5ODNlYTYwNDgu LjYxYTdjMTEyOWExMjg3N2NiNWM5OGE5ZDA5NzU0ZjM3NWM3Y2M3MzQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1Jhbmdl LmNwcApAQCAtMTY1MSw5ICsxNjUxLDkgQEAgTm9kZSogUmFuZ2U6OmZpcnN0Tm9kZSgpIGNvbnN0 CiAgICAgcmV0dXJuIG1fc3RhcnQuY29udGFpbmVyKCktPnRyYXZlcnNlTmV4dFNpYmxpbmcoKTsK IH0KIAotU2hhZG93Um9vdCogUmFuZ2U6OnNoYWRvd1RyZWVSb290Tm9kZSgpIGNvbnN0CitTaGFk b3dSb290KiBSYW5nZTo6c2hhZG93Um9vdCgpIGNvbnN0CiB7Ci0gICAgcmV0dXJuIHN0YXJ0Q29u dGFpbmVyKCkgPyBzdGFydENvbnRhaW5lcigpLT5zaGFkb3dUcmVlUm9vdE5vZGUoKSA6IDA7Cisg ICAgcmV0dXJuIHN0YXJ0Q29udGFpbmVyKCkgPyBzdGFydENvbnRhaW5lcigpLT5zaGFkb3dSb290 KCkgOiAwOwogfQogCiBOb2RlKiBSYW5nZTo6cGFzdExhc3ROb2RlKCkgY29uc3QKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oIGIvU291cmNlL1dlYkNvcmUvZG9tL1Jhbmdl LmgKaW5kZXggZmRiNGMzNGU2MDIyMGM5MGExZWY5NjIzNDNmODk5MjVkMDZlN2NiYy4uOWFjNGM0 OWJkNmQ3N2ZkMjFjOTRhZWE3NmI3NTNjNGIzMzM4Zjc0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL1JhbmdlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmgKQEAgLTEx MSw3ICsxMTEsNyBAQCBwdWJsaWM6CiAgICAgTm9kZSogZmlyc3ROb2RlKCkgY29uc3Q7CiAgICAg Tm9kZSogcGFzdExhc3ROb2RlKCkgY29uc3Q7CiAKLSAgICBTaGFkb3dSb290KiBzaGFkb3dUcmVl Um9vdE5vZGUoKSBjb25zdDsKKyAgICBTaGFkb3dSb290KiBzaGFkb3dSb290KCkgY29uc3Q7CiAK ICAgICBJbnRSZWN0IGJvdW5kaW5nQm94KCk7CiAgICAgCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0VkaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5j cHAKaW5kZXggOGY3MzVmYWE4MTBmNGE0MDQ0N2MxYzg0NDI2Mzc0MTU0ZjIwODgxMC4uYmY3Mjgy ODI2MDdiZTU0ZDBmNDFhZGNiMTQ2OGU3ZTc0YzFiOTY4MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRp dG9yLmNwcApAQCAtMjUxOSwxMiArMjUxOSwxMiBAQCBQYXNzUmVmUHRyPFJhbmdlPiBFZGl0b3I6 Om5leHRWaXNpYmxlUmFuZ2UoUmFuZ2UqIGN1cnJlbnRSYW5nZSwgY29uc3QgU3RyaW5nJiB0YQog ICAgICAgICBlbHNlCiAgICAgICAgICAgICBzZWFyY2hSYW5nZS0+c2V0RW5kQmVmb3JlKHJlc3Vs dFJhbmdlLT5zdGFydENvbnRhaW5lcigpLCBlYyk7CiAKLSAgICAgICAgTm9kZSogc2hhZG93VHJl ZVJvb3QgPSBzZWFyY2hSYW5nZS0+c2hhZG93VHJlZVJvb3ROb2RlKCk7Ci0gICAgICAgIGlmIChz ZWFyY2hSYW5nZS0+Y29sbGFwc2VkKGVjKSAmJiBzaGFkb3dUcmVlUm9vdCkgeworICAgICAgICBT aGFkb3dSb290KiBzaGFkb3dSb290ID0gc2VhcmNoUmFuZ2UtPnNoYWRvd1Jvb3QoKTsKKyAgICAg ICAgaWYgKHNlYXJjaFJhbmdlLT5jb2xsYXBzZWQoZWMpICYmIHNoYWRvd1Jvb3QpIHsKICAgICAg ICAgICAgIGlmIChmb3J3YXJkKQotICAgICAgICAgICAgICAgIHNlYXJjaFJhbmdlLT5zZXRFbmQo c2hhZG93VHJlZVJvb3QsIHNoYWRvd1RyZWVSb290LT5jaGlsZE5vZGVDb3VudCgpLCBlYyk7Cisg ICAgICAgICAgICAgICAgc2VhcmNoUmFuZ2UtPnNldEVuZChzaGFkb3dSb290LCBzaGFkb3dSb290 LT5jaGlsZE5vZGVDb3VudCgpLCBlYyk7CiAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAg ICAgc2VhcmNoUmFuZ2UtPnNldFN0YXJ0QmVmb3JlKHNoYWRvd1RyZWVSb290LCBlYyk7CisgICAg ICAgICAgICAgICAgc2VhcmNoUmFuZ2UtPnNldFN0YXJ0QmVmb3JlKHNoYWRvd1Jvb3QsIGVjKTsK ICAgICAgICAgfQogICAgICAgICAKICAgICAgICAgaWYgKHNlYXJjaFJhbmdlLT5zdGFydENvbnRh aW5lcigpLT5pc0RvY3VtZW50Tm9kZSgpICYmIHNlYXJjaFJhbmdlLT5lbmRDb250YWluZXIoKS0+ aXNEb2N1bWVudE5vZGUoKSkKQEAgLTI4ODIsNyArMjg4Miw3IEBAIHVuc2lnbmVkIEVkaXRvcjo6 Y291bnRNYXRjaGVzRm9yVGV4dChjb25zdCBTdHJpbmcmIHRhcmdldCwgUmFuZ2UqIHJhbmdlLCBG aW5kT3B0CiAgICAgICAgIC8vIHRleHQgbm9kZXMuIAogICAgICAgICBzZWFyY2hSYW5nZS0+c2V0 U3RhcnQocmVzdWx0UmFuZ2UtPmVuZENvbnRhaW5lcihleGNlcHRpb24pLCByZXN1bHRSYW5nZS0+ ZW5kT2Zmc2V0KGV4Y2VwdGlvbiksIGV4Y2VwdGlvbik7CiAKLSAgICAgICAgTm9kZSogc2hhZG93 VHJlZVJvb3QgPSBzZWFyY2hSYW5nZS0+c2hhZG93VHJlZVJvb3ROb2RlKCk7CisgICAgICAgIE5v ZGUqIHNoYWRvd1RyZWVSb290ID0gc2VhcmNoUmFuZ2UtPnNoYWRvd1Jvb3QoKTsKICAgICAgICAg aWYgKHNlYXJjaFJhbmdlLT5jb2xsYXBzZWQoZXhjZXB0aW9uKSAmJiBzaGFkb3dUcmVlUm9vdCkK ICAgICAgICAgICAgIHNlYXJjaFJhbmdlLT5zZXRFbmQoc2hhZG93VHJlZVJvb3QsIHNoYWRvd1Ry ZWVSb290LT5jaGlsZE5vZGVDb3VudCgpLCBleGNlcHRpb24pOwogICAgIH0gd2hpbGUgKHRydWUp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwIGIv U291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCmluZGV4IDY2ZGU5MjhjM2Rh NGJmYzJlODIzZDFmNmRjYzVhYjAxZjYzMzliNjcuLjNmMjAwMGQ0MTgzYzYxM2Y1Y2U0N2NiNzVl YzE2MjUwYzZiYWQ1MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0 ZXJhdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAK QEAgLTY2NCw3ICs2NjQsNyBAQCBib29sIFRleHRJdGVyYXRvcjo6aGFuZGxlUmVwbGFjZWRFbGVt ZW50KCkKIAogICAgIGlmIChtX2VudGVyc1RleHRDb250cm9scyAmJiByZW5kZXJlci0+aXNUZXh0 Q29udHJvbCgpKSB7CiAgICAgICAgIGlmIChIVE1MRWxlbWVudCogaW5uZXJUZXh0RWxlbWVudCA9 IHRvUmVuZGVyVGV4dENvbnRyb2wocmVuZGVyZXIpLT50ZXh0Rm9ybUNvbnRyb2xFbGVtZW50KCkt PmlubmVyVGV4dEVsZW1lbnQoKSkgewotICAgICAgICAgICAgbV9ub2RlID0gaW5uZXJUZXh0RWxl bWVudC0+c2hhZG93VHJlZVJvb3ROb2RlKCk7CisgICAgICAgICAgICBtX25vZGUgPSBpbm5lclRl eHRFbGVtZW50LT5zaGFkb3dSb290KCk7CiAgICAgICAgICAgICBwdXNoRnVsbHlDbGlwcGVkU3Rh dGUobV9mdWxseUNsaXBwZWRTdGFjaywgbV9ub2RlKTsKICAgICAgICAgICAgIG1fb2Zmc2V0ID0g MDsKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRp dGluZy5jcHAKaW5kZXggMjI2OWI3YzVhNzIyNmE2Yjc0MDVhYjc5YzBlNDFhNjRkM2VkMGE1ZC4u N2UwMWViM2U4Yjc5MmM2NTE5MTY4MmNhN2IwYjJiNGIxZjc1ZGMwZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9odG1sZWRpdGluZy5jcHAKQEAgLTEwOTMsMTMgKzEwOTMsMTEgQEAgaW50IGluZGV4 Rm9yVmlzaWJsZVBvc2l0aW9uKGNvbnN0IFZpc2libGVQb3NpdGlvbiYgdmlzaWJsZVBvc2l0aW9u LCBSZWZQdHI8Q29udGEKIAogICAgIFBvc2l0aW9uIHAodmlzaWJsZVBvc2l0aW9uLmRlZXBFcXVp dmFsZW50KCkpOwogICAgIERvY3VtZW50KiBkb2N1bWVudCA9IHAuYW5jaG9yTm9kZSgpLT5kb2N1 bWVudCgpOwotICAgIENvbnRhaW5lck5vZGUqIHNoYWRvd1Jvb3QgPSBwLmFuY2hvck5vZGUoKS0+ c2hhZG93VHJlZVJvb3ROb2RlKCk7CisgICAgU2hhZG93Um9vdCogc2hhZG93Um9vdCA9IHAuYW5j aG9yTm9kZSgpLT5zaGFkb3dSb290KCk7CiAKLSAgICBpZiAoc2hhZG93Um9vdCkgewotICAgICAg ICAvLyBVc2UgdGhlIHNoYWRvdyByb290IGZvciBmb3JtIGVsZW1lbnRzLCBzaW5jZSBUZXh0SXRl cmF0b3JzIHdpbGwgbm90IGVudGVyIHNoYWRvdyBjb250ZW50LgotICAgICAgICBBU1NFUlQoc2hh ZG93Um9vdC0+aXNFbGVtZW50Tm9kZSgpIHx8IHNoYWRvd1Jvb3QtPmlzU2hhZG93Um9vdCgpKTsK KyAgICBpZiAoc2hhZG93Um9vdCkKICAgICAgICAgc2NvcGUgPSBzaGFkb3dSb290OwotICAgIH0g ZWxzZQorICAgIGVsc2UKICAgICAgICAgc2NvcGUgPSBkb2N1bWVudC0+ZG9jdW1lbnRFbGVtZW50 KCk7CiAKICAgICBSZWZQdHI8UmFuZ2U+IHJhbmdlID0gUmFuZ2U6OmNyZWF0ZShkb2N1bWVudCwg Zmlyc3RQb3NpdGlvbkluTm9kZShzY29wZS5nZXQoKSksIHAucGFyZW50QW5jaG9yZWRFcXVpdmFs ZW50KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ29udGVudFNl bGVjdG9yUXVlcnkuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ29udGVudFNlbGVj dG9yUXVlcnkuY3BwCmluZGV4IDNiMzcxZmZjN2FkYzQwNjI0YWMyYzIwYjY3YTVjMWZkZDg0Mjlj MGIuLjM4ZDQ0OWM3YjM3NTljMTM3NmMwZTM2ZWNhM2M2MTViNDYxZWMwNTEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0NvbnRlbnRTZWxlY3RvclF1ZXJ5LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50U2VsZWN0b3JRdWVyeS5jcHAKQEAg LTY0LDcgKzY0LDcgQEAgYm9vbCBDb250ZW50U2VsZWN0b3JRdWVyeTo6bWF0Y2hlcyhOb2RlKiBu b2RlKSBjb25zdAogICAgIGlmICghbm9kZSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCi0gICAg QVNTRVJUKG5vZGUtPnBhcmVudE5vZGUoKSA9PSBtX2luc2VydGlvblBvaW50LT5zaGFkb3dUcmVl Um9vdE5vZGUoKS0+c2hhZG93SG9zdCgpKTsKKyAgICBBU1NFUlQobm9kZS0+cGFyZW50Tm9kZSgp ID09IG1faW5zZXJ0aW9uUG9pbnQtPnNoYWRvd1Jvb3QoKS0+c2hhZG93SG9zdCgpKTsKIAogICAg IGlmIChtX2luc2VydGlvblBvaW50LT5zZWxlY3QoKS5pc051bGwoKSB8fCBtX2luc2VydGlvblBv aW50LT5zZWxlY3QoKS5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiB0cnVlOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSFRNTENvbnRlbnRFbGVtZW50LmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0hUTUxDb250ZW50RWxlbWVudC5jcHAKaW5kZXggNmQw MmEwMWQ1YjYyYWM0ODg1NWRhZTIxZjVlN2JiNDgyNzJiMTlhMi4uZGM2ZmIwOWZkMWMzOGY2MDQx MDBlZDFkNzNmODllMTRmYTc3OTY4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvSFRNTENvbnRlbnRFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3No YWRvdy9IVE1MQ29udGVudEVsZW1lbnQuY3BwCkBAIC04OSw3ICs4OSw3IEBAIHZvaWQgSFRNTENv bnRlbnRFbGVtZW50OjpzZXRTZWxlY3QoY29uc3QgQXRvbWljU3RyaW5nJiBzZWxlY3RWYWx1ZSkK IHZvaWQgSFRNTENvbnRlbnRFbGVtZW50OjpwYXJzZUF0dHJpYnV0ZShBdHRyaWJ1dGUqIGF0dHIp CiB7CiAgICAgaWYgKGF0dHItPm5hbWUoKSA9PSBzZWxlY3RBdHRyKSB7Ci0gICAgICAgIGlmIChT aGFkb3dSb290KiByb290ID0gc2hhZG93VHJlZVJvb3ROb2RlKCkpCisgICAgICAgIGlmIChTaGFk b3dSb290KiByb290ID0gc2hhZG93Um9vdCgpKQogICAgICAgICAgICAgcm9vdC0+b3duZXIoKS0+ c2V0TmVlZHNSZWRpc3RyaWJ1dGluZygpOwogICAgIH0gZWxzZQogICAgICAgICBJbnNlcnRpb25Q b2ludDo6cGFyc2VBdHRyaWJ1dGUoYXR0cik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9o dG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9JbnNlcnRpb25Qb2ludC5jcHAKaW5kZXggYWY0NGRlMDk3YzVmNTczNGU5MWEwMjcwNWU1YjI1 YzhlNGRlNTE2NS4uY2E2NmMyNDhhYTQzNWMzYzc5ZmFmMTQxZWZlNGVjM2ViZGIxZmVmZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0luc2VydGlvblBvaW50LmNwcApAQCAtNjQs NyArNjQsNyBAQCB2b2lkIEluc2VydGlvblBvaW50OjphdHRhY2goKQogCiB2b2lkIEluc2VydGlv blBvaW50OjpkZXRhY2goKQogewotICAgIFNoYWRvd1Jvb3QqIHJvb3QgPSBzaGFkb3dUcmVlUm9v dE5vZGUoKTsKKyAgICBTaGFkb3dSb290KiByb290ID0gc2hhZG93Um9vdCgpOwogICAgIGlmIChy b290ICYmIGlzQWN0aXZlKCkpIHsKICAgICAgICAgRWxlbWVudFNoYWRvdyogc2hhZG93ID0gcm9v dC0+b3duZXIoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRs ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCmluZGV4IDZlMGZk OTU2MzljNjgxYmYzNTk3NzIxZjA0MjUyMDQyOWJlOGVhNzAuLjM4M2M2M2UxYjFlNGU2ZDkyZTc1 NDU1ZWI3ODNiMWVlNDEzNGMxMWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZl bnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAK QEAgLTIwOTIsNyArMjA5Miw3IEBAIHN0YXRpYyBpbmxpbmUgU1ZHRWxlbWVudEluc3RhbmNlKiBp bnN0YW5jZUFzc29jaWF0ZWRXaXRoU2hhZG93VHJlZUVsZW1lbnQoTm9kZSoKICAgICBpZiAoIXJl ZmVyZW5jZU5vZGUgfHwgIXJlZmVyZW5jZU5vZGUtPmlzU1ZHRWxlbWVudCgpKQogICAgICAgICBy ZXR1cm4gMDsKIAotICAgIE5vZGUqIHNoYWRvd1RyZWVFbGVtZW50ID0gcmVmZXJlbmNlTm9kZS0+ c2hhZG93VHJlZVJvb3ROb2RlKCk7CisgICAgTm9kZSogc2hhZG93VHJlZUVsZW1lbnQgPSByZWZl cmVuY2VOb2RlLT5zaGFkb3dSb290KCk7CiAgICAgaWYgKCFzaGFkb3dUcmVlRWxlbWVudCkKICAg ICAgICAgcmV0dXJuIDA7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVt ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcAppbmRleCBkZTM4MjA5 ZGUwMjVjY2UxOTI4ZThhY2E3ODRkZjg5OGQ4NDE3ZDI5Li5kMmY5MWUzYTUxMWVhMTNkODA3ZDIz MzEyOTdlY2U4MDdjN2U0MTIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxl bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCkBAIC0yOTYs NyArMjk2LDcgQEAgdm9pZCBTVkdFbGVtZW50OjpjdXJzb3JJbWFnZVZhbHVlUmVtb3ZlZCgpCiAK IFNWR0VsZW1lbnQqIFNWR0VsZW1lbnQ6OmNvcnJlc3BvbmRpbmdFbGVtZW50KCkKIHsKLSAgICBB U1NFUlQoIWhhc1JhcmVTVkdEYXRhKCkgfHwgIXJhcmVTVkdEYXRhKCktPmNvcnJlc3BvbmRpbmdF bGVtZW50KCkgfHwgc2hhZG93VHJlZVJvb3ROb2RlKCkpOworICAgIEFTU0VSVCghaGFzUmFyZVNW R0RhdGEoKSB8fCAhcmFyZVNWR0RhdGEoKS0+Y29ycmVzcG9uZGluZ0VsZW1lbnQoKSB8fCBzaGFk b3dSb290KCkpOwogICAgIHJldHVybiBoYXNSYXJlU1ZHRGF0YSgpID8gcmFyZVNWR0RhdGEoKS0+ Y29ycmVzcG9uZGluZ0VsZW1lbnQoKSA6IDA7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IGU2MGEyN2FmNmJkMWM3ZjMxNTNlN2E2MGU0NzNh Y2IzNTJkYTFmZTEuLmJlY2FhMDA3ZjMyZjJiMDJhZjU2ZDMxZTgxMDcwOTQ5YzFmMDI1NzUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKKysr IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcApAQCAtMTc2Niw3 ICsxNzY2LDcgQEAgdm9pZCBXZWJGcmFtZUltcGw6OnNjb3BlU3RyaW5nTWF0Y2hlcyhpbnQgaWRl bnRpZmllciwKICAgICAgICAgLy8gdGV4dCBub2Rlcy4KICAgICAgICAgc2VhcmNoUmFuZ2UtPnNl dFN0YXJ0KHJlc3VsdFJhbmdlLT5lbmRDb250YWluZXIoZWMpLCByZXN1bHRSYW5nZS0+ZW5kT2Zm c2V0KGVjKSwgZWMpOwogCi0gICAgICAgIE5vZGUqIHNoYWRvd1RyZWVSb290ID0gc2VhcmNoUmFu Z2UtPnNoYWRvd1RyZWVSb290Tm9kZSgpOworICAgICAgICBOb2RlKiBzaGFkb3dUcmVlUm9vdCA9 IHNlYXJjaFJhbmdlLT5zaGFkb3dSb290KCk7CiAgICAgICAgIGlmIChzZWFyY2hSYW5nZS0+Y29s bGFwc2VkKGVjKSAmJiBzaGFkb3dUcmVlUm9vdCkKICAgICAgICAgICAgIHNlYXJjaFJhbmdlLT5z ZXRFbmQoc2hhZG93VHJlZVJvb3QsIHNoYWRvd1RyZWVSb290LT5jaGlsZE5vZGVDb3VudCgpLCBl Yyk7CiAK 142130 2012-05-15 19:29:15 -0700 2012-05-15 19:37:34 -0700 Patch for landing bug-86449-20120516112914.patch text/plain 15366 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjg5MzM1OGJmNWRhMjQ1 NTNmYTE2OTgwYjkwMWZkM2M1ODVjYzIzYy4uNDM0NjNmMmNkZjk2NWVkNDI0Y2JjMTJiYWQxMjBj ODQ0Mzg1NGFhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDEyLTA1LTE1ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5hbWUgTm9k ZTo6c2hhZG93VHJlZVJvb3ROb2RlKCkgdG8gTm9kZTo6c2hhZG93Um9vdCgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjQ0OQorCisgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFNpbmNlIE5vZGU6OnNoYWRvd1RyZWVS b290Tm9kZSgpIHJldHVybnMgYWx3YXlzIGEgU2hhZG93Um9vdCBub3csIHNoYWRvd1Jvb3QoKSBp cworICAgICAgICBtdXJlIHN1aXRhYmxlIHRoYW4gc2hhZG93VHJlZVJvb3ROb2RlKCkuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBjaGFuZ2VzIHRoZSBtZXRob2QgbmFtZS4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIFdlYkNvcmUub3Jk ZXI6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6cmVu ZGVyZXJJc0VkaXRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnNoYWRvd0FuY2VzdG9y Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpzaGFkb3dSb290KToKKyAgICAgICAgKFdl YkNvcmU6Omluc3RhbmNlc0ZvclNWR0VsZW1lbnQpOgorICAgICAgICAqIGRvbS9Ob2RlLmg6Cisg ICAgICAgIChOb2RlKToKKyAgICAgICAgKiBkb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Tm9kZVJlbmRlcmluZ0NvbnRleHQ6Ok5vZGVSZW5kZXJpbmdDb250 ZXh0KToKKyAgICAgICAgKiBkb20vUmFuZ2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmFuZ2U6 OnNoYWRvd1Jvb3QpOgorICAgICAgICAqIGRvbS9SYW5nZS5oOgorICAgICAgICAoUmFuZ2UpOgor ICAgICAgICAqIGVkaXRpbmcvRWRpdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkVkaXRvcjo6 bmV4dFZpc2libGVSYW5nZSk6CisgICAgICAgIChXZWJDb3JlOjpFZGl0b3I6OmNvdW50TWF0Y2hl c0ZvclRleHQpOgorICAgICAgICAqIGVkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlRleHRJdGVyYXRvcjo6aGFuZGxlUmVwbGFjZWRFbGVtZW50KToKKyAgICAgICAg KiBlZGl0aW5nL2h0bWxlZGl0aW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmluZGV4Rm9yVmlz aWJsZVBvc2l0aW9uKToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9Db250ZW50U2VsZWN0b3JRdWVy eS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb250ZW50U2VsZWN0b3JRdWVyeTo6bWF0Y2hlcyk6 CisgICAgICAgICogaHRtbC9zaGFkb3cvSFRNTENvbnRlbnRFbGVtZW50LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkhUTUxDb250ZW50RWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUpOgorICAgICAgICAq IGh0bWwvc2hhZG93L0luc2VydGlvblBvaW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc2Vy dGlvblBvaW50OjpkZXRhY2gpOgorICAgICAgICAqIHBhZ2UvRXZlbnRIYW5kbGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6Omluc3RhbmNlQXNzb2NpYXRlZFdpdGhTaGFkb3dUcmVlRWxlbWVudCk6 CisgICAgICAgICogc3ZnL1NWR0VsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1ZHRWxl bWVudDo6Y29ycmVzcG9uZGluZ0VsZW1lbnQpOgorCiAyMDEyLTA1LTE1ICBSb2JlcnQgSG9nYW4g IDxyb2JlcnRAd2Via2l0Lm9yZz4KIAogICAgICAgICBIZWFwLXVzZS1hZnRlci1mcmVlIGluIFdl YkNvcmU6OlJlbmRlckJsb2NrOjpsYXlvdXRSdW5zQW5kRmxvYXRzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDc2YThlMDM2ODNmMWRlODk4NjMzZmRmNWE0OGFhYWIzY2ZjZTY5Y2IuLmMz MDNhNDc0NWZhNjkyYTUzOThjNmI2NThiN2M0OGYwYTAzYzM1ZWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDUtMTUgIFNoaW55YSBLYXdhbmFrYSAg PHNoaW55YWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJlbmFtZSBOb2RlOjpzaGFkb3dUcmVl Um9vdE5vZGUoKSB0byBOb2RlOjpzaGFkb3dSb290KCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg2NDQ5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFy aW4gQWRsZXIuCisKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViRnJhbWVJbXBsOjpzY29wZVN0cmluZ01hdGNoZXMpOgorCiAyMDEyLTA1LTE1ICBT aGF3biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1 bV0gQWRkIHVuaXQgdGVzdGluZyB0byBXZWJUcmFuc2Zvcm1hdGlvbk1hdHJpeApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRlciBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUu b3JkZXIKaW5kZXggYjI3NjU5YWM5MjY0MzY4ZmJlMzJhMWVmNDFhNGQ4ZjQ3NjBmMTNjNi4uMmRj M2UzMjNhM2E1YjYzZWU1M2Q4MzE1MjE1ODlkMmQyY2M4YTAwMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvV2ViQ29yZS5vcmRlcgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLm9yZGVy CkBAIC00NjU4LDcgKzQ2NTgsNyBAQCBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rpb24zM3Nl dEJhc2VBbmRFeHRlbnRUb0RlZXBFcXVpdmFsZW50c0V2CiBfX1pON1dlYkNvcmUxNmNvbXBhcmVQ b3NpdGlvbnNFUktOU184UG9zaXRpb25FUzJfCiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rp b241MnNldFN0YXJ0QW5kRW5kRnJvbUJhc2VBbmRFeHRlbnRSZXNwZWN0aW5nR3JhbnVsYXJpdHlF TlNfMTVUZXh0R3JhbnVsYXJpdHlFCiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rpb240NmFk anVzdFNlbGVjdGlvblRvQXZvaWRDcm9zc2luZ1NoYWRvd0JvdW5kYXJpZXNFdgotX19aTjdXZWJD b3JlNE5vZGUxOHNoYWRvd1RyZWVSb290Tm9kZUV2CitfX1pON1dlYkNvcmU0Tm9kZTEwc2hhZG93 Um9vdEV2CiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rpb240N2FkanVzdFNlbGVjdGlvblRv QXZvaWRDcm9zc2luZ0VkaXRpbmdCb3VuZGFyaWVzRXYKIF9fWk43V2ViQ29yZTIybG93ZXN0RWRp dGFibGVBbmNlc3RvckVQTlNfNE5vZGVFCiBfX1pON1dlYkNvcmUxNlZpc2libGVTZWxlY3Rpb24x OXVwZGF0ZVNlbGVjdGlvblR5cGVFdgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05v ZGUuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCmluZGV4IDFjOTc5YzdlYzRiM2Yz NWIxOGFhNWNjZjQ5ZjM5NDM2YWZlNzllYTEuLjdjZjU2MmI2Nzg4M2MyZWM2NDdiYTkxZjMxOGU0 NzM3M2JmNmY3ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKQEAgLTcyNyw3ICs3MjcsNyBAQCB2b2lkIE5v ZGU6Omluc3BlY3QoKQogCiBib29sIE5vZGU6OnJlbmRlcmVySXNFZGl0YWJsZShFZGl0YWJsZUxl dmVsIGVkaXRhYmxlTGV2ZWwpIGNvbnN0CiB7Ci0gICAgaWYgKGRvY3VtZW50KCktPmZyYW1lKCkg JiYgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+cGFnZSgpICYmIGRvY3VtZW50KCktPmZyYW1lKCktPnBh Z2UoKS0+aXNFZGl0YWJsZSgpICYmICFzaGFkb3dUcmVlUm9vdE5vZGUoKSkKKyAgICBpZiAoZG9j dW1lbnQoKS0+ZnJhbWUoKSAmJiBkb2N1bWVudCgpLT5mcmFtZSgpLT5wYWdlKCkgJiYgZG9jdW1l bnQoKS0+ZnJhbWUoKS0+cGFnZSgpLT5pc0VkaXRhYmxlKCkgJiYgIXNoYWRvd1Jvb3QoKSkKICAg ICAgICAgcmV0dXJuIHRydWU7CiAKICAgICAvLyBJZGVhbGx5IHdlJ2QgY2FsbCBBU1NFUlQoIW5l ZWRzU3R5bGVSZWNhbGMoKSkgaGVyZSwgYnV0CkBAIC0xNDk1LDEzICsxNDk1LDEzIEBAIE5vZGUq IE5vZGU6OnNoYWRvd0FuY2VzdG9yTm9kZSgpIGNvbnN0CiAgICAgICAgIHJldHVybiBjb25zdF9j YXN0PE5vZGUqPih0aGlzKTsKICNlbmRpZgogCi0gICAgaWYgKFNoYWRvd1Jvb3QqIHJvb3QgPSBz aGFkb3dUcmVlUm9vdE5vZGUoKSkKKyAgICBpZiAoU2hhZG93Um9vdCogcm9vdCA9IHNoYWRvd1Jv b3QoKSkKICAgICAgICAgcmV0dXJuIHJvb3QtPmhvc3QoKTsKIAogICAgIHJldHVybiBjb25zdF9j YXN0PE5vZGUqPih0aGlzKTsKIH0KIAotU2hhZG93Um9vdCogTm9kZTo6c2hhZG93VHJlZVJvb3RO b2RlKCkgY29uc3QKK1NoYWRvd1Jvb3QqIE5vZGU6OnNoYWRvd1Jvb3QoKSBjb25zdAogewogICAg IE5vZGUqIHJvb3QgPSBjb25zdF9jYXN0PE5vZGUqPih0aGlzKTsKICAgICB3aGlsZSAocm9vdCkg ewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuaCBiL1NvdXJjZS9XZWJDb3Jl L2RvbS9Ob2RlLmgKaW5kZXggNDIyNzFlN2QxOTAzMjJmMTY2NDA1NDU3OGI5MDFiNThkZWU2MDM1 Yy4uZjM4ZDg0OTAzNzg0MDQ0MDAyNjdjZWQzYTY0MmE1NjIyMTk2NWNlMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL05vZGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5o CkBAIC0yMjEsOCArMjIxLDcgQEAgcHVibGljOgogICAgIGJvb2wgaXNGcmFtZU93bmVyRWxlbWVu dCgpIGNvbnN0IHsgcmV0dXJuIGdldEZsYWcoSXNGcmFtZU93bmVyRWxlbWVudEZsYWcpOyB9CiAK ICAgICBOb2RlKiBzaGFkb3dBbmNlc3Rvck5vZGUoKSBjb25zdDsKLSAgICAvLyBSZXR1cm5zIDAs IGEgU2hhZG93Um9vdCwgb3IgYSBsZWdhY3kgc2hhZG93IHJvb3QuCi0gICAgU2hhZG93Um9vdCog c2hhZG93VHJlZVJvb3ROb2RlKCkgY29uc3Q7CisgICAgU2hhZG93Um9vdCogc2hhZG93Um9vdCgp IGNvbnN0OwogICAgIC8vIFJldHVybnMgMCwgYSBjaGlsZCBvZiBTaGFkb3dSb290LCBvciBhIGxl Z2FjeSBzaGFkb3cgcm9vdC4KICAgICBOb2RlKiBub25Cb3VuZGFyeVNoYWRvd1RyZWVSb290Tm9k ZSgpOwogICAgIGJvb2wgaXNJblNoYWRvd1RyZWUoKSBjb25zdDsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9k b20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3BwCmluZGV4IDI5NDgxMTI0MzY3Mzg4YTc4ZWNhODVk NjljMmQ3ZTcxNGIwMGZkZjYuLmM2NzliYzhjNDE5MTYxZDQ0M2JlMGVjMjIyYWQyN2YxYWI4MmIz YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGVSZW5kZXJpbmdDb250ZXh0LmNwcApAQCAt NzgsNyArNzgsNyBAQCBOb2RlUmVuZGVyaW5nQ29udGV4dDo6Tm9kZVJlbmRlcmluZ0NvbnRleHQo Tm9kZSogbm9kZSkKIAogICAgICAgICBpZiAobV92aXN1YWxQYXJlbnRTaGFkb3cpIHsKICAgICAg ICAgICAgIGlmICgobV9pbnNlcnRpb25Qb2ludCA9IG1fdmlzdWFsUGFyZW50U2hhZG93LT5pbnNl cnRpb25Qb2ludEZvcihtX25vZGUpKSkgewotICAgICAgICAgICAgICAgIGlmIChtX2luc2VydGlv blBvaW50LT5zaGFkb3dUcmVlUm9vdE5vZGUoKS0+aXNVc2VkRm9yUmVuZGVyaW5nKCkpIHsKKyAg ICAgICAgICAgICAgICBpZiAobV9pbnNlcnRpb25Qb2ludC0+c2hhZG93Um9vdCgpLT5pc1VzZWRG b3JSZW5kZXJpbmcoKSkgewogICAgICAgICAgICAgICAgICAgICBtX3BoYXNlID0gQXR0YWNoaW5n RGlzdHJpYnV0ZWQ7CiAgICAgICAgICAgICAgICAgICAgIG1fcGFyZW50Tm9kZUZvclJlbmRlcmlu Z0FuZFN0eWxlID0gTm9kZVJlbmRlcmluZ0NvbnRleHQobV9pbnNlcnRpb25Qb2ludCkucGFyZW50 Tm9kZUZvclJlbmRlcmluZ0FuZFN0eWxlKCk7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsK QEAgLTkxLDcgKzkxLDcgQEAgTm9kZVJlbmRlcmluZ0NvbnRleHQ6Ok5vZGVSZW5kZXJpbmdDb250 ZXh0KE5vZGUqIG5vZGUpCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoaXNTaGFkb3dCb3VuZGFy eShwYXJlbnQpKSB7Ci0gICAgICAgICAgICBpZiAoIXBhcmVudC0+c2hhZG93VHJlZVJvb3ROb2Rl KCktPmlzVXNlZEZvclJlbmRlcmluZygpKSB7CisgICAgICAgICAgICBpZiAoIXBhcmVudC0+c2hh ZG93Um9vdCgpLT5pc1VzZWRGb3JSZW5kZXJpbmcoKSkgewogICAgICAgICAgICAgICAgIG1fcGhh c2UgPSBBdHRhY2hpbmdOb3REaXN0cmlidXRlZDsKICAgICAgICAgICAgICAgICBtX3BhcmVudE5v ZGVGb3JSZW5kZXJpbmdBbmRTdHlsZSA9IHBhcmVudDsKICAgICAgICAgICAgICAgICByZXR1cm47 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwIGIvU291cmNlL1dlYkNv cmUvZG9tL1JhbmdlLmNwcAppbmRleCAxODE2MGRiZGYyZTdkZjhiZGUzNmY3MTBkYjVlOTExOTgz ZWE2MDQ4Li42MWE3YzExMjlhMTI4NzdjYjVjOThhOWQwOTc1NGYzNzVjN2NjNzM0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9SYW5nZS5jcHAKQEAgLTE2NTEsOSArMTY1MSw5IEBAIE5vZGUqIFJhbmdlOjpmaXJzdE5vZGUo KSBjb25zdAogICAgIHJldHVybiBtX3N0YXJ0LmNvbnRhaW5lcigpLT50cmF2ZXJzZU5leHRTaWJs aW5nKCk7CiB9CiAKLVNoYWRvd1Jvb3QqIFJhbmdlOjpzaGFkb3dUcmVlUm9vdE5vZGUoKSBjb25z dAorU2hhZG93Um9vdCogUmFuZ2U6OnNoYWRvd1Jvb3QoKSBjb25zdAogewotICAgIHJldHVybiBz dGFydENvbnRhaW5lcigpID8gc3RhcnRDb250YWluZXIoKS0+c2hhZG93VHJlZVJvb3ROb2RlKCkg OiAwOworICAgIHJldHVybiBzdGFydENvbnRhaW5lcigpID8gc3RhcnRDb250YWluZXIoKS0+c2hh ZG93Um9vdCgpIDogMDsKIH0KIAogTm9kZSogUmFuZ2U6OnBhc3RMYXN0Tm9kZSgpIGNvbnN0CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9SYW5nZS5oCmluZGV4IGZkYjRjMzRlNjAyMjBjOTBhMWVmOTYyMzQzZjg5OTI1ZDA2ZTdjYmMu LjlhYzRjNDliZDZkNzdmZDIxYzk0YWVhNzZiNzUzYzRiMzMzOGY3NDAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9SYW5nZS5o CkBAIC0xMTEsNyArMTExLDcgQEAgcHVibGljOgogICAgIE5vZGUqIGZpcnN0Tm9kZSgpIGNvbnN0 OwogICAgIE5vZGUqIHBhc3RMYXN0Tm9kZSgpIGNvbnN0OwogCi0gICAgU2hhZG93Um9vdCogc2hh ZG93VHJlZVJvb3ROb2RlKCkgY29uc3Q7CisgICAgU2hhZG93Um9vdCogc2hhZG93Um9vdCgpIGNv bnN0OwogCiAgICAgSW50UmVjdCBib3VuZGluZ0JveCgpOwogICAgIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9F ZGl0b3IuY3BwCmluZGV4IDhmNzM1ZmFhODEwZjRhNDA0NDdjMWM4NDQyNjM3NDE1NGYyMDg4MTAu LmJmNzI4MjgyNjA3YmU1NGQwZjQxYWRjYjE0NjhlN2U3NGMxYjk2ODEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0 aW5nL0VkaXRvci5jcHAKQEAgLTI1MTksMTIgKzI1MTksMTIgQEAgUGFzc1JlZlB0cjxSYW5nZT4g RWRpdG9yOjpuZXh0VmlzaWJsZVJhbmdlKFJhbmdlKiBjdXJyZW50UmFuZ2UsIGNvbnN0IFN0cmlu ZyYgdGEKICAgICAgICAgZWxzZQogICAgICAgICAgICAgc2VhcmNoUmFuZ2UtPnNldEVuZEJlZm9y ZShyZXN1bHRSYW5nZS0+c3RhcnRDb250YWluZXIoKSwgZWMpOwogCi0gICAgICAgIE5vZGUqIHNo YWRvd1RyZWVSb290ID0gc2VhcmNoUmFuZ2UtPnNoYWRvd1RyZWVSb290Tm9kZSgpOwotICAgICAg ICBpZiAoc2VhcmNoUmFuZ2UtPmNvbGxhcHNlZChlYykgJiYgc2hhZG93VHJlZVJvb3QpIHsKKyAg ICAgICAgU2hhZG93Um9vdCogc2hhZG93Um9vdCA9IHNlYXJjaFJhbmdlLT5zaGFkb3dSb290KCk7 CisgICAgICAgIGlmIChzZWFyY2hSYW5nZS0+Y29sbGFwc2VkKGVjKSAmJiBzaGFkb3dSb290KSB7 CiAgICAgICAgICAgICBpZiAoZm9yd2FyZCkKLSAgICAgICAgICAgICAgICBzZWFyY2hSYW5nZS0+ c2V0RW5kKHNoYWRvd1RyZWVSb290LCBzaGFkb3dUcmVlUm9vdC0+Y2hpbGROb2RlQ291bnQoKSwg ZWMpOworICAgICAgICAgICAgICAgIHNlYXJjaFJhbmdlLT5zZXRFbmQoc2hhZG93Um9vdCwgc2hh ZG93Um9vdC0+Y2hpbGROb2RlQ291bnQoKSwgZWMpOwogICAgICAgICAgICAgZWxzZQotICAgICAg ICAgICAgICAgIHNlYXJjaFJhbmdlLT5zZXRTdGFydEJlZm9yZShzaGFkb3dUcmVlUm9vdCwgZWMp OworICAgICAgICAgICAgICAgIHNlYXJjaFJhbmdlLT5zZXRTdGFydEJlZm9yZShzaGFkb3dSb290 LCBlYyk7CiAgICAgICAgIH0KICAgICAgICAgCiAgICAgICAgIGlmIChzZWFyY2hSYW5nZS0+c3Rh cnRDb250YWluZXIoKS0+aXNEb2N1bWVudE5vZGUoKSAmJiBzZWFyY2hSYW5nZS0+ZW5kQ29udGFp bmVyKCktPmlzRG9jdW1lbnROb2RlKCkpCkBAIC0yODgyLDcgKzI4ODIsNyBAQCB1bnNpZ25lZCBF ZGl0b3I6OmNvdW50TWF0Y2hlc0ZvclRleHQoY29uc3QgU3RyaW5nJiB0YXJnZXQsIFJhbmdlKiBy YW5nZSwgRmluZE9wdAogICAgICAgICAvLyB0ZXh0IG5vZGVzLiAKICAgICAgICAgc2VhcmNoUmFu Z2UtPnNldFN0YXJ0KHJlc3VsdFJhbmdlLT5lbmRDb250YWluZXIoZXhjZXB0aW9uKSwgcmVzdWx0 UmFuZ2UtPmVuZE9mZnNldChleGNlcHRpb24pLCBleGNlcHRpb24pOwogCi0gICAgICAgIE5vZGUq IHNoYWRvd1RyZWVSb290ID0gc2VhcmNoUmFuZ2UtPnNoYWRvd1RyZWVSb290Tm9kZSgpOworICAg ICAgICBOb2RlKiBzaGFkb3dUcmVlUm9vdCA9IHNlYXJjaFJhbmdlLT5zaGFkb3dSb290KCk7CiAg ICAgICAgIGlmIChzZWFyY2hSYW5nZS0+Y29sbGFwc2VkKGV4Y2VwdGlvbikgJiYgc2hhZG93VHJl ZVJvb3QpCiAgICAgICAgICAgICBzZWFyY2hSYW5nZS0+c2V0RW5kKHNoYWRvd1RyZWVSb290LCBz aGFkb3dUcmVlUm9vdC0+Y2hpbGROb2RlQ291bnQoKSwgZXhjZXB0aW9uKTsKICAgICB9IHdoaWxl ICh0cnVlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9y LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4dEl0ZXJhdG9yLmNwcAppbmRleCA2NmRl OTI4YzNkYTRiZmMyZTgyM2QxZjZkY2M1YWIwMWY2MzM5YjY3Li4zZjIwMDBkNDE4M2M2MTNmNWNl NDdjYjc1ZWMxNjI1MGM2YmFkNTEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5n L1RleHRJdGVyYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9UZXh0SXRlcmF0 b3IuY3BwCkBAIC02NjQsNyArNjY0LDcgQEAgYm9vbCBUZXh0SXRlcmF0b3I6OmhhbmRsZVJlcGxh Y2VkRWxlbWVudCgpCiAKICAgICBpZiAobV9lbnRlcnNUZXh0Q29udHJvbHMgJiYgcmVuZGVyZXIt PmlzVGV4dENvbnRyb2woKSkgewogICAgICAgICBpZiAoSFRNTEVsZW1lbnQqIGlubmVyVGV4dEVs ZW1lbnQgPSB0b1JlbmRlclRleHRDb250cm9sKHJlbmRlcmVyKS0+dGV4dEZvcm1Db250cm9sRWxl bWVudCgpLT5pbm5lclRleHRFbGVtZW50KCkpIHsKLSAgICAgICAgICAgIG1fbm9kZSA9IGlubmVy VGV4dEVsZW1lbnQtPnNoYWRvd1RyZWVSb290Tm9kZSgpOworICAgICAgICAgICAgbV9ub2RlID0g aW5uZXJUZXh0RWxlbWVudC0+c2hhZG93Um9vdCgpOwogICAgICAgICAgICAgcHVzaEZ1bGx5Q2xp cHBlZFN0YXRlKG1fZnVsbHlDbGlwcGVkU3RhY2ssIG1fbm9kZSk7CiAgICAgICAgICAgICBtX29m ZnNldCA9IDA7CiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv aHRtbGVkaXRpbmcuY3BwCmluZGV4IDlmZTc0ZTQ4MGE1ZDllNDczN2NjNjgxMGQyODhjM2JiNGQ5 ZWRhMDcuLjY2NzRmYTE2N2NiYjAwY2U3NWY5YjhmZGU3NjZkNTc3MWNmMDQ2MjYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvaHRtbGVkaXRpbmcuY3BwCkBAIC0xMDkzLDEzICsxMDkzLDExIEBAIGlu dCBpbmRleEZvclZpc2libGVQb3NpdGlvbihjb25zdCBWaXNpYmxlUG9zaXRpb24mIHZpc2libGVQ b3NpdGlvbiwgUmVmUHRyPENvbnRhCiAKICAgICBQb3NpdGlvbiBwKHZpc2libGVQb3NpdGlvbi5k ZWVwRXF1aXZhbGVudCgpKTsKICAgICBEb2N1bWVudCogZG9jdW1lbnQgPSBwLmFuY2hvck5vZGUo KS0+ZG9jdW1lbnQoKTsKLSAgICBDb250YWluZXJOb2RlKiBzaGFkb3dSb290ID0gcC5hbmNob3JO b2RlKCktPnNoYWRvd1RyZWVSb290Tm9kZSgpOworICAgIFNoYWRvd1Jvb3QqIHNoYWRvd1Jvb3Qg PSBwLmFuY2hvck5vZGUoKS0+c2hhZG93Um9vdCgpOwogCi0gICAgaWYgKHNoYWRvd1Jvb3QpIHsK LSAgICAgICAgLy8gVXNlIHRoZSBzaGFkb3cgcm9vdCBmb3IgZm9ybSBlbGVtZW50cywgc2luY2Ug VGV4dEl0ZXJhdG9ycyB3aWxsIG5vdCBlbnRlciBzaGFkb3cgY29udGVudC4KLSAgICAgICAgQVNT RVJUKHNoYWRvd1Jvb3QtPmlzRWxlbWVudE5vZGUoKSB8fCBzaGFkb3dSb290LT5pc1NoYWRvd1Jv b3QoKSk7CisgICAgaWYgKHNoYWRvd1Jvb3QpCiAgICAgICAgIHNjb3BlID0gc2hhZG93Um9vdDsK LSAgICB9IGVsc2UKKyAgICBlbHNlCiAgICAgICAgIHNjb3BlID0gZG9jdW1lbnQtPmRvY3VtZW50 RWxlbWVudCgpOwogCiAgICAgUmVmUHRyPFJhbmdlPiByYW5nZSA9IFJhbmdlOjpjcmVhdGUoZG9j dW1lbnQsIGZpcnN0UG9zaXRpb25Jbk5vZGUoc2NvcGUuZ2V0KCkpLCBwLnBhcmVudEFuY2hvcmVk RXF1aXZhbGVudCgpKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0Nv bnRlbnRTZWxlY3RvclF1ZXJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0NvbnRl bnRTZWxlY3RvclF1ZXJ5LmNwcAppbmRleCAzYjM3MWZmYzdhZGM0MDYyNGFjMmMyMGI2N2E1YzFm ZGQ4NDI5YzBiLi4zOGQ0NDljN2IzNzU5YzEzNzZjMGUzNmVjYTNjNjE1YjQ2MWVjMDUxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9Db250ZW50U2VsZWN0b3JRdWVyeS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ29udGVudFNlbGVjdG9yUXVlcnku Y3BwCkBAIC02NCw3ICs2NCw3IEBAIGJvb2wgQ29udGVudFNlbGVjdG9yUXVlcnk6Om1hdGNoZXMo Tm9kZSogbm9kZSkgY29uc3QKICAgICBpZiAoIW5vZGUpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIEFTU0VSVChub2RlLT5wYXJlbnROb2RlKCkgPT0gbV9pbnNlcnRpb25Qb2ludC0+c2hh ZG93VHJlZVJvb3ROb2RlKCktPnNoYWRvd0hvc3QoKSk7CisgICAgQVNTRVJUKG5vZGUtPnBhcmVu dE5vZGUoKSA9PSBtX2luc2VydGlvblBvaW50LT5zaGFkb3dSb290KCktPnNoYWRvd0hvc3QoKSk7 CiAKICAgICBpZiAobV9pbnNlcnRpb25Qb2ludC0+c2VsZWN0KCkuaXNOdWxsKCkgfHwgbV9pbnNl cnRpb25Qb2ludC0+c2VsZWN0KCkuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0hUTUxDb250ZW50RWxlbWVudC5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9IVE1MQ29udGVudEVsZW1lbnQuY3BwCmlu ZGV4IDAyNTE3ODc1YjBjYzBiZjM4MGQ3NTM0OWMzNmRlNjJjYTU5ZDY2MWQuLmE0ZGNlZWVkMGRm YmIwYTE2YzZjNGRkNWM0ZDI5OGIwYzY0NzJkNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L0hUTUxDb250ZW50RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9zaGFkb3cvSFRNTENvbnRlbnRFbGVtZW50LmNwcApAQCAtODksNyArODksNyBAQCB2b2lk IEhUTUxDb250ZW50RWxlbWVudDo6c2V0U2VsZWN0KGNvbnN0IEF0b21pY1N0cmluZyYgc2VsZWN0 VmFsdWUpCiB2b2lkIEhUTUxDb250ZW50RWxlbWVudDo6cGFyc2VBdHRyaWJ1dGUoY29uc3QgQXR0 cmlidXRlJiBhdHRyaWJ1dGUpCiB7CiAgICAgaWYgKGF0dHJpYnV0ZS5uYW1lKCkgPT0gc2VsZWN0 QXR0cikgewotICAgICAgICBpZiAoU2hhZG93Um9vdCogcm9vdCA9IHNoYWRvd1RyZWVSb290Tm9k ZSgpKQorICAgICAgICBpZiAoU2hhZG93Um9vdCogcm9vdCA9IHNoYWRvd1Jvb3QoKSkKICAgICAg ICAgICAgIHJvb3QtPm93bmVyKCktPnNldE5lZWRzUmVkaXN0cmlidXRpbmcoKTsKICAgICB9IGVs c2UKICAgICAgICAgSW5zZXJ0aW9uUG9pbnQ6OnBhcnNlQXR0cmlidXRlKGF0dHJpYnV0ZSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5jcHAKaW5kZXggYWY0 NGRlMDk3YzVmNTczNGU5MWEwMjcwNWU1YjI1YzhlNGRlNTE2NS4uY2E2NmMyNDhhYTQzNWMzYzc5 ZmFmMTQxZWZlNGVjM2ViZGIxZmVmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9z aGFkb3cvSW5zZXJ0aW9uUG9pbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93 L0luc2VydGlvblBvaW50LmNwcApAQCAtNjQsNyArNjQsNyBAQCB2b2lkIEluc2VydGlvblBvaW50 OjphdHRhY2goKQogCiB2b2lkIEluc2VydGlvblBvaW50OjpkZXRhY2goKQogewotICAgIFNoYWRv d1Jvb3QqIHJvb3QgPSBzaGFkb3dUcmVlUm9vdE5vZGUoKTsKKyAgICBTaGFkb3dSb290KiByb290 ID0gc2hhZG93Um9vdCgpOwogICAgIGlmIChyb290ICYmIGlzQWN0aXZlKCkpIHsKICAgICAgICAg RWxlbWVudFNoYWRvdyogc2hhZG93ID0gcm9vdC0+b3duZXIoKTsKIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9F dmVudEhhbmRsZXIuY3BwCmluZGV4IGEzMDlhOTFhMTI3ODAzZWJjOTFkMDFkYjAzNDAzNjgxMjNl MmY2MjcuLmI0MjIxYjBiNGVmOTdiMDk3Y2Y4OGRmNzdiNjhlOTVkNjI5YjQzMjkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKQEAgLTIwOTIsNyArMjA5Miw3IEBAIHN0YXRpYyBp bmxpbmUgU1ZHRWxlbWVudEluc3RhbmNlKiBpbnN0YW5jZUFzc29jaWF0ZWRXaXRoU2hhZG93VHJl ZUVsZW1lbnQoTm9kZSoKICAgICBpZiAoIXJlZmVyZW5jZU5vZGUgfHwgIXJlZmVyZW5jZU5vZGUt PmlzU1ZHRWxlbWVudCgpKQogICAgICAgICByZXR1cm4gMDsKIAotICAgIE5vZGUqIHNoYWRvd1Ry ZWVFbGVtZW50ID0gcmVmZXJlbmNlTm9kZS0+c2hhZG93VHJlZVJvb3ROb2RlKCk7CisgICAgTm9k ZSogc2hhZG93VHJlZUVsZW1lbnQgPSByZWZlcmVuY2VOb2RlLT5zaGFkb3dSb290KCk7CiAgICAg aWYgKCFzaGFkb3dUcmVlRWxlbWVudCkKICAgICAgICAgcmV0dXJuIDA7CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2Zy9T VkdFbGVtZW50LmNwcAppbmRleCBlNWQwZWYzMzlhYmIxNmYzM2ZhNjhkODVhZTFmOGU0OGVhZTVm MTBmLi4xOWFhZDJhNDk1OTY1MDVhZDNhNDM4MjhjYzMxODQ4NmE1MmM5Nzc4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv c3ZnL1NWR0VsZW1lbnQuY3BwCkBAIC0yOTYsNyArMjk2LDcgQEAgdm9pZCBTVkdFbGVtZW50Ojpj dXJzb3JJbWFnZVZhbHVlUmVtb3ZlZCgpCiAKIFNWR0VsZW1lbnQqIFNWR0VsZW1lbnQ6OmNvcnJl c3BvbmRpbmdFbGVtZW50KCkKIHsKLSAgICBBU1NFUlQoIWhhc1JhcmVTVkdEYXRhKCkgfHwgIXJh cmVTVkdEYXRhKCktPmNvcnJlc3BvbmRpbmdFbGVtZW50KCkgfHwgc2hhZG93VHJlZVJvb3ROb2Rl KCkpOworICAgIEFTU0VSVCghaGFzUmFyZVNWR0RhdGEoKSB8fCAhcmFyZVNWR0RhdGEoKS0+Y29y cmVzcG9uZGluZ0VsZW1lbnQoKSB8fCBzaGFkb3dSb290KCkpOwogICAgIHJldHVybiBoYXNSYXJl U1ZHRGF0YSgpID8gcmFyZVNWR0RhdGEoKS0+Y29ycmVzcG9uZGluZ0VsZW1lbnQoKSA6IDA7CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5j cHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IGU2 MGEyN2FmNmJkMWM3ZjMxNTNlN2E2MGU0NzNhY2IzNTJkYTFmZTEuLmJlY2FhMDA3ZjMyZjJiMDJh ZjU2ZDMxZTgxMDcwOTQ5YzFmMDI1NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMv V2ViRnJhbWVJbXBsLmNwcApAQCAtMTc2Niw3ICsxNzY2LDcgQEAgdm9pZCBXZWJGcmFtZUltcGw6 OnNjb3BlU3RyaW5nTWF0Y2hlcyhpbnQgaWRlbnRpZmllciwKICAgICAgICAgLy8gdGV4dCBub2Rl cy4KICAgICAgICAgc2VhcmNoUmFuZ2UtPnNldFN0YXJ0KHJlc3VsdFJhbmdlLT5lbmRDb250YWlu ZXIoZWMpLCByZXN1bHRSYW5nZS0+ZW5kT2Zmc2V0KGVjKSwgZWMpOwogCi0gICAgICAgIE5vZGUq IHNoYWRvd1RyZWVSb290ID0gc2VhcmNoUmFuZ2UtPnNoYWRvd1RyZWVSb290Tm9kZSgpOworICAg ICAgICBOb2RlKiBzaGFkb3dUcmVlUm9vdCA9IHNlYXJjaFJhbmdlLT5zaGFkb3dSb290KCk7CiAg ICAgICAgIGlmIChzZWFyY2hSYW5nZS0+Y29sbGFwc2VkKGVjKSAmJiBzaGFkb3dUcmVlUm9vdCkK ICAgICAgICAgICAgIHNlYXJjaFJhbmdlLT5zZXRFbmQoc2hhZG93VHJlZVJvb3QsIHNoYWRvd1Ry ZWVSb290LT5jaGlsZE5vZGVDb3VudCgpLCBlYyk7CiAK 142132 2012-05-15 19:43:55 -0700 2012-05-15 19:43:55 -0700 Patch for landing bug-86449-20120516114354.patch text/plain 15699 shinyak U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3MTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjg5MzM1OGJmNWRhMjQ1 NTNmYTE2OTgwYjkwMWZkM2M1ODVjYzIzYy4uZWEzOTA4MmIzY2IyZjVhNjQ0YTFiNDljYzUzOTE3 Nzg0NmRmMmY0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ5IEBACisyMDEyLTA1LTE1ICBTaGlu eWEgS2F3YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5hbWUgTm9k ZTo6c2hhZG93VHJlZVJvb3ROb2RlKCkgdG8gTm9kZTo6c2hhZG93Um9vdCgpCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjQ0OQorCisgICAgICAgIFJl dmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIFNpbmNlIE5vZGU6OnNoYWRvd1RyZWVS b290Tm9kZSgpIHJldHVybnMgYWx3YXlzIGEgU2hhZG93Um9vdCBub3csIHNoYWRvd1Jvb3QoKSBp cworICAgICAgICBtdXJlIHN1aXRhYmxlIHRoYW4gc2hhZG93VHJlZVJvb3ROb2RlKCkuCisKKyAg ICAgICAgVGhpcyBwYXRjaCBjaGFuZ2VzIHRoZSBtZXRob2QgbmFtZS4KKworICAgICAgICBObyBu ZXcgdGVzdHMsIG5vIGNoYW5nZSBpbiBiZWhhdmlvci4KKworICAgICAgICAqIFdlYkNvcmUub3Jk ZXI6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Tm9kZTo6cmVu ZGVyZXJJc0VkaXRhYmxlKToKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OnNoYWRvd0FuY2VzdG9y Tm9kZSk6CisgICAgICAgIChXZWJDb3JlOjpOb2RlOjpzaGFkb3dSb290KToKKyAgICAgICAgKiBk b20vTm9kZS5oOgorICAgICAgICAoTm9kZSk6CisgICAgICAgICogZG9tL05vZGVSZW5kZXJpbmdD b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok5vZGVSZW5kZXJpbmdDb250ZXh0OjpOb2Rl UmVuZGVyaW5nQ29udGV4dCk6CisgICAgICAgICogZG9tL1JhbmdlLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlJhbmdlOjpzaGFkb3dSb290KToKKyAgICAgICAgKiBkb20vUmFuZ2UuaDoKKyAgICAg ICAgKFJhbmdlKToKKyAgICAgICAgKiBlZGl0aW5nL0VkaXRvci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpFZGl0b3I6Om5leHRWaXNpYmxlUmFuZ2UpOgorICAgICAgICAoV2ViQ29yZTo6RWRpdG9y Ojpjb3VudE1hdGNoZXNGb3JUZXh0KToKKyAgICAgICAgKiBlZGl0aW5nL1RleHRJdGVyYXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpUZXh0SXRlcmF0b3I6OmhhbmRsZVJlcGxhY2VkRWxlbWVu dCk6CisgICAgICAgICogZWRpdGluZy9odG1sZWRpdGluZy5jcHA6CisgICAgICAgIChXZWJDb3Jl OjppbmRleEZvclZpc2libGVQb3NpdGlvbik6CisgICAgICAgICogaHRtbC9zaGFkb3cvQ29udGVu dFNlbGVjdG9yUXVlcnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudFNlbGVjdG9yUXVl cnk6Om1hdGNoZXMpOgorICAgICAgICAqIGh0bWwvc2hhZG93L0hUTUxDb250ZW50RWxlbWVudC5j cHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ29udGVudEVsZW1lbnQ6OnBhcnNlQXR0cmlidXRl KToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9JbnNlcnRpb25Qb2ludC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpJbnNlcnRpb25Qb2ludDo6ZGV0YWNoKToKKyAgICAgICAgKiBwYWdlL0V2ZW50SGFu ZGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjppbnN0YW5jZUFzc29jaWF0ZWRXaXRoU2hhZG93 VHJlZUVsZW1lbnQpOgorICAgICAgICAqIHN2Zy9TVkdFbGVtZW50LmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNWR0VsZW1lbnQ6OmNvcnJlc3BvbmRpbmdFbGVtZW50KToKKyAgICAgICAgKFdlYkNv cmU6OmNvbGxlY3RJbnN0YW5jZXNGb3JTVkdFbGVtZW50KToKKwogMjAxMi0wNS0xNSAgUm9iZXJ0 IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CiAKICAgICAgICAgSGVhcC11c2UtYWZ0ZXItZnJl ZSBpbiBXZWJDb3JlOjpSZW5kZXJCbG9jazo6bGF5b3V0UnVuc0FuZEZsb2F0cwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0NoYW5nZUxvZwppbmRleCA3NmE4ZTAzNjgzZjFkZTg5ODYzM2ZkZjVhNDhhYWFiM2NmY2U2 OWNiLi5jMzAzYTQ3NDVmYTY5MmE1Mzk4YzZiNjU4YjdjNDhmMGEwM2MzNWVmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDEyLTA1LTE1ICBTaGlueWEgS2F3 YW5ha2EgIDxzaGlueWFrQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZW5hbWUgTm9kZTo6c2hh ZG93VHJlZVJvb3ROb2RlKCkgdG8gTm9kZTo6c2hhZG93Um9vdCgpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjQ0OQorCisgICAgICAgIFJldmlld2Vk IGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgICogc3JjL1dlYkZyYW1lSW1wbC5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6c2NvcGVTdHJpbmdNYXRjaGVzKToKKwogMjAxMi0w NS0xNSAgU2hhd24gU2luZ2ggIDxzaGF3bnNpbmdoQGNocm9taXVtLm9yZz4KIAogICAgICAgICBb Y2hyb21pdW1dIEFkZCB1bml0IHRlc3RpbmcgdG8gV2ViVHJhbnNmb3JtYXRpb25NYXRyaXgKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIgYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLm9yZGVyCmluZGV4IGIyNzY1OWFjOTI2NDM2OGZiZTMyYTFlZjQxYTRkOGY0NzYwZjEz YzYuLjJkYzNlMzIzYTNhNWI2M2VlNTNkODMxNTIxNTg5ZDJkMmNjOGEwMDAgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS5vcmRlcgpAQCAtNDY1OCw3ICs0NjU4LDcgQEAgX19aTjdXZWJDb3JlMTZWaXNpYmxlU2VsZWN0 aW9uMzNzZXRCYXNlQW5kRXh0ZW50VG9EZWVwRXF1aXZhbGVudHNFdgogX19aTjdXZWJDb3JlMTZj b21wYXJlUG9zaXRpb25zRVJLTlNfOFBvc2l0aW9uRVMyXwogX19aTjdXZWJDb3JlMTZWaXNpYmxl U2VsZWN0aW9uNTJzZXRTdGFydEFuZEVuZEZyb21CYXNlQW5kRXh0ZW50UmVzcGVjdGluZ0dyYW51 bGFyaXR5RU5TXzE1VGV4dEdyYW51bGFyaXR5RQogX19aTjdXZWJDb3JlMTZWaXNpYmxlU2VsZWN0 aW9uNDZhZGp1c3RTZWxlY3Rpb25Ub0F2b2lkQ3Jvc3NpbmdTaGFkb3dCb3VuZGFyaWVzRXYKLV9f Wk43V2ViQ29yZTROb2RlMThzaGFkb3dUcmVlUm9vdE5vZGVFdgorX19aTjdXZWJDb3JlNE5vZGUx MHNoYWRvd1Jvb3RFdgogX19aTjdXZWJDb3JlMTZWaXNpYmxlU2VsZWN0aW9uNDdhZGp1c3RTZWxl Y3Rpb25Ub0F2b2lkQ3Jvc3NpbmdFZGl0aW5nQm91bmRhcmllc0V2CiBfX1pON1dlYkNvcmUyMmxv d2VzdEVkaXRhYmxlQW5jZXN0b3JFUE5TXzROb2RlRQogX19aTjdXZWJDb3JlMTZWaXNpYmxlU2Vs ZWN0aW9uMTl1cGRhdGVTZWxlY3Rpb25UeXBlRXYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Ob2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCAxYzk3OWM3 ZWM0YjNmMzViMThhYTVjY2Y0OWYzOTQzNmFmZTc5ZWExLi43Y2Y1NjJiNjc4ODNjMmVjNjQ3YmE5 MWYzMThlNDczNzNiZjZmNzg4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL05vZGUuY3BwCkBAIC03MjcsNyArNzI3LDcgQEAg dm9pZCBOb2RlOjppbnNwZWN0KCkKIAogYm9vbCBOb2RlOjpyZW5kZXJlcklzRWRpdGFibGUoRWRp dGFibGVMZXZlbCBlZGl0YWJsZUxldmVsKSBjb25zdAogewotICAgIGlmIChkb2N1bWVudCgpLT5m cmFtZSgpICYmIGRvY3VtZW50KCktPmZyYW1lKCktPnBhZ2UoKSAmJiBkb2N1bWVudCgpLT5mcmFt ZSgpLT5wYWdlKCktPmlzRWRpdGFibGUoKSAmJiAhc2hhZG93VHJlZVJvb3ROb2RlKCkpCisgICAg aWYgKGRvY3VtZW50KCktPmZyYW1lKCkgJiYgZG9jdW1lbnQoKS0+ZnJhbWUoKS0+cGFnZSgpICYm IGRvY3VtZW50KCktPmZyYW1lKCktPnBhZ2UoKS0+aXNFZGl0YWJsZSgpICYmICFzaGFkb3dSb290 KCkpCiAgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgLy8gSWRlYWxseSB3ZSdkIGNhbGwgQVNT RVJUKCFuZWVkc1N0eWxlUmVjYWxjKCkpIGhlcmUsIGJ1dApAQCAtMTQ5NSwxMyArMTQ5NSwxMyBA QCBOb2RlKiBOb2RlOjpzaGFkb3dBbmNlc3Rvck5vZGUoKSBjb25zdAogICAgICAgICByZXR1cm4g Y29uc3RfY2FzdDxOb2RlKj4odGhpcyk7CiAjZW5kaWYKIAotICAgIGlmIChTaGFkb3dSb290KiBy b290ID0gc2hhZG93VHJlZVJvb3ROb2RlKCkpCisgICAgaWYgKFNoYWRvd1Jvb3QqIHJvb3QgPSBz aGFkb3dSb290KCkpCiAgICAgICAgIHJldHVybiByb290LT5ob3N0KCk7CiAKICAgICByZXR1cm4g Y29uc3RfY2FzdDxOb2RlKj4odGhpcyk7CiB9CiAKLVNoYWRvd1Jvb3QqIE5vZGU6OnNoYWRvd1Ry ZWVSb290Tm9kZSgpIGNvbnN0CitTaGFkb3dSb290KiBOb2RlOjpzaGFkb3dSb290KCkgY29uc3QK IHsKICAgICBOb2RlKiByb290ID0gY29uc3RfY2FzdDxOb2RlKj4odGhpcyk7CiAgICAgd2hpbGUg KHJvb3QpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmggYi9Tb3VyY2Uv V2ViQ29yZS9kb20vTm9kZS5oCmluZGV4IDQyMjcxZTdkMTkwMzIyZjE2NjQwNTQ1NzhiOTAxYjU4 ZGVlNjAzNWMuLmYzOGQ4NDkwMzc4NDA0NDAwMjY3Y2VkM2E2NDJhNTYyMjE5NjVjZTIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9t L05vZGUuaApAQCAtMjIxLDggKzIyMSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzRnJhbWVPd25l ckVsZW1lbnQoKSBjb25zdCB7IHJldHVybiBnZXRGbGFnKElzRnJhbWVPd25lckVsZW1lbnRGbGFn KTsgfQogCiAgICAgTm9kZSogc2hhZG93QW5jZXN0b3JOb2RlKCkgY29uc3Q7Ci0gICAgLy8gUmV0 dXJucyAwLCBhIFNoYWRvd1Jvb3QsIG9yIGEgbGVnYWN5IHNoYWRvdyByb290LgotICAgIFNoYWRv d1Jvb3QqIHNoYWRvd1RyZWVSb290Tm9kZSgpIGNvbnN0OworICAgIFNoYWRvd1Jvb3QqIHNoYWRv d1Jvb3QoKSBjb25zdDsKICAgICAvLyBSZXR1cm5zIDAsIGEgY2hpbGQgb2YgU2hhZG93Um9vdCwg b3IgYSBsZWdhY3kgc2hhZG93IHJvb3QuCiAgICAgTm9kZSogbm9uQm91bmRhcnlTaGFkb3dUcmVl Um9vdE5vZGUoKTsKICAgICBib29sIGlzSW5TaGFkb3dUcmVlKCkgY29uc3Q7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dl YkNvcmUvZG9tL05vZGVSZW5kZXJpbmdDb250ZXh0LmNwcAppbmRleCAyOTQ4MTEyNDM2NzM4OGE3 OGVjYTg1ZDY5YzJkN2U3MTRiMDBmZGY2Li5jNjc5YmM4YzQxOTE2MWQ0NDNiZTBlYzIyMmFkMjdm MWFiODJiM2JmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZVJlbmRlcmluZ0Nv bnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlUmVuZGVyaW5nQ29udGV4dC5j cHAKQEAgLTc4LDcgKzc4LDcgQEAgTm9kZVJlbmRlcmluZ0NvbnRleHQ6Ok5vZGVSZW5kZXJpbmdD b250ZXh0KE5vZGUqIG5vZGUpCiAKICAgICAgICAgaWYgKG1fdmlzdWFsUGFyZW50U2hhZG93KSB7 CiAgICAgICAgICAgICBpZiAoKG1faW5zZXJ0aW9uUG9pbnQgPSBtX3Zpc3VhbFBhcmVudFNoYWRv dy0+aW5zZXJ0aW9uUG9pbnRGb3IobV9ub2RlKSkpIHsKLSAgICAgICAgICAgICAgICBpZiAobV9p bnNlcnRpb25Qb2ludC0+c2hhZG93VHJlZVJvb3ROb2RlKCktPmlzVXNlZEZvclJlbmRlcmluZygp KSB7CisgICAgICAgICAgICAgICAgaWYgKG1faW5zZXJ0aW9uUG9pbnQtPnNoYWRvd1Jvb3QoKS0+ aXNVc2VkRm9yUmVuZGVyaW5nKCkpIHsKICAgICAgICAgICAgICAgICAgICAgbV9waGFzZSA9IEF0 dGFjaGluZ0Rpc3RyaWJ1dGVkOwogICAgICAgICAgICAgICAgICAgICBtX3BhcmVudE5vZGVGb3JS ZW5kZXJpbmdBbmRTdHlsZSA9IE5vZGVSZW5kZXJpbmdDb250ZXh0KG1faW5zZXJ0aW9uUG9pbnQp LnBhcmVudE5vZGVGb3JSZW5kZXJpbmdBbmRTdHlsZSgpOwogICAgICAgICAgICAgICAgICAgICBy ZXR1cm47CkBAIC05MSw3ICs5MSw3IEBAIE5vZGVSZW5kZXJpbmdDb250ZXh0OjpOb2RlUmVuZGVy aW5nQ29udGV4dChOb2RlKiBub2RlKQogICAgICAgICB9CiAKICAgICAgICAgaWYgKGlzU2hhZG93 Qm91bmRhcnkocGFyZW50KSkgewotICAgICAgICAgICAgaWYgKCFwYXJlbnQtPnNoYWRvd1RyZWVS b290Tm9kZSgpLT5pc1VzZWRGb3JSZW5kZXJpbmcoKSkgeworICAgICAgICAgICAgaWYgKCFwYXJl bnQtPnNoYWRvd1Jvb3QoKS0+aXNVc2VkRm9yUmVuZGVyaW5nKCkpIHsKICAgICAgICAgICAgICAg ICBtX3BoYXNlID0gQXR0YWNoaW5nTm90RGlzdHJpYnV0ZWQ7CiAgICAgICAgICAgICAgICAgbV9w YXJlbnROb2RlRm9yUmVuZGVyaW5nQW5kU3R5bGUgPSBwYXJlbnQ7CiAgICAgICAgICAgICAgICAg cmV0dXJuOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9SYW5nZS5jcHAKaW5kZXggMTgxNjBkYmRmMmU3ZGY4YmRlMzZmNzEwZGI1 ZTkxMTk4M2VhNjA0OC4uNjFhN2MxMTI5YTEyODc3Y2I1Yzk4YTlkMDk3NTRmMzc1YzdjYzczNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vUmFuZ2UuY3BwCkBAIC0xNjUxLDkgKzE2NTEsOSBAQCBOb2RlKiBSYW5nZTo6Zmly c3ROb2RlKCkgY29uc3QKICAgICByZXR1cm4gbV9zdGFydC5jb250YWluZXIoKS0+dHJhdmVyc2VO ZXh0U2libGluZygpOwogfQogCi1TaGFkb3dSb290KiBSYW5nZTo6c2hhZG93VHJlZVJvb3ROb2Rl KCkgY29uc3QKK1NoYWRvd1Jvb3QqIFJhbmdlOjpzaGFkb3dSb290KCkgY29uc3QKIHsKLSAgICBy ZXR1cm4gc3RhcnRDb250YWluZXIoKSA/IHN0YXJ0Q29udGFpbmVyKCktPnNoYWRvd1RyZWVSb290 Tm9kZSgpIDogMDsKKyAgICByZXR1cm4gc3RhcnRDb250YWluZXIoKSA/IHN0YXJ0Q29udGFpbmVy KCktPnNoYWRvd1Jvb3QoKSA6IDA7CiB9CiAKIE5vZGUqIFJhbmdlOjpwYXN0TGFzdE5vZGUoKSBj b25zdApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL1JhbmdlLmggYi9Tb3VyY2UvV2Vi Q29yZS9kb20vUmFuZ2UuaAppbmRleCBmZGI0YzM0ZTYwMjIwYzkwYTFlZjk2MjM0M2Y4OTkyNWQw NmU3Y2JjLi45YWM0YzQ5YmQ2ZDc3ZmQyMWM5NGFlYTc2Yjc1M2M0YjMzMzhmNzQwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vUmFuZ2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v UmFuZ2UuaApAQCAtMTExLDcgKzExMSw3IEBAIHB1YmxpYzoKICAgICBOb2RlKiBmaXJzdE5vZGUo KSBjb25zdDsKICAgICBOb2RlKiBwYXN0TGFzdE5vZGUoKSBjb25zdDsKIAotICAgIFNoYWRvd1Jv b3QqIHNoYWRvd1RyZWVSb290Tm9kZSgpIGNvbnN0OworICAgIFNoYWRvd1Jvb3QqIHNoYWRvd1Jv b3QoKSBjb25zdDsKIAogICAgIEludFJlY3QgYm91bmRpbmdCb3goKTsKICAgICAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvRWRpdG9yLmNwcAppbmRleCA4ZjczNWZhYTgxMGY0YTQwNDQ3YzFjODQ0MjYzNzQxNTRm MjA4ODEwLi5iZjcyODI4MjYwN2JlNTRkMGY0MWFkY2IxNDY4ZTdlNzRjMWI5NjgxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZWRpdGluZy9FZGl0b3IuY3BwCkBAIC0yNTE5LDEyICsyNTE5LDEyIEBAIFBhc3NSZWZQdHI8 UmFuZ2U+IEVkaXRvcjo6bmV4dFZpc2libGVSYW5nZShSYW5nZSogY3VycmVudFJhbmdlLCBjb25z dCBTdHJpbmcmIHRhCiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIHNlYXJjaFJhbmdlLT5zZXRF bmRCZWZvcmUocmVzdWx0UmFuZ2UtPnN0YXJ0Q29udGFpbmVyKCksIGVjKTsKIAotICAgICAgICBO b2RlKiBzaGFkb3dUcmVlUm9vdCA9IHNlYXJjaFJhbmdlLT5zaGFkb3dUcmVlUm9vdE5vZGUoKTsK LSAgICAgICAgaWYgKHNlYXJjaFJhbmdlLT5jb2xsYXBzZWQoZWMpICYmIHNoYWRvd1RyZWVSb290 KSB7CisgICAgICAgIFNoYWRvd1Jvb3QqIHNoYWRvd1Jvb3QgPSBzZWFyY2hSYW5nZS0+c2hhZG93 Um9vdCgpOworICAgICAgICBpZiAoc2VhcmNoUmFuZ2UtPmNvbGxhcHNlZChlYykgJiYgc2hhZG93 Um9vdCkgewogICAgICAgICAgICAgaWYgKGZvcndhcmQpCi0gICAgICAgICAgICAgICAgc2VhcmNo UmFuZ2UtPnNldEVuZChzaGFkb3dUcmVlUm9vdCwgc2hhZG93VHJlZVJvb3QtPmNoaWxkTm9kZUNv dW50KCksIGVjKTsKKyAgICAgICAgICAgICAgICBzZWFyY2hSYW5nZS0+c2V0RW5kKHNoYWRvd1Jv b3QsIHNoYWRvd1Jvb3QtPmNoaWxkTm9kZUNvdW50KCksIGVjKTsKICAgICAgICAgICAgIGVsc2UK LSAgICAgICAgICAgICAgICBzZWFyY2hSYW5nZS0+c2V0U3RhcnRCZWZvcmUoc2hhZG93VHJlZVJv b3QsIGVjKTsKKyAgICAgICAgICAgICAgICBzZWFyY2hSYW5nZS0+c2V0U3RhcnRCZWZvcmUoc2hh ZG93Um9vdCwgZWMpOwogICAgICAgICB9CiAgICAgICAgIAogICAgICAgICBpZiAoc2VhcmNoUmFu Z2UtPnN0YXJ0Q29udGFpbmVyKCktPmlzRG9jdW1lbnROb2RlKCkgJiYgc2VhcmNoUmFuZ2UtPmVu ZENvbnRhaW5lcigpLT5pc0RvY3VtZW50Tm9kZSgpKQpAQCAtMjg4Miw3ICsyODgyLDcgQEAgdW5z aWduZWQgRWRpdG9yOjpjb3VudE1hdGNoZXNGb3JUZXh0KGNvbnN0IFN0cmluZyYgdGFyZ2V0LCBS YW5nZSogcmFuZ2UsIEZpbmRPcHQKICAgICAgICAgLy8gdGV4dCBub2Rlcy4gCiAgICAgICAgIHNl YXJjaFJhbmdlLT5zZXRTdGFydChyZXN1bHRSYW5nZS0+ZW5kQ29udGFpbmVyKGV4Y2VwdGlvbiks IHJlc3VsdFJhbmdlLT5lbmRPZmZzZXQoZXhjZXB0aW9uKSwgZXhjZXB0aW9uKTsKIAotICAgICAg ICBOb2RlKiBzaGFkb3dUcmVlUm9vdCA9IHNlYXJjaFJhbmdlLT5zaGFkb3dUcmVlUm9vdE5vZGUo KTsKKyAgICAgICAgTm9kZSogc2hhZG93VHJlZVJvb3QgPSBzZWFyY2hSYW5nZS0+c2hhZG93Um9v dCgpOwogICAgICAgICBpZiAoc2VhcmNoUmFuZ2UtPmNvbGxhcHNlZChleGNlcHRpb24pICYmIHNo YWRvd1RyZWVSb290KQogICAgICAgICAgICAgc2VhcmNoUmFuZ2UtPnNldEVuZChzaGFkb3dUcmVl Um9vdCwgc2hhZG93VHJlZVJvb3QtPmNoaWxkTm9kZUNvdW50KCksIGV4Y2VwdGlvbik7CiAgICAg fSB3aGlsZSAodHJ1ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJ dGVyYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1RleHRJdGVyYXRvci5jcHAKaW5k ZXggNjZkZTkyOGMzZGE0YmZjMmU4MjNkMWY2ZGNjNWFiMDFmNjMzOWI2Ny4uM2YyMDAwZDQxODNj NjEzZjVjZTQ3Y2I3NWVjMTYyNTBjNmJhZDUxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9UZXh0SXRlcmF0b3IuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvVGV4 dEl0ZXJhdG9yLmNwcApAQCAtNjY0LDcgKzY2NCw3IEBAIGJvb2wgVGV4dEl0ZXJhdG9yOjpoYW5k bGVSZXBsYWNlZEVsZW1lbnQoKQogCiAgICAgaWYgKG1fZW50ZXJzVGV4dENvbnRyb2xzICYmIHJl bmRlcmVyLT5pc1RleHRDb250cm9sKCkpIHsKICAgICAgICAgaWYgKEhUTUxFbGVtZW50KiBpbm5l clRleHRFbGVtZW50ID0gdG9SZW5kZXJUZXh0Q29udHJvbChyZW5kZXJlciktPnRleHRGb3JtQ29u dHJvbEVsZW1lbnQoKS0+aW5uZXJUZXh0RWxlbWVudCgpKSB7Ci0gICAgICAgICAgICBtX25vZGUg PSBpbm5lclRleHRFbGVtZW50LT5zaGFkb3dUcmVlUm9vdE5vZGUoKTsKKyAgICAgICAgICAgIG1f bm9kZSA9IGlubmVyVGV4dEVsZW1lbnQtPnNoYWRvd1Jvb3QoKTsKICAgICAgICAgICAgIHB1c2hG dWxseUNsaXBwZWRTdGF0ZShtX2Z1bGx5Q2xpcHBlZFN0YWNrLCBtX25vZGUpOwogICAgICAgICAg ICAgbV9vZmZzZXQgPSAwOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZWRpdGluZy9odG1sZWRpdGluZy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9l ZGl0aW5nL2h0bWxlZGl0aW5nLmNwcAppbmRleCA5ZmU3NGU0ODBhNWQ5ZTQ3MzdjYzY4MTBkMjg4 YzNiYjRkOWVkYTA3Li42Njc0ZmExNjdjYmIwMGNlNzVmOWI4ZmRlNzY2ZDU3NzFjZjA0NjI2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9lZGl0aW5nL2h0bWxlZGl0aW5nLmNwcApAQCAtMTA5MywxMyArMTA5Mywx MSBAQCBpbnQgaW5kZXhGb3JWaXNpYmxlUG9zaXRpb24oY29uc3QgVmlzaWJsZVBvc2l0aW9uJiB2 aXNpYmxlUG9zaXRpb24sIFJlZlB0cjxDb250YQogCiAgICAgUG9zaXRpb24gcCh2aXNpYmxlUG9z aXRpb24uZGVlcEVxdWl2YWxlbnQoKSk7CiAgICAgRG9jdW1lbnQqIGRvY3VtZW50ID0gcC5hbmNo b3JOb2RlKCktPmRvY3VtZW50KCk7Ci0gICAgQ29udGFpbmVyTm9kZSogc2hhZG93Um9vdCA9IHAu YW5jaG9yTm9kZSgpLT5zaGFkb3dUcmVlUm9vdE5vZGUoKTsKKyAgICBTaGFkb3dSb290KiBzaGFk b3dSb290ID0gcC5hbmNob3JOb2RlKCktPnNoYWRvd1Jvb3QoKTsKIAotICAgIGlmIChzaGFkb3dS b290KSB7Ci0gICAgICAgIC8vIFVzZSB0aGUgc2hhZG93IHJvb3QgZm9yIGZvcm0gZWxlbWVudHMs IHNpbmNlIFRleHRJdGVyYXRvcnMgd2lsbCBub3QgZW50ZXIgc2hhZG93IGNvbnRlbnQuCi0gICAg ICAgIEFTU0VSVChzaGFkb3dSb290LT5pc0VsZW1lbnROb2RlKCkgfHwgc2hhZG93Um9vdC0+aXNT aGFkb3dSb290KCkpOworICAgIGlmIChzaGFkb3dSb290KQogICAgICAgICBzY29wZSA9IHNoYWRv d1Jvb3Q7Ci0gICAgfSBlbHNlCisgICAgZWxzZQogICAgICAgICBzY29wZSA9IGRvY3VtZW50LT5k b2N1bWVudEVsZW1lbnQoKTsKIAogICAgIFJlZlB0cjxSYW5nZT4gcmFuZ2UgPSBSYW5nZTo6Y3Jl YXRlKGRvY3VtZW50LCBmaXJzdFBvc2l0aW9uSW5Ob2RlKHNjb3BlLmdldCgpKSwgcC5wYXJlbnRB bmNob3JlZEVxdWl2YWxlbnQoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3No YWRvdy9Db250ZW50U2VsZWN0b3JRdWVyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9Db250ZW50U2VsZWN0b3JRdWVyeS5jcHAKaW5kZXggM2IzNzFmZmM3YWRjNDA2MjRhYzJjMjBi NjdhNWMxZmRkODQyOWMwYi4uMzhkNDQ5YzdiMzc1OWMxMzc2YzBlMzZlY2EzYzYxNWI0NjFlYzA1 MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvQ29udGVudFNlbGVjdG9y UXVlcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvc2hhZG93L0NvbnRlbnRTZWxlY3Rv clF1ZXJ5LmNwcApAQCAtNjQsNyArNjQsNyBAQCBib29sIENvbnRlbnRTZWxlY3RvclF1ZXJ5Ojpt YXRjaGVzKE5vZGUqIG5vZGUpIGNvbnN0CiAgICAgaWYgKCFub2RlKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKLSAgICBBU1NFUlQobm9kZS0+cGFyZW50Tm9kZSgpID09IG1faW5zZXJ0aW9uUG9p bnQtPnNoYWRvd1RyZWVSb290Tm9kZSgpLT5zaGFkb3dIb3N0KCkpOworICAgIEFTU0VSVChub2Rl LT5wYXJlbnROb2RlKCkgPT0gbV9pbnNlcnRpb25Qb2ludC0+c2hhZG93Um9vdCgpLT5zaGFkb3dI b3N0KCkpOwogCiAgICAgaWYgKG1faW5zZXJ0aW9uUG9pbnQtPnNlbGVjdCgpLmlzTnVsbCgpIHx8 IG1faW5zZXJ0aW9uUG9pbnQtPnNlbGVjdCgpLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIHRy dWU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9IVE1MQ29udGVudEVs ZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSFRNTENvbnRlbnRFbGVtZW50 LmNwcAppbmRleCAwMjUxNzg3NWIwY2MwYmYzODBkNzUzNDljMzZkZTYyY2E1OWQ2NjFkLi5hNGRj ZWVlZDBkZmJiMGExNmM2YzRkZDVjNGQyOThiMGM2NDcyZDYwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9IVE1MQ29udGVudEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvc2hhZG93L0hUTUxDb250ZW50RWxlbWVudC5jcHAKQEAgLTg5LDcgKzg5LDcg QEAgdm9pZCBIVE1MQ29udGVudEVsZW1lbnQ6OnNldFNlbGVjdChjb25zdCBBdG9taWNTdHJpbmcm IHNlbGVjdFZhbHVlKQogdm9pZCBIVE1MQ29udGVudEVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKGNv bnN0IEF0dHJpYnV0ZSYgYXR0cmlidXRlKQogewogICAgIGlmIChhdHRyaWJ1dGUubmFtZSgpID09 IHNlbGVjdEF0dHIpIHsKLSAgICAgICAgaWYgKFNoYWRvd1Jvb3QqIHJvb3QgPSBzaGFkb3dUcmVl Um9vdE5vZGUoKSkKKyAgICAgICAgaWYgKFNoYWRvd1Jvb3QqIHJvb3QgPSBzaGFkb3dSb290KCkp CiAgICAgICAgICAgICByb290LT5vd25lcigpLT5zZXROZWVkc1JlZGlzdHJpYnV0aW5nKCk7CiAg ICAgfSBlbHNlCiAgICAgICAgIEluc2VydGlvblBvaW50OjpwYXJzZUF0dHJpYnV0ZShhdHRyaWJ1 dGUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9p bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvSW5zZXJ0aW9uUG9pbnQuY3BwCmlu ZGV4IGFmNDRkZTA5N2M1ZjU3MzRlOTFhMDI3MDVlNWIyNWM4ZTRkZTUxNjUuLmNhNjZjMjQ4YWE0 MzVjM2M3OWZhZjE0MWVmZTRlYzNlYmRiMWZlZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2h0bWwvc2hhZG93L0luc2VydGlvblBvaW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L3NoYWRvdy9JbnNlcnRpb25Qb2ludC5jcHAKQEAgLTY0LDcgKzY0LDcgQEAgdm9pZCBJbnNlcnRp b25Qb2ludDo6YXR0YWNoKCkKIAogdm9pZCBJbnNlcnRpb25Qb2ludDo6ZGV0YWNoKCkKIHsKLSAg ICBTaGFkb3dSb290KiByb290ID0gc2hhZG93VHJlZVJvb3ROb2RlKCk7CisgICAgU2hhZG93Um9v dCogcm9vdCA9IHNoYWRvd1Jvb3QoKTsKICAgICBpZiAocm9vdCAmJiBpc0FjdGl2ZSgpKSB7CiAg ICAgICAgIEVsZW1lbnRTaGFkb3cqIHNoYWRvdyA9IHJvb3QtPm93bmVyKCk7CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRXZlbnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRXZlbnRIYW5kbGVyLmNwcAppbmRleCBhMzA5YTkxYTEyNzgwM2ViYzkxZDAxZGIwMzQw MzY4MTIzZTJmNjI3Li5iNDIyMWIwYjRlZjk3YjA5N2NmODhkZjc3YjY4ZTk1ZDYyOWI0MzI5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0V2ZW50SGFuZGxlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9FdmVudEhhbmRsZXIuY3BwCkBAIC0yMDkyLDcgKzIwOTIsNyBAQCBz dGF0aWMgaW5saW5lIFNWR0VsZW1lbnRJbnN0YW5jZSogaW5zdGFuY2VBc3NvY2lhdGVkV2l0aFNo YWRvd1RyZWVFbGVtZW50KE5vZGUqCiAgICAgaWYgKCFyZWZlcmVuY2VOb2RlIHx8ICFyZWZlcmVu Y2VOb2RlLT5pc1NWR0VsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuIDA7CiAKLSAgICBOb2RlKiBz aGFkb3dUcmVlRWxlbWVudCA9IHJlZmVyZW5jZU5vZGUtPnNoYWRvd1RyZWVSb290Tm9kZSgpOwor ICAgIE5vZGUqIHNoYWRvd1RyZWVFbGVtZW50ID0gcmVmZXJlbmNlTm9kZS0+c2hhZG93Um9vdCgp OwogICAgIGlmICghc2hhZG93VHJlZUVsZW1lbnQpCiAgICAgICAgIHJldHVybiAwOwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9zdmcvU1ZHRWxlbWVudC5jcHAKaW5kZXggZTVkMGVmMzM5YWJiMTZmMzNmYTY4ZDg1YWUxZjhl NDhlYWU1ZjEwZi4uMzgxNDkwNmM2OGNkM2IxZTYxNmI0MWI4ODk0Yzg2NjFkMDVlYjFjOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3N2Zy9TVkdFbGVtZW50LmNwcApAQCAtMjk2LDcgKzI5Niw3IEBAIHZvaWQgU1ZHRWxl bWVudDo6Y3Vyc29ySW1hZ2VWYWx1ZVJlbW92ZWQoKQogCiBTVkdFbGVtZW50KiBTVkdFbGVtZW50 Ojpjb3JyZXNwb25kaW5nRWxlbWVudCgpCiB7Ci0gICAgQVNTRVJUKCFoYXNSYXJlU1ZHRGF0YSgp IHx8ICFyYXJlU1ZHRGF0YSgpLT5jb3JyZXNwb25kaW5nRWxlbWVudCgpIHx8IHNoYWRvd1RyZWVS b290Tm9kZSgpKTsKKyAgICBBU1NFUlQoIWhhc1JhcmVTVkdEYXRhKCkgfHwgIXJhcmVTVkdEYXRh KCktPmNvcnJlc3BvbmRpbmdFbGVtZW50KCkgfHwgc2hhZG93Um9vdCgpKTsKICAgICByZXR1cm4g aGFzUmFyZVNWR0RhdGEoKSA/IHJhcmVTVkdEYXRhKCktPmNvcnJlc3BvbmRpbmdFbGVtZW50KCkg OiAwOwogfQogCkBAIC0zNTEsNyArMzUxLDcgQEAgYm9vbCBTVkdFbGVtZW50OjpoYXZlTG9hZGVk UmVxdWlyZWRSZXNvdXJjZXMoKQogc3RhdGljIGlubGluZSB2b2lkIGNvbGxlY3RJbnN0YW5jZXNG b3JTVkdFbGVtZW50KFNWR0VsZW1lbnQqIGVsZW1lbnQsIEhhc2hTZXQ8U1ZHRWxlbWVudEluc3Rh bmNlKj4mIGluc3RhbmNlcykKIHsKICAgICBBU1NFUlQoZWxlbWVudCk7Ci0gICAgaWYgKGVsZW1l bnQtPnNoYWRvd1RyZWVSb290Tm9kZSgpKQorICAgIGlmIChlbGVtZW50LT5zaGFkb3dSb290KCkp CiAgICAgICAgIHJldHVybjsKIAogICAgIGlmICghZWxlbWVudC0+aXNTdHlsZWQoKSkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCmluZGV4IGU2MGEyN2FmNmJk MWM3ZjMxNTNlN2E2MGU0NzNhY2IzNTJkYTFmZTEuLmJlY2FhMDA3ZjMyZjJiMDJhZjU2ZDMxZTgx MDcwOTQ5YzFmMDI1NzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1dl YkZyYW1lSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvV2ViRnJhbWVJ bXBsLmNwcApAQCAtMTc2Niw3ICsxNzY2LDcgQEAgdm9pZCBXZWJGcmFtZUltcGw6OnNjb3BlU3Ry aW5nTWF0Y2hlcyhpbnQgaWRlbnRpZmllciwKICAgICAgICAgLy8gdGV4dCBub2Rlcy4KICAgICAg ICAgc2VhcmNoUmFuZ2UtPnNldFN0YXJ0KHJlc3VsdFJhbmdlLT5lbmRDb250YWluZXIoZWMpLCBy ZXN1bHRSYW5nZS0+ZW5kT2Zmc2V0KGVjKSwgZWMpOwogCi0gICAgICAgIE5vZGUqIHNoYWRvd1Ry ZWVSb290ID0gc2VhcmNoUmFuZ2UtPnNoYWRvd1RyZWVSb290Tm9kZSgpOworICAgICAgICBOb2Rl KiBzaGFkb3dUcmVlUm9vdCA9IHNlYXJjaFJhbmdlLT5zaGFkb3dSb290KCk7CiAgICAgICAgIGlm IChzZWFyY2hSYW5nZS0+Y29sbGFwc2VkKGVjKSAmJiBzaGFkb3dUcmVlUm9vdCkKICAgICAgICAg ICAgIHNlYXJjaFJhbmdlLT5zZXRFbmQoc2hhZG93VHJlZVJvb3QsIHNoYWRvd1RyZWVSb290LT5j aGlsZE5vZGVDb3VudCgpLCBlYyk7CiAK