108234 2013-01-29 15:05:17 -0800 Get rid of MessageID::is() 2013-01-29 18:14:27 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 108276 1 andersca andersca oldest_to_newest 819371 0 andersca 2013-01-29 15:05:17 -0800 Get rid of MessageID::is 819421 1 185326 andersca 2013-01-29 15:56:21 -0800 Created attachment 185326 Patch 819428 2 andersca 2013-01-29 16:02:06 -0800 Committed r141174: <http://trac.webkit.org/changeset/141174> 185326 2013-01-29 15:56:21 -0800 2013-01-29 15:59:21 -0800 Patch bug-108234-20130129155307.patch text/plain 24939 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQxMTcwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNTVmOTA3NWRmZGE2Njll Mzg4ODYwNzk3OTViNjIwN2RkYzI2NjgzYi4uZGIxYjUyZDhmNjFhNzIwMmM2NjRhNTA3MWFjYmI4 NTkwMGNiNjI3OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUwIEBACiAyMDEzLTAxLTI5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgR2V0IHJpZCBvZiBN ZXNzYWdlSUQ6OmlzKCkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEwODIzNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBleHBsaWNpdCBtZXNzYWdlIHJlY2VpdmVyIG5hbWUgZXF1YWxpdHkgY2hlY2tz IGluc3RlYWQgb2YgdXNpbmcgTWVzc2FnZUlEOjppcy4KKworICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmRpZFJlY2VpdmVTeW5j TWVzc2FnZSk6CisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlSUQuaDoKKyAgICAg ICAgKiBQbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVTeW5jTWVzc2FnZSk6Cisg ICAgICAgICogU2hhcmVkL21hYy9TZWNJdGVtU2hpbS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNl Y0l0ZW1TaGltOjpkaWRSZWNlaXZlTWVzc2FnZU9uQ29ubmVjdGlvbldvcmtRdWV1ZSk6CisgICAg ICAgICogVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRl eHQ6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6ZGlk UmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlByb2Nlc3NQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlTWVzc2FnZU9uQ29ubmVjdGlvbldvcmtRdWV1ZSk6 CisgICAgICAgICogVUlQcm9jZXNzL21hYy9TZWNJdGVtU2hpbVByb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6U2VjSXRlbVNoaW1Qcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2VPbkNvbm5lY3Rpb25X b3JrUXVldWUpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc0Nv bm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246 OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NDb25u ZWN0aW9uOjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvUGx1 Z2lucy9QbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdp blByb2Nlc3NDb25uZWN0aW9uOjpkaWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9FdmVudERpc3BhdGNoZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpF dmVudERpc3BhdGNoZXI6OmRpZFJlY2VpdmVNZXNzYWdlT25Db25uZWN0aW9uV29ya1F1ZXVlKToK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzOjpkaWRSZWNlaXZlTWVz c2FnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OmRpZFJlY2VpdmVNZXNzYWdlT25D b25uZWN0aW9uV29ya1F1ZXVlKToKKworMjAxMy0wMS0yOSAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIEdldCByaWQgb2YgTWVzc2FnZUlEOjpnZXQoKQog ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA4MjM1CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdvcmtDb25uZWN0 aW9uVG9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL05ldHdv cmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcAppbmRleCBiNjkyZjRiNTgzYWY3MTVkNDViYTlj YTA3NGRjOGUxMGRiNTkyYTI1Li43ZWJiMzA3YTEzODJkNWRhZjE5ODdiNmM3MTZkOTM3MWNmM2U1 MDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29u bmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCkBAIC0yNyw2ICsyNyw3IEBACiAj aW5jbHVkZSAiTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuaCIKIAogI2luY2x1ZGUgIkNv bm5lY3Rpb25TdGFjay5oIgorI2luY2x1ZGUgIk5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz TWVzc2FnZXMuaCIKICNpbmNsdWRlICJOZXR3b3JrUHJvY2Vzcy5oIgogI2luY2x1ZGUgIk5ldHdv cmtSZXNvdXJjZUxvYWRlci5oIgogI2luY2x1ZGUgIlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0Lmgi CkBAIC02MSw3ICs2Miw3IEBAIE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjp+TmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MoKQogICAgIAogdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRv V2ViUHJvY2Vzczo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVj dGlvbiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29k ZXImIGRlY29kZXIpCiB7Ci0gICAgaWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xh c3NOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcz4oKSkgeworICAgIGlmIChkZWNvZGVyLm1l c3NhZ2VSZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlBy b2Nlc3M6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSkgewogICAgICAgICBkaWRSZWNlaXZlTmV0d29y a0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3NNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgZGVj b2Rlcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CkBAIC03MSw3ICs3Miw3IEBAIHZvaWQgTmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNv bm5lY3Rpb24qIGNvbm5lCiAKIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmRp ZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3Jl SVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2Rl ciwgT3duUHRyPENvcmVJUEM6Ok1lc3NhZ2VFbmNvZGVyPiYgcmVwbHkpCiB7Ci0gICAgaWYgKG1l c3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJv Y2Vzcz4oKSkgeworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKSA9PSBNZXNz YWdlczo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSkgewogICAgICAgICBkaWRSZWNlaXZlU3luY05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNz TWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIsIHJlcGx5KTsKICAgICAgICAg cmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJ UEMvTWVzc2FnZUlELmggYi9Tb3VyY2UvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL01lc3NhZ2VJ RC5oCmluZGV4IGFmZjIyMWQ0ZDZhZmE5Mzg2M2I3ZmI5M2U0M2ExZTk2NzMwZGI4YTAuLmNmMjE1 MDc2ZjQ4ODM3MzhlNjg2MGRkODBiMjNhNzYwM2M0ZmI5MmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZUlELmgKKysrIGIvU291cmNlL1dlYktpdDIv UGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlSUQuaApAQCAtMTcyLDEyICsxNzIsNiBAQCBwdWJsaWM6 CiAgICAgewogICAgIH0KIAotICAgIHRlbXBsYXRlIDxNZXNzYWdlQ2xhc3MgSz4KLSAgICBib29s IGlzKCkgY29uc3QKLSAgICB7Ci0gICAgICAgIHJldHVybiBnZXRDbGFzcygpID09IEs7Ci0gICAg fQotCiAgICAgc3RhdGljIE1lc3NhZ2VJRCBmcm9tSW50KHVuc2lnbmVkIGkpCiAgICAgewogICAg ICAgICBNZXNzYWdlSUQgbWVzc2FnZUlEOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvUGx1 Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9QbHVn aW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNwcAppbmRleCBlZjU3NGU2ZWJhZjc3MzRj MGYxZDA0OWJmNTkyNWRiZThmNGE3MmEyLi44NjViNzY5YmZjZTM5NGJiYTAyYTk0NThiMDEzNDc1 OTQ2ZDM5OGVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlBy b2Nlc3NDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dl YlByb2Nlc3NDb25uZWN0aW9uLmNwcApAQCAtMzAsMTIgKzMwLDE0IEBACiAKICNpbmNsdWRlICJB cmd1bWVudENvZGVycy5oIgogI2luY2x1ZGUgIkNvbm5lY3Rpb25TdGFjay5oIgorI2luY2x1ZGUg Ik5QT2JqZWN0TWVzc2FnZVJlY2VpdmVyTWVzc2FnZXMuaCIKICNpbmNsdWRlICJOUFJlbW90ZU9i amVjdE1hcC5oIgogI2luY2x1ZGUgIlBsdWdpbkNvbnRyb2xsZXJQcm94eS5oIgogI2luY2x1ZGUg IlBsdWdpbkNyZWF0aW9uUGFyYW1ldGVycy5oIgogI2luY2x1ZGUgIlBsdWdpblByb2Nlc3MuaCIK ICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbk1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAi UGx1Z2luUHJveHlNZXNzYWdlcy5oIgorI2luY2x1ZGUgIldlYlByb2Nlc3NDb25uZWN0aW9uTWVz c2FnZXMuaCIKICNpbmNsdWRlIDxXZWJDb3JlL1J1bkxvb3AuaD4KICNpbmNsdWRlIDx1bmlzdGQu aD4KIApAQCAtMTE4LDcgKzEyMCw3IEBAIHZvaWQgV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJl Y2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvCiB7CiAgICAg Q29ubmVjdGlvblN0YWNrOjpDdXJyZW50Q29ubmVjdGlvblB1c2hlciBjdXJyZW50Q29ubmVjdGlv bihDb25uZWN0aW9uU3RhY2s6OnNoYXJlZCgpLCBjb25uZWN0aW9uKTsKIAotICAgIGlmIChtZXNz YWdlSUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNzV2ViUHJvY2Vzc0Nvbm5lY3Rpb24+KCkpIHsK KyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlBy b2Nlc3NDb25uZWN0aW9uOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpIHsKICAgICAgICAgZGlkUmVj ZWl2ZVdlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRl Y29kZXIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTQ3LDcgKzE0OSw3IEBAIHZvaWQg V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpDb25u ZWN0aW9uKiBjb25uZWN0aW9uCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAobWVz c2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc05QT2JqZWN0TWVzc2FnZVJlY2VpdmVyPigp KSB7CisgICAgaWYgKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpO UE9iamVjdE1lc3NhZ2VSZWNlaXZlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKSB7CiAgICAgICAg IG1fbnBSZW1vdGVPYmplY3RNYXAtPmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9uLCBt ZXNzYWdlSUQsIGRlY29kZXIsIHJlcGx5RW5jb2Rlcik7CiAgICAgICAgIHJldHVybjsKICAgICB9 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1NlY0l0ZW1TaGltLmNwcCBi L1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2VjSXRlbVNoaW0uY3BwCmluZGV4IGI0ZDc5NzAw MDYyOWI0MDEwNDg4NTliMTc2NjA5YWQ2YWYzZWJiNDguLjM1NTMxMDk5MGI0Mzg4YjI3YjlhMDRl OTBmYjU5MDJmMDJlNTQzYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMv U2VjSXRlbVNoaW0uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvU2VjSXRlbVNo aW0uY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiU2VjSXRlbVJlcXVlc3REYXRhLmgi CiAjaW5jbHVkZSAiU2VjSXRlbVJlc3BvbnNlRGF0YS5oIgogI2luY2x1ZGUgIlNlY0l0ZW1TaGlt TGlicmFyeS5oIgorI2luY2x1ZGUgIlNlY0l0ZW1TaGltTWVzc2FnZXMuaCIKICNpbmNsdWRlICJT ZWNJdGVtU2hpbVByb3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlIDxTZWN1cml0eS9TZWN1cml0eS5o PgogI2luY2x1ZGUgPGRsZmNuLmg+CkBAIC0xMzMsNyArMTM0LDcgQEAgdm9pZCBTZWNJdGVtU2hp bTo6aW5pdGlhbGl6ZShDaGlsZFByb2Nlc3MqIHByb2Nlc3MpCiAKIHZvaWQgU2VjSXRlbVNoaW06 OmRpZFJlY2VpdmVNZXNzYWdlT25Db25uZWN0aW9uV29ya1F1ZXVlKENvcmVJUEM6OkNvbm5lY3Rp b24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6Ok1l c3NhZ2VEZWNvZGVyJiBkZWNvZGVyLCBib29sJiBkaWRIYW5kbGVNZXNzYWdlKQogewotICAgIGlm IChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNzU2VjSXRlbVNoaW0+KCkpIHsKKyAg ICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OlNlY0l0ZW1T aGltOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpIHsKICAgICAgICAgZGlkUmVjZWl2ZVNlY0l0ZW1T aGltTWVzc2FnZU9uQ29ubmVjdGlvbldvcmtRdWV1ZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRl Y29kZXIsIGRpZEhhbmRsZU1lc3NhZ2UpOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94 eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1By b3h5LmNwcAppbmRleCAxYTdlYjgyYjFjNDM3NjUxNzI4YTE4MDM3ZDE3ZTJiNDQ0MzcyOTBhLi41 OGVmZTI2NTMzMmEwZjZjOGRjM2VlZjI1NmViYjdkMmU1NjFmNjc4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNw cApAQCAtMjksNiArMjksNyBAQAogI2lmIEVOQUJMRShORVRXT1JLX1BST0NFU1MpCiAKICNpbmNs dWRlICJBdXRoZW50aWNhdGlvbkNoYWxsZW5nZVByb3h5LmgiCisjaW5jbHVkZSAiQ3VzdG9tUHJv dG9jb2xNYW5hZ2VyUHJveHlNZXNzYWdlcy5oIgogI2luY2x1ZGUgIkRvd25sb2FkUHJveHlNZXNz YWdlcy5oIgogI2luY2x1ZGUgIk5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAj aW5jbHVkZSAiTmV0d29ya1Byb2Nlc3NNZXNzYWdlcy5oIgpAQCAtMTE3LDcgKzExOCw3IEBAIHZv aWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVj dGlvbiogY29ubmVjdGlvbiwgQ29yCiAgICAgICAgIHJldHVybjsKIAogI2lmIEVOQUJMRShDVVNU T01fUFJPVE9DT0xTKQotICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNz Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyUHJveHk+KCkpIHsKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdl UmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OkN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCkpIHsKICAgICAgICAgbV9jdXN0b21Qcm90b2NvbE1hbmFnZXJQ cm94eS5kaWRSZWNlaXZlTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIpOwog ICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQu Y3BwCmluZGV4IDZiN2QzZDQ0YmRlMmMwNWQwMmQ4OWNiZDhjM2Y5NzU5MWYzMjg1NWMuLjZkNjBk M2MxNjM4ZTU1YTE5YzkwYTUxMWM0MWQwZjhlZTQxMDc1ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViQ29udGV4dC5jcHAKQEAgLTg5Myw3ICs4OTMsNyBAQCBib29sIFdlYkNvbnRleHQ6 OmRpc3BhdGNoU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29y ZUlQQzo6TQogCiB2b2lkIFdlYkNvbnRleHQ6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNv bm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJ UEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyKQogewotICAgIGlmIChtZXNzYWdlSUQuaXM8Q29y ZUlQQzo6TWVzc2FnZUNsYXNzV2ViQ29udGV4dD4oKSkgeworICAgIGlmIChkZWNvZGVyLm1lc3Nh Z2VSZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6V2ViQ29udGV4dDo6bWVzc2FnZVJlY2VpdmVy TmFtZSgpKSB7CiAgICAgICAgIGRpZFJlY2VpdmVXZWJDb250ZXh0TWVzc2FnZShjb25uZWN0aW9u LCBtZXNzYWdlSUQsIGRlY29kZXIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtOTE3LDcg KzkxNyw3IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29u bmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6TWVzCiAKIHZvaWQgV2ViQ29udGV4dDo6ZGlk UmVjZWl2ZVN5bmNNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJ UEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVy LCBPd25QdHI8Q29yZUlQQzo6TWVzc2FnZUVuY29kZXI+JiByZXBseUVuY29kZXIpCiB7Ci0gICAg aWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJDb250ZXh0PigpKSB7Cisg ICAgaWYgKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJDb250 ZXh0OjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpIHsKICAgICAgICAgZGlkUmVjZWl2ZVN5bmNXZWJD b250ZXh0TWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIsIHJlcGx5RW5jb2Rl cik7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwCmluZGV4IDkwYzQ2ZTM2Mjk2OGQxNmNmMWQzYzYxMmVjNzRlOWRjOWQ5MzU1 MDIuLjJkMDA4OTRmYjE3YzU4ZTk2M2EwMjNiZmRhOTM2YzVkNTlmZDY5OWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC0zMiw2ICszMiw3IEBACiAjaW5j bHVkZSAiRGF0YVJlZmVyZW5jZS5oIgogI2luY2x1ZGUgIkRvd25sb2FkUHJveHkuaCIKICNpbmNs dWRlICJEcmF3aW5nQXJlYVByb3h5LmgiCisjaW5jbHVkZSAiRHJhd2luZ0FyZWFQcm94eU1lc3Nh Z2VzLmgiCiAjaW5jbHVkZSAiRXZlbnREaXNwYXRjaGVyTWVzc2FnZXMuaCIKICNpbmNsdWRlICJG aW5kSW5kaWNhdG9yLmgiCiAjaW5jbHVkZSAiSW1tdXRhYmxlQXJyYXkuaCIKQEAgLTYzLDcgKzY0 LDkgQEAKICNpbmNsdWRlICJXZWJGb3JtU3VibWlzc2lvbkxpc3RlbmVyUHJveHkuaCIKICNpbmNs dWRlICJXZWJGcmFtZVBvbGljeUxpc3RlbmVyUHJveHkuaCIKICNpbmNsdWRlICJXZWJGdWxsU2Ny ZWVuTWFuYWdlclByb3h5LmgiCisjaW5jbHVkZSAiV2ViRnVsbFNjcmVlbk1hbmFnZXJQcm94eU1l c3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViSW5zcGVjdG9yUHJveHkuaCIKKyNpbmNsdWRlICJXZWJJ bnNwZWN0b3JQcm94eU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2ViTm90aWZpY2F0aW9uTWFuYWdl clByb3h5LmgiCiAjaW5jbHVkZSAiV2ViT3BlblBhbmVsUmVzdWx0TGlzdGVuZXJQcm94eS5oIgog I2luY2x1ZGUgIldlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMuaCIKQEAgLTE5MjQsNyArMTkyNyw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpwcmVmZXJlbmNlc0RpZENoYW5nZSgpCiAKIHZvaWQgV2Vi UGFnZVByb3h5OjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0 aW9uLCBDb3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2Rl ciYgZGVjb2RlcikKIHsKLSAgICBpZiAobWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFz c0RyYXdpbmdBcmVhUHJveHk+KCkpIHsKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJO YW1lKCkgPT0gTWVzc2FnZXM6OkRyYXdpbmdBcmVhUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUo KSkgewogICAgICAgICBtX2RyYXdpbmdBcmVhLT5kaWRSZWNlaXZlRHJhd2luZ0FyZWFQcm94eU1l c3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBkZWNvZGVyKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KQEAgLTE5MzcsNyArMTk0MCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRSZWNlaXZl TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNCiAjZW5k aWYKIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBD OjpNZXNzYWdlQ2xhc3NXZWJJbnNwZWN0b3JQcm94eT4oKSkgeworICAgIGlmIChkZWNvZGVyLm1l c3NhZ2VSZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6V2ViSW5zcGVjdG9yUHJveHk6Om1lc3Nh Z2VSZWNlaXZlck5hbWUoKSkgewogICAgICAgICBpZiAoV2ViSW5zcGVjdG9yUHJveHkqIGluc3Bl Y3RvciA9IHRoaXMtPmluc3BlY3RvcigpKQogICAgICAgICAgICAgaW5zcGVjdG9yLT5kaWRSZWNl aXZlV2ViSW5zcGVjdG9yUHJveHlNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgZGVjb2Rl cik7CiAgICAgICAgIHJldHVybjsKQEAgLTE5NDUsNyArMTk0OCw3IEBAIHZvaWQgV2ViUGFnZVBy b3h5OjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBD b3JlSVBDOjpNCiAjZW5kaWYKIAogI2lmIEVOQUJMRShGVUxMU0NSRUVOX0FQSSkKLSAgICBpZiAo bWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJv eHk+KCkpIHsKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2Fn ZXM6OldlYkZ1bGxTY3JlZW5NYW5hZ2VyUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSkgewog ICAgICAgICBmdWxsU2NyZWVuTWFuYWdlcigpLT5kaWRSZWNlaXZlTWVzc2FnZShjb25uZWN0aW9u LCBtZXNzYWdlSUQsIGRlY29kZXIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTk1Nyw3 ICsxOTYwLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6 OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok0KIHZvaWQgV2ViUGFnZVByb3h5Ojpk aWRSZWNlaXZlU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29y ZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29k ZXIsIE93blB0cjxDb3JlSVBDOjpNZXNzYWdlRW5jb2Rlcj4mIHJlcGx5RW5jb2RlcikKIHsKICNp ZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6TWVzc2Fn ZUNsYXNzV2ViSW5zcGVjdG9yUHJveHk+KCkpIHsKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVj ZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OldlYkluc3BlY3RvclByb3h5OjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCkpIHsKICAgICAgICAgaWYgKFdlYkluc3BlY3RvclByb3h5KiBpbnNwZWN0b3IgPSB0 aGlzLT5pbnNwZWN0b3IoKSkKICAgICAgICAgICAgIGluc3BlY3Rvci0+ZGlkUmVjZWl2ZVN5bmNX ZWJJbnNwZWN0b3JQcm94eU1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBkZWNvZGVyLCBy ZXBseUVuY29kZXIpOwogICAgICAgICByZXR1cm47CkBAIC0xOTY1LDcgKzE5NjgsNyBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24q IGNvbm5lY3Rpb24sIENvcmVJUAogI2VuZGlmCiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkp Ci0gICAgaWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJGdWxsU2NyZWVu TWFuYWdlclByb3h5PigpKSB7CisgICAgaWYgKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgp ID09IE1lc3NhZ2VzOjpXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5OjptZXNzYWdlUmVjZWl2ZXJO YW1lKCkpIHsKICAgICAgICAgZnVsbFNjcmVlbk1hbmFnZXIoKS0+ZGlkUmVjZWl2ZVN5bmNNZXNz YWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgZGVjb2RlciwgcmVwbHlFbmNvZGVyKTsKICAgICAg ICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ cm94eS5jcHAKaW5kZXggMDY4OGM3ZmM1ZDNlMDk2MTQ5MDZjZGNlNmU5NGZkYmVhZjMyNTk2YS4u NjM1ODJlYzg1NTY5OWFlM2I1MmFiN2FkOTZjZDBmZjUzNDhjNjQ4MyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTI2LDYgKzI2LDcgQEAKICNp bmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzUHJveHkuaCIKIAorI2luY2x1 ZGUgIkN1c3RvbVByb3RvY29sTWFuYWdlclByb3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJEYXRh UmVmZXJlbmNlLmgiCiAjaW5jbHVkZSAiRG93bmxvYWRQcm94eU1hcC5oIgogI2luY2x1ZGUgIlBs dWdpbkluZm9TdG9yZS5oIgpAQCAtNDE5LDEzICs0MjAsMTMgQEAgdm9pZCBXZWJQcm9jZXNzUHJv eHk6OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENv cmVJUEMKICAgICBpZiAobV9jb250ZXh0LT5kaXNwYXRjaE1lc3NhZ2UoY29ubmVjdGlvbiwgbWVz c2FnZUlELCBkZWNvZGVyKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1lc3NhZ2VJRC5p czxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJQcm9jZXNzUHJveHk+KCkpIHsKKyAgICBpZiAoZGVj b2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlByb2Nlc3NQcm94eTo6 bWVzc2FnZVJlY2VpdmVyTmFtZSgpKSB7CiAgICAgICAgIGRpZFJlY2VpdmVXZWJQcm9jZXNzUHJv eHlNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgZGVjb2Rlcik7CiAgICAgICAgIHJldHVy bjsKICAgICB9CiAKICNpZiBFTkFCTEUoQ1VTVE9NX1BST1RPQ09MUykKLSAgICBpZiAobWVzc2Fn ZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc0N1c3RvbVByb3RvY29sTWFuYWdlclByb3h5Pigp KSB7CisgICAgaWYgKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpD dXN0b21Qcm90b2NvbE1hbmFnZXJQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKSB7CiAjaWYg RU5BQkxFKE5FVFdPUktfUFJPQ0VTUykKICAgICAgICAgQVNTRVJUKCFjb250ZXh0KCktPnVzZXNO ZXR3b3JrUHJvY2VzcygpKTsKICNlbmRpZgpAQCAtNDUzLDcgKzQ1NCw3IEBAIHZvaWQgV2ViUHJv Y2Vzc1Byb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29u bmVjdGlvbiwgQ29yCiAgICAgaWYgKG1fY29udGV4dC0+ZGlzcGF0Y2hTeW5jTWVzc2FnZShjb25u ZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIsIHJlcGx5RW5jb2RlcikpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNzV2ViUHJvY2Vz c1Byb3h5PigpKSB7CisgICAgaWYgKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpID09IE1l c3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSkgewogICAgICAg ICBkaWRSZWNlaXZlU3luY1dlYlByb2Nlc3NQcm94eU1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2Fn ZUlELCBkZWNvZGVyLCByZXBseUVuY29kZXIpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAt NDcxLDcgKzQ3Miw3IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlU3luY01lc3Nh Z2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yCiAKIHZvaWQgV2ViUHJvY2Vz c1Byb3h5OjpkaWRSZWNlaXZlTWVzc2FnZU9uQ29ubmVjdGlvbldvcmtRdWV1ZShDb3JlSVBDOjpD b25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3Jl SVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlciwgYm9vbCYgZGlkSGFuZGxlTWVzc2FnZSkKIHsK LSAgICBpZiAobWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYlByb2Nlc3NQcm94 eT4oKSkKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6 OldlYlByb2Nlc3NQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKQogICAgICAgICBkaWRSZWNl aXZlV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZU9uQ29ubmVjdGlvbldvcmtRdWV1ZShjb25uZWN0aW9u LCBtZXNzYWdlSUQsIGRlY29kZXIsIGRpZEhhbmRsZU1lc3NhZ2UpOwogfQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1NlY0l0ZW1TaGltUHJveHkuY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9TZWNJdGVtU2hpbVByb3h5LmNwcAppbmRleCBjYjg0 N2M3Mjg3ZWMxYjdkMjM4YTYyZjgwOTU3ZDdjMGZkMmMwYWU2Li5jMzBjYjQxYTlhMGU5NjgxYjE0 ZGUxNjRlOTJhYmRhM2ZkMDYwMjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvbWFjL1NlY0l0ZW1TaGltUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvU2VjSXRlbVNoaW1Qcm94eS5jcHAKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJT ZWNJdGVtUmVxdWVzdERhdGEuaCIKICNpbmNsdWRlICJTZWNJdGVtUmVzcG9uc2VEYXRhLmgiCiAj aW5jbHVkZSAiU2VjSXRlbVNoaW1NZXNzYWdlcy5oIgorI2luY2x1ZGUgIlNlY0l0ZW1TaGltUHJv eHlNZXNzYWdlcy5oIgogI2luY2x1ZGUgPFNlY3VyaXR5L1NlY0l0ZW0uaD4KIAogbmFtZXNwYWNl IFdlYktpdCB7CkBAIC0xMDcsNyArMTA4LDcgQEAgdm9pZCBTZWNJdGVtU2hpbVByb3h5OjpzZWNJ dGVtUmVxdWVzdChDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdAogCiB2 b2lkIFNlY0l0ZW1TaGltUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlT25Db25uZWN0aW9uV29ya1F1 ZXVlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBt ZXNzYWdlSUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyLCBib29sJiBkaWRIYW5k bGVNZXNzYWdlKQogewotICAgIGlmIChtZXNzYWdlSUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNz U2VjSXRlbVNoaW1Qcm94eT4oKSkgeworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5h bWUoKSA9PSBNZXNzYWdlczo6U2VjSXRlbVNoaW1Qcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgp KSB7CiAgICAgICAgIGRpZFJlY2VpdmVTZWNJdGVtU2hpbVByb3h5TWVzc2FnZU9uQ29ubmVjdGlv bldvcmtRdWV1ZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIsIGRpZEhhbmRsZU1lc3Nh Z2UpOwogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbi5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLmNwcApp bmRleCA2YjZmZmNmYTJmYWNmMWZiMmJjOGJkOTRmMDg1Yzc1ODc3NDdmY2RmLi45NWY0YzJiZGM1 N2I4YmQxMzEwYmI0YjhlZTI3OThjZTk2MThhMzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NDb25uZWN0aW9u LmNwcApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIldlYlByb2Nlc3MuaCIKICNpbmNsdWRl ICJXZWJSZXNvdXJjZUJ1ZmZlci5oIgogI2luY2x1ZGUgIldlYlJlc291cmNlTG9hZFNjaGVkdWxl ci5oIgorI2luY2x1ZGUgIldlYlJlc291cmNlTG9hZGVyTWVzc2FnZXMuaCIKICNpbmNsdWRlIDxX ZWJDb3JlL1Jlc291cmNlQnVmZmVyLmg+CiAKICNpZiBFTkFCTEUoTkVUV09SS19QUk9DRVNTKQpA QCAtNTIsNyArNTMsNyBAQCBOZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb246On5OZXR3b3JrUHJvY2Vz c0Nvbm5lY3Rpb24oKQogCiB2b2lkIE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6ZGlkUmVjZWl2 ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6TWVzc2Fn ZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29kZXIpCiB7Ci0gICAg aWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJSZXNvdXJjZUxvYWRlcj4o KSkgeworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6 V2ViUmVzb3VyY2VMb2FkZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSkgewogICAgICAgICBpZiAo V2ViUmVzb3VyY2VMb2FkZXIqIHdlYlJlc291cmNlTG9hZGVyID0gV2ViUHJvY2Vzczo6c2hhcmVk KCkud2ViUmVzb3VyY2VMb2FkU2NoZWR1bGVyKCkud2ViUmVzb3VyY2VMb2FkZXJGb3JJZGVudGlm aWVyKGRlY29kZXIuZGVzdGluYXRpb25JRCgpKSkKICAgICAgICAgICAgIHdlYlJlc291cmNlTG9h ZGVyLT5kaWRSZWNlaXZlV2ViUmVzb3VyY2VMb2FkZXJNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3Nh Z2VJRCwgZGVjb2Rlcik7CiAgICAgICAgIApAQCAtNjQsNyArNjUsNyBAQCB2b2lkIE5ldHdvcmtQ cm9jZXNzQ29ubmVjdGlvbjo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiog Y29ubmVjdGlvbgogCiB2b2lkIE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6ZGlkUmVjZWl2ZVN5 bmNNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3Nh Z2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6Ok1lc3NhZ2VEZWNvZGVyJiBkZWNvZGVyLCBPd25QdHI8 Q29yZUlQQzo6TWVzc2FnZUVuY29kZXI+JiByZXBseUVuY29kZXIpCiB7Ci0gICAgaWYgKG1lc3Nh Z2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJSZXNvdXJjZUxvYWRlcj4oKSkgeworICAg IGlmIChkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6V2ViUmVzb3Vy Y2VMb2FkZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSkgewogICAgICAgICBpZiAoV2ViUmVzb3Vy Y2VMb2FkZXIqIHdlYlJlc291cmNlTG9hZGVyID0gV2ViUHJvY2Vzczo6c2hhcmVkKCkud2ViUmVz b3VyY2VMb2FkU2NoZWR1bGVyKCkud2ViUmVzb3VyY2VMb2FkZXJGb3JJZGVudGlmaWVyKGRlY29k ZXIuZGVzdGluYXRpb25JRCgpKSkKICAgICAgICAgICAgIHdlYlJlc291cmNlTG9hZGVyLT5kaWRS ZWNlaXZlU3luY1dlYlJlc291cmNlTG9hZGVyTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQs IGRlY29kZXIsIHJlcGx5RW5jb2Rlcik7CiAgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NDb25uZWN0aW9uLmNwcCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbi5j cHAKaW5kZXggYTk0NjkyNWFjMWE1YWFhYTQ1OTVlMDU3NjZkZGVlNzYyM2MwMGVlNC4uZGY2ZjQ2 MWI4ZGYxNjgyMzgwY2QxZjczMGQxYWEzODQ0MDgwNTNlNiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NDb25uZWN0aW9uLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rp b24uY3BwCkBAIC0yOCw3ICsyOCw3IEBACiAKICNpZiBFTkFCTEUoUExVR0lOX1BST0NFU1MpCiAK LSNpbmNsdWRlIDxydW50aW1lL0pTT2JqZWN0Lmg+CisjaW5jbHVkZSAiTlBPYmplY3RNZXNzYWdl UmVjZWl2ZXJNZXNzYWdlcy5oIgogI2luY2x1ZGUgIk5QUmVtb3RlT2JqZWN0TWFwLmgiCiAjaW5j bHVkZSAiTlBSdW50aW1lT2JqZWN0TWFwLmgiCiAjaW5jbHVkZSAiUGx1Z2luUHJvY2Vzc0Nvbm5l Y3Rpb25NYW5hZ2VyLmgiCkBAIC0zNiw2ICszNiw3IEBACiAjaW5jbHVkZSAiV2ViUHJvY2Vzcy5o IgogI2luY2x1ZGUgIldlYlByb2Nlc3NQcm94eU1lc3NhZ2VzLmgiCiAjaW5jbHVkZSA8V2ViQ29y ZS9GaWxlU3lzdGVtLmg+CisjaW5jbHVkZSA8cnVudGltZS9KU09iamVjdC5oPgogCiB1c2luZyBu YW1lc3BhY2UgV2ViQ29yZTsKIApAQCAtMTAxLDcgKzEwMiw3IEBAIHZvaWQgUGx1Z2luUHJvY2Vz c0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5l Y3Rpb24sCiAKIHZvaWQgUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVTeW5jTWVz c2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNZXNzYWdlSUQg bWVzc2FnZUlELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVjb2RlciwgT3duUHRyPENvcmVJ UEM6Ok1lc3NhZ2VFbmNvZGVyPiYgcmVwbHlFbmNvZGVyKQogewotICAgIGlmIChtZXNzYWdlSUQu aXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNzTlBPYmplY3RNZXNzYWdlUmVjZWl2ZXI+KCkpIHsKKyAg ICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6Ok5QT2JqZWN0 TWVzc2FnZVJlY2VpdmVyOjptZXNzYWdlUmVjZWl2ZXJOYW1lKCkpIHsKICAgICAgICAgbV9ucFJl bW90ZU9iamVjdE1hcC0+ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJ RCwgZGVjb2RlciwgcmVwbHlFbmNvZGVyKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9FdmVudERpc3BhdGNoZXIu Y3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5j cHAKaW5kZXggMmE3ZTdmNDkzMGVjOTFhZmRkM2NkZGMxZjA4YjNhNGMwMzg5ZGJhMy4uMDFkNmI3 YTk1NDRmNmM2MDNhNmI5OGI0ZDVlZDNjMjk4NjVhOTE0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5jcHAKKysrIGIvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0V2ZW50RGlzcGF0Y2hlci5jcHAKQEAgLTI2LDYg KzI2LDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKICNpbmNsdWRlICJFdmVudERpc3BhdGNoZXIu aCIKIAorI2luY2x1ZGUgIkV2ZW50RGlzcGF0Y2hlck1lc3NhZ2VzLmgiCiAjaW5jbHVkZSAiV2Vi RXZlbnQuaCIKICNpbmNsdWRlICJXZWJFdmVudENvbnZlcnNpb24uaCIKICNpbmNsdWRlICJXZWJQ YWdlLmgiCkBAIC03NCw3ICs3NSw3IEBAIHZvaWQgRXZlbnREaXNwYXRjaGVyOjpyZW1vdmVTY3Jv bGxpbmdUcmVlRm9yUGFnZShXZWJQYWdlKiB3ZWJQYWdlKQogCiB2b2lkIEV2ZW50RGlzcGF0Y2hl cjo6ZGlkUmVjZWl2ZU1lc3NhZ2VPbkNvbm5lY3Rpb25Xb3JrUXVldWUoQ29yZUlQQzo6Q29ubmVj dGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6 TWVzc2FnZURlY29kZXImIGRlY29kZXIsIGJvb2wmIGRpZEhhbmRsZU1lc3NhZ2UpCiB7Ci0gICAg aWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NFdmVudERpc3BhdGNoZXI+KCkp IHsKKyAgICBpZiAoZGVjb2Rlci5tZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OkV2 ZW50RGlzcGF0Y2hlcjo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKSB7CiAgICAgICAgIGRpZFJlY2Vp dmVFdmVudERpc3BhdGNoZXJNZXNzYWdlT25Db25uZWN0aW9uV29ya1F1ZXVlKGNvbm5lY3Rpb24s IG1lc3NhZ2VJRCwgZGVjb2RlciwgZGlkSGFuZGxlTWVzc2FnZSk7CiAgICAgICAgIHJldHVybjsK ICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAK aW5kZXggMmY4MTUwNWIwYzQ4Y2FkNTkyMzliMTdkOTVlMDJkOGE4MzExMmQzNy4uMmM2OTE0YjQ5 NWY5NmU3NmUwM2UxZDVlOTkwZGRiYzU1M2Q0YmY0ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjk3OSw3ICsyOTc5LDcgQEAgYm9vbCBX ZWJQYWdlOjp3aW5kb3dBbmRXZWJQYWdlQXJlRm9jdXNlZCgpIGNvbnN0CiAKIHZvaWQgV2ViUGFn ZTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29y ZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6TWVzc2FnZURlY29kZXImIGRlY29k ZXIpCiB7Ci0gICAgaWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NEcmF3aW5n QXJlYT4oKSkgeworICAgIGlmIChkZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKSA9PSBNZXNz YWdlczo6RHJhd2luZ0FyZWE6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSkgewogICAgICAgICBpZiAo bV9kcmF3aW5nQXJlYSkKICAgICAgICAgICAgIG1fZHJhd2luZ0FyZWEtPmRpZFJlY2VpdmVEcmF3 aW5nQXJlYU1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBkZWNvZGVyKTsKICAgICAgICAg cmV0dXJuOwpAQCAtMjk5NCw3ICsyOTk0LDcgQEAgdm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlTWVz c2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNZXNzYWcKICNl bmRpZgogICAgIAogI2lmIEVOQUJMRShJTlNQRUNUT1IpCi0gICAgaWYgKG1lc3NhZ2VJRC5pczxD b3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJJbnNwZWN0b3I+KCkpIHsKKyAgICBpZiAoZGVjb2Rlci5t ZXNzYWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OldlYkluc3BlY3Rvcjo6bWVzc2FnZVJl Y2VpdmVyTmFtZSgpKSB7CiAgICAgICAgIGlmIChXZWJJbnNwZWN0b3IqIGluc3BlY3RvciA9IHRo aXMtPmluc3BlY3RvcigpKQogICAgICAgICAgICAgaW5zcGVjdG9yLT5kaWRSZWNlaXZlV2ViSW5z cGVjdG9yTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIpOwogICAgICAgICBy ZXR1cm47CkBAIC0zMDAyLDcgKzMwMDIsNyBAQCB2b2lkIFdlYlBhZ2U6OmRpZFJlY2VpdmVNZXNz YWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZwogI2Vu ZGlmCiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCi0gICAgaWYgKG1lc3NhZ2VJRC5pczxD b3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJGdWxsU2NyZWVuTWFuYWdlcj4oKSkgeworICAgIGlmIChk ZWNvZGVyLm1lc3NhZ2VSZWNlaXZlck5hbWUoKSA9PSBNZXNzYWdlczo6V2ViRnVsbFNjcmVlbk1h bmFnZXI6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSkgewogICAgICAgICBmdWxsU2NyZWVuTWFuYWdl cigpLT5kaWRSZWNlaXZlTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGRlY29kZXIpOwog ICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUHJvY2Vz cy5jcHAKaW5kZXggNmRlYmQ4NTlmYjRhNDU4YTdkMmRmNDU2OTg4YTlkYWMzNzJlZjM1OS4uZjg4 YzQ5ODJmNWM3N2RmNWI0Nzk4NTJlYmRhMDMzMzRhMmQxMDM0MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQcm9jZXNzLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlByb2Nlc3MuY3BwCkBAIC00NSw2ICs0NSw3IEBACiAjaW5jbHVkZSAiV2Vi TWVtb3J5U2FtcGxlci5oIgogI2luY2x1ZGUgIldlYlBhZ2UuaCIKICNpbmNsdWRlICJXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzLmgiCisjaW5jbHVkZSAiV2ViUGFnZUdyb3VwUHJveHlNZXNzYWdl cy5oIgogI2luY2x1ZGUgIldlYlBsYXRmb3JtU3RyYXRlZ2llcy5oIgogI2luY2x1ZGUgIldlYlBy ZWZlcmVuY2VzU3RvcmUuaCIKICNpbmNsdWRlICJXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz LmgiCkBAIC01OTMsMTIgKzU5NCwxMiBAQCB2b2lkIFdlYlByb2Nlc3M6OmRpZFJlY2VpdmVNZXNz YWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lcwogICAgIGlm IChtZXNzYWdlUmVjZWl2ZXJNYXAoKS5kaXNwYXRjaE1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2Fn ZUlELCBkZWNvZGVyKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1lc3NhZ2VJRC5pczxD b3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJQcm9jZXNzPigpKSB7CisgICAgaWYgKGRlY29kZXIubWVz c2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpXZWJQcm9jZXNzOjptZXNzYWdlUmVjZWl2 ZXJOYW1lKCkpIHsKICAgICAgICAgZGlkUmVjZWl2ZVdlYlByb2Nlc3NNZXNzYWdlKGNvbm5lY3Rp b24sIG1lc3NhZ2VJRCwgZGVjb2Rlcik7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBp ZiAobWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYlBhZ2VHcm91cFByb3h5Pigp KSB7CisgICAgaWYgKGRlY29kZXIubWVzc2FnZVJlY2VpdmVyTmFtZSgpID09IE1lc3NhZ2VzOjpX ZWJQYWdlR3JvdXBQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpKSB7CiAgICAgICAgIHVpbnQ2 NF90IHBhZ2VHcm91cElEID0gZGVjb2Rlci5kZXN0aW5hdGlvbklEKCk7CiAgICAgICAgIGlmICgh cGFnZUdyb3VwSUQpCiAgICAgICAgICAgICByZXR1cm47CkBAIC02MzksNyArNjQwLDcgQEAgdm9p ZCBXZWJQcm9jZXNzOjpkaWRSZWNlaXZlSW52YWxpZE1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlv biosIENvcmVJUEM6OlN0cmluZ1IKIAogdm9pZCBXZWJQcm9jZXNzOjpkaWRSZWNlaXZlTWVzc2Fn ZU9uQ29ubmVjdGlvbldvcmtRdWV1ZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBD b3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYgZGVj b2RlciwgYm9vbCYgZGlkSGFuZGxlTWVzc2FnZSkKIHsKLSAgICBpZiAobWVzc2FnZUlELmlzPENv cmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYlByb2Nlc3M+KCkpIHsKKyAgICBpZiAoZGVjb2Rlci5tZXNz YWdlUmVjZWl2ZXJOYW1lKCkgPT0gTWVzc2FnZXM6OldlYlByb2Nlc3M6Om1lc3NhZ2VSZWNlaXZl ck5hbWUoKSkgewogICAgICAgICBkaWRSZWNlaXZlV2ViUHJvY2Vzc01lc3NhZ2VPbkNvbm5lY3Rp b25Xb3JrUXVldWUoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBkZWNvZGVyLCBkaWRIYW5kbGVNZXNz YWdlKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K