93824 2012-08-13 05:02:22 -0700 [V8] Rename v8ValueToAtomicWebCoreString() to toWebCoreAtomicString() 2012-08-13 19:25:17 -0700 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 93095 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 693544 0 haraken 2012-08-13 05:02:22 -0700 For naming consistency with toWebCoreString(), we can rename v8ValueToAtomicWebCoreString() to toWebCoreAtomicString(). Also we can rename v8ValueToAtomicWebCoreStringWithNullCheck() to toWebCoreAtomicStringWithNullCheck(). 693547 1 157963 haraken 2012-08-13 05:04:36 -0700 Created attachment 157963 Patch 694299 2 haraken 2012-08-13 17:51:53 -0700 Committed r125482: <http://trac.webkit.org/changeset/125482> 157963 2012-08-13 05:04:36 -0700 2012-08-13 19:25:17 -0700 Patch bug-93824-20120813210405.patch text/plain 16959 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1MzgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWMzZjExMGM1YTc4Mzcx MmQ4NjQ4NTI2ODg2ZGNmMjc5ZTM5M2MyNy4uYWU3MmZkYzM4MTUxMzE4MGY2M2Q5MzdmZjE3ZjA1 MDAwYWQzMGEzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQ4IEBACisyMDEyLTA4LTEzICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIFJlbmFtZSB2 OFZhbHVlVG9BdG9taWNXZWJDb3JlU3RyaW5nKCkgdG8gdG9XZWJDb3JlQXRvbWljU3RyaW5nKCkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTkzODI0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIG5hbWlu ZyBjb25zaXN0ZW5jeSB3aXRoIHRvV2ViQ29yZVN0cmluZygpLCB3ZSBjYW4gcmVuYW1lCisgICAg ICAgIHY4VmFsdWVUb0F0b21pY1dlYkNvcmVTdHJpbmcoKSB0byB0b1dlYkNvcmVBdG9taWNTdHJp bmcoKS4KKyAgICAgICAgQWxzbyB3ZSBjYW4gcmVuYW1lIHY4VmFsdWVUb0F0b21pY1dlYkNvcmVT dHJpbmdXaXRoTnVsbENoZWNrKCkKKyAgICAgICAgdG8gdG9XZWJDb3JlQXRvbWljU3RyaW5nV2l0 aE51bGxDaGVjaygpLgorCisgICAgICAgIE5vIHRlc3RzLiBObyBjaGFuZ2UgaW4gYmVoYXZpb3Iu CisKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbToKKyAgICAg ICAgKEdlbmVyYXRlTm9ybWFsQXR0clNldHRlcik6CisgICAgICAgIChHZW5lcmF0ZUV2ZW50TGlz dGVuZXJDYWxsYmFjayk6CisgICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVz dEV2ZW50VGFyZ2V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlRlc3RFdmVudFRhcmdldFY4SW50 ZXJuYWw6OmFkZEV2ZW50TGlzdGVuZXJDYWxsYmFjayk6CisgICAgICAgIChXZWJDb3JlOjpUZXN0 RXZlbnRUYXJnZXRWOEludGVybmFsOjpyZW1vdmVFdmVudExpc3RlbmVyQ2FsbGJhY2spOgorICAg ICAgICAqIGJpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RPYmouY3BwOgorICAgICAgICAo V2ViQ29yZTo6VGVzdE9ialY4SW50ZXJuYWw6OmFkZEV2ZW50TGlzdGVuZXJDYWxsYmFjayk6Cisg ICAgICAgIChXZWJDb3JlOjpUZXN0T2JqVjhJbnRlcm5hbDo6cmVtb3ZlRXZlbnRMaXN0ZW5lckNh bGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOEJpbmRpbmcuY3BwOgorICAgICAgICAo V2ViQ29yZTo6dG9XZWJDb3JlQXRvbWljU3RyaW5nKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9W OEJpbmRpbmcuaDoKKyAgICAgICAgKFdlYkNvcmU6OnRvV2ViQ29yZVN0cmluZ1dpdGhOdWxsT3JV bmRlZmluZWRDaGVjayk6CisgICAgICAgIChXZWJDb3JlOjp0b1dlYkNvcmVBdG9taWNTdHJpbmdX aXRoTnVsbENoZWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9WOENvbGxlY3Rpb24uaDoKKyAg ICAgICAgKFdlYkNvcmU6OmdldE5hbWVkUHJvcGVydHlPZkNvbGxlY3Rpb24pOgorICAgICAgICAq IGJpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Z2V0 dGVyKToKKyAgICAgICAgKiBiaW5kaW5ncy92OC9jdXN0b20vVjhET01XaW5kb3dDdXN0b20uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VjhET01XaW5kb3c6Om5hbWVkUHJvcGVydHlHZXR0ZXIpOgor ICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxBbGxDb2xsZWN0aW9uQ3VzdG9tLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlY4SFRNTEFsbENvbGxlY3Rpb246Om5hbWVkUHJvcGVydHlH ZXR0ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDb2xsZWN0aW9uQ3Vz dG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4SFRNTENvbGxlY3Rpb246Om5hbWVkUHJvcGVy dHlHZXR0ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxGb3JtRWxlbWVu dEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOEhUTUxGb3JtRWxlbWVudDo6bmFtZWRQ cm9wZXJ0eUdldHRlcik6CisgICAgICAgICogYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEZyYW1l U2V0RWxlbWVudEN1c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpWOEhUTUxGcmFtZVNldEVs ZW1lbnQ6Om5hbWVkUHJvcGVydHlHZXR0ZXIpOgorICAgICAgICAqIGJpbmRpbmdzL3Y4L2N1c3Rv bS9WOE5vZGVMaXN0Q3VzdG9tLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlY4Tm9kZUxpc3Q6Om5h bWVkUHJvcGVydHlHZXR0ZXIpOgorCiAyMDEyLTA4LTEyICBQcmF2aW4gRCAgPHByYXZpbmQuMms0 QGdtYWlsLmNvbT4KIAogICAgICAgICB0YWJsZSBjZWxsLmNlbGxJbmRleCBzaG91bGQgcmV0dXJu IC0xIGlmIHRoZXJlIGlzIG5vIHBhcmVudCB0YWJsZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0gYi9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JWOC5wbQppbmRleCAwYTlkOWQ3MmZjNDNjMTg5 M2QxZWMwNjlhN2Y4MzFkYzAxMjMwYTVjLi44MWIyNDI2MWZiYmE3MjkxYzRiNTIxOWNmNjEyMzE0 NGRiM2ZjYWNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0Nv ZGVHZW5lcmF0b3JWOC5wbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0Nv ZGVHZW5lcmF0b3JWOC5wbQpAQCAtMTE4Myw3ICsxMTgzLDcgQEAgRU5ECiAgICAgICAgICAgICBt eSAkbmFtZXNwYWNlID0gJGNvZGVHZW5lcmF0b3ItPk5hbWVzcGFjZUZvckF0dHJpYnV0ZU5hbWUo JGludGVyZmFjZU5hbWUsICRjb250ZW50QXR0cmlidXRlTmFtZSk7CiAgICAgICAgICAgICBBZGRU b0ltcGxJbmNsdWRlcygiJHtuYW1lc3BhY2V9LmgiKTsKICAgICAgICAgICAgIHB1c2goQGltcGxD b250ZW50RGVjbHMsICIgICAgRWxlbWVudCogaW1wID0gVjhFbGVtZW50Ojp0b05hdGl2ZShpbmZv LkhvbGRlcigpKTtcbiIpOwotICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnREZWNscywgIiAg ICBBdG9taWNTdHJpbmcgdiA9IHRvQXRvbWljV2ViQ29yZVN0cmluZ1dpdGhOdWxsQ2hlY2sodmFs dWUpO1xuIik7CisgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAiICAgIEF0b21p Y1N0cmluZyB2ID0gdG9XZWJDb3JlQXRvbWljU3RyaW5nV2l0aE51bGxDaGVjayh2YWx1ZSk7XG4i KTsKICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIgICAgaW1wLT5zZXRBdHRy aWJ1dGUoJHtuYW1lc3BhY2V9Ojoke2NvbnRlbnRBdHRyaWJ1dGVOYW1lfUF0dHIsIHYpO1xuIik7 CiAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCAifVxuXG4iKTsKICAgICAgICAg ICAgIHB1c2goQGltcGxDb250ZW50RGVjbHMsICIjZW5kaWYgLy8gJHtjb25kaXRpb25hbFN0cmlu Z31cblxuIikgaWYgJGNvbmRpdGlvbmFsU3RyaW5nOwpAQCAtMTM0NSw3ICsxMzQ1LDcgQEAgc3Rh dGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiAke2Z1bmN0aW9uTmFtZX1FdmVudExpc3RlbmVyQ2Fs bGJhY2soY29uc3Qgdjg6OkFyZ3UKICAgICBJTkNfU1RBVFMoIkRPTS4ke2ltcGxDbGFzc05hbWV9 LiR7ZnVuY3Rpb25OYW1lfUV2ZW50TGlzdGVuZXIoKSIpOwogICAgIFJlZlB0cjxFdmVudExpc3Rl bmVyPiBsaXN0ZW5lciA9IFY4RE9NV3JhcHBlcjo6Z2V0RXZlbnRMaXN0ZW5lcihhcmdzWzFdLCBm YWxzZSwgTGlzdGVuZXJGaW5kJHtsb29rdXBUeXBlfSk7CiAgICAgaWYgKGxpc3RlbmVyKSB7Ci0g ICAgICAgIFY4JHtpbXBsQ2xhc3NOYW1lfTo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSktPiR7ZnVu Y3Rpb25OYW1lfUV2ZW50TGlzdGVuZXIodjhWYWx1ZVRvQXRvbWljV2ViQ29yZVN0cmluZyhhcmdz WzBdKSwgbGlzdGVuZXIke3Bhc3NSZWZQdHJIYW5kbGluZ30sIGFyZ3NbMl0tPkJvb2xlYW5WYWx1 ZSgpKTsKKyAgICAgICAgVjgke2ltcGxDbGFzc05hbWV9Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigp KS0+JHtmdW5jdGlvbk5hbWV9RXZlbnRMaXN0ZW5lcih0b1dlYkNvcmVBdG9taWNTdHJpbmcoYXJn c1swXSksIGxpc3RlbmVyJHtwYXNzUmVmUHRySGFuZGxpbmd9LCBhcmdzWzJdLT5Cb29sZWFuVmFs dWUoKSk7CiBFTkQKICAgICBpZiAoJHJlcXVpcmVzSGlkZGVuRGVwZW5kZW5jeSkgewogICAgICAg ICBwdXNoKEBpbXBsQ29udGVudERlY2xzLCA8PEVORCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0RXZlbnRUYXJnZXQuY3BwIGIvU291 cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdEV2ZW50VGFyZ2V0LmNw cAppbmRleCA4N2VlYThiZjBlYmJjZGE5MzFjNGNmYmY4NjI4MTA0NjFhNjBkYzM0Li5lY2MyYTIx ZGRhNDMwYWU3MjUwNzE1NWYxMTMzZGJkMDk3ZjUwMDk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0RXZlbnRUYXJnZXQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RFdmVudFRhcmdl dC5jcHAKQEAgLTY2LDcgKzY2LDcgQEAgc3RhdGljIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBhZGRF dmVudExpc3RlbmVyQ2FsbGJhY2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKICAgICBJTkNf U1RBVFMoIkRPTS5UZXN0RXZlbnRUYXJnZXQuYWRkRXZlbnRMaXN0ZW5lcigpIik7CiAgICAgUmVm UHRyPEV2ZW50TGlzdGVuZXI+IGxpc3RlbmVyID0gVjhET01XcmFwcGVyOjpnZXRFdmVudExpc3Rl bmVyKGFyZ3NbMV0sIGZhbHNlLCBMaXN0ZW5lckZpbmRPckNyZWF0ZSk7CiAgICAgaWYgKGxpc3Rl bmVyKSB7Ci0gICAgICAgIFY4VGVzdEV2ZW50VGFyZ2V0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigp KS0+YWRkRXZlbnRMaXN0ZW5lcih2OFZhbHVlVG9BdG9taWNXZWJDb3JlU3RyaW5nKGFyZ3NbMF0p LCBsaXN0ZW5lciwgYXJnc1syXS0+Qm9vbGVhblZhbHVlKCkpOworICAgICAgICBWOFRlc3RFdmVu dFRhcmdldDo6dG9OYXRpdmUoYXJncy5Ib2xkZXIoKSktPmFkZEV2ZW50TGlzdGVuZXIodG9XZWJD b3JlQXRvbWljU3RyaW5nKGFyZ3NbMF0pLCBsaXN0ZW5lciwgYXJnc1syXS0+Qm9vbGVhblZhbHVl KCkpOwogICAgICAgICBjcmVhdGVIaWRkZW5EZXBlbmRlbmN5KGFyZ3MuSG9sZGVyKCksIGFyZ3Nb MV0sIFY4VGVzdEV2ZW50VGFyZ2V0OjpldmVudExpc3RlbmVyQ2FjaGVJbmRleCk7CiAgICAgfQog ICAgIHJldHVybiB2OFVuZGVmaW5lZCgpOwpAQCAtNzcsNyArNzcsNyBAQCBzdGF0aWMgdjg6Okhh bmRsZTx2ODo6VmFsdWU+IHJlbW92ZUV2ZW50TGlzdGVuZXJDYWxsYmFjayhjb25zdCB2ODo6QXJn dW1lbnRzJiBhcgogICAgIElOQ19TVEFUUygiRE9NLlRlc3RFdmVudFRhcmdldC5yZW1vdmVFdmVu dExpc3RlbmVyKCkiKTsKICAgICBSZWZQdHI8RXZlbnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBWOERP TVdyYXBwZXI6OmdldEV2ZW50TGlzdGVuZXIoYXJnc1sxXSwgZmFsc2UsIExpc3RlbmVyRmluZE9u bHkpOwogICAgIGlmIChsaXN0ZW5lcikgewotICAgICAgICBWOFRlc3RFdmVudFRhcmdldDo6dG9O YXRpdmUoYXJncy5Ib2xkZXIoKSktPnJlbW92ZUV2ZW50TGlzdGVuZXIodjhWYWx1ZVRvQXRvbWlj V2ViQ29yZVN0cmluZyhhcmdzWzBdKSwgbGlzdGVuZXIuZ2V0KCksIGFyZ3NbMl0tPkJvb2xlYW5W YWx1ZSgpKTsKKyAgICAgICAgVjhUZXN0RXZlbnRUYXJnZXQ6OnRvTmF0aXZlKGFyZ3MuSG9sZGVy KCkpLT5yZW1vdmVFdmVudExpc3RlbmVyKHRvV2ViQ29yZUF0b21pY1N0cmluZyhhcmdzWzBdKSwg bGlzdGVuZXIuZ2V0KCksIGFyZ3NbMl0tPkJvb2xlYW5WYWx1ZSgpKTsKICAgICAgICAgcmVtb3Zl SGlkZGVuRGVwZW5kZW5jeShhcmdzLkhvbGRlcigpLCBhcmdzWzFdLCBWOFRlc3RFdmVudFRhcmdl dDo6ZXZlbnRMaXN0ZW5lckNhY2hlSW5kZXgpOwogICAgIH0KICAgICByZXR1cm4gdjhVbmRlZmlu ZWQoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvdGVzdC9W OC9WOFRlc3RPYmouY3BwIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4 L1Y4VGVzdE9iai5jcHAKaW5kZXggYjNkNzc1ZTgxZDcwZTgwOGNiOGYyODM4OGZmNGU3ZDk1MjM4 YzA1ZC4uYzYzOWY3YjQxZjhjMjMyNDYyMDQ5OWU0NjdiOTM1MWZjMTRhMzAxMSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdE9iai5j cHAKQEAgLTEyMzIsNyArMTIzMiw3IEBAIHN0YXRpYyB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gYWRk RXZlbnRMaXN0ZW5lckNhbGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudHMmIGFyZ3MpCiAgICAgSU5D X1NUQVRTKCJET00uVGVzdE9iai5hZGRFdmVudExpc3RlbmVyKCkiKTsKICAgICBSZWZQdHI8RXZl bnRMaXN0ZW5lcj4gbGlzdGVuZXIgPSBWOERPTVdyYXBwZXI6OmdldEV2ZW50TGlzdGVuZXIoYXJn c1sxXSwgZmFsc2UsIExpc3RlbmVyRmluZE9yQ3JlYXRlKTsKICAgICBpZiAobGlzdGVuZXIpIHsK LSAgICAgICAgVjhUZXN0T2JqOjp0b05hdGl2ZShhcmdzLkhvbGRlcigpKS0+YWRkRXZlbnRMaXN0 ZW5lcih2OFZhbHVlVG9BdG9taWNXZWJDb3JlU3RyaW5nKGFyZ3NbMF0pLCBsaXN0ZW5lciwgYXJn c1syXS0+Qm9vbGVhblZhbHVlKCkpOworICAgICAgICBWOFRlc3RPYmo6OnRvTmF0aXZlKGFyZ3Mu SG9sZGVyKCkpLT5hZGRFdmVudExpc3RlbmVyKHRvV2ViQ29yZUF0b21pY1N0cmluZyhhcmdzWzBd KSwgbGlzdGVuZXIsIGFyZ3NbMl0tPkJvb2xlYW5WYWx1ZSgpKTsKICAgICAgICAgY3JlYXRlSGlk ZGVuRGVwZW5kZW5jeShhcmdzLkhvbGRlcigpLCBhcmdzWzFdLCBWOFRlc3RPYmo6OmV2ZW50TGlz dGVuZXJDYWNoZUluZGV4KTsKICAgICB9CiAgICAgcmV0dXJuIHY4VW5kZWZpbmVkKCk7CkBAIC0x MjQzLDcgKzEyNDMsNyBAQCBzdGF0aWMgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJlbW92ZUV2ZW50 TGlzdGVuZXJDYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcgogICAgIElOQ19TVEFUUygi RE9NLlRlc3RPYmoucmVtb3ZlRXZlbnRMaXN0ZW5lcigpIik7CiAgICAgUmVmUHRyPEV2ZW50TGlz dGVuZXI+IGxpc3RlbmVyID0gVjhET01XcmFwcGVyOjpnZXRFdmVudExpc3RlbmVyKGFyZ3NbMV0s IGZhbHNlLCBMaXN0ZW5lckZpbmRPbmx5KTsKICAgICBpZiAobGlzdGVuZXIpIHsKLSAgICAgICAg VjhUZXN0T2JqOjp0b05hdGl2ZShhcmdzLkhvbGRlcigpKS0+cmVtb3ZlRXZlbnRMaXN0ZW5lcih2 OFZhbHVlVG9BdG9taWNXZWJDb3JlU3RyaW5nKGFyZ3NbMF0pLCBsaXN0ZW5lci5nZXQoKSwgYXJn c1syXS0+Qm9vbGVhblZhbHVlKCkpOworICAgICAgICBWOFRlc3RPYmo6OnRvTmF0aXZlKGFyZ3Mu SG9sZGVyKCkpLT5yZW1vdmVFdmVudExpc3RlbmVyKHRvV2ViQ29yZUF0b21pY1N0cmluZyhhcmdz WzBdKSwgbGlzdGVuZXIuZ2V0KCksIGFyZ3NbMl0tPkJvb2xlYW5WYWx1ZSgpKTsKICAgICAgICAg cmVtb3ZlSGlkZGVuRGVwZW5kZW5jeShhcmdzLkhvbGRlcigpLCBhcmdzWzFdLCBWOFRlc3RPYmo6 OmV2ZW50TGlzdGVuZXJDYWNoZUluZGV4KTsKICAgICB9CiAgICAgcmV0dXJuIHY4VW5kZWZpbmVk KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOEJpbmRpbmcuY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvVjhCaW5kaW5nLmNwcAppbmRleCBhNWU5NWE4 N2JmYzA1OWNjNTA0OWFmODMwYzc2ZWQxZmMzYzZjNTdjLi42M2E5YjVjODQ2NTA2OWI5N2FkMmVk NDFlMjU3MzAxNzYzZWE2YWZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92 OC9WOEJpbmRpbmcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGlu Zy5jcHAKQEAgLTEwOSw3ICsxMDksNyBAQCBTdHJpbmcgdjhWYWx1ZVRvV2ViQ29yZVN0cmluZyh2 ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCiAgICAgcmV0dXJuIHY4Tm9uU3RyaW5nVmFsdWVU b1dlYkNvcmVTdHJpbmcodmFsdWUpOwogfQogCi1BdG9taWNTdHJpbmcgdjhWYWx1ZVRvQXRvbWlj V2ViQ29yZVN0cmluZyh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUpCitBdG9taWNTdHJpbmcg dG9XZWJDb3JlQXRvbWljU3RyaW5nKHY4OjpIYW5kbGU8djg6OlZhbHVlPiB2YWx1ZSkKIHsKICAg ICBpZiAodmFsdWUtPklzU3RyaW5nKCkpCiAgICAgICAgIHJldHVybiB2OFN0cmluZ1RvV2ViQ29y ZVN0cmluZzxBdG9taWNTdHJpbmc+KHY4OjpIYW5kbGU8djg6OlN0cmluZz46OkNhc3QodmFsdWUp LCBFeHRlcm5hbGl6ZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9W OEJpbmRpbmcuaCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4QmluZGluZy5oCmluZGV4 IGNhM2FmYjY0OWI2NjZkZTJhNGVkYjEzOTkxNTk1NjY5NDE5MTQ5ZWMuLjJhOTM5YTA0YTc5NjRk MjVlOTJlMWEyOWNjMWZkZDY1ODU2MWUzNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4QmluZGluZy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4 QmluZGluZy5oCkBAIC0xMjcsNyArMTI3LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIFN0 cmluZyB2OFZhbHVlVG9XZWJDb3JlU3RyaW5nKHY4OjpIYW5kbGU8djg6OlZhbHVlPik7CiAKICAg ICAvLyBDb252ZXJ0IGEgVjggdmFsdWUgdG8gYSBXVEY6OkF0b21pY1N0cmluZy4KLSAgICBBdG9t aWNTdHJpbmcgdjhWYWx1ZVRvQXRvbWljV2ViQ29yZVN0cmluZyh2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4pOworICAgIEF0b21pY1N0cmluZyB0b1dlYkNvcmVBdG9taWNTdHJpbmcodjg6OkhhbmRsZTx2 ODo6VmFsdWU+KTsKIAogICAgIC8vIFJldHVybiBhIFY4IGV4dGVybmFsIHN0cmluZyB0aGF0IHNo YXJlcyB0aGUgdW5kZXJseWluZyBidWZmZXIgd2l0aCB0aGUgZ2l2ZW4KICAgICAvLyBXZWJDb3Jl IHN0cmluZy4gVGhlIHJlZmVyZW5jZSBjb3VudGluZyBtZWNoYW5pc20gaXMgdXNlZCB0byBrZWVw IHRoZQpAQCAtMzgyLDE0ICszODIsMTQgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBy ZXR1cm4gdmFsdWUtPklzTnVsbCgpID8gU3RyaW5nKCkgOiB2OFZhbHVlVG9XZWJDb3JlU3RyaW5n KHZhbHVlKTsKICAgICB9CiAKLSAgICBpbmxpbmUgQXRvbWljU3RyaW5nIHRvQXRvbWljV2ViQ29y ZVN0cmluZ1dpdGhOdWxsQ2hlY2sodjg6OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlKQorICAgIGlu bGluZSBTdHJpbmcgdG9XZWJDb3JlU3RyaW5nV2l0aE51bGxPclVuZGVmaW5lZENoZWNrKHY4OjpI YW5kbGU8djg6OlZhbHVlPiB2YWx1ZSkKICAgICB7Ci0gICAgICAgIHJldHVybiB2YWx1ZS0+SXNO dWxsKCkgPyBBdG9taWNTdHJpbmcoKSA6IHY4VmFsdWVUb0F0b21pY1dlYkNvcmVTdHJpbmcodmFs dWUpOworICAgICAgICByZXR1cm4gKHZhbHVlLT5Jc051bGwoKSB8fCB2YWx1ZS0+SXNVbmRlZmlu ZWQoKSkgPyBTdHJpbmcoKSA6IHRvV2ViQ29yZVN0cmluZyh2YWx1ZSk7CiAgICAgfQogCi0gICAg aW5saW5lIFN0cmluZyB0b1dlYkNvcmVTdHJpbmdXaXRoTnVsbE9yVW5kZWZpbmVkQ2hlY2sodjg6 OkhhbmRsZTx2ODo6VmFsdWU+IHZhbHVlKQorICAgIGlubGluZSBBdG9taWNTdHJpbmcgdG9XZWJD b3JlQXRvbWljU3RyaW5nV2l0aE51bGxDaGVjayh2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gdmFsdWUp CiAgICAgewotICAgICAgICByZXR1cm4gKHZhbHVlLT5Jc051bGwoKSB8fCB2YWx1ZS0+SXNVbmRl ZmluZWQoKSkgPyBTdHJpbmcoKSA6IHRvV2ViQ29yZVN0cmluZyh2YWx1ZSk7CisgICAgICAgIHJl dHVybiB2YWx1ZS0+SXNOdWxsKCkgPyBBdG9taWNTdHJpbmcoKSA6IHRvV2ViQ29yZUF0b21pY1N0 cmluZyh2YWx1ZSk7CiAgICAgfQogCiAgICAgaW5saW5lIHY4OjpIYW5kbGU8djg6OlN0cmluZz4g djhVbmRldGVjdGFibGVTdHJpbmcoY29uc3QgU3RyaW5nJiBzdHIpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOENvbGxlY3Rpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oCmluZGV4IGFlNTQyNTkyYWNkODczYjg5ODI2ODcwYzQ4 NmU0NWM3OTAwYzcwYjMuLjI4MWY4ZWM2MmI4OGQzNjhjYzQ3OWExYzBkZDg0MGJkZWQxNjMzOGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4Q29sbGVjdGlvbi5oCkBAIC02Niw3ICs2 Niw3IEBAIHRlbXBsYXRlPGNsYXNzIENvbGxlY3Rpb24sIGNsYXNzIEl0ZW1UeXBlPiBzdGF0aWMg djg6OkhhbmRsZTx2ODo6VmFsdWU+IGdldE5hbWVkCiAgICAgQVNTRVJUKFY4RE9NV3JhcHBlcjo6 bWF5YmVET01XcmFwcGVyKG9iamVjdCkpOwogICAgIEFTU0VSVChWOERPTVdyYXBwZXI6OmRvbVdy YXBwZXJUeXBlKG9iamVjdCkgIT0gJlY4Tm9kZTo6aW5mbyk7CiAgICAgQ29sbGVjdGlvbiogY29s bGVjdGlvbiA9IHRvTmF0aXZlQ29sbGVjdGlvbjxDb2xsZWN0aW9uPihvYmplY3QpOwotICAgIEF0 b21pY1N0cmluZyBwcm9wZXJ0eU5hbWUgPSB0b0F0b21pY1dlYkNvcmVTdHJpbmdXaXRoTnVsbENo ZWNrKG5hbWUpOworICAgIEF0b21pY1N0cmluZyBwcm9wZXJ0eU5hbWUgPSB0b1dlYkNvcmVBdG9t aWNTdHJpbmdXaXRoTnVsbENoZWNrKG5hbWUpOwogICAgIHJldHVybiBnZXRWOE9iamVjdDxJdGVt VHlwZT4oY29sbGVjdGlvbi0+bmFtZWRJdGVtKHByb3BlcnR5TmFtZSksIGlzb2xhdGUpOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9WOERPTVdpbmRvd1NoZWxs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3BwCmlu ZGV4IDdmNzkwMzExMjM3NWVlNDBmODY5NWYyMzdjZTkxMjk3M2YyMzNjOTkuLjJlM2Y2Y2M2Njk3 YjhhNzE1ZTc3NWJhM2E1ZGRmZjJlZjgwNWM1ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL3Y4L1Y4RE9NV2luZG93U2hlbGwuY3BwCkBAIC01NTYsNyArNTU2LDcgQEAgdm9pZCBW OERPTVdpbmRvd1NoZWxsOjp1cGRhdGVEb2N1bWVudCgpCiB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g Z2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBwcm9wZXJ0eSwgY29uc3Qgdjg6OkFjY2Vzc29y SW5mbyYgaW5mbykKIHsKICAgICAvLyBGSVhNRShhbnRvbm0pOiBjb25zaWRlciBwYXNzaW5nIEF0 b21pY1N0cmluZ0ltcGwgZGlyZWN0bHkuCi0gICAgQXRvbWljU3RyaW5nIG5hbWUgPSB2OFZhbHVl VG9BdG9taWNXZWJDb3JlU3RyaW5nKHByb3BlcnR5KTsKKyAgICBBdG9taWNTdHJpbmcgbmFtZSA9 IHRvV2ViQ29yZUF0b21pY1N0cmluZyhwcm9wZXJ0eSk7CiAgICAgSFRNTERvY3VtZW50KiBodG1s RG9jdW1lbnQgPSBWOEhUTUxEb2N1bWVudDo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7CiAgICAg QVNTRVJUKGh0bWxEb2N1bWVudCk7CiAgICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IHJlc3VsdCA9 IFY4SFRNTERvY3VtZW50OjpHZXROYW1lZFByb3BlcnR5KGh0bWxEb2N1bWVudCwgbmFtZSwgaW5m by5HZXRJc29sYXRlKCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvdjgv Y3VzdG9tL1Y4RE9NV2luZG93Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4 L2N1c3RvbS9WOERPTVdpbmRvd0N1c3RvbS5jcHAKaW5kZXggM2ZlODgwYTc4NDZlNGI3YWY4YWQz MWUxYjk4NDQ4NWVmN2RmYzI3NC4uMDE4MGJkZDBlNjI1YzYzMmYyMzNiZTE3OTFkMjk0N2E1MDZi ZjhjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RE9N V2luZG93Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20v VjhET01XaW5kb3dDdXN0b20uY3BwCkBAIC00OTksNyArNDk5LDcgQEAgdjg6OkhhbmRsZTx2ODo6 VmFsdWU+IFY4RE9NV2luZG93OjpuYW1lZFByb3BlcnR5R2V0dGVyKHY4OjpMb2NhbDx2ODo6U3Ry aW5nPiBuYW0KICAgICAgICAgcmV0dXJuIHY4VW5kZWZpbmVkKCk7CiAKICAgICAvLyBTZWFyY2gg c3ViLWZyYW1lcy4KLSAgICBBdG9taWNTdHJpbmcgcHJvcE5hbWUgPSB2OFZhbHVlVG9BdG9taWNX ZWJDb3JlU3RyaW5nKG5hbWUpOworICAgIEF0b21pY1N0cmluZyBwcm9wTmFtZSA9IHRvV2ViQ29y ZUF0b21pY1N0cmluZyhuYW1lKTsKICAgICBGcmFtZSogY2hpbGQgPSBmcmFtZS0+dHJlZSgpLT5z Y29wZWRDaGlsZChwcm9wTmFtZSk7CiAgICAgaWYgKGNoaWxkKQogICAgICAgICByZXR1cm4gdG9W OChjaGlsZC0+ZG9tV2luZG93KCksIGluZm8uR2V0SXNvbGF0ZSgpKTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxBbGxDb2xsZWN0aW9uQ3VzdG9t LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxBbGxDb2xsZWN0 aW9uQ3VzdG9tLmNwcAppbmRleCA1MzJlMjU3YWM3N2VmZjFmNTBjYTU4Y2NjOWNlZGY4YjczN2Mx Y2UzLi42YmNkYzcxYzljOTIzMzliZDgwZjBhYjk0N2UzODI5YTg4MTQ3ZTI4IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQWxsQ29sbGVjdGlvbkN1 c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEFs bENvbGxlY3Rpb25DdXN0b20uY3BwCkBAIC04MSw3ICs4MSw3IEBAIHY4OjpIYW5kbGU8djg6OlZh bHVlPiBWOEhUTUxBbGxDb2xsZWN0aW9uOjpuYW1lZFByb3BlcnR5R2V0dGVyKHY4OjpMb2NhbDx2 ODo6U3RyCiAgICAgICAgIHJldHVybiB2OFVuZGVmaW5lZCgpOwogCiAgICAgSFRNTEFsbENvbGxl Y3Rpb24qIGltcCA9IFY4SFRNTEFsbENvbGxlY3Rpb246OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkp OwotICAgIHJldHVybiBnZXROYW1lZEl0ZW1zKGltcCwgdjhWYWx1ZVRvQXRvbWljV2ViQ29yZVN0 cmluZyhuYW1lKSwgaW5mby5HZXRJc29sYXRlKCkpOworICAgIHJldHVybiBnZXROYW1lZEl0ZW1z KGltcCwgdG9XZWJDb3JlQXRvbWljU3RyaW5nKG5hbWUpLCBpbmZvLkdldElzb2xhdGUoKSk7CiB9 CiAKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhUTUxBbGxDb2xsZWN0aW9uOjppdGVtQ2FsbGJh Y2soY29uc3Qgdjg6OkFyZ3VtZW50cyYgYXJncykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDb2xsZWN0aW9uQ3VzdG9tLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEhUTUxDb2xsZWN0aW9uQ3VzdG9tLmNwcAppbmRl eCAzODAyYmIzZWM2YmIyYTVmNDlhNDQwZGY4MWJiODljMjI5ZTQzOGNiLi5lYjBmZDI1ZDIwYWUw M2YxZGZhZWExMzE5NWRjZTk2OGI2ZjY0OGIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhIVE1MQ29sbGVjdGlvbkN1c3RvbS5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTENvbGxlY3Rpb25DdXN0b20uY3BwCkBA IC03MCw3ICs3MCw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhUTUxDb2xsZWN0aW9uOjpu YW1lZFByb3BlcnR5R2V0dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nCiAgICAgICAgIHJldHVybiB2 OFVuZGVmaW5lZCgpOwogCiAgICAgSFRNTENvbGxlY3Rpb24qIGltcCA9IFY4SFRNTENvbGxlY3Rp b246OnRvTmF0aXZlKGluZm8uSG9sZGVyKCkpOwotICAgIHJldHVybiBnZXROYW1lZEl0ZW1zKGlt cCwgdjhWYWx1ZVRvQXRvbWljV2ViQ29yZVN0cmluZyhuYW1lKSwgaW5mby5HZXRJc29sYXRlKCkp OworICAgIHJldHVybiBnZXROYW1lZEl0ZW1zKGltcCwgdG9XZWJDb3JlQXRvbWljU3RyaW5nKG5h bWUpLCBpbmZvLkdldElzb2xhdGUoKSk7CiB9CiAKIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOEhU TUxDb2xsZWN0aW9uOjpuYW1lZEl0ZW1DYWxsYmFjayhjb25zdCB2ODo6QXJndW1lbnRzJiBhcmdz KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEZv cm1FbGVtZW50Q3VzdG9tLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9W OEhUTUxGb3JtRWxlbWVudEN1c3RvbS5jcHAKaW5kZXggYmVjMDIwZDk1Zjg0YzQ5YTY3OWVmNzNm NjhkOWJlNDg5NWE5NWVkYi4uYzY1MDY0OWRmMTllMDUwNDc1YTFhYzMzZWQxOGE4MzE0YTU3NzYy MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEZv cm1FbGVtZW50Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0 b20vVjhIVE1MRm9ybUVsZW1lbnRDdXN0b20uY3BwCkBAIC01Niw3ICs1Niw3IEBAIHY4OjpIYW5k bGU8djg6OlZhbHVlPiBWOEhUTUxGb3JtRWxlbWVudDo6bmFtZWRQcm9wZXJ0eUdldHRlcih2ODo6 TG9jYWw8djg6OlN0cmluCiB7CiAgICAgSU5DX1NUQVRTKCJET00uSFRNTEZvcm1FbGVtZW50Lk5h bWVkUHJvcGVydHlHZXR0ZXIiKTsKICAgICBIVE1MRm9ybUVsZW1lbnQqIGltcCA9IFY4SFRNTEZv cm1FbGVtZW50Ojp0b05hdGl2ZShpbmZvLkhvbGRlcigpKTsKLSAgICBBdG9taWNTdHJpbmcgdiA9 IHY4VmFsdWVUb0F0b21pY1dlYkNvcmVTdHJpbmcobmFtZSk7CisgICAgQXRvbWljU3RyaW5nIHYg PSB0b1dlYkNvcmVBdG9taWNTdHJpbmcobmFtZSk7CiAKICAgICAvLyBDYWxsIGdldE5hbWVkRWxl bWVudHMgdHdpY2UsIGZpcnN0IHRpbWUgY2hlY2sgaWYgaXQgaGFzIGEgdmFsdWUKICAgICAvLyBh bmQgbGV0IEhUTUxGb3JtRWxlbWVudCB1cGRhdGUgaXRzIGNhY2hlLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4SFRNTEZyYW1lU2V0RWxlbWVudEN1c3Rv bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRnJhbWVTZXRF bGVtZW50Q3VzdG9tLmNwcAppbmRleCA1MTllMDE1Zjc4MTRiM2NkMWUxMDFiY2MyMWJlNGI0ZmQz NjI0ZjQ0Li41Mjk0MDk5NjFmNGJjODFjMTE4ZjIxYWI2YmRiMTIzYzI1NDI4MzAyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhIVE1MRnJhbWVTZXRFbGVt ZW50Q3VzdG9tLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhI VE1MRnJhbWVTZXRFbGVtZW50Q3VzdG9tLmNwcApAQCAtNDksNyArNDksNyBAQCB2ODo6SGFuZGxl PHY4OjpWYWx1ZT4gVjhIVE1MRnJhbWVTZXRFbGVtZW50OjpuYW1lZFByb3BlcnR5R2V0dGVyKHY4 OjpMb2NhbDx2ODo6UwogewogICAgIElOQ19TVEFUUygiRE9NLkhUTUxGcmFtZVNldEVsZW1lbnQu TmFtZWRQcm9wZXJ0eUdldHRlciIpOwogICAgIEhUTUxGcmFtZVNldEVsZW1lbnQqIGltcCA9IFY4 SFRNTEZyYW1lU2V0RWxlbWVudDo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7Ci0gICAgTm9kZSog ZnJhbWVOb2RlID0gaW1wLT5jaGlsZHJlbigpLT5uYW1lZEl0ZW0odjhWYWx1ZVRvQXRvbWljV2Vi Q29yZVN0cmluZyhuYW1lKSk7CisgICAgTm9kZSogZnJhbWVOb2RlID0gaW1wLT5jaGlsZHJlbigp LT5uYW1lZEl0ZW0odG9XZWJDb3JlQXRvbWljU3RyaW5nKG5hbWUpKTsKICAgICBpZiAoZnJhbWVO b2RlICYmIGZyYW1lTm9kZS0+aGFzVGFnTmFtZShIVE1MTmFtZXM6OmZyYW1lVGFnKSkgewogICAg ICAgICBEb2N1bWVudCogZG9jID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1lRWxlbWVudCo+KGZyYW1l Tm9kZSktPmNvbnRlbnREb2N1bWVudCgpOwogICAgICAgICBpZiAoIWRvYykKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE5vZGVMaXN0Q3VzdG9tLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOE5vZGVMaXN0Q3VzdG9tLmNwcApp bmRleCA2ODFmZTQ5ZDFlYjFlODU4NDg2NTk2ZTU5YzhkMzY3MDFlMzZiY2RjLi41OTViNDg0ZWQ4 NGJhNjMyNDM3MzMzM2FmNjIzYzFjOTlhMTQ5MDczIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9iaW5kaW5ncy92OC9jdXN0b20vVjhOb2RlTGlzdEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4Tm9kZUxpc3RDdXN0b20uY3BwCkBAIC00Niw3ICs0 Niw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOE5vZGVMaXN0OjpuYW1lZFByb3BlcnR5R2V0 dGVyKHY4OjpMb2NhbDx2ODo6U3RyaW5nPiBuYW1lCiB7CiAgICAgSU5DX1NUQVRTKCJET00uTm9k ZUxpc3QuTmFtZWRQcm9wZXJ0eUdldHRlciIpOwogICAgIE5vZGVMaXN0KiBsaXN0ID0gVjhOb2Rl TGlzdDo6dG9OYXRpdmUoaW5mby5Ib2xkZXIoKSk7Ci0gICAgQXRvbWljU3RyaW5nIGtleSA9IHY4 VmFsdWVUb0F0b21pY1dlYkNvcmVTdHJpbmcobmFtZSk7CisgICAgQXRvbWljU3RyaW5nIGtleSA9 IHRvV2ViQ29yZUF0b21pY1N0cmluZyhuYW1lKTsKIAogICAgIC8vIExlbmd0aCBwcm9wZXJ0eSBj YW5ub3QgYmUgb3ZlcnJpZGRlbi4KICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IEF0b21p Y1N0cmluZywgbGVuZ3RoLCAoImxlbmd0aCIpKTsK