130722 2014-03-25 09:55:56 -0700 Replace DEPRECATED_DEFINE_STATIC_LOCAL by static NeverDestroyed<T> in editing/ 2014-03-26 08:13:22 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 130185 1 svillar svillar darin koivisto rniwa oldest_to_newest 994224 0 svillar 2014-03-25 09:55:56 -0700 Replace DEPRECATED_DEFINE_STATIC_LOCAL by static NeverDestroyed<T> in editing/ 994225 1 227763 svillar 2014-03-25 09:57:57 -0700 Created attachment 227763 Patch 994488 2 227763 darin 2014-03-25 20:31:39 -0700 Comment on attachment 227763 Patch EWS bots show that we need more get() calls in AlternativeTextController.cpp 994564 3 227849 svillar 2014-03-26 07:25:14 -0700 Created attachment 227849 Patch 994565 4 227849 koivisto 2014-03-26 07:39:02 -0700 Comment on attachment 227849 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=227849&action=review > Source/WebCore/editing/atk/FrameSelectionAtk.cpp:66 > + oldObject.get() = 0; nullptr > Source/WebCore/editing/atk/FrameSelectionAtk.cpp:69 > + AtkObject* oldAxObject = oldObject.get() ? oldObject.get()->wrapper() : 0; nullptr 994577 5 svillar 2014-03-26 08:13:22 -0700 Committed r166294: <http://trac.webkit.org/changeset/166294> 227763 2014-03-25 09:57:57 -0700 2014-03-26 07:25:07 -0700 Patch bug-130722-20140325175735.patch text/plain 21912 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MjMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDY1NWFlOGFjNjYxZGMx MzdkZDA5YTc5ZTg2NGEwOGYwMzk1ZjI2MC4uNGE0ZGE0ZDhiOWFiZmE1OTI0NjUwNTE4MDdmM2Yx M2Y2MDllMzhhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTI1ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlcGxhY2Ug REVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMIGJ5IHN0YXRpYyBOZXZlckRlc3Ryb3llZDxU PiBpbiBlZGl0aW5nLworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTMwNzIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBlZGl0aW5nL0FsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6bWFya2VyVHlwZXNGb3JBdXRvY29ycmVjdGlvbik6CisgICAgICAgIChXZWJDb3Jl OjptYXJrZXJUeXBlc0ZvclJlcGxhY2VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6Om1hcmtlclR5 cGVzRm9yQXBwbGllZERpY3RhdGlvbkFsdGVybmF0aXZlKToKKyAgICAgICAgKiBlZGl0aW5nL0Vk aXRpbmdTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpodG1sRWxlbWVudEVxdWl2YWxlbnRz KToKKyAgICAgICAgKFdlYkNvcmU6Omh0bWxBdHRyaWJ1dGVFcXVpdmFsZW50cyk6CisgICAgICAg ICogZWRpdGluZy9Gb3JtYXRCbG9ja0NvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNF bGVtZW50Rm9yRm9ybWF0QmxvY2spOgorICAgICAgICAqIGVkaXRpbmcvUmVtb3ZlRm9ybWF0Q29t bWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0VsZW1lbnRGb3JSZW1vdmVGb3JtYXRDb21t YW5kKToKKyAgICAgICAgKiBlZGl0aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmlzUHJvaGliaXRlZFBhcmFncmFwaENoaWxkKToKKyAgICAgICAgKiBl ZGl0aW5nL2F0ay9GcmFtZVNlbGVjdGlvbkF0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjptYXli ZUVtaXRUZXh0Rm9jdXNDaGFuZ2UpOgorCiAyMDE0LTAzLTIwICBTZXJnaW8gVmlsbGFyIFNlbmlu ICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDU1MgR3JpZCBMYXlvdXRdIFZlcnRp Y2FsIHJlY3RhbmdsZXMgbm90IGNvbnNpZGVyZWQgYXMgdmFsaWQgZ3JpZCBhcmVhcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9BbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5jcHAK aW5kZXggNDhiYzc4NzZlNWI0MzIzOTk4N2M3YjcwMjZlNzhkMDI3Yjc4Y2Y0My4uMTA2MzFhMzYy ZDk1NTFlN2I4YzMwM2Y3NjBiNzc1NzYxODY2MmUyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9BbHRlcm5hdGl2ZVRleHRDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9lZGl0aW5nL0FsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuY3BwCkBAIC00NSw2ICs0NSw3 IEBACiAjaW5jbHVkZSAiVmlzaWJsZVVuaXRzLmgiCiAjaW5jbHVkZSAiaHRtbGVkaXRpbmcuaCIK ICNpbmNsdWRlICJtYXJrdXAuaCIKKyNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAog bmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC04NSw3ICs4Niw3IEBAIHByaXZhdGU6CiAKIHN0YXRp YyBjb25zdCBWZWN0b3I8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+JiBtYXJrZXJUeXBlc0Zv ckF1dG9jb3JyZWN0aW9uKCkKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwo VmVjdG9yPERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBlPiwgbWFya2VyVHlwZXNGb3JBdXRvQ29y cmVjdGlvbiwgKCkpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxWZWN0b3I8RG9jdW1lbnRN YXJrZXI6Ok1hcmtlclR5cGU+PiBtYXJrZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uOwogICAgIGlm IChtYXJrZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uLmlzRW1wdHkoKSkgewogICAgICAgICBtYXJr ZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uLmFwcGVuZChEb2N1bWVudE1hcmtlcjo6UmVwbGFjZW1l bnQpOwogICAgICAgICBtYXJrZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uLmFwcGVuZChEb2N1bWVu dE1hcmtlcjo6Q29ycmVjdGlvbkluZGljYXRvcik7CkBAIC05Nyw3ICs5OCw3IEBAIHN0YXRpYyBj b25zdCBWZWN0b3I8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+JiBtYXJrZXJUeXBlc0ZvckF1 dG9jb3JyZWN0aW9uKCkKIAogc3RhdGljIGNvbnN0IFZlY3RvcjxEb2N1bWVudE1hcmtlcjo6TWFy a2VyVHlwZT4mIG1hcmtlclR5cGVzRm9yUmVwbGFjZW1lbnQoKQogewotICAgIERFUFJFQ0FURURf REVGSU5FX1NUQVRJQ19MT0NBTChWZWN0b3I8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+LCBt YXJrZXJUeXBlc0ZvclJlcGxhY2VtZW50LCAoKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVk PFZlY3RvcjxEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZT4+IG1hcmtlclR5cGVzRm9yUmVwbGFj ZW1lbnQ7CiAgICAgaWYgKG1hcmtlclR5cGVzRm9yUmVwbGFjZW1lbnQuaXNFbXB0eSgpKSB7CiAg ICAgICAgIG1hcmtlclR5cGVzRm9yUmVwbGFjZW1lbnQuYXBwZW5kKERvY3VtZW50TWFya2VyOjpS ZXBsYWNlbWVudCk7CiAgICAgICAgIG1hcmtlclR5cGVzRm9yUmVwbGFjZW1lbnQuYXBwZW5kKERv Y3VtZW50TWFya2VyOjpTcGVsbENoZWNraW5nRXhlbXB0aW9uKTsKQEAgLTEwNyw3ICsxMDgsNyBA QCBzdGF0aWMgY29uc3QgVmVjdG9yPERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBlPiYgbWFya2Vy VHlwZXNGb3JSZXBsYWNlbWVudCgpCiAKIHN0YXRpYyBjb25zdCBWZWN0b3I8RG9jdW1lbnRNYXJr ZXI6Ok1hcmtlclR5cGU+JiBtYXJrZXJUeXBlc0ZvckFwcGxpZWREaWN0YXRpb25BbHRlcm5hdGl2 ZSgpCiB7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKFZlY3RvcjxEb2N1bWVu dE1hcmtlcjo6TWFya2VyVHlwZT4sIG1hcmtlclR5cGVzRm9yQXBwbGllZERpY3RhdGlvbkFsdGVy bmF0aXZlLCAoKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3RvcjxEb2N1bWVudE1h cmtlcjo6TWFya2VyVHlwZT4+IG1hcmtlclR5cGVzRm9yQXBwbGllZERpY3RhdGlvbkFsdGVybmF0 aXZlOwogICAgIGlmIChtYXJrZXJUeXBlc0ZvckFwcGxpZWREaWN0YXRpb25BbHRlcm5hdGl2ZS5p c0VtcHR5KCkpCiAgICAgICAgIG1hcmtlclR5cGVzRm9yQXBwbGllZERpY3RhdGlvbkFsdGVybmF0 aXZlLmFwcGVuZChEb2N1bWVudE1hcmtlcjo6U3BlbGxDaGVja2luZ0V4ZW1wdGlvbik7CiAgICAg cmV0dXJuIG1hcmtlclR5cGVzRm9yQXBwbGllZERpY3RhdGlvbkFsdGVybmF0aXZlOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCmluZGV4IGFlZmY3MDA4MjI5YThhY2FhOGRi MjA2MzJmNTVkNjJjYTRhZGI3MWYuLjAwMGNkYmQ2Njg5YmYyZTAwNTdjZmE5NWI1ZDY2NWE0ZTk3 MzgwODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKQEAgLTc0MCwx OSArNzQwLDE5IEBAIGJvb2wgRWRpdGluZ1N0eWxlOjpjb25mbGljdHNXaXRoSW5saW5lU3R5bGVP ZkVsZW1lbnQoU3R5bGVkRWxlbWVudCogZWxlbWVudCwgRWRpCiAKIHN0YXRpYyBjb25zdCBWZWN0 b3I8c3RkOjp1bmlxdWVfcHRyPEhUTUxFbGVtZW50RXF1aXZhbGVudD4+JiBodG1sRWxlbWVudEVx dWl2YWxlbnRzKCkKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoVmVjdG9y PHN0ZDo6dW5pcXVlX3B0cjxIVE1MRWxlbWVudEVxdWl2YWxlbnQ+PiwgSFRNTEVsZW1lbnRFcXVp dmFsZW50cywgKCkpOwotCi0gICAgaWYgKCFIVE1MRWxlbWVudEVxdWl2YWxlbnRzLnNpemUoKSkg ewotICAgICAgICBIVE1MRWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVl PEhUTUxFbGVtZW50RXF1aXZhbGVudD4oQ1NTUHJvcGVydHlGb250V2VpZ2h0LCBDU1NWYWx1ZUJv bGQsIEhUTUxOYW1lczo6YlRhZykpOwotICAgICAgICBIVE1MRWxlbWVudEVxdWl2YWxlbnRzLmFw cGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxFbGVtZW50RXF1aXZhbGVudD4oQ1NTUHJvcGVydHlG b250V2VpZ2h0LCBDU1NWYWx1ZUJvbGQsIEhUTUxOYW1lczo6c3Ryb25nVGFnKSk7Ci0gICAgICAg IEhUTUxFbGVtZW50RXF1aXZhbGVudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEVsZW1l bnRFcXVpdmFsZW50PihDU1NQcm9wZXJ0eVZlcnRpY2FsQWxpZ24sIENTU1ZhbHVlU3ViLCBIVE1M TmFtZXM6OnN1YlRhZykpOwotICAgICAgICBIVE1MRWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChz dGQ6Om1ha2VfdW5pcXVlPEhUTUxFbGVtZW50RXF1aXZhbGVudD4oQ1NTUHJvcGVydHlWZXJ0aWNh bEFsaWduLCBDU1NWYWx1ZVN1cGVyLCBIVE1MTmFtZXM6OnN1cFRhZykpOwotICAgICAgICBIVE1M RWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxFbGVtZW50RXF1 aXZhbGVudD4oQ1NTUHJvcGVydHlGb250U3R5bGUsIENTU1ZhbHVlSXRhbGljLCBIVE1MTmFtZXM6 OmlUYWcpKTsKLSAgICAgICAgSFRNTEVsZW1lbnRFcXVpdmFsZW50cy5hcHBlbmQoc3RkOjptYWtl X3VuaXF1ZTxIVE1MRWxlbWVudEVxdWl2YWxlbnQ+KENTU1Byb3BlcnR5Rm9udFN0eWxlLCBDU1NW YWx1ZUl0YWxpYywgSFRNTE5hbWVzOjplbVRhZykpOwotCi0gICAgICAgIEhUTUxFbGVtZW50RXF1 aXZhbGVudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTFRleHREZWNvcmF0aW9uRXF1aXZh bGVudD4oQ1NTVmFsdWVVbmRlcmxpbmUsIEhUTUxOYW1lczo6dVRhZykpOwotICAgICAgICBIVE1M RWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxUZXh0RGVjb3Jh dGlvbkVxdWl2YWxlbnQ+KENTU1ZhbHVlTGluZVRocm91Z2gsIEhUTUxOYW1lczo6c1RhZykpOwot ICAgICAgICBIVE1MRWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhU TUxUZXh0RGVjb3JhdGlvbkVxdWl2YWxlbnQ+KENTU1ZhbHVlTGluZVRocm91Z2gsIEhUTUxOYW1l czo6c3RyaWtlVGFnKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3RvcjxzdGQ6OnVu aXF1ZV9wdHI8SFRNTEVsZW1lbnRFcXVpdmFsZW50Pj4+IEhUTUxFbGVtZW50RXF1aXZhbGVudHM7 CisKKyAgICBpZiAoIUhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0KCkuc2l6ZSgpKSB7CisgICAg ICAgIEhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8 SFRNTEVsZW1lbnRFcXVpdmFsZW50PihDU1NQcm9wZXJ0eUZvbnRXZWlnaHQsIENTU1ZhbHVlQm9s ZCwgSFRNTE5hbWVzOjpiVGFnKSk7CisgICAgICAgIEhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0 KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEVsZW1lbnRFcXVpdmFsZW50PihDU1NQcm9w ZXJ0eUZvbnRXZWlnaHQsIENTU1ZhbHVlQm9sZCwgSFRNTE5hbWVzOjpzdHJvbmdUYWcpKTsKKyAg ICAgICAgSFRNTEVsZW1lbnRFcXVpdmFsZW50cy5nZXQoKS5hcHBlbmQoc3RkOjptYWtlX3VuaXF1 ZTxIVE1MRWxlbWVudEVxdWl2YWxlbnQ+KENTU1Byb3BlcnR5VmVydGljYWxBbGlnbiwgQ1NTVmFs dWVTdWIsIEhUTUxOYW1lczo6c3ViVGFnKSk7CisgICAgICAgIEhUTUxFbGVtZW50RXF1aXZhbGVu dHMuZ2V0KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEVsZW1lbnRFcXVpdmFsZW50PihD U1NQcm9wZXJ0eVZlcnRpY2FsQWxpZ24sIENTU1ZhbHVlU3VwZXIsIEhUTUxOYW1lczo6c3VwVGFn KSk7CisgICAgICAgIEhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0KCkuYXBwZW5kKHN0ZDo6bWFr ZV91bmlxdWU8SFRNTEVsZW1lbnRFcXVpdmFsZW50PihDU1NQcm9wZXJ0eUZvbnRTdHlsZSwgQ1NT VmFsdWVJdGFsaWMsIEhUTUxOYW1lczo6aVRhZykpOworICAgICAgICBIVE1MRWxlbWVudEVxdWl2 YWxlbnRzLmdldCgpLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxFbGVtZW50RXF1aXZhbGVu dD4oQ1NTUHJvcGVydHlGb250U3R5bGUsIENTU1ZhbHVlSXRhbGljLCBIVE1MTmFtZXM6OmVtVGFn KSk7CisKKyAgICAgICAgSFRNTEVsZW1lbnRFcXVpdmFsZW50cy5nZXQoKS5hcHBlbmQoc3RkOjpt YWtlX3VuaXF1ZTxIVE1MVGV4dERlY29yYXRpb25FcXVpdmFsZW50PihDU1NWYWx1ZVVuZGVybGlu ZSwgSFRNTE5hbWVzOjp1VGFnKSk7CisgICAgICAgIEhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0 KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTFRleHREZWNvcmF0aW9uRXF1aXZhbGVudD4o Q1NTVmFsdWVMaW5lVGhyb3VnaCwgSFRNTE5hbWVzOjpzVGFnKSk7CisgICAgICAgIEhUTUxFbGVt ZW50RXF1aXZhbGVudHMuZ2V0KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTFRleHREZWNv cmF0aW9uRXF1aXZhbGVudD4oQ1NTVmFsdWVMaW5lVGhyb3VnaCwgSFRNTE5hbWVzOjpzdHJpa2VU YWcpKTsKICAgICB9CiAKICAgICByZXR1cm4gSFRNTEVsZW1lbnRFcXVpdmFsZW50czsKQEAgLTc3 OSwxNyArNzc5LDE3IEBAIGJvb2wgRWRpdGluZ1N0eWxlOjpjb25mbGljdHNXaXRoSW1wbGljaXRT dHlsZU9mRWxlbWVudChIVE1MRWxlbWVudCogZWxlbWVudCwgRWRpCiAKIHN0YXRpYyBjb25zdCBW ZWN0b3I8c3RkOjp1bmlxdWVfcHRyPEhUTUxBdHRyaWJ1dGVFcXVpdmFsZW50Pj4mIGh0bWxBdHRy aWJ1dGVFcXVpdmFsZW50cygpCiB7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FM KFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8SFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnQ+PiwgSFRNTEF0 dHJpYnV0ZUVxdWl2YWxlbnRzLCAoKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3Rv cjxzdGQ6OnVuaXF1ZV9wdHI8SFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnQ+Pj4gSFRNTEF0dHJpYnV0 ZUVxdWl2YWxlbnRzOwogCi0gICAgaWYgKCFIVE1MQXR0cmlidXRlRXF1aXZhbGVudHMuc2l6ZSgp KSB7CisgICAgaWYgKCFIVE1MQXR0cmlidXRlRXF1aXZhbGVudHMuZ2V0KCkuc2l6ZSgpKSB7CiAg ICAgICAgIC8vIGVsZW1lbnRJc1N0eWxlZFNwYW5PckhUTUxFcXVpdmFsZW50IGRlcGVuZHMgb24g dGhlIGZhY3QgZWFjaCBIVE1MQXR0cml1dGVFcXVpdmFsZW50IG1hdGNoZXMgZXhhY3RseSBvbmUg YXR0cmlidXRlCiAgICAgICAgIC8vIG9mIGV4YWN0bHkgb25lIGVsZW1lbnQgZXhjZXB0IGRpckF0 dHIuCi0gICAgICAgIEhUTUxBdHRyaWJ1dGVFcXVpdmFsZW50cy5hcHBlbmQoc3RkOjptYWtlX3Vu aXF1ZTxIVE1MQXR0cmlidXRlRXF1aXZhbGVudD4oQ1NTUHJvcGVydHlDb2xvciwgSFRNTE5hbWVz Ojpmb250VGFnLCBIVE1MTmFtZXM6OmNvbG9yQXR0cikpOwotICAgICAgICBIVE1MQXR0cmlidXRl RXF1aXZhbGVudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEF0dHJpYnV0ZUVxdWl2YWxl bnQ+KENTU1Byb3BlcnR5Rm9udEZhbWlseSwgSFRNTE5hbWVzOjpmb250VGFnLCBIVE1MTmFtZXM6 OmZhY2VBdHRyKSk7Ci0gICAgICAgIEhUTUxBdHRyaWJ1dGVFcXVpdmFsZW50cy5hcHBlbmQoc3Rk OjptYWtlX3VuaXF1ZTxIVE1MRm9udFNpemVFcXVpdmFsZW50PigpKTsKKyAgICAgICAgSFRNTEF0 dHJpYnV0ZUVxdWl2YWxlbnRzLmdldCgpLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxBdHRy aWJ1dGVFcXVpdmFsZW50PihDU1NQcm9wZXJ0eUNvbG9yLCBIVE1MTmFtZXM6OmZvbnRUYWcsIEhU TUxOYW1lczo6Y29sb3JBdHRyKSk7CisgICAgICAgIEhUTUxBdHRyaWJ1dGVFcXVpdmFsZW50cy5n ZXQoKS5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxIVE1MQXR0cmlidXRlRXF1aXZhbGVudD4oQ1NT UHJvcGVydHlGb250RmFtaWx5LCBIVE1MTmFtZXM6OmZvbnRUYWcsIEhUTUxOYW1lczo6ZmFjZUF0 dHIpKTsKKyAgICAgICAgSFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnRzLmdldCgpLmFwcGVuZChzdGQ6 Om1ha2VfdW5pcXVlPEhUTUxGb250U2l6ZUVxdWl2YWxlbnQ+KCkpOwogCi0gICAgICAgIEhUTUxB dHRyaWJ1dGVFcXVpdmFsZW50cy5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxIVE1MQXR0cmlidXRl RXF1aXZhbGVudD4oQ1NTUHJvcGVydHlEaXJlY3Rpb24sIEhUTUxOYW1lczo6ZGlyQXR0cikpOwot ICAgICAgICBIVE1MQXR0cmlidXRlRXF1aXZhbGVudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8 SFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnQ+KENTU1Byb3BlcnR5VW5pY29kZUJpZGksIEhUTUxOYW1l czo6ZGlyQXR0cikpOworICAgICAgICBIVE1MQXR0cmlidXRlRXF1aXZhbGVudHMuZ2V0KCkuYXBw ZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnQ+KENTU1Byb3BlcnR5 RGlyZWN0aW9uLCBIVE1MTmFtZXM6OmRpckF0dHIpKTsKKyAgICAgICAgSFRNTEF0dHJpYnV0ZUVx dWl2YWxlbnRzLmdldCgpLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxBdHRyaWJ1dGVFcXVp dmFsZW50PihDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpLCBIVE1MTmFtZXM6OmRpckF0dHIpKTsKICAg ICB9CiAKICAgICByZXR1cm4gSFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnRzOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZWRpdGluZy9Gb3JtYXRCbG9ja0NvbW1hbmQuY3BwIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9Gb3JtYXRCbG9ja0NvbW1hbmQuY3BwCmluZGV4IDQ3MDIwYjMyYmJhYmU3 NjRhYjc4ODI5Njg3ZjFkMzliNzFiYTdmZjQuLjQ2OTBmMjE3NTM1NzMwYjI0ODc5NWE5OGE4NTY2 MzZmOTYzMDdjNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRm9ybWF0Qmxv Y2tDb21tYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0Zvcm1hdEJsb2NrQ29t bWFuZC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNs dWRlICJSYW5nZS5oIgogI2luY2x1ZGUgIlZpc2libGVVbml0cy5oIgorI2luY2x1ZGUgPHd0Zi9O ZXZlckRlc3Ryb3llZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTExNywzMiArMTE4 LDMyIEBAIEVsZW1lbnQqIEZvcm1hdEJsb2NrQ29tbWFuZDo6ZWxlbWVudEZvckZvcm1hdEJsb2Nr Q29tbWFuZChSYW5nZSogcmFuZ2UpCiAKIGJvb2wgaXNFbGVtZW50Rm9yRm9ybWF0QmxvY2soY29u c3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSkKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFU SUNfTE9DQUwoSGFzaFNldDxRdWFsaWZpZWROYW1lPiwgYmxvY2tUYWdzLCAoKSk7Ci0gICAgaWYg KGJsb2NrVGFncy5pc0VtcHR5KCkpIHsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChhZGRyZXNzVGFn KTsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChhcnRpY2xlVGFnKTsKLSAgICAgICAgYmxvY2tUYWdz LmFkZChhc2lkZVRhZyk7Ci0gICAgICAgIGJsb2NrVGFncy5hZGQoYmxvY2txdW90ZVRhZyk7Ci0g ICAgICAgIGJsb2NrVGFncy5hZGQoZGRUYWcpOwotICAgICAgICBibG9ja1RhZ3MuYWRkKGRpdlRh Zyk7Ci0gICAgICAgIGJsb2NrVGFncy5hZGQoZGxUYWcpOwotICAgICAgICBibG9ja1RhZ3MuYWRk KGR0VGFnKTsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChmb290ZXJUYWcpOwotICAgICAgICBibG9j a1RhZ3MuYWRkKGgxVGFnKTsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChoMlRhZyk7Ci0gICAgICAg IGJsb2NrVGFncy5hZGQoaDNUYWcpOwotICAgICAgICBibG9ja1RhZ3MuYWRkKGg0VGFnKTsKLSAg ICAgICAgYmxvY2tUYWdzLmFkZChoNVRhZyk7Ci0gICAgICAgIGJsb2NrVGFncy5hZGQoaDZUYWcp OwotICAgICAgICBibG9ja1RhZ3MuYWRkKGhlYWRlclRhZyk7Ci0gICAgICAgIGJsb2NrVGFncy5h ZGQoaGdyb3VwVGFnKTsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChtYWluVGFnKTsKLSAgICAgICAg YmxvY2tUYWdzLmFkZChuYXZUYWcpOwotICAgICAgICBibG9ja1RhZ3MuYWRkKHBUYWcpOwotICAg ICAgICBibG9ja1RhZ3MuYWRkKHByZVRhZyk7Ci0gICAgICAgIGJsb2NrVGFncy5hZGQoc2VjdGlv blRhZyk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8UXVhbGlmaWVkTmFtZT4+ IGJsb2NrVGFnczsKKyAgICBpZiAoYmxvY2tUYWdzLmdldCgpLmlzRW1wdHkoKSkgeworICAgICAg ICBibG9ja1RhZ3MuZ2V0KCkuYWRkKGFkZHJlc3NUYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0 KCkuYWRkKGFydGljbGVUYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0KCkuYWRkKGFzaWRlVGFn KTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZChibG9ja3F1b3RlVGFnKTsKKyAgICAgICAg YmxvY2tUYWdzLmdldCgpLmFkZChkZFRhZyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQo ZGl2VGFnKTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZChkbFRhZyk7CisgICAgICAgIGJs b2NrVGFncy5nZXQoKS5hZGQoZHRUYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0KCkuYWRkKGZv b3RlclRhZyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQoaDFUYWcpOworICAgICAgICBi bG9ja1RhZ3MuZ2V0KCkuYWRkKGgyVGFnKTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZCho M1RhZyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQoaDRUYWcpOworICAgICAgICBibG9j a1RhZ3MuZ2V0KCkuYWRkKGg1VGFnKTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZChoNlRh Zyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQoaGVhZGVyVGFnKTsKKyAgICAgICAgYmxv Y2tUYWdzLmdldCgpLmFkZChoZ3JvdXBUYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0KCkuYWRk KG1haW5UYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0KCkuYWRkKG5hdlRhZyk7CisgICAgICAg IGJsb2NrVGFncy5nZXQoKS5hZGQocFRhZyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQo cHJlVGFnKTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZChzZWN0aW9uVGFnKTsKICAgICB9 Ci0gICAgcmV0dXJuIGJsb2NrVGFncy5jb250YWlucyh0YWdOYW1lKTsKKyAgICByZXR1cm4gYmxv Y2tUYWdzLmdldCgpLmNvbnRhaW5zKHRhZ05hbWUpOwogfQogCiBOb2RlKiBlbmNsb3NpbmdCbG9j a1RvU3BsaXRUcmVlVG8oTm9kZSogc3RhcnROb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9SZW1vdmVGb3JtYXRDb21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvUmVtb3ZlRm9ybWF0Q29tbWFuZC5jcHAKaW5kZXggNGI2YWE0NWVkMzA0NzYxOWYxZGNkMGIy MTI3OGVmN2UzYmYyMzQ5My4uNzhiMWZkNjRmMDllYzE4OTY0MmI5MjVmMTM1MzQ4MmUxZGZjMDlk MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZW1vdmVGb3JtYXRDb21tYW5k LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1JlbW92ZUZvcm1hdENvbW1hbmQuY3Bw CkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiRnJhbWVTZWxlY3Rpb24uaCIKICNpbmNsdWRl ICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJTdHlsZVByb3BlcnRpZXMuaCIKKyNpbmNsdWRlIDx3 dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00NSwzNCAr NDYsMzQgQEAgUmVtb3ZlRm9ybWF0Q29tbWFuZDo6UmVtb3ZlRm9ybWF0Q29tbWFuZChEb2N1bWVu dCYgZG9jdW1lbnQpCiAKIHN0YXRpYyBib29sIGlzRWxlbWVudEZvclJlbW92ZUZvcm1hdENvbW1h bmQoY29uc3QgRWxlbWVudCogZWxlbWVudCkKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFU SUNfTE9DQUwoSGFzaFNldDxRdWFsaWZpZWROYW1lPiwgZWxlbWVudHMsICgpKTsKLSAgICBpZiAo ZWxlbWVudHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChhY3JvbnltVGFnKTsK LSAgICAgICAgZWxlbWVudHMuYWRkKGJUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoYmRvVGFn KTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGJpZ1RhZyk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChj aXRlVGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGNvZGVUYWcpOwotICAgICAgICBlbGVtZW50 cy5hZGQoZGZuVGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGVtVGFnKTsKLSAgICAgICAgZWxl bWVudHMuYWRkKGZvbnRUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoaVRhZyk7Ci0gICAgICAg IGVsZW1lbnRzLmFkZChpbnNUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoa2JkVGFnKTsKLSAg ICAgICAgZWxlbWVudHMuYWRkKG5vYnJUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQocVRhZyk7 Ci0gICAgICAgIGVsZW1lbnRzLmFkZChzVGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKHNhbXBU YWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoc21hbGxUYWcpOwotICAgICAgICBlbGVtZW50cy5h ZGQoc3RyaWtlVGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKHN0cm9uZ1RhZyk7Ci0gICAgICAg IGVsZW1lbnRzLmFkZChzdWJUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoc3VwVGFnKTsKLSAg ICAgICAgZWxlbWVudHMuYWRkKHR0VGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKHVUYWcpOwot ICAgICAgICBlbGVtZW50cy5hZGQodmFyVGFnKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 SGFzaFNldDxRdWFsaWZpZWROYW1lPj4gZWxlbWVudHM7CisgICAgaWYgKGVsZW1lbnRzLmdldCgp LmlzRW1wdHkoKSkgeworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoYWNyb255bVRhZyk7Cisg ICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChiVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCku YWRkKGJkb1RhZyk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChiaWdUYWcpOworICAgICAg ICBlbGVtZW50cy5nZXQoKS5hZGQoY2l0ZVRhZyk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFk ZChjb2RlVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGRmblRhZyk7CisgICAgICAg IGVsZW1lbnRzLmdldCgpLmFkZChlbVRhZyk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChm b250VGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGlUYWcpOworICAgICAgICBlbGVt ZW50cy5nZXQoKS5hZGQoaW5zVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGtiZFRh Zyk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChub2JyVGFnKTsKKyAgICAgICAgZWxlbWVu dHMuZ2V0KCkuYWRkKHFUYWcpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoc1RhZyk7Cisg ICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChzYW1wVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0 KCkuYWRkKHNtYWxsVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKHN0cmlrZVRhZyk7 CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChzdHJvbmdUYWcpOworICAgICAgICBlbGVtZW50 cy5nZXQoKS5hZGQoc3ViVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKHN1cFRhZyk7 CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0dFRhZyk7CisgICAgICAgIGVsZW1lbnRzLmdl dCgpLmFkZCh1VGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKHZhclRhZyk7CiAgICAg fQotICAgIHJldHVybiBlbGVtZW50cy5jb250YWlucyhlbGVtZW50LT50YWdRTmFtZSgpKTsKKyAg ICByZXR1cm4gZWxlbWVudHMuZ2V0KCkuY29udGFpbnMoZWxlbWVudC0+dGFnUU5hbWUoKSk7CiB9 CiAKIHZvaWQgUmVtb3ZlRm9ybWF0Q29tbWFuZDo6ZG9BcHBseSgpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwCmluZGV4IGZlZGZhMGEw MTQwODEzNzkxODhkMWJjNWE4ZWYyODkwNmVmZDY0NDQuLmU5MjUwOTQ0MDhkYzI3NmY4ZjAwMDli ZTVlY2U1NmZkOGZiM2U5YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVw bGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVw bGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwCkBAIC01NSw2ICs1NSw3IEBACiAjaW5jbHVkZSAiVmlz aWJsZVVuaXRzLmgiCiAjaW5jbHVkZSAiaHRtbGVkaXRpbmcuaCIKICNpbmNsdWRlICJtYXJrdXAu aCIKKyNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvU3RkTGli RXh0cmFzLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTU2Myw1OCArNTY0LDU4IEBAIHZv aWQgUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OnJlbW92ZVJlZHVuZGFudFN0eWxlc0FuZEtlZXBT dHlsZVNwYW5JbmxpbmUoSW5zZXJ0CiBzdGF0aWMgYm9vbCBpc1Byb2hpYml0ZWRQYXJhZ3JhcGhD aGlsZChjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUpCiB7CiAgICAgLy8gaHR0cHM6Ly9kdmNzLncz Lm9yZy9oZy9lZGl0aW5nL3Jhdy1maWxlLzU3YWJlNmQzY2I2MC9lZGl0aW5nLmh0bWwjcHJvaGli aXRlZC1wYXJhZ3JhcGgtY2hpbGQKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwo SGFzaFNldDxBdG9taWNTdHJpbmc+LCBlbGVtZW50cywgKCkpOwotICAgIGlmIChlbGVtZW50cy5p c0VtcHR5KCkpIHsKLSAgICAgICAgZWxlbWVudHMuYWRkKGFkZHJlc3NUYWcubG9jYWxOYW1lKCkp OwotICAgICAgICBlbGVtZW50cy5hZGQoYXJ0aWNsZVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAg IGVsZW1lbnRzLmFkZChhc2lkZVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFk ZChibG9ja3F1b3RlVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGNhcHRp b25UYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoY2VudGVyVGFnLmxvY2Fs TmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGNvbFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAg ICAgIGVsZW1lbnRzLmFkZChjb2xncm91cFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1l bnRzLmFkZChkZFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChkZXRhaWxz VGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGRpclRhZy5sb2NhbE5hbWUo KSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChkaXZUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBl bGVtZW50cy5hZGQoZGxUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoZHRU YWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoZmllbGRzZXRUYWcubG9jYWxO YW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoZmlnY2FwdGlvblRhZy5sb2NhbE5hbWUoKSk7 Ci0gICAgICAgIGVsZW1lbnRzLmFkZChmaWd1cmVUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBl bGVtZW50cy5hZGQoZm9vdGVyVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRk KGZvcm1UYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoaDFUYWcubG9jYWxO YW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoaDJUYWcubG9jYWxOYW1lKCkpOwotICAgICAg ICBlbGVtZW50cy5hZGQoaDNUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQo aDRUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoaDVUYWcubG9jYWxOYW1l KCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoaDZUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBl bGVtZW50cy5hZGQoaGVhZGVyVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRk KGhncm91cFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChoclRhZy5sb2Nh bE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChsaVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAg ICAgIGVsZW1lbnRzLmFkZChsaXN0aW5nVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVu dHMuYWRkKG1haW5UYWcubG9jYWxOYW1lKCkpOyAvLyBNaXNzaW5nIGluIHRoZSBzcGVjaWZpY2F0 aW9uLgotICAgICAgICBlbGVtZW50cy5hZGQobWVudVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAg IGVsZW1lbnRzLmFkZChuYXZUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQo b2xUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQocFRhZy5sb2NhbE5hbWUo KSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChwbGFpbnRleHRUYWcubG9jYWxOYW1lKCkpOwotICAg ICAgICBlbGVtZW50cy5hZGQocHJlVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMu YWRkKHNlY3Rpb25UYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoc3VtbWFy eVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh0YWJsZVRhZy5sb2NhbE5h bWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh0Ym9keVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAg ICAgIGVsZW1lbnRzLmFkZCh0ZFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFk ZCh0Zm9vdFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh0aFRhZy5sb2Nh bE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh0aGVhZFRhZy5sb2NhbE5hbWUoKSk7Ci0g ICAgICAgIGVsZW1lbnRzLmFkZCh0clRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRz LmFkZCh1bFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh4bXBUYWcubG9j YWxOYW1lKCkpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoU2V0PEF0b21pY1N0cmlu Zz4+IGVsZW1lbnRzOworICAgIGlmIChlbGVtZW50cy5nZXQoKS5pc0VtcHR5KCkpIHsKKyAgICAg ICAgZWxlbWVudHMuZ2V0KCkuYWRkKGFkZHJlc3NUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBl bGVtZW50cy5nZXQoKS5hZGQoYXJ0aWNsZVRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1l bnRzLmdldCgpLmFkZChhc2lkZVRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdl dCgpLmFkZChibG9ja3F1b3RlVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0 KCkuYWRkKGNhcHRpb25UYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5h ZGQoY2VudGVyVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGNv bFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChjb2xncm91cFRh Zy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChkZFRhZy5sb2NhbE5h bWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChkZXRhaWxzVGFnLmxvY2FsTmFtZSgp KTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGRpclRhZy5sb2NhbE5hbWUoKSk7CisgICAg ICAgIGVsZW1lbnRzLmdldCgpLmFkZChkaXZUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVt ZW50cy5nZXQoKS5hZGQoZGxUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQo KS5hZGQoZHRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoZmll bGRzZXRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoZmlnY2Fw dGlvblRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChmaWd1cmVU YWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoZm9vdGVyVGFnLmxv Y2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGZvcm1UYWcubG9jYWxOYW1l KCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaDFUYWcubG9jYWxOYW1lKCkpOworICAg ICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaDJUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVt ZW50cy5nZXQoKS5hZGQoaDNUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQo KS5hZGQoaDRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaDVU YWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaDZUYWcubG9jYWxO YW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaGVhZGVyVGFnLmxvY2FsTmFtZSgp KTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGhncm91cFRhZy5sb2NhbE5hbWUoKSk7Cisg ICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChoclRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVs ZW1lbnRzLmdldCgpLmFkZChsaVRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdl dCgpLmFkZChsaXN0aW5nVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCku YWRkKG1haW5UYWcubG9jYWxOYW1lKCkpOyAvLyBNaXNzaW5nIGluIHRoZSBzcGVjaWZpY2F0aW9u LgorICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQobWVudVRhZy5sb2NhbE5hbWUoKSk7CisgICAg ICAgIGVsZW1lbnRzLmdldCgpLmFkZChuYXZUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVt ZW50cy5nZXQoKS5hZGQob2xUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQo KS5hZGQocFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChwbGFp bnRleHRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQocHJlVGFn LmxvY2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKHNlY3Rpb25UYWcubG9j YWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoc3VtbWFyeVRhZy5sb2NhbE5h bWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0YWJsZVRhZy5sb2NhbE5hbWUoKSk7 CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0Ym9keVRhZy5sb2NhbE5hbWUoKSk7CisgICAg ICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0ZFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1l bnRzLmdldCgpLmFkZCh0Zm9vdFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdl dCgpLmFkZCh0aFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0 aGVhZFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0clRhZy5s b2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh1bFRhZy5sb2NhbE5hbWUo KSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh4bXBUYWcubG9jYWxOYW1lKCkpOwogICAg IH0KLSAgICByZXR1cm4gZWxlbWVudHMuY29udGFpbnMobmFtZSk7CisgICAgcmV0dXJuIGVsZW1l bnRzLmdldCgpLmNvbnRhaW5zKG5hbWUpOwogfQogCiB2b2lkIFJlcGxhY2VTZWxlY3Rpb25Db21t YW5kOjptYWtlSW5zZXJ0ZWRDb250ZW50Um91bmRUcmlwcGFibGVXaXRoSFRNTFRyZWVCdWlsZGVy KGNvbnN0IEluc2VydGVkTm9kZXMmIGluc2VydGVkTm9kZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL2F0ay9GcmFtZVNlbGVjdGlvbkF0ay5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL2F0ay9GcmFtZVNlbGVjdGlvbkF0ay5jcHAKaW5kZXggMDY4N2M3MmExNDQzMTg4 OTBkMTJkMTcyMTAyZjFmMGNmNzlkYjQyYi4uYWRlMDJiZThkYWI0YWU3NjI0ZjA0MzlhMjU5NTA0 ODAxZTc0NTk1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9hdGsvRnJhbWVT ZWxlY3Rpb25BdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvYXRrL0ZyYW1lU2Vs ZWN0aW9uQXRrLmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgPGd0ay9ndGsuaD4KICNl bmRpZgogCisjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL1Jl ZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01Myw3ICs1NCw3IEBAIHN0YXRpYyB2 b2lkIG1heWJlRW1pdFRleHRGb2N1c0NoYW5nZShQYXNzUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmpl Y3Q+IHBycE9iamVjdCkKICAgICAvLyBUaGlzIHN0YXRpYyB2YXJpYWJsZSBpcyBuZWVkZWQgdG8g a2VlcCB0cmFjayBvZiB0aGUgb2xkIG9iamVjdAogICAgIC8vIGFzIHBlciBwcmV2aW91cyBjYWxs cyB0byB0aGlzIGZ1bmN0aW9uLCBpbiBvcmRlciB0byBwcm9wZXJseQogICAgIC8vIGRlY2lkZSB3 aGV0aGVyIHRvIGVtaXQgc29tZSBzaWduYWxzIG9yIG5vdC4KLSAgICBERVBSRUNBVEVEX0RFRklO RV9TVEFUSUNfTE9DQUwoUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+LCBvbGRPYmplY3QsICgp KTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8UmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+ PiBvbGRPYmplY3Q7CiAKICAgICBSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gb2JqZWN0ID0g cHJwT2JqZWN0OwogCkBAIC02MSwxMSArNjIsMTEgQEAgc3RhdGljIHZvaWQgbWF5YmVFbWl0VGV4 dEZvY3VzQ2hhbmdlKFBhc3NSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gcHJwT2JqZWN0KQog ICAgIC8vIGN1cnJlbnQgb2JqZWN0IHNvIGZ1cnRoZXIgY29tcGFyaXNvbnMgbWFrZSBzZW5zZS4g T3RoZXJ3aXNlLAogICAgIC8vIGp1c3QgcmVzZXQgb2xkT2JqZWN0IHRvIDAgc28gaXQgd29uJ3Qg YmUgdGFrZW4gaW50byBhY2NvdW50IGluCiAgICAgLy8gdGhlIGltbWVkaWF0ZWx5IGZvbGxvd2lu ZyBjYWxsIHRvIHRoaXMgZnVuY3Rpb24uCi0gICAgaWYgKG9iamVjdCAmJiBvbGRPYmplY3QgJiYg b2xkT2JqZWN0LT5kb2N1bWVudCgpICE9IG9iamVjdC0+ZG9jdW1lbnQoKSkKLSAgICAgICAgb2xk T2JqZWN0ID0gMDsKKyAgICBpZiAob2JqZWN0ICYmIG9sZE9iamVjdC5nZXQoKSAmJiBvbGRPYmpl Y3QuZ2V0KCktPmRvY3VtZW50KCkgIT0gb2JqZWN0LT5kb2N1bWVudCgpKQorICAgICAgICBvbGRP YmplY3QuZ2V0KCkgPSAwOwogCiAgICAgQXRrT2JqZWN0KiBheE9iamVjdCA9IG9iamVjdCA/IG9i amVjdC0+d3JhcHBlcigpIDogMDsKLSAgICBBdGtPYmplY3QqIG9sZEF4T2JqZWN0ID0gb2xkT2Jq ZWN0ID8gb2xkT2JqZWN0LT53cmFwcGVyKCkgOiAwOworICAgIEF0a09iamVjdCogb2xkQXhPYmpl Y3QgPSBvbGRPYmplY3QuZ2V0KCkgPyBvbGRPYmplY3QuZ2V0KCktPndyYXBwZXIoKSA6IDA7CiAK ICAgICBpZiAoYXhPYmplY3QgIT0gb2xkQXhPYmplY3QpIHsKICAgICAgICAgaWYgKG9sZEF4T2Jq ZWN0ICYmIEFUS19JU19URVhUKG9sZEF4T2JqZWN0KSkgewpAQCAtNzksNyArODAsNyBAQCBzdGF0 aWMgdm9pZCBtYXliZUVtaXRUZXh0Rm9jdXNDaGFuZ2UoUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5 T2JqZWN0PiBwcnBPYmplY3QpCiAgICAgfQogCiAgICAgLy8gVXBkYXRlIHBvaW50ZXIgdG8gbGFz dCBmb2N1c2VkIG9iamVjdC4KLSAgICBvbGRPYmplY3QgPSBvYmplY3Q7CisgICAgb2xkT2JqZWN0 LmdldCgpID0gb2JqZWN0OwogfQogCiAK 227849 2014-03-26 07:25:14 -0700 2014-03-26 07:39:02 -0700 Patch bug-130722-20140326152452.patch text/plain 22767 svillar U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2MjkwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzYyOWZlMTNhY2E2MTg1 ZDQ1MWMyMjQwZmIyMzE0MDZlNjQ5NDBkZi4uMGNhZTAyNzAxY2QwM2Y3MDI4NDQ5NjYzODBmNGIw OTk2Mjk2MGFkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTI1ICBTZXJn aW8gVmlsbGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgorCisgICAgICAgIFJlcGxhY2Ug REVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMIGJ5IHN0YXRpYyBOZXZlckRlc3Ryb3llZDxU PiBpbiBlZGl0aW5nLworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTMwNzIyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBlZGl0aW5nL0FsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6bWFya2VyVHlwZXNGb3JBdXRvY29ycmVjdGlvbik6CisgICAgICAgIChXZWJDb3Jl OjptYXJrZXJUeXBlc0ZvclJlcGxhY2VtZW50KToKKyAgICAgICAgKFdlYkNvcmU6Om1hcmtlclR5 cGVzRm9yQXBwbGllZERpY3RhdGlvbkFsdGVybmF0aXZlKToKKyAgICAgICAgKiBlZGl0aW5nL0Vk aXRpbmdTdHlsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpodG1sRWxlbWVudEVxdWl2YWxlbnRz KToKKyAgICAgICAgKFdlYkNvcmU6Omh0bWxBdHRyaWJ1dGVFcXVpdmFsZW50cyk6CisgICAgICAg ICogZWRpdGluZy9Gb3JtYXRCbG9ja0NvbW1hbmQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNF bGVtZW50Rm9yRm9ybWF0QmxvY2spOgorICAgICAgICAqIGVkaXRpbmcvUmVtb3ZlRm9ybWF0Q29t bWFuZC5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0VsZW1lbnRGb3JSZW1vdmVGb3JtYXRDb21t YW5kKToKKyAgICAgICAgKiBlZGl0aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OmlzUHJvaGliaXRlZFBhcmFncmFwaENoaWxkKToKKyAgICAgICAgKiBl ZGl0aW5nL2F0ay9GcmFtZVNlbGVjdGlvbkF0ay5jcHA6CisgICAgICAgIChXZWJDb3JlOjptYXli ZUVtaXRUZXh0Rm9jdXNDaGFuZ2UpOgorCiAyMDE0LTAzLTI2ICBLcnp5c3p0b2YgQ3plY2ggIDxr LmN6ZWNoQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtBVEtdIFV0aWxpemUgbmV3IEF0a1ZhbHVl IGludGVyZmFjZSBjb21pbmcgaW4gQVRLIDIuMTEuOTIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2VkaXRpbmcvQWx0ZXJuYXRpdmVUZXh0Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL0FsdGVybmF0aXZlVGV4dENvbnRyb2xsZXIuY3BwCmluZGV4IDQ4YmM3ODc2ZTVi NDMyMzk5ODdjN2I3MDI2ZTc4ZDAyN2I3OGNmNDMuLjE2NWMxNDljOWI0ZmE4MjRlNjFmNGJiYzE3 N2FkMzg1YWNmMTNlZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvQWx0ZXJu YXRpdmVUZXh0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZWRpdGluZy9BbHRl cm5hdGl2ZVRleHRDb250cm9sbGVyLmNwcApAQCAtNDUsNiArNDUsNyBAQAogI2luY2x1ZGUgIlZp c2libGVVbml0cy5oIgogI2luY2x1ZGUgImh0bWxlZGl0aW5nLmgiCiAjaW5jbHVkZSAibWFya3Vw LmgiCisjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIApAQCAtODUsMzEgKzg2LDMxIEBAIHByaXZhdGU6CiAKIHN0YXRpYyBjb25zdCBWZWN0b3I8 RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+JiBtYXJrZXJUeXBlc0ZvckF1dG9jb3JyZWN0aW9u KCkKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoVmVjdG9yPERvY3VtZW50 TWFya2VyOjpNYXJrZXJUeXBlPiwgbWFya2VyVHlwZXNGb3JBdXRvQ29ycmVjdGlvbiwgKCkpOwot ICAgIGlmIChtYXJrZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uLmlzRW1wdHkoKSkgewotICAgICAg ICBtYXJrZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uLmFwcGVuZChEb2N1bWVudE1hcmtlcjo6UmVw bGFjZW1lbnQpOwotICAgICAgICBtYXJrZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uLmFwcGVuZChE b2N1bWVudE1hcmtlcjo6Q29ycmVjdGlvbkluZGljYXRvcik7Ci0gICAgICAgIG1hcmtlclR5cGVz Rm9yQXV0b0NvcnJlY3Rpb24uYXBwZW5kKERvY3VtZW50TWFya2VyOjpTcGVsbENoZWNraW5nRXhl bXB0aW9uKTsKLSAgICAgICAgbWFya2VyVHlwZXNGb3JBdXRvQ29ycmVjdGlvbi5hcHBlbmQoRG9j dW1lbnRNYXJrZXI6OkF1dG9jb3JyZWN0ZWQpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxW ZWN0b3I8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+PiBtYXJrZXJUeXBlc0ZvckF1dG9Db3Jy ZWN0aW9uOworICAgIGlmIChtYXJrZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uLmdldCgpLmlzRW1w dHkoKSkgeworICAgICAgICBtYXJrZXJUeXBlc0ZvckF1dG9Db3JyZWN0aW9uLmdldCgpLmFwcGVu ZChEb2N1bWVudE1hcmtlcjo6UmVwbGFjZW1lbnQpOworICAgICAgICBtYXJrZXJUeXBlc0ZvckF1 dG9Db3JyZWN0aW9uLmdldCgpLmFwcGVuZChEb2N1bWVudE1hcmtlcjo6Q29ycmVjdGlvbkluZGlj YXRvcik7CisgICAgICAgIG1hcmtlclR5cGVzRm9yQXV0b0NvcnJlY3Rpb24uZ2V0KCkuYXBwZW5k KERvY3VtZW50TWFya2VyOjpTcGVsbENoZWNraW5nRXhlbXB0aW9uKTsKKyAgICAgICAgbWFya2Vy VHlwZXNGb3JBdXRvQ29ycmVjdGlvbi5nZXQoKS5hcHBlbmQoRG9jdW1lbnRNYXJrZXI6OkF1dG9j b3JyZWN0ZWQpOwogICAgIH0KICAgICByZXR1cm4gbWFya2VyVHlwZXNGb3JBdXRvQ29ycmVjdGlv bjsKIH0KIAogc3RhdGljIGNvbnN0IFZlY3RvcjxEb2N1bWVudE1hcmtlcjo6TWFya2VyVHlwZT4m IG1hcmtlclR5cGVzRm9yUmVwbGFjZW1lbnQoKQogewotICAgIERFUFJFQ0FURURfREVGSU5FX1NU QVRJQ19MT0NBTChWZWN0b3I8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+LCBtYXJrZXJUeXBl c0ZvclJlcGxhY2VtZW50LCAoKSk7Ci0gICAgaWYgKG1hcmtlclR5cGVzRm9yUmVwbGFjZW1lbnQu aXNFbXB0eSgpKSB7Ci0gICAgICAgIG1hcmtlclR5cGVzRm9yUmVwbGFjZW1lbnQuYXBwZW5kKERv Y3VtZW50TWFya2VyOjpSZXBsYWNlbWVudCk7Ci0gICAgICAgIG1hcmtlclR5cGVzRm9yUmVwbGFj ZW1lbnQuYXBwZW5kKERvY3VtZW50TWFya2VyOjpTcGVsbENoZWNraW5nRXhlbXB0aW9uKTsKKyAg ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8VmVjdG9yPERvY3VtZW50TWFya2VyOjpNYXJrZXJUeXBl Pj4gbWFya2VyVHlwZXNGb3JSZXBsYWNlbWVudDsKKyAgICBpZiAobWFya2VyVHlwZXNGb3JSZXBs YWNlbWVudC5nZXQoKS5pc0VtcHR5KCkpIHsKKyAgICAgICAgbWFya2VyVHlwZXNGb3JSZXBsYWNl bWVudC5nZXQoKS5hcHBlbmQoRG9jdW1lbnRNYXJrZXI6OlJlcGxhY2VtZW50KTsKKyAgICAgICAg bWFya2VyVHlwZXNGb3JSZXBsYWNlbWVudC5nZXQoKS5hcHBlbmQoRG9jdW1lbnRNYXJrZXI6OlNw ZWxsQ2hlY2tpbmdFeGVtcHRpb24pOwogICAgIH0KICAgICByZXR1cm4gbWFya2VyVHlwZXNGb3JS ZXBsYWNlbWVudDsKIH0KIAogc3RhdGljIGNvbnN0IFZlY3RvcjxEb2N1bWVudE1hcmtlcjo6TWFy a2VyVHlwZT4mIG1hcmtlclR5cGVzRm9yQXBwbGllZERpY3RhdGlvbkFsdGVybmF0aXZlKCkKIHsK LSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoVmVjdG9yPERvY3VtZW50TWFya2Vy OjpNYXJrZXJUeXBlPiwgbWFya2VyVHlwZXNGb3JBcHBsaWVkRGljdGF0aW9uQWx0ZXJuYXRpdmUs ICgpKTsKLSAgICBpZiAobWFya2VyVHlwZXNGb3JBcHBsaWVkRGljdGF0aW9uQWx0ZXJuYXRpdmUu aXNFbXB0eSgpKQotICAgICAgICBtYXJrZXJUeXBlc0ZvckFwcGxpZWREaWN0YXRpb25BbHRlcm5h dGl2ZS5hcHBlbmQoRG9jdW1lbnRNYXJrZXI6OlNwZWxsQ2hlY2tpbmdFeGVtcHRpb24pOworICAg IHN0YXRpYyBOZXZlckRlc3Ryb3llZDxWZWN0b3I8RG9jdW1lbnRNYXJrZXI6Ok1hcmtlclR5cGU+ PiBtYXJrZXJUeXBlc0ZvckFwcGxpZWREaWN0YXRpb25BbHRlcm5hdGl2ZTsKKyAgICBpZiAobWFy a2VyVHlwZXNGb3JBcHBsaWVkRGljdGF0aW9uQWx0ZXJuYXRpdmUuZ2V0KCkuaXNFbXB0eSgpKQor ICAgICAgICBtYXJrZXJUeXBlc0ZvckFwcGxpZWREaWN0YXRpb25BbHRlcm5hdGl2ZS5nZXQoKS5h cHBlbmQoRG9jdW1lbnRNYXJrZXI6OlNwZWxsQ2hlY2tpbmdFeGVtcHRpb24pOwogICAgIHJldHVy biBtYXJrZXJUeXBlc0ZvckFwcGxpZWREaWN0YXRpb25BbHRlcm5hdGl2ZTsKIH0KIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9FZGl0aW5nU3R5bGUuY3BwCmluZGV4IGFlZmY3MDA4MjI5YThhY2FhOGRi MjA2MzJmNTVkNjJjYTRhZGI3MWYuLjAwMGNkYmQ2Njg5YmYyZTAwNTdjZmE5NWI1ZDY2NWE0ZTk3 MzgwODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRWRpdGluZ1N0eWxlLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0VkaXRpbmdTdHlsZS5jcHAKQEAgLTc0MCwx OSArNzQwLDE5IEBAIGJvb2wgRWRpdGluZ1N0eWxlOjpjb25mbGljdHNXaXRoSW5saW5lU3R5bGVP ZkVsZW1lbnQoU3R5bGVkRWxlbWVudCogZWxlbWVudCwgRWRpCiAKIHN0YXRpYyBjb25zdCBWZWN0 b3I8c3RkOjp1bmlxdWVfcHRyPEhUTUxFbGVtZW50RXF1aXZhbGVudD4+JiBodG1sRWxlbWVudEVx dWl2YWxlbnRzKCkKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoVmVjdG9y PHN0ZDo6dW5pcXVlX3B0cjxIVE1MRWxlbWVudEVxdWl2YWxlbnQ+PiwgSFRNTEVsZW1lbnRFcXVp dmFsZW50cywgKCkpOwotCi0gICAgaWYgKCFIVE1MRWxlbWVudEVxdWl2YWxlbnRzLnNpemUoKSkg ewotICAgICAgICBIVE1MRWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVl PEhUTUxFbGVtZW50RXF1aXZhbGVudD4oQ1NTUHJvcGVydHlGb250V2VpZ2h0LCBDU1NWYWx1ZUJv bGQsIEhUTUxOYW1lczo6YlRhZykpOwotICAgICAgICBIVE1MRWxlbWVudEVxdWl2YWxlbnRzLmFw cGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxFbGVtZW50RXF1aXZhbGVudD4oQ1NTUHJvcGVydHlG b250V2VpZ2h0LCBDU1NWYWx1ZUJvbGQsIEhUTUxOYW1lczo6c3Ryb25nVGFnKSk7Ci0gICAgICAg IEhUTUxFbGVtZW50RXF1aXZhbGVudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEVsZW1l bnRFcXVpdmFsZW50PihDU1NQcm9wZXJ0eVZlcnRpY2FsQWxpZ24sIENTU1ZhbHVlU3ViLCBIVE1M TmFtZXM6OnN1YlRhZykpOwotICAgICAgICBIVE1MRWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChz dGQ6Om1ha2VfdW5pcXVlPEhUTUxFbGVtZW50RXF1aXZhbGVudD4oQ1NTUHJvcGVydHlWZXJ0aWNh bEFsaWduLCBDU1NWYWx1ZVN1cGVyLCBIVE1MTmFtZXM6OnN1cFRhZykpOwotICAgICAgICBIVE1M RWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxFbGVtZW50RXF1 aXZhbGVudD4oQ1NTUHJvcGVydHlGb250U3R5bGUsIENTU1ZhbHVlSXRhbGljLCBIVE1MTmFtZXM6 OmlUYWcpKTsKLSAgICAgICAgSFRNTEVsZW1lbnRFcXVpdmFsZW50cy5hcHBlbmQoc3RkOjptYWtl X3VuaXF1ZTxIVE1MRWxlbWVudEVxdWl2YWxlbnQ+KENTU1Byb3BlcnR5Rm9udFN0eWxlLCBDU1NW YWx1ZUl0YWxpYywgSFRNTE5hbWVzOjplbVRhZykpOwotCi0gICAgICAgIEhUTUxFbGVtZW50RXF1 aXZhbGVudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTFRleHREZWNvcmF0aW9uRXF1aXZh bGVudD4oQ1NTVmFsdWVVbmRlcmxpbmUsIEhUTUxOYW1lczo6dVRhZykpOwotICAgICAgICBIVE1M RWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxUZXh0RGVjb3Jh dGlvbkVxdWl2YWxlbnQ+KENTU1ZhbHVlTGluZVRocm91Z2gsIEhUTUxOYW1lczo6c1RhZykpOwot ICAgICAgICBIVE1MRWxlbWVudEVxdWl2YWxlbnRzLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhU TUxUZXh0RGVjb3JhdGlvbkVxdWl2YWxlbnQ+KENTU1ZhbHVlTGluZVRocm91Z2gsIEhUTUxOYW1l czo6c3RyaWtlVGFnKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3RvcjxzdGQ6OnVu aXF1ZV9wdHI8SFRNTEVsZW1lbnRFcXVpdmFsZW50Pj4+IEhUTUxFbGVtZW50RXF1aXZhbGVudHM7 CisKKyAgICBpZiAoIUhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0KCkuc2l6ZSgpKSB7CisgICAg ICAgIEhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8 SFRNTEVsZW1lbnRFcXVpdmFsZW50PihDU1NQcm9wZXJ0eUZvbnRXZWlnaHQsIENTU1ZhbHVlQm9s ZCwgSFRNTE5hbWVzOjpiVGFnKSk7CisgICAgICAgIEhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0 KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEVsZW1lbnRFcXVpdmFsZW50PihDU1NQcm9w ZXJ0eUZvbnRXZWlnaHQsIENTU1ZhbHVlQm9sZCwgSFRNTE5hbWVzOjpzdHJvbmdUYWcpKTsKKyAg ICAgICAgSFRNTEVsZW1lbnRFcXVpdmFsZW50cy5nZXQoKS5hcHBlbmQoc3RkOjptYWtlX3VuaXF1 ZTxIVE1MRWxlbWVudEVxdWl2YWxlbnQ+KENTU1Byb3BlcnR5VmVydGljYWxBbGlnbiwgQ1NTVmFs dWVTdWIsIEhUTUxOYW1lczo6c3ViVGFnKSk7CisgICAgICAgIEhUTUxFbGVtZW50RXF1aXZhbGVu dHMuZ2V0KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEVsZW1lbnRFcXVpdmFsZW50PihD U1NQcm9wZXJ0eVZlcnRpY2FsQWxpZ24sIENTU1ZhbHVlU3VwZXIsIEhUTUxOYW1lczo6c3VwVGFn KSk7CisgICAgICAgIEhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0KCkuYXBwZW5kKHN0ZDo6bWFr ZV91bmlxdWU8SFRNTEVsZW1lbnRFcXVpdmFsZW50PihDU1NQcm9wZXJ0eUZvbnRTdHlsZSwgQ1NT VmFsdWVJdGFsaWMsIEhUTUxOYW1lczo6aVRhZykpOworICAgICAgICBIVE1MRWxlbWVudEVxdWl2 YWxlbnRzLmdldCgpLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxFbGVtZW50RXF1aXZhbGVu dD4oQ1NTUHJvcGVydHlGb250U3R5bGUsIENTU1ZhbHVlSXRhbGljLCBIVE1MTmFtZXM6OmVtVGFn KSk7CisKKyAgICAgICAgSFRNTEVsZW1lbnRFcXVpdmFsZW50cy5nZXQoKS5hcHBlbmQoc3RkOjpt YWtlX3VuaXF1ZTxIVE1MVGV4dERlY29yYXRpb25FcXVpdmFsZW50PihDU1NWYWx1ZVVuZGVybGlu ZSwgSFRNTE5hbWVzOjp1VGFnKSk7CisgICAgICAgIEhUTUxFbGVtZW50RXF1aXZhbGVudHMuZ2V0 KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTFRleHREZWNvcmF0aW9uRXF1aXZhbGVudD4o Q1NTVmFsdWVMaW5lVGhyb3VnaCwgSFRNTE5hbWVzOjpzVGFnKSk7CisgICAgICAgIEhUTUxFbGVt ZW50RXF1aXZhbGVudHMuZ2V0KCkuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTFRleHREZWNv cmF0aW9uRXF1aXZhbGVudD4oQ1NTVmFsdWVMaW5lVGhyb3VnaCwgSFRNTE5hbWVzOjpzdHJpa2VU YWcpKTsKICAgICB9CiAKICAgICByZXR1cm4gSFRNTEVsZW1lbnRFcXVpdmFsZW50czsKQEAgLTc3 OSwxNyArNzc5LDE3IEBAIGJvb2wgRWRpdGluZ1N0eWxlOjpjb25mbGljdHNXaXRoSW1wbGljaXRT dHlsZU9mRWxlbWVudChIVE1MRWxlbWVudCogZWxlbWVudCwgRWRpCiAKIHN0YXRpYyBjb25zdCBW ZWN0b3I8c3RkOjp1bmlxdWVfcHRyPEhUTUxBdHRyaWJ1dGVFcXVpdmFsZW50Pj4mIGh0bWxBdHRy aWJ1dGVFcXVpdmFsZW50cygpCiB7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FM KFZlY3RvcjxzdGQ6OnVuaXF1ZV9wdHI8SFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnQ+PiwgSFRNTEF0 dHJpYnV0ZUVxdWl2YWxlbnRzLCAoKSk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPFZlY3Rv cjxzdGQ6OnVuaXF1ZV9wdHI8SFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnQ+Pj4gSFRNTEF0dHJpYnV0 ZUVxdWl2YWxlbnRzOwogCi0gICAgaWYgKCFIVE1MQXR0cmlidXRlRXF1aXZhbGVudHMuc2l6ZSgp KSB7CisgICAgaWYgKCFIVE1MQXR0cmlidXRlRXF1aXZhbGVudHMuZ2V0KCkuc2l6ZSgpKSB7CiAg ICAgICAgIC8vIGVsZW1lbnRJc1N0eWxlZFNwYW5PckhUTUxFcXVpdmFsZW50IGRlcGVuZHMgb24g dGhlIGZhY3QgZWFjaCBIVE1MQXR0cml1dGVFcXVpdmFsZW50IG1hdGNoZXMgZXhhY3RseSBvbmUg YXR0cmlidXRlCiAgICAgICAgIC8vIG9mIGV4YWN0bHkgb25lIGVsZW1lbnQgZXhjZXB0IGRpckF0 dHIuCi0gICAgICAgIEhUTUxBdHRyaWJ1dGVFcXVpdmFsZW50cy5hcHBlbmQoc3RkOjptYWtlX3Vu aXF1ZTxIVE1MQXR0cmlidXRlRXF1aXZhbGVudD4oQ1NTUHJvcGVydHlDb2xvciwgSFRNTE5hbWVz Ojpmb250VGFnLCBIVE1MTmFtZXM6OmNvbG9yQXR0cikpOwotICAgICAgICBIVE1MQXR0cmlidXRl RXF1aXZhbGVudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEF0dHJpYnV0ZUVxdWl2YWxl bnQ+KENTU1Byb3BlcnR5Rm9udEZhbWlseSwgSFRNTE5hbWVzOjpmb250VGFnLCBIVE1MTmFtZXM6 OmZhY2VBdHRyKSk7Ci0gICAgICAgIEhUTUxBdHRyaWJ1dGVFcXVpdmFsZW50cy5hcHBlbmQoc3Rk OjptYWtlX3VuaXF1ZTxIVE1MRm9udFNpemVFcXVpdmFsZW50PigpKTsKKyAgICAgICAgSFRNTEF0 dHJpYnV0ZUVxdWl2YWxlbnRzLmdldCgpLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxBdHRy aWJ1dGVFcXVpdmFsZW50PihDU1NQcm9wZXJ0eUNvbG9yLCBIVE1MTmFtZXM6OmZvbnRUYWcsIEhU TUxOYW1lczo6Y29sb3JBdHRyKSk7CisgICAgICAgIEhUTUxBdHRyaWJ1dGVFcXVpdmFsZW50cy5n ZXQoKS5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxIVE1MQXR0cmlidXRlRXF1aXZhbGVudD4oQ1NT UHJvcGVydHlGb250RmFtaWx5LCBIVE1MTmFtZXM6OmZvbnRUYWcsIEhUTUxOYW1lczo6ZmFjZUF0 dHIpKTsKKyAgICAgICAgSFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnRzLmdldCgpLmFwcGVuZChzdGQ6 Om1ha2VfdW5pcXVlPEhUTUxGb250U2l6ZUVxdWl2YWxlbnQ+KCkpOwogCi0gICAgICAgIEhUTUxB dHRyaWJ1dGVFcXVpdmFsZW50cy5hcHBlbmQoc3RkOjptYWtlX3VuaXF1ZTxIVE1MQXR0cmlidXRl RXF1aXZhbGVudD4oQ1NTUHJvcGVydHlEaXJlY3Rpb24sIEhUTUxOYW1lczo6ZGlyQXR0cikpOwot ICAgICAgICBIVE1MQXR0cmlidXRlRXF1aXZhbGVudHMuYXBwZW5kKHN0ZDo6bWFrZV91bmlxdWU8 SFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnQ+KENTU1Byb3BlcnR5VW5pY29kZUJpZGksIEhUTUxOYW1l czo6ZGlyQXR0cikpOworICAgICAgICBIVE1MQXR0cmlidXRlRXF1aXZhbGVudHMuZ2V0KCkuYXBw ZW5kKHN0ZDo6bWFrZV91bmlxdWU8SFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnQ+KENTU1Byb3BlcnR5 RGlyZWN0aW9uLCBIVE1MTmFtZXM6OmRpckF0dHIpKTsKKyAgICAgICAgSFRNTEF0dHJpYnV0ZUVx dWl2YWxlbnRzLmdldCgpLmFwcGVuZChzdGQ6Om1ha2VfdW5pcXVlPEhUTUxBdHRyaWJ1dGVFcXVp dmFsZW50PihDU1NQcm9wZXJ0eVVuaWNvZGVCaWRpLCBIVE1MTmFtZXM6OmRpckF0dHIpKTsKICAg ICB9CiAKICAgICByZXR1cm4gSFRNTEF0dHJpYnV0ZUVxdWl2YWxlbnRzOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZWRpdGluZy9Gb3JtYXRCbG9ja0NvbW1hbmQuY3BwIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9Gb3JtYXRCbG9ja0NvbW1hbmQuY3BwCmluZGV4IDQ3MDIwYjMyYmJhYmU3 NjRhYjc4ODI5Njg3ZjFkMzliNzFiYTdmZjQuLjQ2OTBmMjE3NTM1NzMwYjI0ODc5NWE5OGE4NTY2 MzZmOTYzMDdjNmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvRm9ybWF0Qmxv Y2tDb21tYW5kLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL0Zvcm1hdEJsb2NrQ29t bWFuZC5jcHAKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJIVE1MTmFtZXMuaCIKICNpbmNs dWRlICJSYW5nZS5oIgogI2luY2x1ZGUgIlZpc2libGVVbml0cy5oIgorI2luY2x1ZGUgPHd0Zi9O ZXZlckRlc3Ryb3llZC5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTExNywzMiArMTE4 LDMyIEBAIEVsZW1lbnQqIEZvcm1hdEJsb2NrQ29tbWFuZDo6ZWxlbWVudEZvckZvcm1hdEJsb2Nr Q29tbWFuZChSYW5nZSogcmFuZ2UpCiAKIGJvb2wgaXNFbGVtZW50Rm9yRm9ybWF0QmxvY2soY29u c3QgUXVhbGlmaWVkTmFtZSYgdGFnTmFtZSkKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFU SUNfTE9DQUwoSGFzaFNldDxRdWFsaWZpZWROYW1lPiwgYmxvY2tUYWdzLCAoKSk7Ci0gICAgaWYg KGJsb2NrVGFncy5pc0VtcHR5KCkpIHsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChhZGRyZXNzVGFn KTsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChhcnRpY2xlVGFnKTsKLSAgICAgICAgYmxvY2tUYWdz LmFkZChhc2lkZVRhZyk7Ci0gICAgICAgIGJsb2NrVGFncy5hZGQoYmxvY2txdW90ZVRhZyk7Ci0g ICAgICAgIGJsb2NrVGFncy5hZGQoZGRUYWcpOwotICAgICAgICBibG9ja1RhZ3MuYWRkKGRpdlRh Zyk7Ci0gICAgICAgIGJsb2NrVGFncy5hZGQoZGxUYWcpOwotICAgICAgICBibG9ja1RhZ3MuYWRk KGR0VGFnKTsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChmb290ZXJUYWcpOwotICAgICAgICBibG9j a1RhZ3MuYWRkKGgxVGFnKTsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChoMlRhZyk7Ci0gICAgICAg IGJsb2NrVGFncy5hZGQoaDNUYWcpOwotICAgICAgICBibG9ja1RhZ3MuYWRkKGg0VGFnKTsKLSAg ICAgICAgYmxvY2tUYWdzLmFkZChoNVRhZyk7Ci0gICAgICAgIGJsb2NrVGFncy5hZGQoaDZUYWcp OwotICAgICAgICBibG9ja1RhZ3MuYWRkKGhlYWRlclRhZyk7Ci0gICAgICAgIGJsb2NrVGFncy5h ZGQoaGdyb3VwVGFnKTsKLSAgICAgICAgYmxvY2tUYWdzLmFkZChtYWluVGFnKTsKLSAgICAgICAg YmxvY2tUYWdzLmFkZChuYXZUYWcpOwotICAgICAgICBibG9ja1RhZ3MuYWRkKHBUYWcpOwotICAg ICAgICBibG9ja1RhZ3MuYWRkKHByZVRhZyk7Ci0gICAgICAgIGJsb2NrVGFncy5hZGQoc2VjdGlv blRhZyk7CisgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hTZXQ8UXVhbGlmaWVkTmFtZT4+ IGJsb2NrVGFnczsKKyAgICBpZiAoYmxvY2tUYWdzLmdldCgpLmlzRW1wdHkoKSkgeworICAgICAg ICBibG9ja1RhZ3MuZ2V0KCkuYWRkKGFkZHJlc3NUYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0 KCkuYWRkKGFydGljbGVUYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0KCkuYWRkKGFzaWRlVGFn KTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZChibG9ja3F1b3RlVGFnKTsKKyAgICAgICAg YmxvY2tUYWdzLmdldCgpLmFkZChkZFRhZyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQo ZGl2VGFnKTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZChkbFRhZyk7CisgICAgICAgIGJs b2NrVGFncy5nZXQoKS5hZGQoZHRUYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0KCkuYWRkKGZv b3RlclRhZyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQoaDFUYWcpOworICAgICAgICBi bG9ja1RhZ3MuZ2V0KCkuYWRkKGgyVGFnKTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZCho M1RhZyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQoaDRUYWcpOworICAgICAgICBibG9j a1RhZ3MuZ2V0KCkuYWRkKGg1VGFnKTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZChoNlRh Zyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQoaGVhZGVyVGFnKTsKKyAgICAgICAgYmxv Y2tUYWdzLmdldCgpLmFkZChoZ3JvdXBUYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0KCkuYWRk KG1haW5UYWcpOworICAgICAgICBibG9ja1RhZ3MuZ2V0KCkuYWRkKG5hdlRhZyk7CisgICAgICAg IGJsb2NrVGFncy5nZXQoKS5hZGQocFRhZyk7CisgICAgICAgIGJsb2NrVGFncy5nZXQoKS5hZGQo cHJlVGFnKTsKKyAgICAgICAgYmxvY2tUYWdzLmdldCgpLmFkZChzZWN0aW9uVGFnKTsKICAgICB9 Ci0gICAgcmV0dXJuIGJsb2NrVGFncy5jb250YWlucyh0YWdOYW1lKTsKKyAgICByZXR1cm4gYmxv Y2tUYWdzLmdldCgpLmNvbnRhaW5zKHRhZ05hbWUpOwogfQogCiBOb2RlKiBlbmNsb3NpbmdCbG9j a1RvU3BsaXRUcmVlVG8oTm9kZSogc3RhcnROb2RlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvZWRpdGluZy9SZW1vdmVGb3JtYXRDb21tYW5kLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2VkaXRp bmcvUmVtb3ZlRm9ybWF0Q29tbWFuZC5jcHAKaW5kZXggNGI2YWE0NWVkMzA0NzYxOWYxZGNkMGIy MTI3OGVmN2UzYmYyMzQ5My4uNzhiMWZkNjRmMDllYzE4OTY0MmI5MjVmMTM1MzQ4MmUxZGZjMDlk MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9SZW1vdmVGb3JtYXRDb21tYW5k LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL1JlbW92ZUZvcm1hdENvbW1hbmQuY3Bw CkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiRnJhbWVTZWxlY3Rpb24uaCIKICNpbmNsdWRl ICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJTdHlsZVByb3BlcnRpZXMuaCIKKyNpbmNsdWRlIDx3 dGYvTmV2ZXJEZXN0cm95ZWQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCkBAIC00NSwzNCAr NDYsMzQgQEAgUmVtb3ZlRm9ybWF0Q29tbWFuZDo6UmVtb3ZlRm9ybWF0Q29tbWFuZChEb2N1bWVu dCYgZG9jdW1lbnQpCiAKIHN0YXRpYyBib29sIGlzRWxlbWVudEZvclJlbW92ZUZvcm1hdENvbW1h bmQoY29uc3QgRWxlbWVudCogZWxlbWVudCkKIHsKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFU SUNfTE9DQUwoSGFzaFNldDxRdWFsaWZpZWROYW1lPiwgZWxlbWVudHMsICgpKTsKLSAgICBpZiAo ZWxlbWVudHMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChhY3JvbnltVGFnKTsK LSAgICAgICAgZWxlbWVudHMuYWRkKGJUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoYmRvVGFn KTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGJpZ1RhZyk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChj aXRlVGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGNvZGVUYWcpOwotICAgICAgICBlbGVtZW50 cy5hZGQoZGZuVGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGVtVGFnKTsKLSAgICAgICAgZWxl bWVudHMuYWRkKGZvbnRUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoaVRhZyk7Ci0gICAgICAg IGVsZW1lbnRzLmFkZChpbnNUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoa2JkVGFnKTsKLSAg ICAgICAgZWxlbWVudHMuYWRkKG5vYnJUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQocVRhZyk7 Ci0gICAgICAgIGVsZW1lbnRzLmFkZChzVGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKHNhbXBU YWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoc21hbGxUYWcpOwotICAgICAgICBlbGVtZW50cy5h ZGQoc3RyaWtlVGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKHN0cm9uZ1RhZyk7Ci0gICAgICAg IGVsZW1lbnRzLmFkZChzdWJUYWcpOwotICAgICAgICBlbGVtZW50cy5hZGQoc3VwVGFnKTsKLSAg ICAgICAgZWxlbWVudHMuYWRkKHR0VGFnKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKHVUYWcpOwot ICAgICAgICBlbGVtZW50cy5hZGQodmFyVGFnKTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8 SGFzaFNldDxRdWFsaWZpZWROYW1lPj4gZWxlbWVudHM7CisgICAgaWYgKGVsZW1lbnRzLmdldCgp LmlzRW1wdHkoKSkgeworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoYWNyb255bVRhZyk7Cisg ICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChiVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCku YWRkKGJkb1RhZyk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChiaWdUYWcpOworICAgICAg ICBlbGVtZW50cy5nZXQoKS5hZGQoY2l0ZVRhZyk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFk ZChjb2RlVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGRmblRhZyk7CisgICAgICAg IGVsZW1lbnRzLmdldCgpLmFkZChlbVRhZyk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChm b250VGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGlUYWcpOworICAgICAgICBlbGVt ZW50cy5nZXQoKS5hZGQoaW5zVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGtiZFRh Zyk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChub2JyVGFnKTsKKyAgICAgICAgZWxlbWVu dHMuZ2V0KCkuYWRkKHFUYWcpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoc1RhZyk7Cisg ICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChzYW1wVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0 KCkuYWRkKHNtYWxsVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKHN0cmlrZVRhZyk7 CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChzdHJvbmdUYWcpOworICAgICAgICBlbGVtZW50 cy5nZXQoKS5hZGQoc3ViVGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKHN1cFRhZyk7 CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0dFRhZyk7CisgICAgICAgIGVsZW1lbnRzLmdl dCgpLmFkZCh1VGFnKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKHZhclRhZyk7CiAgICAg fQotICAgIHJldHVybiBlbGVtZW50cy5jb250YWlucyhlbGVtZW50LT50YWdRTmFtZSgpKTsKKyAg ICByZXR1cm4gZWxlbWVudHMuZ2V0KCkuY29udGFpbnMoZWxlbWVudC0+dGFnUU5hbWUoKSk7CiB9 CiAKIHZvaWQgUmVtb3ZlRm9ybWF0Q29tbWFuZDo6ZG9BcHBseSgpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9lZGl0aW5nL1JlcGxhY2VTZWxlY3Rpb25Db21tYW5kLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2VkaXRpbmcvUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwCmluZGV4IGZlZGZhMGEw MTQwODEzNzkxODhkMWJjNWE4ZWYyODkwNmVmZDY0NDQuLmU5MjUwOTQ0MDhkYzI3NmY4ZjAwMDli ZTVlY2U1NmZkOGZiM2U5YzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVw bGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvUmVw bGFjZVNlbGVjdGlvbkNvbW1hbmQuY3BwCkBAIC01NSw2ICs1NSw3IEBACiAjaW5jbHVkZSAiVmlz aWJsZVVuaXRzLmgiCiAjaW5jbHVkZSAiaHRtbGVkaXRpbmcuaCIKICNpbmNsdWRlICJtYXJrdXAu aCIKKyNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNpbmNsdWRlIDx3dGYvU3RkTGli RXh0cmFzLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTU2Myw1OCArNTY0LDU4IEBAIHZv aWQgUmVwbGFjZVNlbGVjdGlvbkNvbW1hbmQ6OnJlbW92ZVJlZHVuZGFudFN0eWxlc0FuZEtlZXBT dHlsZVNwYW5JbmxpbmUoSW5zZXJ0CiBzdGF0aWMgYm9vbCBpc1Byb2hpYml0ZWRQYXJhZ3JhcGhD aGlsZChjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUpCiB7CiAgICAgLy8gaHR0cHM6Ly9kdmNzLncz Lm9yZy9oZy9lZGl0aW5nL3Jhdy1maWxlLzU3YWJlNmQzY2I2MC9lZGl0aW5nLmh0bWwjcHJvaGli aXRlZC1wYXJhZ3JhcGgtY2hpbGQKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwo SGFzaFNldDxBdG9taWNTdHJpbmc+LCBlbGVtZW50cywgKCkpOwotICAgIGlmIChlbGVtZW50cy5p c0VtcHR5KCkpIHsKLSAgICAgICAgZWxlbWVudHMuYWRkKGFkZHJlc3NUYWcubG9jYWxOYW1lKCkp OwotICAgICAgICBlbGVtZW50cy5hZGQoYXJ0aWNsZVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAg IGVsZW1lbnRzLmFkZChhc2lkZVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFk ZChibG9ja3F1b3RlVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGNhcHRp b25UYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoY2VudGVyVGFnLmxvY2Fs TmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGNvbFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAg ICAgIGVsZW1lbnRzLmFkZChjb2xncm91cFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1l bnRzLmFkZChkZFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChkZXRhaWxz VGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRkKGRpclRhZy5sb2NhbE5hbWUo KSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChkaXZUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBl bGVtZW50cy5hZGQoZGxUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoZHRU YWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoZmllbGRzZXRUYWcubG9jYWxO YW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoZmlnY2FwdGlvblRhZy5sb2NhbE5hbWUoKSk7 Ci0gICAgICAgIGVsZW1lbnRzLmFkZChmaWd1cmVUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBl bGVtZW50cy5hZGQoZm9vdGVyVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRk KGZvcm1UYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoaDFUYWcubG9jYWxO YW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoaDJUYWcubG9jYWxOYW1lKCkpOwotICAgICAg ICBlbGVtZW50cy5hZGQoaDNUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQo aDRUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoaDVUYWcubG9jYWxOYW1l KCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoaDZUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBl bGVtZW50cy5hZGQoaGVhZGVyVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMuYWRk KGhncm91cFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChoclRhZy5sb2Nh bE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChsaVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAg ICAgIGVsZW1lbnRzLmFkZChsaXN0aW5nVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVu dHMuYWRkKG1haW5UYWcubG9jYWxOYW1lKCkpOyAvLyBNaXNzaW5nIGluIHRoZSBzcGVjaWZpY2F0 aW9uLgotICAgICAgICBlbGVtZW50cy5hZGQobWVudVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAg IGVsZW1lbnRzLmFkZChuYXZUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQo b2xUYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQocFRhZy5sb2NhbE5hbWUo KSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZChwbGFpbnRleHRUYWcubG9jYWxOYW1lKCkpOwotICAg ICAgICBlbGVtZW50cy5hZGQocHJlVGFnLmxvY2FsTmFtZSgpKTsKLSAgICAgICAgZWxlbWVudHMu YWRkKHNlY3Rpb25UYWcubG9jYWxOYW1lKCkpOwotICAgICAgICBlbGVtZW50cy5hZGQoc3VtbWFy eVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh0YWJsZVRhZy5sb2NhbE5h bWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh0Ym9keVRhZy5sb2NhbE5hbWUoKSk7Ci0gICAg ICAgIGVsZW1lbnRzLmFkZCh0ZFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFk ZCh0Zm9vdFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh0aFRhZy5sb2Nh bE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh0aGVhZFRhZy5sb2NhbE5hbWUoKSk7Ci0g ICAgICAgIGVsZW1lbnRzLmFkZCh0clRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRz LmFkZCh1bFRhZy5sb2NhbE5hbWUoKSk7Ci0gICAgICAgIGVsZW1lbnRzLmFkZCh4bXBUYWcubG9j YWxOYW1lKCkpOworICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoU2V0PEF0b21pY1N0cmlu Zz4+IGVsZW1lbnRzOworICAgIGlmIChlbGVtZW50cy5nZXQoKS5pc0VtcHR5KCkpIHsKKyAgICAg ICAgZWxlbWVudHMuZ2V0KCkuYWRkKGFkZHJlc3NUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBl bGVtZW50cy5nZXQoKS5hZGQoYXJ0aWNsZVRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1l bnRzLmdldCgpLmFkZChhc2lkZVRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdl dCgpLmFkZChibG9ja3F1b3RlVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0 KCkuYWRkKGNhcHRpb25UYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5h ZGQoY2VudGVyVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGNv bFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChjb2xncm91cFRh Zy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChkZFRhZy5sb2NhbE5h bWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChkZXRhaWxzVGFnLmxvY2FsTmFtZSgp KTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGRpclRhZy5sb2NhbE5hbWUoKSk7CisgICAg ICAgIGVsZW1lbnRzLmdldCgpLmFkZChkaXZUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVt ZW50cy5nZXQoKS5hZGQoZGxUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQo KS5hZGQoZHRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoZmll bGRzZXRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoZmlnY2Fw dGlvblRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChmaWd1cmVU YWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoZm9vdGVyVGFnLmxv Y2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGZvcm1UYWcubG9jYWxOYW1l KCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaDFUYWcubG9jYWxOYW1lKCkpOworICAg ICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaDJUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVt ZW50cy5nZXQoKS5hZGQoaDNUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQo KS5hZGQoaDRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaDVU YWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaDZUYWcubG9jYWxO YW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoaGVhZGVyVGFnLmxvY2FsTmFtZSgp KTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKGhncm91cFRhZy5sb2NhbE5hbWUoKSk7Cisg ICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChoclRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVs ZW1lbnRzLmdldCgpLmFkZChsaVRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdl dCgpLmFkZChsaXN0aW5nVGFnLmxvY2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCku YWRkKG1haW5UYWcubG9jYWxOYW1lKCkpOyAvLyBNaXNzaW5nIGluIHRoZSBzcGVjaWZpY2F0aW9u LgorICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQobWVudVRhZy5sb2NhbE5hbWUoKSk7CisgICAg ICAgIGVsZW1lbnRzLmdldCgpLmFkZChuYXZUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVt ZW50cy5nZXQoKS5hZGQob2xUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQo KS5hZGQocFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZChwbGFp bnRleHRUYWcubG9jYWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQocHJlVGFn LmxvY2FsTmFtZSgpKTsKKyAgICAgICAgZWxlbWVudHMuZ2V0KCkuYWRkKHNlY3Rpb25UYWcubG9j YWxOYW1lKCkpOworICAgICAgICBlbGVtZW50cy5nZXQoKS5hZGQoc3VtbWFyeVRhZy5sb2NhbE5h bWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0YWJsZVRhZy5sb2NhbE5hbWUoKSk7 CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0Ym9keVRhZy5sb2NhbE5hbWUoKSk7CisgICAg ICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0ZFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1l bnRzLmdldCgpLmFkZCh0Zm9vdFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdl dCgpLmFkZCh0aFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0 aGVhZFRhZy5sb2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh0clRhZy5s b2NhbE5hbWUoKSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh1bFRhZy5sb2NhbE5hbWUo KSk7CisgICAgICAgIGVsZW1lbnRzLmdldCgpLmFkZCh4bXBUYWcubG9jYWxOYW1lKCkpOwogICAg IH0KLSAgICByZXR1cm4gZWxlbWVudHMuY29udGFpbnMobmFtZSk7CisgICAgcmV0dXJuIGVsZW1l bnRzLmdldCgpLmNvbnRhaW5zKG5hbWUpOwogfQogCiB2b2lkIFJlcGxhY2VTZWxlY3Rpb25Db21t YW5kOjptYWtlSW5zZXJ0ZWRDb250ZW50Um91bmRUcmlwcGFibGVXaXRoSFRNTFRyZWVCdWlsZGVy KGNvbnN0IEluc2VydGVkTm9kZXMmIGluc2VydGVkTm9kZXMpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL2F0ay9GcmFtZVNlbGVjdGlvbkF0ay5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9lZGl0aW5nL2F0ay9GcmFtZVNlbGVjdGlvbkF0ay5jcHAKaW5kZXggMDY4N2M3MmExNDQzMTg4 OTBkMTJkMTcyMTAyZjFmMGNmNzlkYjQyYi4uYWRlMDJiZThkYWI0YWU3NjI0ZjA0MzlhMjU5NTA0 ODAxZTc0NTk1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9hdGsvRnJhbWVT ZWxlY3Rpb25BdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvYXRrL0ZyYW1lU2Vs ZWN0aW9uQXRrLmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgPGd0ay9ndGsuaD4KICNl bmRpZgogCisjaW5jbHVkZSA8d3RmL05ldmVyRGVzdHJveWVkLmg+CiAjaW5jbHVkZSA8d3RmL1Jl ZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CkBAIC01Myw3ICs1NCw3IEBAIHN0YXRpYyB2 b2lkIG1heWJlRW1pdFRleHRGb2N1c0NoYW5nZShQYXNzUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmpl Y3Q+IHBycE9iamVjdCkKICAgICAvLyBUaGlzIHN0YXRpYyB2YXJpYWJsZSBpcyBuZWVkZWQgdG8g a2VlcCB0cmFjayBvZiB0aGUgb2xkIG9iamVjdAogICAgIC8vIGFzIHBlciBwcmV2aW91cyBjYWxs cyB0byB0aGlzIGZ1bmN0aW9uLCBpbiBvcmRlciB0byBwcm9wZXJseQogICAgIC8vIGRlY2lkZSB3 aGV0aGVyIHRvIGVtaXQgc29tZSBzaWduYWxzIG9yIG5vdC4KLSAgICBERVBSRUNBVEVEX0RFRklO RV9TVEFUSUNfTE9DQUwoUmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+LCBvbGRPYmplY3QsICgp KTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8UmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+ PiBvbGRPYmplY3Q7CiAKICAgICBSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gb2JqZWN0ID0g cHJwT2JqZWN0OwogCkBAIC02MSwxMSArNjIsMTEgQEAgc3RhdGljIHZvaWQgbWF5YmVFbWl0VGV4 dEZvY3VzQ2hhbmdlKFBhc3NSZWZQdHI8QWNjZXNzaWJpbGl0eU9iamVjdD4gcHJwT2JqZWN0KQog ICAgIC8vIGN1cnJlbnQgb2JqZWN0IHNvIGZ1cnRoZXIgY29tcGFyaXNvbnMgbWFrZSBzZW5zZS4g T3RoZXJ3aXNlLAogICAgIC8vIGp1c3QgcmVzZXQgb2xkT2JqZWN0IHRvIDAgc28gaXQgd29uJ3Qg YmUgdGFrZW4gaW50byBhY2NvdW50IGluCiAgICAgLy8gdGhlIGltbWVkaWF0ZWx5IGZvbGxvd2lu ZyBjYWxsIHRvIHRoaXMgZnVuY3Rpb24uCi0gICAgaWYgKG9iamVjdCAmJiBvbGRPYmplY3QgJiYg b2xkT2JqZWN0LT5kb2N1bWVudCgpICE9IG9iamVjdC0+ZG9jdW1lbnQoKSkKLSAgICAgICAgb2xk T2JqZWN0ID0gMDsKKyAgICBpZiAob2JqZWN0ICYmIG9sZE9iamVjdC5nZXQoKSAmJiBvbGRPYmpl Y3QuZ2V0KCktPmRvY3VtZW50KCkgIT0gb2JqZWN0LT5kb2N1bWVudCgpKQorICAgICAgICBvbGRP YmplY3QuZ2V0KCkgPSAwOwogCiAgICAgQXRrT2JqZWN0KiBheE9iamVjdCA9IG9iamVjdCA/IG9i amVjdC0+d3JhcHBlcigpIDogMDsKLSAgICBBdGtPYmplY3QqIG9sZEF4T2JqZWN0ID0gb2xkT2Jq ZWN0ID8gb2xkT2JqZWN0LT53cmFwcGVyKCkgOiAwOworICAgIEF0a09iamVjdCogb2xkQXhPYmpl Y3QgPSBvbGRPYmplY3QuZ2V0KCkgPyBvbGRPYmplY3QuZ2V0KCktPndyYXBwZXIoKSA6IDA7CiAK ICAgICBpZiAoYXhPYmplY3QgIT0gb2xkQXhPYmplY3QpIHsKICAgICAgICAgaWYgKG9sZEF4T2Jq ZWN0ICYmIEFUS19JU19URVhUKG9sZEF4T2JqZWN0KSkgewpAQCAtNzksNyArODAsNyBAQCBzdGF0 aWMgdm9pZCBtYXliZUVtaXRUZXh0Rm9jdXNDaGFuZ2UoUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5 T2JqZWN0PiBwcnBPYmplY3QpCiAgICAgfQogCiAgICAgLy8gVXBkYXRlIHBvaW50ZXIgdG8gbGFz dCBmb2N1c2VkIG9iamVjdC4KLSAgICBvbGRPYmplY3QgPSBvYmplY3Q7CisgICAgb2xkT2JqZWN0 LmdldCgpID0gb2JqZWN0OwogfQogCiAK