83003 2012-04-02 23:36:46 -0700 Web Inspector: Database::Database::id field in the protocol should have type integer not string 2012-04-03 05:08:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys abarth apavlov bweinstein haraken japhet joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 594230 0 yurys 2012-04-02 23:36:46 -0700 At the moment it is passed as int but declared as string. The declaration can be easily fixed as the message is still hidden. It was discovered while switching Database domain to the new typed API: https://bugs.webkit.org/show_bug.cgi?id=82958 594231 1 135279 yurys 2012-04-02 23:39:20 -0700 Created attachment 135279 Patch 594262 2 135279 pfeldman 2012-04-03 00:51:26 -0700 Comment on attachment 135279 Patch I think database ids should be strings (in case we want unique ones). 594325 3 135294 yurys 2012-04-03 02:51:57 -0700 Created attachment 135294 Patch 594383 4 135294 pfeldman 2012-04-03 05:01:39 -0700 Comment on attachment 135294 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135294&action=review > Source/WebCore/inspector/Inspector.json:885 > + "id": "DatabaseIdentifier", "DatabaseId" 594384 5 yurys 2012-04-03 05:02:37 -0700 (In reply to comment #4) > (From update of attachment 135294 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=135294&action=review > > > Source/WebCore/inspector/Inspector.json:885 > > + "id": "DatabaseIdentifier", > > "DatabaseId" Done. 594389 6 yurys 2012-04-03 05:08:16 -0700 Committed r113013: <http://trac.webkit.org/changeset/113013> 135279 2012-04-02 23:39:20 -0700 2012-04-03 02:51:49 -0700 Patch bug-83003-20120403103918.patch text/plain 1664 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyOTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWZkMjFkMjQxNmE0ZDRj NmU5NTNiMGQ5OWQ5NzgzZDFmNDljNjNjZC4uNTc1MTk1N2FkZTYyYzE2Nzg2ZTIwZTBlMDE5NDFj OTE4ODBkZWNmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA0LTAyICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERhdGFiYXNlOjpEYXRhYmFzZTo6aWQgZmllbGQgaW4gdGhlIHByb3RvY29sIHNob3VsZCBo YXZlIHR5cGUgaW50ZWdlciBub3Qgc3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04MzAwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENoYW5nZWQgRGF0YWJhc2U6OkRhdGFiYXNlOjppZCBkZWNsYXJl ZCB0eXBlIHRvIGludGVnZXIgdG8gbWF0Y2ggaXRzIGN1cnJlbnQgdXNhZ2UuCisKKyAgICAgICAg KiBpbnNwZWN0b3IvSW5zcGVjdG9yLmpzb246CisKIDIwMTItMDQtMDIgIERhbmEgSmFuc2VucyAg PGRhbmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBSZW1vdmUgU2tDYW52 YXM6OkxheWVySXRlciB1c2UgZnJvbSBPcGFxdWVSZWdpb25Ta2lhCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggOTNkNGY4NWRkOGJlMmNjZDBlNjY5OTdjNjc1YjU5 ZjVhM2Q3ZWIzZS4uMzI5ZmIxMzc4NDExMjgxNTAwN2JjZjE2YjA1N2NlYmFiMjgwNTJiOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtODg3LDcgKzg4Nyw3IEBA CiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRhdGFiYXNlIG9iamVjdC4iLAogICAg ICAgICAgICAgICAgICJoaWRkZW4iOiB0cnVlLAogICAgICAgICAgICAgICAgICJwcm9wZXJ0aWVz IjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkIiwgInR5cGUiOiAic3RyaW5n IiwgImRlc2NyaXB0aW9uIjogIkRhdGFiYXNlIElELiIgfSwKKyAgICAgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJpZCIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiRGF0YWJh c2UgSUQuIiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImRvbWFpbiIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJEYXRhYmFzZSBkb21haW4uIiB9LAogICAgICAg ICAgICAgICAgICAgICB7ICJuYW1lIjogIm5hbWUiLCAidHlwZSI6ICJzdHJpbmciLCAiZGVzY3Jp cHRpb24iOiAiRGF0YWJhc2UgbmFtZS4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUi OiAidmVyc2lvbiIsICJ0eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJEYXRhYmFzZSB2 ZXJzaW9uLiIgfQo= 135294 2012-04-03 02:51:57 -0700 2012-04-03 05:01:39 -0700 Patch bug-83003-20120403135155.patch text/plain 24951 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyOTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWZkMjFkMjQxNmE0ZDRj NmU5NTNiMGQ5OWQ5NzgzZDFmNDljNjNjZC4uMWRjMWFmMmM0MGQ5ZjMyMGQ4YTQ5YzY5NjQ2MmEw ODQ1YTBkNmFlYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU0IEBACisyMDEyLTA0LTAzICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IERhdGFiYXNlOjpEYXRhYmFzZTo6aWQgZmllbGQgaW4gdGhlIHByb3RvY29sIHNob3VsZCBo YXZlIHR5cGUgaW50ZWdlciBub3Qgc3RyaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04MzAwMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIENoYW5nZWQgRE9NIHN0b3JhZ2UgYW5kIGRhdGFiYXNlIGlkZW50 aWZpZXIgdHlwZSBmcm9tIGludCB0byBTdHJpbmcuIFRoaXMKKyAgICAgICAgaXMgYWxpZ25lZCB3 aXRoIG90aGVyIGRvbWFpbnMgYW5kIGdpdmVzIHVzIG1vcmUgZmxleGliaWxpdHkuCisKKyAgICAg ICAgKiBiaW5kaW5ncy9qcy9KU0luamVjdGVkU2NyaXB0SG9zdEN1c3RvbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6ZGF0YWJhc2VJZCk6CisgICAgICAgIChX ZWJDb3JlOjpKU0luamVjdGVkU2NyaXB0SG9zdDo6c3RvcmFnZUlkKToKKyAgICAgICAgKiBiaW5k aW5ncy92OC9jdXN0b20vVjhJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwOgorICAgICAgICAo V2ViQ29yZTo6VjhJbmplY3RlZFNjcmlwdEhvc3Q6OmRhdGFiYXNlSWRDYWxsYmFjayk6CisgICAg ICAgIChXZWJDb3JlOjpWOEluamVjdGVkU2NyaXB0SG9zdDo6c3RvcmFnZUlkQ2FsbGJhY2spOgor ICAgICAgICAqIGluc3BlY3Rvci9JbmplY3RlZFNjcmlwdEhvc3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5qZWN0ZWRTY3JpcHRIb3N0OjpkYXRhYmFzZUlkSW1wbCk6CisgICAgICAgIChXZWJD b3JlOjpJbmplY3RlZFNjcmlwdEhvc3Q6OnN0b3JhZ2VJZEltcGwpOgorICAgICAgICAqIGluc3Bl Y3Rvci9JbmplY3RlZFNjcmlwdEhvc3QuaDoKKyAgICAgICAgKEluamVjdGVkU2NyaXB0SG9zdCk6 CisgICAgICAgICogaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5pZGw6CisgICAgICAgICog aW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JE T01TdG9yYWdlQWdlbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFn ZUFnZW50OjpnZXRET01TdG9yYWdlRW50cmllcyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JET01TdG9yYWdlQWdlbnQ6OnNldERPTVN0b3JhZ2VJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6 Okluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6cmVtb3ZlRE9NU3RvcmFnZUl0ZW0pOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpzdG9yYWdlSWQpOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpnZXRET01TdG9yYWdlUmVzb3Vy Y2VGb3JJZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2VudC5o OgorICAgICAgICAoSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50KToKKyAgICAgICAgKiBpbnNwZWN0 b3IvSW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZTo6SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZTo6YmluZCk6Cisg ICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZS5oOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlOjppZCk6CisgICAgICAgIChJ bnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0 b3JEYXRhYmFzZUFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRhdGFiYXNl QWdlbnQ6OmdldERhdGFiYXNlVGFibGVOYW1lcyk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0 b3JEYXRhYmFzZUFnZW50OjpleGVjdXRlU1FMKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3Rv ckRhdGFiYXNlQWdlbnQ6OmRhdGFiYXNlSWQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9y RGF0YWJhc2VBZ2VudDo6ZGF0YWJhc2VGb3JJZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckRhdGFiYXNlQWdlbnQuaDoKKyAgICAgICAgKEluc3BlY3RvckRhdGFiYXNlQWdlbnQpOgor ICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6Okluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2U6Okluc3BlY3RvckRhdGFiYXNl UmVzb3VyY2UpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZTo6 YmluZCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckRhdGFiYXNlUmVzb3VyY2UuaDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2U6OmlkKToKKyAgICAg ICAgKEluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2UpOgorCiAyMDEyLTA0LTAyICBEYW5hIEphbnNl bnMgIDxkYW5ha2pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUmVtb3ZlIFNr Q2FudmFzOjpMYXllckl0ZXIgdXNlIGZyb20gT3BhcXVlUmVnaW9uU2tpYQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20uY3Bw IGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNJbmplY3RlZFNjcmlwdEhvc3RDdXN0b20u Y3BwCmluZGV4IDY5YjA4ZWU3NmU1YzUxNTkxMGNiNmUzZjkzNmY3OGQ2ZWRiMzE1MDIuLmI1YTAz Yjk1OTI3ZmJlYmI5MjIwMmRjNTI0YWMxYTAzZmQxMTk2YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2JpbmRpbmdzL2pzL0pTSW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0luamVjdGVkU2NyaXB0SG9zdEN1c3RvbS5jcHAK QEAgLTI1Niw3ICsyNTYsNyBAQCBKU1ZhbHVlIEpTSW5qZWN0ZWRTY3JpcHRIb3N0OjpkYXRhYmFz ZUlkKEV4ZWNTdGF0ZSogZXhlYykKICNpZiBFTkFCTEUoU1FMX0RBVEFCQVNFKQogICAgIERhdGFi YXNlKiBkYXRhYmFzZSA9IHRvRGF0YWJhc2UoZXhlYy0+YXJndW1lbnQoMCkpOwogICAgIGlmIChk YXRhYmFzZSkKLSAgICAgICAgcmV0dXJuIGpzTnVtYmVyKGltcGwoKS0+ZGF0YWJhc2VJZEltcGwo ZGF0YWJhc2UpKTsKKyAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIGltcGwoKS0+ZGF0YWJh c2VJZEltcGwoZGF0YWJhc2UpKTsKICNlbmRpZgogICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwog fQpAQCAtMjY3LDcgKzI2Nyw3IEBAIEpTVmFsdWUgSlNJbmplY3RlZFNjcmlwdEhvc3Q6OnN0b3Jh Z2VJZChFeGVjU3RhdGUqIGV4ZWMpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogICAg IFN0b3JhZ2UqIHN0b3JhZ2UgPSB0b1N0b3JhZ2UoZXhlYy0+YXJndW1lbnQoMCkpOwogICAgIGlm IChzdG9yYWdlKQotICAgICAgICByZXR1cm4ganNOdW1iZXIoaW1wbCgpLT5zdG9yYWdlSWRJbXBs KHN0b3JhZ2UpKTsKKyAgICAgICAgcmV0dXJuIGpzU3RyaW5nKGV4ZWMsIGltcGwoKS0+c3RvcmFn ZUlkSW1wbChzdG9yYWdlKSk7CiAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CiB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVkU2NyaXB0 SG9zdEN1c3RvbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20vVjhJbmpl Y3RlZFNjcmlwdEhvc3RDdXN0b20uY3BwCmluZGV4IDVjZGY5Mzg5MDg3YzgxNjdiYWY2OWI4N2Yy MDMwZmY1MWFkM2U1OTYuLmQxMWIyZjQxNGYxZjE5YTg1ZmFhMDg2MTM1Zjc0MDIzYTMwN2I0NGQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOEluamVjdGVk U2NyaXB0SG9zdEN1c3RvbS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3MvdjgvY3Vz dG9tL1Y4SW5qZWN0ZWRTY3JpcHRIb3N0Q3VzdG9tLmNwcApAQCAtMjY4LDcgKzI2OCw3IEBAIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBWOEluamVjdGVkU2NyaXB0SG9zdDo6ZGF0YWJhc2VJZENhbGxi YWNrKGNvbnN0IHY4OjpBcmd1bWVuCiAgICAgSW5qZWN0ZWRTY3JpcHRIb3N0KiBob3N0ID0gVjhJ bmplY3RlZFNjcmlwdEhvc3Q6OnRvTmF0aXZlKGFyZ3MuSG9sZGVyKCkpOwogICAgIERhdGFiYXNl KiBkYXRhYmFzZSA9IFY4RGF0YWJhc2U6OnRvTmF0aXZlKHY4OjpIYW5kbGU8djg6Ok9iamVjdD46 OkNhc3QoYXJnc1swXSkpOwogICAgIGlmIChkYXRhYmFzZSkKLSAgICAgICAgcmV0dXJuIHY4OjpO dW1iZXI6Ok5ldyhob3N0LT5kYXRhYmFzZUlkSW1wbChkYXRhYmFzZSkpOworICAgICAgICByZXR1 cm4gdjhTdHJpbmdPclVuZGVmaW5lZChob3N0LT5kYXRhYmFzZUlkSW1wbChkYXRhYmFzZSkpOwog I2VuZGlmCiAgICAgcmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIH0KQEAgLTI4MSw3ICsyODEsNyBA QCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhJbmplY3RlZFNjcmlwdEhvc3Q6OnN0b3JhZ2VJZENh bGxiYWNrKGNvbnN0IHY4OjpBcmd1bWVudAogICAgIEluamVjdGVkU2NyaXB0SG9zdCogaG9zdCA9 IFY4SW5qZWN0ZWRTY3JpcHRIb3N0Ojp0b05hdGl2ZShhcmdzLkhvbGRlcigpKTsKICAgICBTdG9y YWdlKiBzdG9yYWdlID0gVjhTdG9yYWdlOjp0b05hdGl2ZSh2ODo6SGFuZGxlPHY4OjpPYmplY3Q+ OjpDYXN0KGFyZ3NbMF0pKTsKICAgICBpZiAoc3RvcmFnZSkKLSAgICAgICAgcmV0dXJuIHY4OjpO dW1iZXI6Ok5ldyhob3N0LT5zdG9yYWdlSWRJbXBsKHN0b3JhZ2UpKTsKKyAgICAgICAgcmV0dXJu IHY4U3RyaW5nT3JVbmRlZmluZWQoaG9zdC0+c3RvcmFnZUlkSW1wbChzdG9yYWdlKSk7CiAgICAg cmV0dXJuIHY4OjpVbmRlZmluZWQoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmNwcAppbmRleCA5MTI5M2NjOTBjMWRiY2Y1ODcxYzExNWE4 Njk1N2U5NzY5ZjZkMzFjLi5jZWUzYzk0MmQ2M2JkNzcwNzZiZDhhYmE5NTQzYmM0YmJkODMyY2Iz IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmNw cApAQCAtMTQ2LDE5ICsxNDYsMTkgQEAgSW5qZWN0ZWRTY3JpcHRIb3N0OjpJbnNwZWN0YWJsZU9i amVjdCogSW5qZWN0ZWRTY3JpcHRIb3N0OjppbnNwZWN0ZWRPYmplY3QodW5zaWcKIH0KIAogI2lm IEVOQUJMRShTUUxfREFUQUJBU0UpCi1pbnQgSW5qZWN0ZWRTY3JpcHRIb3N0OjpkYXRhYmFzZUlk SW1wbChEYXRhYmFzZSogZGF0YWJhc2UpCitTdHJpbmcgSW5qZWN0ZWRTY3JpcHRIb3N0OjpkYXRh YmFzZUlkSW1wbChEYXRhYmFzZSogZGF0YWJhc2UpCiB7CiAgICAgaWYgKG1fZGF0YWJhc2VBZ2Vu dCkKICAgICAgICAgcmV0dXJuIG1fZGF0YWJhc2VBZ2VudC0+ZGF0YWJhc2VJZChkYXRhYmFzZSk7 Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIFN0cmluZygpOwogfQogI2VuZGlmCiAKLWludCBJ bmplY3RlZFNjcmlwdEhvc3Q6OnN0b3JhZ2VJZEltcGwoU3RvcmFnZSogc3RvcmFnZSkKK1N0cmlu ZyBJbmplY3RlZFNjcmlwdEhvc3Q6OnN0b3JhZ2VJZEltcGwoU3RvcmFnZSogc3RvcmFnZSkKIHsK ICAgICBpZiAobV9kb21TdG9yYWdlQWdlbnQpCiAgICAgICAgIHJldHVybiBtX2RvbVN0b3JhZ2VB Z2VudC0+c3RvcmFnZUlkKHN0b3JhZ2UpOwotICAgIHJldHVybiAwOworICAgIHJldHVybiBTdHJp bmcoKTsKIH0KIAogI2lmIEVOQUJMRShXT1JLRVJTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luamVjdGVkU2NyaXB0SG9zdC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luamVjdGVkU2NyaXB0SG9zdC5oCmluZGV4IGM0ZjgxY2ViZTU0MWM1YzA1NmNlNWJhZTA4 YWU5Y2I2MTc5MzljZjIuLmM1MTg2M2IzMTNlMThhNmQ0ZWU4ZWU5MTkwNzA4NzhmMDUyOTZiZGMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdEhvc3Qu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0LmgKQEAg LTk4LDkgKzk4LDkgQEAgcHVibGljOgogICAgIHZvaWQgY2xlYXJDb25zb2xlTWVzc2FnZXMoKTsK ICAgICB2b2lkIGNvcHlUZXh0KGNvbnN0IFN0cmluZyYgdGV4dCk7CiAjaWYgRU5BQkxFKFNRTF9E QVRBQkFTRSkKLSAgICBpbnQgZGF0YWJhc2VJZEltcGwoRGF0YWJhc2UqKTsKKyAgICBTdHJpbmcg ZGF0YWJhc2VJZEltcGwoRGF0YWJhc2UqKTsKICNlbmRpZgotICAgIGludCBzdG9yYWdlSWRJbXBs KFN0b3JhZ2UqKTsKKyAgICBTdHJpbmcgc3RvcmFnZUlkSW1wbChTdG9yYWdlKik7CiAjaWYgRU5B QkxFKFdPUktFUlMpCiAgICAgbG9uZyBuZXh0V29ya2VySWQoKTsKICAgICB2b2lkIGRpZENyZWF0 ZVdvcmtlcihsb25nIGlkLCBjb25zdCBTdHJpbmcmIHVybCwgYm9vbCBpc1NoYXJlZFdvcmtlcik7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5qZWN0ZWRTY3JpcHRIb3N0 LmlkbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdEhvc3QuaWRsCmlu ZGV4IDQ4ZWU1ZDRhMTVkNTZhOTY2MmI3ZmJhNDU1MDAwNmExMzNlNWQ0MzIuLjU0ZjA4MGYyYzNh YWE0ZjNjMzI2ZDBkYTRiMjY3OGRjMjYxNWY4NDggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbmplY3RlZFNjcmlwdEhvc3QuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbmplY3RlZFNjcmlwdEhvc3QuaWRsCkBAIC00NSw4ICs0NSw4IEBAIG1vZHVsZSBj b3JlIHsKICAgICAgICAgW0N1c3RvbV0gRE9NT2JqZWN0IGZ1bmN0aW9uRGV0YWlscyhpbiBET01P YmplY3Qgb2JqZWN0KTsKICAgICAgICAgW0N1c3RvbV0gQXJyYXkgZ2V0RXZlbnRMaXN0ZW5lcnMo aW4gTm9kZSBub2RlKTsKIAotICAgICAgICBbQ3VzdG9tXSBpbnQgZGF0YWJhc2VJZChpbiBET01P YmplY3QgZGF0YWJhc2UpOwotICAgICAgICBbQ3VzdG9tXSBpbnQgc3RvcmFnZUlkKGluIERPTU9i amVjdCBzdG9yYWdlKTsKKyAgICAgICAgW0N1c3RvbV0gRE9NU3RyaW5nIGRhdGFiYXNlSWQoaW4g RE9NT2JqZWN0IGRhdGFiYXNlKTsKKyAgICAgICAgW0N1c3RvbV0gRE9NU3RyaW5nIHN0b3JhZ2VJ ZChpbiBET01PYmplY3Qgc3RvcmFnZSk7CiAKICNpZiBkZWZpbmVkKEVOQUJMRV9XT1JLRVJTKSAm JiBFTkFCTEVfV09SS0VSUwogICAgICAgICB2b2lkIGRpZENyZWF0ZVdvcmtlcihpbiBsb25nIGlk LCBpbiBET01TdHJpbmcgdXJsLCBpbiBib29sZWFuIGlzRmFrZVdvcmtlcik7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggOTNkNGY4NWRkOGJlMmNjZDBlNjY5OTdj Njc1YjU5ZjVhM2Q3ZWIzZS4uNzg5ZDQxODI4ZmE5MjkwZjcyZGQ4MWIwMmM0Yzc3Y2Q5Yjg0NDRi YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtODgyLDEyICs4 ODIsMTggQEAKICAgICAgICAgImhpZGRlbiI6IHRydWUsCiAgICAgICAgICJ0eXBlcyI6IFsKICAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAiaWQiOiAiRGF0YWJhc2VJZGVudGlmaWVyIiwK KyAgICAgICAgICAgICAgICAidHlwZSI6ICJzdHJpbmciLAorICAgICAgICAgICAgICAgICJkZXNj cmlwdGlvbiI6ICJVbmlxdWUgaWRlbnRpZmllciBvZiBEYXRhYmFzZSBvYmplY3QuIiwKKyAgICAg ICAgICAgICAgICAiaGlkZGVuIjogdHJ1ZQorICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsK ICAgICAgICAgICAgICAgICAiaWQiOiAiRGF0YWJhc2UiLAogICAgICAgICAgICAgICAgICJ0eXBl IjogIm9iamVjdCIsCiAgICAgICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkRhdGFiYXNlIG9i amVjdC4iLAogICAgICAgICAgICAgICAgICJoaWRkZW4iOiB0cnVlLAogICAgICAgICAgICAgICAg ICJwcm9wZXJ0aWVzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImlkIiwgInR5 cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkRhdGFiYXNlIElELiIgfSwKKyAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJpZCIsICIkcmVmIjogIkRhdGFiYXNlSWRlbnRpZmllciIs ICJkZXNjcmlwdGlvbiI6ICJEYXRhYmFzZSBJRC4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsg Im5hbWUiOiAiZG9tYWluIiwgInR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkRhdGFi YXNlIGRvbWFpbi4iIH0sCiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmFtZSIsICJ0 eXBlIjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJEYXRhYmFzZSBuYW1lLiIgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ2ZXJzaW9uIiwgInR5cGUiOiAic3RyaW5nIiwgImRl c2NyaXB0aW9uIjogIkRhdGFiYXNlIHZlcnNpb24uIiB9CkBAIC05MTEsNyArOTE3LDcgQEAKICAg ICAgICAgICAgIHsKICAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXREYXRhYmFzZVRhYmxlTmFt ZXMiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogImRhdGFiYXNlSWQiLCAidHlwZSI6ICJpbnRlZ2VyIiB9CisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiZGF0YWJhc2VJZCIsICIkcmVmIjogIkRhdGFiYXNlSWRlbnRp ZmllciIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBb CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGFibGVOYW1lcyIsICJ0eXBlIjogImFy cmF5IiwgIml0ZW1zIjogeyAidHlwZSI6ICJzdHJpbmciIH0gfQpAQCAtOTIwLDcgKzkyNiw3IEBA CiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiZXhlY3V0ZVNRTCIsCiAg ICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAiZGF0YWJhc2VJZCIsICJ0eXBlIjogImludGVnZXIiIH0sCisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAiZGF0YWJhc2VJZCIsICIkcmVmIjogIkRhdGFiYXNlSWRlbnRpZmllciIg fSwKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJxdWVyeSIsICJ0eXBlIjogInN0cmlu ZyIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCkBA IC0xMTEwLDYgKzExMTYsMTIgQEAKICAgICAgICAgImhpZGRlbiI6IHRydWUsCiAgICAgICAgICJ0 eXBlcyI6IFsKICAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAiaWQiOiAiU3RvcmFnZUlk ZW50aWZpZXIiLAorICAgICAgICAgICAgICAgICJ0eXBlIjogInN0cmluZyIsCisgICAgICAgICAg ICAgICAgImRlc2NyaXB0aW9uIjogIlVuaXF1ZSBpZGVudGlmaWVyIG9mIERPTSBzdG9yYWdlIGVu dHJ5LiIsCisgICAgICAgICAgICAgICAgImhpZGRlbiI6IHRydWUKKyAgICAgICAgICAgIH0sCisg ICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgImlkIjogIkVudHJ5IiwKICAgICAgICAgICAg ICAgICAidHlwZSI6ICJvYmplY3QiLAogICAgICAgICAgICAgICAgICJkZXNjcmlwdGlvbiI6ICJE T00gU3RvcmFnZSBlbnRyeS4iLApAQCAtMTExNyw3ICsxMTI5LDcgQEAKICAgICAgICAgICAgICAg ICAicHJvcGVydGllcyI6IFsKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJob3N0Iiwg InR5cGUiOiAic3RyaW5nIiwgImRlc2NyaXB0aW9uIjogIkRvbWFpbiBuYW1lLiIgfSwKICAgICAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJpc0xvY2FsU3RvcmFnZSIsICJ0eXBlIjogImJvb2xl YW4iLCAiZGVzY3JpcHRpb24iOiAiVHJ1ZSBmb3IgbG9jYWwgc3RvcmFnZS4iIH0sCi0gICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAiaWQiLCAidHlwZSI6ICJudW1iZXIiLCAiZGVzY3JpcHRp b24iOiAiRW50cnkgaWQgZm9yIGZ1cnRoZXIgcmVmZXJlbmNlLiIgfQorICAgICAgICAgICAgICAg ICAgICB7ICJuYW1lIjogImlkIiwgIiRyZWYiOiAiU3RvcmFnZUlkZW50aWZpZXIiLCAiZGVzY3Jp cHRpb24iOiAiRW50cnkgaWQgZm9yIGZ1cnRoZXIgcmVmZXJlbmNlLiIgfQogICAgICAgICAgICAg ICAgIF0KICAgICAgICAgICAgIH0KICAgICAgICAgXSwKQEAgLTExMzMsNyArMTE0NSw3IEBACiAg ICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAiZ2V0RE9NU3RvcmFnZUVudHJp ZXMiLAogICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAg ICB7ICJuYW1lIjogInN0b3JhZ2VJZCIsICJ0eXBlIjogImludGVnZXIiIH0KKyAgICAgICAgICAg ICAgICAgICAgeyAibmFtZSI6ICJzdG9yYWdlSWQiLCAiJHJlZiI6ICJTdG9yYWdlSWRlbnRpZmll ciIgfQogICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgInJldHVybnMiOiBbCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZW50cmllcyIsICJ0eXBlIjogImFycmF5Iiwg Iml0ZW1zIjogeyAiJHJlZiI6ICJFbnRyeSJ9IH0KQEAgLTExNDIsNyArMTE1NCw3IEBACiAgICAg ICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAic2V0RE9NU3RvcmFnZUl0ZW0iLAog ICAgICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJu YW1lIjogInN0b3JhZ2VJZCIsICJ0eXBlIjogImludGVnZXIiIH0sCisgICAgICAgICAgICAgICAg ICAgIHsgIm5hbWUiOiAic3RvcmFnZUlkIiwgIiRyZWYiOiAiU3RvcmFnZUlkZW50aWZpZXIiIH0s CiAgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAia2V5IiwgInR5cGUiOiAic3RyaW5nIiB9 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInZhbHVlIiwgInR5cGUiOiAic3RyaW5n IiB9CiAgICAgICAgICAgICAgICAgXSwKQEAgLTExNTMsNyArMTE2NSw3IEBACiAgICAgICAgICAg ICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAicmVtb3ZlRE9NU3RvcmFnZUl0ZW0iLAogICAg ICAgICAgICAgICAgICJwYXJhbWV0ZXJzIjogWwotICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogInN0b3JhZ2VJZCIsICJ0eXBlIjogImludGVnZXIiIH0sCisgICAgICAgICAgICAgICAgICAg IHsgIm5hbWUiOiAic3RvcmFnZUlkIiwgIiRyZWYiOiAiU3RvcmFnZUlkZW50aWZpZXIiIH0sCiAg ICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAia2V5IiwgInR5cGUiOiAic3RyaW5nIiB9CiAg ICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKQEAgLTExNzEs NyArMTE4Myw3IEBACiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgIm5hbWUiOiAidXBk YXRlRE9NU3RvcmFnZSIsCiAgICAgICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCi0gICAgICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAic3RvcmFnZUlkIiwgInR5cGUiOiAiaW50ZWdlciIgfQor ICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0b3JhZ2VJZCIsICAiJHJlZiI6ICJTdG9y YWdlSWRlbnRpZmllciIgfQogICAgICAgICAgICAgICAgIF0KICAgICAgICAgICAgIH0KICAgICAg ICAgXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0 b3JhZ2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3Rv cmFnZUFnZW50LmNwcAppbmRleCA2NThlYjJkMjQ4MzYzMDZiYWE3Y2Q4MDRlM2I2NGY0ODk2N2Iy MWRmLi4xZDVjYmFiMDJmNzhmMzc0ZGRlMDU2MzEyMjA0MmY2YjNhMjBhYTBmIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50LmNw cApAQCAtMTA4LDcgKzEwOCw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpkaXNh YmxlKEVycm9yU3RyaW5nKikKICAgICBtX3N0YXRlLT5zZXRCb29sZWFuKERPTVN0b3JhZ2VBZ2Vu dFN0YXRlOjpkb21TdG9yYWdlQWdlbnRFbmFibGVkLCBtX2VuYWJsZWQpOwogfQogCi12b2lkIElu c3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3RvcmFnZUVudHJpZXMoRXJyb3JTdHJpbmcq LCBpbnQgc3RvcmFnZUlkLCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+JiBlbnRyaWVzKQordm9pZCBJ bnNwZWN0b3JET01TdG9yYWdlQWdlbnQ6OmdldERPTVN0b3JhZ2VFbnRyaWVzKEVycm9yU3RyaW5n KiwgY29uc3QgU3RyaW5nJiBzdG9yYWdlSWQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4mIGVudHJp ZXMpCiB7CiAgICAgSW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlKiBzdG9yYWdlUmVzb3VyY2Ug PSBnZXRET01TdG9yYWdlUmVzb3VyY2VGb3JJZChzdG9yYWdlSWQpOwogICAgIGlmICghc3RvcmFn ZVJlc291cmNlKQpAQCAtMTI5LDcgKzEyOSw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFn ZW50OjpnZXRET01TdG9yYWdlRW50cmllcyhFcnJvclN0cmluZyosIGludCBzdG9yYWdlSWQsCiAg ICAgfQogfQogCi12b2lkIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6c2V0RE9NU3RvcmFnZUl0 ZW0oRXJyb3JTdHJpbmcqLCBpbnQgc3RvcmFnZUlkLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3Qg U3RyaW5nJiB2YWx1ZSwgYm9vbCogc3VjY2VzcykKK3ZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFn ZW50OjpzZXRET01TdG9yYWdlSXRlbShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc3RvcmFn ZUlkLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSwgYm9vbCogc3VjY2Vz cykKIHsKICAgICBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3VyY2UqIHN0b3JhZ2VSZXNvdXJjZSA9 IGdldERPTVN0b3JhZ2VSZXNvdXJjZUZvcklkKHN0b3JhZ2VJZCk7CiAgICAgaWYgKHN0b3JhZ2VS ZXNvdXJjZSkgewpAQCAtMTM5LDcgKzEzOSw3IEBAIHZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFn ZW50OjpzZXRET01TdG9yYWdlSXRlbShFcnJvclN0cmluZyosIGludCBzdG9yYWdlSWQsIGNvCiAg ICAgfQogfQogCi12b2lkIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6cmVtb3ZlRE9NU3RvcmFn ZUl0ZW0oRXJyb3JTdHJpbmcqLCBpbnQgc3RvcmFnZUlkLCBjb25zdCBTdHJpbmcmIGtleSwgYm9v bCogc3VjY2VzcykKK3ZvaWQgSW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpyZW1vdmVET01TdG9y YWdlSXRlbShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgc3RvcmFnZUlkLCBjb25zdCBTdHJp bmcmIGtleSwgYm9vbCogc3VjY2VzcykKIHsKICAgICBJbnNwZWN0b3JET01TdG9yYWdlUmVzb3Vy Y2UqIHN0b3JhZ2VSZXNvdXJjZSA9IGdldERPTVN0b3JhZ2VSZXNvdXJjZUZvcklkKHN0b3JhZ2VJ ZCk7CiAgICAgaWYgKHN0b3JhZ2VSZXNvdXJjZSkgewpAQCAtMTQ4LDcgKzE0OCw3IEBAIHZvaWQg SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpyZW1vdmVET01TdG9yYWdlSXRlbShFcnJvclN0cmlu ZyosIGludCBzdG9yYWdlSWQsCiAgICAgfQogfQogCi1pbnQgSW5zcGVjdG9yRE9NU3RvcmFnZUFn ZW50OjpzdG9yYWdlSWQoU3RvcmFnZSogc3RvcmFnZSkKK1N0cmluZyBJbnNwZWN0b3JET01TdG9y YWdlQWdlbnQ6OnN0b3JhZ2VJZChTdG9yYWdlKiBzdG9yYWdlKQogewogICAgIEFTU0VSVChzdG9y YWdlKTsKICAgICBGcmFtZSogZnJhbWUgPSBzdG9yYWdlLT5mcmFtZSgpOwpAQCAtMTU5LDEwICsx NTksMTAgQEAgaW50IEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6c3RvcmFnZUlkKFN0b3JhZ2Uq IHN0b3JhZ2UpCiAgICAgICAgIGlmIChpdC0+c2Vjb25kLT5pc1NhbWVIb3N0QW5kVHlwZShmcmFt ZSwgaXNMb2NhbFN0b3JhZ2UpKQogICAgICAgICAgICAgcmV0dXJuIGl0LT5maXJzdDsKICAgICB9 Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIFN0cmluZygpOwogfQogCi1JbnNwZWN0b3JET01T dG9yYWdlUmVzb3VyY2UqIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudDo6Z2V0RE9NU3RvcmFnZVJl c291cmNlRm9ySWQoaW50IHN0b3JhZ2VJZCkKK0luc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZSog SW5zcGVjdG9yRE9NU3RvcmFnZUFnZW50OjpnZXRET01TdG9yYWdlUmVzb3VyY2VGb3JJZChjb25z dCBTdHJpbmcmIHN0b3JhZ2VJZCkKIHsKICAgICBET01TdG9yYWdlUmVzb3VyY2VzTWFwOjppdGVy YXRvciBpdCA9IG1fcmVzb3VyY2VzLmZpbmQoc3RvcmFnZUlkKTsKICAgICBpZiAoaXQgPT0gbV9y ZXNvdXJjZXMuZW5kKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRE9NU3RvcmFnZUFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRE9NU3RvcmFnZUFnZW50LmgKaW5kZXggYmVmYmQ5MDIyMTJmMjQxZmQyY2JiMzIxZGQ3Mjc2 ZWUyZTFiZTA3Mi4uYjBhMWNlM2MyM2FkNjdhMDJhMGIxNGI1NzZmMmZmY2UyYzY2NTYxNyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRPTVN0b3JhZ2VBZ2Vu dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdlQWdl bnQuaApAQCAtNjQsMTIgKzY0LDEyIEBAIHB1YmxpYzoKICAgICAvLyBDYWxsZWQgZnJvbSB0aGUg ZnJvbnQtZW5kLgogICAgIHZpcnR1YWwgdm9pZCBlbmFibGUoRXJyb3JTdHJpbmcqKTsKICAgICB2 aXJ0dWFsIHZvaWQgZGlzYWJsZShFcnJvclN0cmluZyopOwotICAgIHZpcnR1YWwgdm9pZCBnZXRE T01TdG9yYWdlRW50cmllcyhFcnJvclN0cmluZyosIGludCBzdG9yYWdlSWQsIFJlZlB0cjxJbnNw ZWN0b3JBcnJheT4mIGVudHJpZXMpOwotICAgIHZpcnR1YWwgdm9pZCBzZXRET01TdG9yYWdlSXRl bShFcnJvclN0cmluZyosIGludCBzdG9yYWdlSWQsIGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBT dHJpbmcmIHZhbHVlLCBib29sKiBzdWNjZXNzKTsKLSAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlRE9N U3RvcmFnZUl0ZW0oRXJyb3JTdHJpbmcqLCBpbnQgc3RvcmFnZUlkLCBjb25zdCBTdHJpbmcmIGtl eSwgYm9vbCogc3VjY2Vzcyk7CisgICAgdmlydHVhbCB2b2lkIGdldERPTVN0b3JhZ2VFbnRyaWVz KEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzdG9yYWdlSWQsIFJlZlB0cjxJbnNwZWN0b3JB cnJheT4mIGVudHJpZXMpOworICAgIHZpcnR1YWwgdm9pZCBzZXRET01TdG9yYWdlSXRlbShFcnJv clN0cmluZyosIGNvbnN0IFN0cmluZyYgc3RvcmFnZUlkLCBjb25zdCBTdHJpbmcmIGtleSwgY29u c3QgU3RyaW5nJiB2YWx1ZSwgYm9vbCogc3VjY2Vzcyk7CisgICAgdmlydHVhbCB2b2lkIHJlbW92 ZURPTVN0b3JhZ2VJdGVtKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBzdG9yYWdlSWQsIGNv bnN0IFN0cmluZyYga2V5LCBib29sKiBzdWNjZXNzKTsKIAogICAgIC8vIENhbGxlZCBmcm9tIHRo ZSBpbmplY3RlZCBzY3JpcHQuCi0gICAgaW50IHN0b3JhZ2VJZChTdG9yYWdlKik7CisgICAgU3Ry aW5nIHN0b3JhZ2VJZChTdG9yYWdlKik7CiAKICAgICAvLyBDYWxsZWQgZnJvbSBJbnNwZWN0b3JJ bnN0cnVtZW50YXRpb24KICAgICB2b2lkIGRpZFVzZURPTVN0b3JhZ2UoU3RvcmFnZUFyZWEqLCBi b29sIGlzTG9jYWxTdG9yYWdlLCBGcmFtZSopOwpAQCAtNzcsOSArNzcsOSBAQCBwdWJsaWM6CiBw cml2YXRlOgogICAgIEluc3BlY3RvckRPTVN0b3JhZ2VBZ2VudChJbnN0cnVtZW50aW5nQWdlbnRz KiwgSW5zcGVjdG9yU3RhdGUqKTsKIAotICAgIEluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZSog Z2V0RE9NU3RvcmFnZVJlc291cmNlRm9ySWQoaW50IHN0b3JhZ2VJZCk7CisgICAgSW5zcGVjdG9y RE9NU3RvcmFnZVJlc291cmNlKiBnZXRET01TdG9yYWdlUmVzb3VyY2VGb3JJZChjb25zdCBTdHJp bmcmIHN0b3JhZ2VJZCk7CiAKLSAgICB0eXBlZGVmIEhhc2hNYXA8aW50LCBSZWZQdHI8SW5zcGVj dG9yRE9NU3RvcmFnZVJlc291cmNlPiA+IERPTVN0b3JhZ2VSZXNvdXJjZXNNYXA7CisgICAgdHlw ZWRlZiBIYXNoTWFwPFN0cmluZywgUmVmUHRyPEluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZT4g PiBET01TdG9yYWdlUmVzb3VyY2VzTWFwOwogICAgIERPTVN0b3JhZ2VSZXNvdXJjZXNNYXAgbV9y ZXNvdXJjZXM7CiAgICAgSW5zcGVjdG9yRnJvbnRlbmQqIG1fZnJvbnRlbmQ7CiAgICAgYm9vbCBt X2VuYWJsZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RE9NU3RvcmFnZVJlc291cmNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JET01TdG9yYWdlUmVzb3VyY2UuY3BwCmluZGV4IDVjOTgyMjNlOWE0NGVkZmUxYmFkZDU4NWQ0 NjlkMDMzZDI2MmRmM2UuLmIxMWE3MjkwMWVmNjY0ZDA4ZmJhMDJjNmYyOTM2OWQ4ZjBlZDk3Y2Yg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9yYWdl UmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01T dG9yYWdlUmVzb3VyY2UuY3BwCkBAIC01Nyw3ICs1Nyw3IEBAIEluc3BlY3RvckRPTVN0b3JhZ2VS ZXNvdXJjZTo6SW5zcGVjdG9yRE9NU3RvcmFnZVJlc291cmNlKFN0b3JhZ2VBcmVhKiBzdG9yYWdl QXJlCiAgICAgLCBtX2lzTG9jYWxTdG9yYWdlKGlzTG9jYWxTdG9yYWdlKQogICAgICwgbV9mcmFt ZShmcmFtZSkKICAgICAsIG1fZnJvbnRlbmQoMCkKLSAgICAsIG1faWQoc19uZXh0VW51c2VkSWQr KykKKyAgICAsIG1faWQoU3RyaW5nOjpudW1iZXIoc19uZXh0VW51c2VkSWQrKykpCiAgICAgLCBt X3JlcG9ydGluZ0NoYW5nZXNUb0Zyb250ZW5kKGZhbHNlKQogewogfQpAQCAtNzUsNyArNzUsNyBA QCB2b2lkIEluc3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZTo6YmluZChJbnNwZWN0b3JGcm9udGVu ZCogZnJvbnRlbmQpCiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4ganNvbk9iamVjdCA9IElu c3BlY3Rvck9iamVjdDo6Y3JlYXRlKCk7CiAgICAganNvbk9iamVjdC0+c2V0U3RyaW5nKCJob3N0 IiwgbV9mcmFtZS0+ZG9jdW1lbnQoKS0+c2VjdXJpdHlPcmlnaW4oKS0+aG9zdCgpKTsKICAgICBq c29uT2JqZWN0LT5zZXRCb29sZWFuKCJpc0xvY2FsU3RvcmFnZSIsIG1faXNMb2NhbFN0b3JhZ2Up OwotICAgIGpzb25PYmplY3QtPnNldE51bWJlcigiaWQiLCBtX2lkKTsKKyAgICBqc29uT2JqZWN0 LT5zZXRTdHJpbmcoImlkIiwgbV9pZCk7CiAgICAgbV9mcm9udGVuZC0+YWRkRE9NU3RvcmFnZShq c29uT2JqZWN0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRPTVN0b3JhZ2VSZXNvdXJjZS5oCmluZGV4IDVjYmJlMGU2MzRiYzgwYmQwMjg5NTA1 YjA0MmUxMzE0YWE0OTVmMzAuLjY5OGFkMWYxZDI0NWIxMGUxYWU4NzYwOGE4YzBhODNkZmQ5ZmVk NjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JET01TdG9y YWdlUmVzb3VyY2UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRE9N U3RvcmFnZVJlc291cmNlLmgKQEAgLTY0LDcgKzY0LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewog ICAgICAgICB2aXJ0dWFsIGJvb2wgb3BlcmF0b3I9PShjb25zdCBFdmVudExpc3RlbmVyJiBsaXN0 ZW5lcik7CiAKICAgICAgICAgYm9vbCBpc1NhbWVIb3N0QW5kVHlwZShGcmFtZSosIGJvb2wgaXNM b2NhbFN0b3JhZ2UpIGNvbnN0OwotICAgICAgICBpbnQgaWQoKSBjb25zdCB7IHJldHVybiBtX2lk OyB9CisgICAgICAgIFN0cmluZyBpZCgpIGNvbnN0IHsgcmV0dXJuIG1faWQ7IH0KICAgICAgICAg U3RvcmFnZUFyZWEqIHN0b3JhZ2VBcmVhKCkgY29uc3QgeyByZXR1cm4gbV9zdG9yYWdlQXJlYS5n ZXQoKTsgfQogICAgICAgICBGcmFtZSogZnJhbWUoKSBjb25zdCB7IHJldHVybiBtX2ZyYW1lLmdl dCgpOyB9CiAKQEAgLTc2LDcgKzc2LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBi b29sIG1faXNMb2NhbFN0b3JhZ2U7CiAgICAgICAgIFJlZlB0cjxGcmFtZT4gbV9mcmFtZTsKICAg ICAgICAgSW5zcGVjdG9yRnJvbnRlbmQ6OkRPTVN0b3JhZ2UqIG1fZnJvbnRlbmQ7Ci0gICAgICAg IGludCBtX2lkOworICAgICAgICBTdHJpbmcgbV9pZDsKICAgICAgICAgYm9vbCBtX3JlcG9ydGlu Z0NoYW5nZXNUb0Zyb250ZW5kOwogCiAgICAgICAgIHN0YXRpYyBpbnQgc19uZXh0VW51c2VkSWQ7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VB Z2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VBZ2Vu dC5jcHAKaW5kZXggMDZmNjUyNDg4ZWM2NGFhNzlhMWE2OWEyNmE5NDAwMWQxMzBmOGZjOC4uZTc0 NmIxODhjMGRjMDlkNGI2YjhkODMzMjVkYmU4OGU4YTNlN2Y1YSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRhdGFiYXNlQWdlbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JEYXRhYmFzZUFnZW50LmNwcApAQCAtMjkxLDcg KzI5MSw3IEBAIHZvaWQgSW5zcGVjdG9yRGF0YWJhc2VBZ2VudDo6cmVzdG9yZSgpCiAgICAgbV9l bmFibGVkID0gIG1fc3RhdGUtPmdldEJvb2xlYW4oRGF0YWJhc2VBZ2VudFN0YXRlOjpkYXRhYmFz ZUFnZW50RW5hYmxlZCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRGF0YWJhc2VBZ2VudDo6Z2V0RGF0 YWJhc2VUYWJsZU5hbWVzKEVycm9yU3RyaW5nKiBlcnJvciwgaW50IGRhdGFiYXNlSWQsIFJlZlB0 cjxJbnNwZWN0b3JBcnJheT4mIG5hbWVzKQordm9pZCBJbnNwZWN0b3JEYXRhYmFzZUFnZW50Ojpn ZXREYXRhYmFzZVRhYmxlTmFtZXMoRXJyb3JTdHJpbmcqIGVycm9yLCBjb25zdCBTdHJpbmcmIGRh dGFiYXNlSWQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4mIG5hbWVzKQogewogICAgIGlmICghbV9l bmFibGVkKSB7CiAgICAgICAgICplcnJvciA9ICJEYXRhYmFzZSBhZ2VudCBpcyBub3QgZW5hYmxl ZCI7CkBAIC0zMDcsNyArMzA3LDcgQEAgdm9pZCBJbnNwZWN0b3JEYXRhYmFzZUFnZW50OjpnZXRE YXRhYmFzZVRhYmxlTmFtZXMoRXJyb3JTdHJpbmcqIGVycm9yLCBpbnQgZGF0YWIKICAgICB9CiB9 CiAKLXZvaWQgSW5zcGVjdG9yRGF0YWJhc2VBZ2VudDo6ZXhlY3V0ZVNRTChFcnJvclN0cmluZyog ZXJyb3IsIGludCBkYXRhYmFzZUlkLCBjb25zdCBTdHJpbmcmIHF1ZXJ5LCBib29sKiBzdWNjZXNz LCBpbnQqIHRyYW5zYWN0aW9uSWQpCit2b2lkIEluc3BlY3RvckRhdGFiYXNlQWdlbnQ6OmV4ZWN1 dGVTUUwoRXJyb3JTdHJpbmcqIGVycm9yLCBjb25zdCBTdHJpbmcmIGRhdGFiYXNlSWQsIGNvbnN0 IFN0cmluZyYgcXVlcnksIGJvb2wqIHN1Y2Nlc3MsIGludCogdHJhbnNhY3Rpb25JZCkKIHsKICAg ICBpZiAoIW1fZW5hYmxlZCkgewogICAgICAgICAqZXJyb3IgPSAiRGF0YWJhc2UgYWdlbnQgaXMg bm90IGVuYWJsZWQiOwpAQCAtMzI4LDEzICszMjgsMTMgQEAgdm9pZCBJbnNwZWN0b3JEYXRhYmFz ZUFnZW50OjpleGVjdXRlU1FMKEVycm9yU3RyaW5nKiBlcnJvciwgaW50IGRhdGFiYXNlSWQsIGNv bnMKICAgICAqc3VjY2VzcyA9IHRydWU7CiB9CiAKLWludCBJbnNwZWN0b3JEYXRhYmFzZUFnZW50 OjpkYXRhYmFzZUlkKERhdGFiYXNlKiBkYXRhYmFzZSkKK1N0cmluZyBJbnNwZWN0b3JEYXRhYmFz ZUFnZW50OjpkYXRhYmFzZUlkKERhdGFiYXNlKiBkYXRhYmFzZSkKIHsKICAgICBmb3IgKERhdGFi YXNlUmVzb3VyY2VzTWFwOjppdGVyYXRvciBpdCA9IG1fcmVzb3VyY2VzLmJlZ2luKCk7IGl0ICE9 IG1fcmVzb3VyY2VzLmVuZCgpOyArK2l0KSB7CiAgICAgICAgIGlmIChpdC0+c2Vjb25kLT5kYXRh YmFzZSgpID09IGRhdGFiYXNlKQogICAgICAgICAgICAgcmV0dXJuIGl0LT5maXJzdDsKICAgICB9 Ci0gICAgcmV0dXJuIDA7CisgICAgcmV0dXJuIFN0cmluZygpOwogfQogCiBJbnNwZWN0b3JEYXRh YmFzZVJlc291cmNlKiBJbnNwZWN0b3JEYXRhYmFzZUFnZW50OjpmaW5kQnlGaWxlTmFtZShjb25z dCBTdHJpbmcmIGZpbGVOYW1lKQpAQCAtMzQ2LDcgKzM0Niw3IEBAIEluc3BlY3RvckRhdGFiYXNl UmVzb3VyY2UqIEluc3BlY3RvckRhdGFiYXNlQWdlbnQ6OmZpbmRCeUZpbGVOYW1lKGNvbnN0IFN0 cmluZyYKICAgICByZXR1cm4gMDsKIH0KIAotRGF0YWJhc2UqIEluc3BlY3RvckRhdGFiYXNlQWdl bnQ6OmRhdGFiYXNlRm9ySWQoaW50IGRhdGFiYXNlSWQpCitEYXRhYmFzZSogSW5zcGVjdG9yRGF0 YWJhc2VBZ2VudDo6ZGF0YWJhc2VGb3JJZChjb25zdCBTdHJpbmcmIGRhdGFiYXNlSWQpCiB7CiAg ICAgRGF0YWJhc2VSZXNvdXJjZXNNYXA6Oml0ZXJhdG9yIGl0ID0gbV9yZXNvdXJjZXMuZmluZChk YXRhYmFzZUlkKTsKICAgICBpZiAoaXQgPT0gbV9yZXNvdXJjZXMuZW5kKCkpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VBZ2VudC5oIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRhdGFiYXNlQWdlbnQuaAppbmRleCA5ZjRl OTQ2NzdhNDZiYzY0ODk0YmNhNzg2MWNmMDM2MWE3MmNkMTljLi5mYzc2ZTFiZDZjNThkMjgxYWNi NDJmZjA5NGE4YjBmM2ZhNTMzZTAyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvSW5zcGVjdG9yRGF0YWJhc2VBZ2VudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JEYXRhYmFzZUFnZW50LmgKQEAgLTY2LDIwICs2NiwyMCBAQCBwdWJsaWM6CiAg ICAgLy8gQ2FsbGVkIGZyb20gdGhlIGZyb250LWVuZC4KICAgICB2aXJ0dWFsIHZvaWQgZW5hYmxl KEVycm9yU3RyaW5nKik7CiAgICAgdmlydHVhbCB2b2lkIGRpc2FibGUoRXJyb3JTdHJpbmcqKTsK LSAgICB2aXJ0dWFsIHZvaWQgZ2V0RGF0YWJhc2VUYWJsZU5hbWVzKEVycm9yU3RyaW5nKiwgaW50 IGRhdGFiYXNlSWQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4mIG5hbWVzKTsKLSAgICB2aXJ0dWFs IHZvaWQgZXhlY3V0ZVNRTChFcnJvclN0cmluZyosIGludCBkYXRhYmFzZUlkLCBjb25zdCBTdHJp bmcmIHF1ZXJ5LCBib29sKiBzdWNjZXNzLCBpbnQqIHRyYW5zYWN0aW9uSWQpOworICAgIHZpcnR1 YWwgdm9pZCBnZXREYXRhYmFzZVRhYmxlTmFtZXMoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcm IGRhdGFiYXNlSWQsIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4mIG5hbWVzKTsKKyAgICB2aXJ0dWFs IHZvaWQgZXhlY3V0ZVNRTChFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VJZCwg Y29uc3QgU3RyaW5nJiBxdWVyeSwgYm9vbCogc3VjY2VzcywgaW50KiB0cmFuc2FjdGlvbklkKTsK IAogICAgIC8vIENhbGxlZCBmcm9tIHRoZSBpbmplY3RlZCBzY3JpcHQuCi0gICAgaW50IGRhdGFi YXNlSWQoRGF0YWJhc2UqKTsKKyAgICBTdHJpbmcgZGF0YWJhc2VJZChEYXRhYmFzZSopOwogCiAg ICAgdm9pZCBkaWRPcGVuRGF0YWJhc2UoUGFzc1JlZlB0cjxEYXRhYmFzZT4sIGNvbnN0IFN0cmlu ZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmVyc2lvbik7CiBw cml2YXRlOgogICAgIGV4cGxpY2l0IEluc3BlY3RvckRhdGFiYXNlQWdlbnQoSW5zdHJ1bWVudGlu Z0FnZW50cyosIEluc3BlY3RvclN0YXRlKik7CiAKLSAgICBEYXRhYmFzZSogZGF0YWJhc2VGb3JJ ZChpbnQgZGF0YWJhc2VJZCk7CisgICAgRGF0YWJhc2UqIGRhdGFiYXNlRm9ySWQoY29uc3QgU3Ry aW5nJiBkYXRhYmFzZUlkKTsKICAgICBJbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlKiBmaW5kQnlG aWxlTmFtZShjb25zdCBTdHJpbmcmIGZpbGVOYW1lKTsKIAotICAgIHR5cGVkZWYgSGFzaE1hcDxp bnQsIFJlZlB0cjxJbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlPiA+IERhdGFiYXNlUmVzb3VyY2Vz TWFwOworICAgIHR5cGVkZWYgSGFzaE1hcDxTdHJpbmcsIFJlZlB0cjxJbnNwZWN0b3JEYXRhYmFz ZVJlc291cmNlPiA+IERhdGFiYXNlUmVzb3VyY2VzTWFwOwogICAgIERhdGFiYXNlUmVzb3VyY2Vz TWFwIG1fcmVzb3VyY2VzOwogICAgIFJlZlB0cjxGcm9udGVuZFByb3ZpZGVyPiBtX2Zyb250ZW5k UHJvdmlkZXI7CiAgICAgYm9vbCBtX2VuYWJsZWQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZS5jcHAKaW5kZXggZmU1ODA4YzBl YWNiZTJkYWVlYTEzNGJkYTdlOTg5MWEyOWJkOWFhYy4uNjc4NTQxY2VhZjNhYmIzOWU4YzdjYjky ZGQxYmEwNTM4ZjdkMzk0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckRhdGFiYXNlUmVzb3VyY2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlLmNwcApAQCAtNDksNyArNDksNyBAQCBQYXNzUmVm UHRyPEluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2U+IEluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2U6 OmNyZWF0ZShQYXNzUmVmUAogCiBJbnNwZWN0b3JEYXRhYmFzZVJlc291cmNlOjpJbnNwZWN0b3JE YXRhYmFzZVJlc291cmNlKFBhc3NSZWZQdHI8RGF0YWJhc2U+IGRhdGFiYXNlLCBjb25zdCBTdHJp bmcmIGRvbWFpbiwgY29uc3QgU3RyaW5nJiBuYW1lLCBjb25zdCBTdHJpbmcmIHZlcnNpb24pCiAg ICAgOiBtX2RhdGFiYXNlKGRhdGFiYXNlKQotICAgICwgbV9pZChuZXh0VW51c2VkSWQrKykKKyAg ICAsIG1faWQoU3RyaW5nOjpudW1iZXIobmV4dFVudXNlZElkKyspKQogICAgICwgbV9kb21haW4o ZG9tYWluKQogICAgICwgbV9uYW1lKG5hbWUpCiAgICAgLCBtX3ZlcnNpb24odmVyc2lvbikKQEAg LTU5LDcgKzU5LDcgQEAgSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJjZTo6SW5zcGVjdG9yRGF0YWJh c2VSZXNvdXJjZShQYXNzUmVmUHRyPERhdGFiYXNlPiBkYXRhYmEKIHZvaWQgSW5zcGVjdG9yRGF0 YWJhc2VSZXNvdXJjZTo6YmluZChJbnNwZWN0b3JGcm9udGVuZDo6RGF0YWJhc2UqIGZyb250ZW5k KQogewogICAgIFJlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGpzb25PYmplY3QgPSBJbnNwZWN0b3JP YmplY3Q6OmNyZWF0ZSgpOwotICAgIGpzb25PYmplY3QtPnNldE51bWJlcigiaWQiLCBtX2lkKTsK KyAgICBqc29uT2JqZWN0LT5zZXRTdHJpbmcoImlkIiwgbV9pZCk7CiAgICAganNvbk9iamVjdC0+ c2V0U3RyaW5nKCJkb21haW4iLCBtX2RvbWFpbik7CiAgICAganNvbk9iamVjdC0+c2V0U3RyaW5n KCJuYW1lIiwgbV9uYW1lKTsKICAgICBqc29uT2JqZWN0LT5zZXRTdHJpbmcoInZlcnNpb24iLCBt X3ZlcnNpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckRhdGFiYXNlUmVzb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JE YXRhYmFzZVJlc291cmNlLmgKaW5kZXggNDgzOTczZTRlOWMxNWExNWU4YWVjNzhjMjM0MjY2NmFk MTA0ZWU2Ni4uZTFjODkwMjc1NWRjZDgyMTdkOWU4NDE3MzQ2YTJlZDJkM2I2NzFlOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckRhdGFiYXNlUmVzb3VyY2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRGF0YWJhc2VSZXNvdXJj ZS5oCkBAIC00OSwxMyArNDksMTMgQEAgcHVibGljOgogICAgIHZvaWQgYmluZChJbnNwZWN0b3JG cm9udGVuZDo6RGF0YWJhc2UqKTsKICAgICBEYXRhYmFzZSogZGF0YWJhc2UoKSB7IHJldHVybiBt X2RhdGFiYXNlLmdldCgpOyB9CiAgICAgdm9pZCBzZXREYXRhYmFzZShQYXNzUmVmUHRyPERhdGFi YXNlPiBkYXRhYmFzZSkgeyBtX2RhdGFiYXNlID0gZGF0YWJhc2U7IH0KLSAgICBpbnQgaWQoKSBj b25zdCB7IHJldHVybiBtX2lkOyB9CisgICAgU3RyaW5nIGlkKCkgY29uc3QgeyByZXR1cm4gbV9p ZDsgfQogCiBwcml2YXRlOgogICAgIEluc3BlY3RvckRhdGFiYXNlUmVzb3VyY2UoUGFzc1JlZlB0 cjxEYXRhYmFzZT4sIGNvbnN0IFN0cmluZyYgZG9tYWluLCBjb25zdCBTdHJpbmcmIG5hbWUsIGNv bnN0IFN0cmluZyYgdmVyc2lvbik7CiAKICAgICBSZWZQdHI8RGF0YWJhc2U+IG1fZGF0YWJhc2U7 Ci0gICAgaW50IG1faWQ7CisgICAgU3RyaW5nIG1faWQ7CiAgICAgU3RyaW5nIG1fZG9tYWluOwog ICAgIFN0cmluZyBtX25hbWU7CiAgICAgU3RyaW5nIG1fdmVyc2lvbjsK