228681 2021-07-31 09:54:35 -0700 Introduce an experimental feature to toggle WebRTC socket proxying 2021-08-01 09:02:30 -0700 1 1 1 Unclassified WebKit WebRTC WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen eric.carlson ews-watchlist webkit-bug-importer youennf oldest_to_newest 1781082 0 youennf 2021-07-31 09:54:35 -0700 Introduce an experimental feature to toggle WebRTC socket proxying 1781084 1 434701 youennf 2021-07-31 10:14:35 -0700 Created attachment 434701 Patch 1781085 2 webkit-bug-importer 2021-07-31 10:24:28 -0700 <rdar://problem/81366688> 1781090 3 434702 youennf 2021-07-31 11:26:36 -0700 Created attachment 434702 Patch 1781141 4 ews-feeder 2021-08-01 07:27:14 -0700 ChangeLog entry in Source/WebKit/ChangeLog is not at the top of the file. 1781145 5 434722 youennf 2021-08-01 08:03:47 -0700 Created attachment 434722 Patch for landing 1781147 6 ews-feeder 2021-08-01 09:02:29 -0700 Committed r280523 (240155@main): <https://commits.webkit.org/240155@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434722. 434701 2021-07-31 10:14:35 -0700 2021-07-31 11:26:32 -0700 Patch bug-228681-20210731191433.patch text/plain 20184 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0MjEyNjg2MGQxYzkyNTY1OTk2NmRm NDY4OWRiMGY3M2M2YzJkMmEuLjE1YjI5ODYxM2I5Y2Q1NjI4MTI5ZjlkMTRkNDFjYzA2NmVjNDdi ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDctMzEgIFlvdWVubiBGYWJsZXQgIDx5b3Vl bm5AYXBwbGUuY29tPgorCisgICAgICAgIEludHJvZHVjZSBhbiBleHBlcmltZW50YWwgZmVhdHVy ZSB0byB0b2dnbGUgV2ViUlRDIHNvY2tldCBwcm94eWluZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4NjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZl cmVuY2VzRXhwZXJpbWVudGFsLnlhbWw6CisKIDIwMjEtMDctMzAgIFJvYiBCdWlzICA8cmJ1aXNA aWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLW92ZXJmbG93XSBJbXBsZW1lbnQgY2xpcCB2YWx1 ZSBmb3Igb3ZlcmZsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMDI5YTI2ZGExOTk3NDI0Nzg2ZTkwMTZkYWZiNTE4 YTYxMDA2YWNhYS4uZDRjNTNmN2NkNmQzMjMxZTUyYzZjMzBhYzg3ZTk4ZmMxODk1Nzk5YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsNSArMSwzMSBAQAogMjAyMS0wNy0zMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKKyAgICAgICAgSW50cm9kdWNlIGFuIGV4cGVyaW1lbnRhbCBmZWF0dXJl IHRvIHRvZ2dsZSBXZWJSVEMgc29ja2V0IHByb3h5aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg2ODEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWNpZGUgd2hldGhlciB0byBkaXNhYmxlIHByb3h5 aW5nIGJhc2VkIG9uIGV4cGVyaW1lbnRhbCBmZWF0dXJlIGluIFdlYlByb2Nlc3MuCisgICAgICAg IFNlbmQgdGhlIGRpc2FibGUgcmVsYXkgdmFsdWUgZnJvbSBXZWJQcm9jZXNzIHRvIE5ldHdvcmtQ cm9jZXNzIGZvciBUQ1Agc29ja2V0cy4KKyAgICAgICAgTWFudWFsbHkgdGVzdGVkLgorCisgICAg ICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRlQ2xpZW50VENQU29ja2V0KToK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmg6Cisg ICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5tZXNzYWdl cy5pbjoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tl dENvY29hLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENUQ1BT b2NrZXRDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JUQ1RDUFNvY2tldENvY29h OjpjcmVhdGVDbGllbnRUQ1BTb2NrZXQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDVENQ U29ja2V0Q29jb2E6Ok5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYSk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OlJUQ1NvY2tldEZhY3Rvcnk6OkNyZWF0ZUNsaWVudFRjcFNvY2tldCk6CisgICAgICAgIChX ZWJLaXQ6OkxpYldlYlJUQ1Byb3ZpZGVyOjpjcmVhdGVTb2NrZXRGYWN0b3J5KToKKyAgICAgICAg KiBXZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1NvY2tldEZhY3RvcnkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2NrZXRGYWN0b3J5OjpjcmVhdGVDbGllbnRUY3BT b2NrZXQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay93ZWJydGMvTGliV2ViUlRDU29j a2V0RmFjdG9yeS5oOgorCisyMDIxLTA3LTMwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KKwogICAgICAgICBSZW1vdGVBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckludGVy bmFsVW5pdCBzaG91bGQgaGFuZGxlIGNoYW5nZXMgb2YgcmVxdWVzdGVkIHNhbXBsZUNvdW50CiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg2MzEKICAg ICAgICAgPHJkYXI6Ly84MDY5MDE5MT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvU2NyaXB0cy9Q cmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbC55YW1sIGIvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKaW5kZXgg ZDE4M2IyY2IxZjcyN2QxZmRlN2MxYTQ1MmIzZjA5NGU1NDg5ODA3NC4uZjE3ZWUyNDM5NDg1NDE1 MTgzNWVjZDg4MDkwZGM0MWNmOTAwZWEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9TY3JpcHRz L1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKKysrIGIvU291cmNl L1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwK QEAgLTEzNTcsNiArMTM1NywxOSBAQCBXZWJSVENQbGF0Zm9ybVVEUFNvY2tldHNFbmFibGVkOgog ICAgIFdlYktpdDoKICAgICAgIGRlZmF1bHQ6IGZhbHNlCiAKK1dlYlJUQ1NvY2tldHNQcm94eWlu Z0VuYWJsZWQ6CisgIHR5cGU6IGJvb2wKKyAgaHVtYW5SZWFkYWJsZU5hbWU6ICJXZWJSVEMgU29j a2V0cyBQcm94eWluZyIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiRW5hYmxlIFdlYlJU QyBTb2NrZXRzIFByb3h5aW5nIgorICBjb25kaXRpb246IEVOQUJMRShXRUJfUlRDKQorICBkZWZh dWx0VmFsdWU6CisgICAgV2ViS2l0TGVnYWN5OgorICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBX ZWJLaXQ6CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYkNvcmU6CisgICAgICBkZWZhdWx0 OiBmYWxzZQorCiBXZWJSVENWUDlQcm9maWxlMENvZGVjRW5hYmxlZDoKICAgdHlwZTogYm9vbAog ICBodW1hblJlYWRhYmxlTmFtZTogIldlYlJUQyBWUDkgcHJvZmlsZSAwIGNvZGVjIgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3Zp ZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQ cm92aWRlci5jcHAKaW5kZXggOThiMzA2ZWM1MDM2ZjZhOWNmZWVkMmRlYjA3YTE5YTM0NTE2Y2Nh Ny4uY2FiNTgyMWZhZWQ2YTcxZjhhZTBlZmM0MzVlZjdmNjJkNmVlYTBiMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJv dmlkZXIuY3BwCkBAIC0xNzcsOSArMTc3LDkgQEAgcnRjOjpQcm94eUluZm8gTmV0d29ya1JUQ1By b3ZpZGVyOjpwcm94eUluZm9Gcm9tU2Vzc2lvbihjb25zdCBSVENOZXR3b3JrOjpTb2NrZXQKIH0K ICNlbmRpZgogCi12b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRlQ2xpZW50VENQU29ja2V0 KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwgY29uc3QgUlRDTmV0d29yazo6 U29ja2V0QWRkcmVzcyYgbG9jYWxBZGRyZXNzLCBjb25zdCBSVENOZXR3b3JrOjpTb2NrZXRBZGRy ZXNzJiByZW1vdGVBZGRyZXNzLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGludCBvcHRpb25zKQordm9p ZCBOZXR3b3JrUlRDUHJvdmlkZXI6OmNyZWF0ZUNsaWVudFRDUFNvY2tldChMaWJXZWJSVENTb2Nr ZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3Mm IGxvY2FsQWRkcmVzcywgY29uc3QgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRk cmVzcywgU3RyaW5nJiYgdXNlckFnZW50LCBpbnQgb3B0aW9ucywgYm9vbCBpc1JlbGF5RGlzYWJs ZWQpCiB7Ci0gICAgY2FsbE9uTWFpblJ1bkxvb3AoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgaWRlbnRpZmllciwgbG9jYWxBZGRyZXNzLCByZW1vdGVBZGRyZXNzLCB1c2Vy QWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCkuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnNdKCkgbXV0 YWJsZSB7CisgICAgY2FsbE9uTWFpblJ1bkxvb3AoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgaWRlbnRpZmllciwgbG9jYWxBZGRyZXNzLCByZW1vdGVBZGRyZXNzLCB1c2Vy QWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCkuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMsIGlzUmVs YXlEaXNhYmxlZF0oKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCFtX2Nvbm5lY3Rpb24pCiAgICAg ICAgICAgICByZXR1cm47CiAKQEAgLTE4OCwxMCArMTg4LDEwIEBAIHZvaWQgTmV0d29ya1JUQ1By b3ZpZGVyOjpjcmVhdGVDbGllbnRUQ1BTb2NrZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBp ZGVudGlmCiAgICAgICAgICAgICBtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS5zZW5kKE1lc3Nh Z2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxDbG9zZShpZGVudGlmaWVyLCAxKSwgMCk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgY2FsbE9uUlRDTmV0d29ya1Ro cmVhZChbdGhpcywgaWRlbnRpZmllciwgbG9jYWxBZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0 ZWRDb3B5KGxvY2FsQWRkcmVzcy52YWx1ZSksIHJlbW90ZUFkZHJlc3MgPSBSVENOZXR3b3JrOjpp c29sYXRlZENvcHkocmVtb3RlQWRkcmVzcy52YWx1ZSksIHByb3h5SW5mbyA9IHByb3h5SW5mb0Zy b21TZXNzaW9uKHJlbW90ZUFkZHJlc3MsICpzZXNzaW9uKSwgdXNlckFnZW50ID0gV1RGTW92ZSh1 c2VyQWdlbnQpLmlzb2xhdGVkQ29weSgpLCBvcHRpb25zXSgpIG11dGFibGUgeworICAgICAgICBj YWxsT25SVENOZXR3b3JrVGhyZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBsb2NhbEFkZHJlc3MgPSBS VENOZXR3b3JrOjppc29sYXRlZENvcHkobG9jYWxBZGRyZXNzLnZhbHVlKSwgcmVtb3RlQWRkcmVz cyA9IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShyZW1vdGVBZGRyZXNzLnZhbHVlKSwgcHJveHlJ bmZvID0gcHJveHlJbmZvRnJvbVNlc3Npb24ocmVtb3RlQWRkcmVzcywgKnNlc3Npb24pLCB1c2Vy QWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCkuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMsIGlzUmVs YXlEaXNhYmxlZF0oKSBtdXRhYmxlIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAgICAgICAg IGlmIChtX3BsYXRmb3JtVENQU29ja2V0c0VuYWJsZWQpIHsKLSAgICAgICAgICAgICAgICBpZiAo YXV0byBzb2NrZXQgPSBOZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6OmNyZWF0ZUNsaWVudFRDUFNv Y2tldChpZGVudGlmaWVyLCAqdGhpcywgcmVtb3RlQWRkcmVzcywgb3B0aW9ucywgbV9pcGNDb25u ZWN0aW9uLmNvcHlSZWYoKSkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0byBzb2NrZXQgPSBO ZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6OmNyZWF0ZUNsaWVudFRDUFNvY2tldChpZGVudGlmaWVy LCAqdGhpcywgcmVtb3RlQWRkcmVzcywgb3B0aW9ucywgaXNSZWxheURpc2FibGVkLCBtX2lwY0Nv bm5lY3Rpb24uY29weVJlZigpKSkgewogICAgICAgICAgICAgICAgICAgICBhZGRTb2NrZXQoaWRl bnRpZmllciwgV1RGTW92ZShzb2NrZXQpKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmgKaW5kZXggYmZmZmViYzRhZTljZjNmZDhh NTFlZDU3ODE0MGNkZTk4MzdhYWEzMC4uYzljY2VkNjJmYzYyNTlmNTNhZjI0NzVlMGEzNGMwMDMx OWEzODk1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMv TmV0d29ya1JUQ1Byb3ZpZGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93 ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmgKQEAgLTExNCw3ICsxMTQsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgc3RhcnRMaXN0ZW5pbmdGb3JJUEMoKTsKIAogICAgIHZvaWQgY3JlYXRlVURQU29j a2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6 OlNvY2tldEFkZHJlc3MmLCB1aW50MTZfdCwgdWludDE2X3QsIGJvb2wgaXNGaXJzdFBhcnR5LCBi b29sIGlzUmVsYXlEaXNhYmxlZCwgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mJik7Ci0gICAg dm9pZCBjcmVhdGVDbGllbnRUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRp ZmllciwgY29uc3QgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyYsIGNvbnN0IFJUQ05ldHdvcms6 OlNvY2tldEFkZHJlc3MmLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGludCk7CisgICAgdm9pZCBjcmVh dGVDbGllbnRUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciwgY29u c3QgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyYsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFk ZHJlc3MmLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGludCwgYm9vbCBpc1JlbGF5RGlzYWJsZWQpOwog ICAgIHZvaWQgY3JlYXRlU2VydmVyVENQU29ja2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElk ZW50aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MmLCB1aW50MTZfdCBtaW5Q b3J0LCB1aW50MTZfdCBtYXhQb3J0LCBpbnQpOwogICAgIHZvaWQgd3JhcE5ld1RDUENvbm5lY3Rp b24oV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJDb3Jl OjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIG5ld0Nvbm5lY3Rpb25Tb2NrZXRJZGVudGlmaWVy KTsKICAgICB2b2lkIHNlbmRUb1NvY2tldChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlm aWVyLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNz JiYsIFJUQ1BhY2tldE9wdGlvbnMmJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIubWVzc2FnZXMuaW4gYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIubWVzc2FnZXMu aW4KaW5kZXggMTk1NDA5NmFiMTU2MWE3YTdmZGY1YzUwZTNhMzAzMjQ4NjQ2ZTM2Ni4uN2Y3ZDc5 ZWM1MTZhOGNlY2FjMmJiZDg5ODgxZWQxYmRhMzJiY2Q0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLm1lc3NhZ2VzLmlu CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92 aWRlci5tZXNzYWdlcy5pbgpAQCAtMjUsNyArMjUsNyBAQAogbWVzc2FnZXMgLT4gTmV0d29ya1JU Q1Byb3ZpZGVyIHsKICAgICBDcmVhdGVVRFBTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0 SWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJLaXQ6OlJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3Mg bG9jYWxBZGRyZXNzLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQb3J0LCBib29sIGlz Rmlyc3RQYXJ0eSwgYm9vbCBpc1JlbGF5RGlzYWJsZWQsIFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9t YWluIGRvbWFpbikKICAgICBDcmVhdGVTZXJ2ZXJUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRD U29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJLaXQ6OlJUQ05ldHdvcms6OlNvY2tldEFk ZHJlc3MgbG9jYWxBZGRyZXNzLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQb3J0LCBp bnQgb3B0aW9ucykKLSAgICBDcmVhdGVDbGllbnRUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRD U29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJLaXQ6OlJUQ05ldHdvcms6OlNvY2tldEFk ZHJlc3MgbG9jYWxBZGRyZXNzLCBXZWJLaXQ6OlJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MgcmVt b3RlQWRkcmVzcywgU3RyaW5nIHVzZXJBZ2VudCwgaW50IG9wdGlvbnMpCisgICAgQ3JlYXRlQ2xp ZW50VENQU29ja2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmll ciwgV2ViS2l0OjpSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzIGxvY2FsQWRkcmVzcywgV2ViS2l0 OjpSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzIHJlbW90ZUFkZHJlc3MsIFN0cmluZyB1c2VyQWdl bnQsIGludCBvcHRpb25zLCBib29sIGlzUmVsYXlEaXNhYmxlZCkKICAgICBXcmFwTmV3VENQQ29u bmVjdGlvbihXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIFdl YkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgbmV3Q29ubmVjdGlvblNvY2tldElkZW50 aWZpZXIpCiAKICAgICB2b2lkIFNldFBsYXRmb3JtVENQU29ja2V0c0VuYWJsZWQoYm9vbCBlbmFi bGVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0 d29ya1JUQ1RDUFNvY2tldENvY29hLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dl YnJ0Yy9OZXR3b3JrUlRDVENQU29ja2V0Q29jb2EuaAppbmRleCAzZTVmYTk0YzMxNDdkNTU3ZjUx ZGUwMTdlNDY4Y2MxNDc4ZDhhZDg5Li5mNDEyNWQzY2IwOGZlY2Y5MjYzNjMzODdiOWNhMDAzNDNk ODJkYTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9O ZXR3b3JrUlRDVENQU29ja2V0Q29jb2EuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVENQU29ja2V0Q29jb2EuaApAQCAtMzksOSArMzksOSBAQCBu YW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIE5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYSBmaW5hbCA6 IHB1YmxpYyBOZXR3b3JrUlRDUHJvdmlkZXI6OlNvY2tldCB7CiAgICAgV1RGX01BS0VfRkFTVF9B TExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxOZXR3b3JrUlRD UHJvdmlkZXI6OlNvY2tldD4gY3JlYXRlQ2xpZW50VENQU29ja2V0KFdlYkNvcmU6OkxpYldlYlJU Q1NvY2tldElkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYsIGNvbnN0IHJ0Yzo6U29ja2V0 QWRkcmVzcyYsIGludCBvcHRpb25zLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmKTsKKyAgICBzdGF0 aWMgc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtSVENQcm92aWRlcjo6U29ja2V0PiBjcmVhdGVDbGll bnRUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciwgTmV0d29ya1JU Q1Byb3ZpZGVyJiwgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiwgaW50IG9wdGlvbnMsIGJvb2wg aXNSZWxheURpc2FibGVkLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmKTsKIAotICAgIE5ldHdvcmtS VENUQ1BTb2NrZXRDb2NvYShXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyLCBOZXR3 b3JrUlRDUHJvdmlkZXImLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmLCBpbnQgb3B0aW9ucywg UmVmPElQQzo6Q29ubmVjdGlvbj4mJik7CisgICAgTmV0d29ya1JUQ1RDUFNvY2tldENvY29hKFdl YkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYsIGNv bnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYsIGludCBvcHRpb25zLCBib29sIGlzUmVsYXlEaXNhYmxl ZCwgUmVmPElQQzo6Q29ubmVjdGlvbj4mJik7CiAKIHByaXZhdGU6CiAgICAgLy8gTmV0d29ya1JU Q1Byb3ZpZGVyOjpTb2NrZXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVENQU29ja2V0Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVENQU29ja2V0Q29jb2EubW0KaW5kZXggZmFm ZmQyYzlmYjlkMjllNTAyZGE5OWE5OTMyZDQ0MGI1YmNmYjk3YS4uM2ZiZDBlMGIyYWYwYTJmYWFk NWUwMjQ2MmJhN2MyODI5NTcwNjY2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tldENvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYS5tbQpA QCAtNTAsMTIgKzUwLDEyIEBAIHN0YXRpYyBkaXNwYXRjaF9xdWV1ZV90IHRjcFNvY2tldFF1ZXVl KCkKICAgICByZXR1cm4gcXVldWU7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxOZXR3b3JrUlRDUHJv dmlkZXI6OlNvY2tldD4gTmV0d29ya1JUQ1RDUFNvY2tldENvY29hOjpjcmVhdGVDbGllbnRUQ1BT b2NrZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBOZXR3b3JrUlRDUHJv dmlkZXImIHJ0Y1Byb3ZpZGVyLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIHJlbW90ZUFkZHJl c3MsIGludCB0Y3BPcHRpb25zLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmIGNvbm5lY3Rpb24pCitz dGQ6OnVuaXF1ZV9wdHI8TmV0d29ya1JUQ1Byb3ZpZGVyOjpTb2NrZXQ+IE5ldHdvcmtSVENUQ1BT b2NrZXRDb2NvYTo6Y3JlYXRlQ2xpZW50VENQU29ja2V0KExpYldlYlJUQ1NvY2tldElkZW50aWZp ZXIgaWRlbnRpZmllciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwgY29uc3QgcnRj OjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBpbnQgdGNwT3B0aW9ucywgYm9vbCBpc1Jl bGF5RGlzYWJsZWQsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKIHsKICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIG1pZ3JhdGUgc3NsdGNwIGNhbmRpZGF0ZXMsIG1heWJlIHN1cHBv cnQgT1BUX1RMU19JTlNFQ1VSRSBhcyB3ZWxsLgogICAgIGlmICgodGNwT3B0aW9ucyAmIHJ0Yzo6 UGFja2V0U29ja2V0RmFjdG9yeTo6T1BUX1RMU19GQUtFKSB8fCAodGNwT3B0aW9ucyAmIHJ0Yzo6 UGFja2V0U29ja2V0RmFjdG9yeTo6T1BUX1RMU19JTlNFQ1VSRSkpCiAgICAgICAgIHJldHVybiBu dWxscHRyOwotICAgIHJldHVybiBtYWtlVW5pcXVlPE5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYT4o aWRlbnRpZmllciwgcnRjUHJvdmlkZXIsIHJlbW90ZUFkZHJlc3MsIHRjcE9wdGlvbnMsIFdURk1v dmUoY29ubmVjdGlvbikpOworICAgIHJldHVybiBtYWtlVW5pcXVlPE5ldHdvcmtSVENUQ1BTb2Nr ZXRDb2NvYT4oaWRlbnRpZmllciwgcnRjUHJvdmlkZXIsIHJlbW90ZUFkZHJlc3MsIHRjcE9wdGlv bnMsIGlzUmVsYXlEaXNhYmxlZCwgV1RGTW92ZShjb25uZWN0aW9uKSk7CiB9CiAKIHN0YXRpYyBp bmxpbmUgdm9pZCBwcm9jZXNzSW5jb21pbmdEYXRhKFJldGFpblB0cjxud19jb25uZWN0aW9uX3Q+ JiYgbndDb25uZWN0aW9uLCBGdW5jdGlvbjxWZWN0b3I8dWludDhfdD4oVmVjdG9yPHVpbnQ4X3Q+ JiYpPiYmIHByb2Nlc3NEYXRhLCBWZWN0b3I8dWludDhfdD4mJiBidWZmZXIgPSB7IH0pCkBAIC04 MCw3ICs4MCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwcm9jZXNzSW5jb21pbmdEYXRhKFJldGFp blB0cjxud19jb25uZWN0aW9uX3Q+JiYgbndDb25uZWN0aW9uCiAgICAgfSkuZ2V0KCkpOwogfQog Ci1OZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6Ok5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYShMaWJX ZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYgcnRj UHJvdmlkZXIsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRkcmVzcywgaW50IG9w dGlvbnMsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKK05ldHdvcmtSVENUQ1BT b2NrZXRDb2NvYTo6TmV0d29ya1JUQ1RDUFNvY2tldENvY29hKExpYldlYlJUQ1NvY2tldElkZW50 aWZpZXIgaWRlbnRpZmllciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwgY29uc3Qg cnRjOjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBpbnQgb3B0aW9ucywgYm9vbCBpc1Jl bGF5RGlzYWJsZWQsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKICAgICA6IG1f aWRlbnRpZmllcihpZGVudGlmaWVyKQogICAgICwgbV9ydGNQcm92aWRlcihydGNQcm92aWRlcikK ICAgICAsIG1fY29ubmVjdGlvbihXVEZNb3ZlKGNvbm5lY3Rpb24pKQpAQCAtOTgsNiArOTgsOCBA QCBOZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6Ok5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYShMaWJX ZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZQogCiAgICAgaWYgKGF1dG8gdG9rZW4gPSBydGNQcm92 aWRlci5zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0VG9rZW4oKSkKICAgICAgICAgbndfcGFyYW1ldGVy c19zZXRfc291cmNlX2FwcGxpY2F0aW9uKHRjcFRMUy5nZXQoKSwgKnRva2VuKTsKKyAgICBpZiAo aXNSZWxheURpc2FibGVkKQorICAgICAgICBud19wYXJhbWV0ZXJzX3NldF9hY2NvdW50X2lkKHRj cFRMUy5nZXQoKSwgImNvbS5hcHBsZS5zYWZhcmkucGVlcnRvcGVlciIpOwogCiAgICAgbV9ud0Nv bm5lY3Rpb24gPSBhZG9wdE5TKG53X2Nvbm5lY3Rpb25fY3JlYXRlKGhvc3QuZ2V0KCksIHRjcFRM Uy5nZXQoKSkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29y ay93ZWJydGMvTGliV2ViUlRDUHJvdmlkZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmNwcAppbmRleCA1MjIyYmI5ZDAxMmIx NjUzYjA3ZmIwOWQ0ZjFmNzg3YjZhN2RlOGI4Li5mZmIzYWEwYjcwZTZjYWUzOWY0OTI1Y2IyYzJl MmUwMDYyOTU3YzRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29y ay93ZWJydGMvTGliV2ViUlRDUHJvdmlkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENQcm92aWRlci5jcHAKQEAgLTkwLDYgKzkwLDgg QEAgY2xhc3MgUlRDU29ja2V0RmFjdG9yeSBmaW5hbCA6IHB1YmxpYyBMaWJXZWJSVENQcm92aWRl cjo6U3VzcGVuZGFibGVTb2NrZXRGYWN0b3IKIHB1YmxpYzoKICAgICBSVENTb2NrZXRGYWN0b3J5 KFN0cmluZyYmIHVzZXJBZ2VudCwgYm9vbCBpc0ZpcnN0UGFydHksIFJlZ2lzdHJhYmxlRG9tYWlu JiYpOwogCisgICAgdm9pZCBkaXNhYmxlUmVsYXkoKSBmaW5hbCB7IG1faXNSZWxheURpc2FibGVk ID0gdHJ1ZTsgfQorCiBwcml2YXRlOgogICAgIC8vIFN1c3BlbmRhYmxlU29ja2V0RmFjdG9yeQog ICAgIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIENyZWF0ZVVkcFNvY2tldChjb25zdCBydGM6OlNv Y2tldEFkZHJlc3MmLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQb3J0KSBmaW5hbDsK QEAgLTk4LDcgKzEwMCw2IEBAIHByaXZhdGU6CiAgICAgcnRjOjpBc3luY1Jlc29sdmVySW50ZXJm YWNlKiBDcmVhdGVBc3luY1Jlc29sdmVyKCkgZmluYWw7CiAgICAgdm9pZCBzdXNwZW5kKCkgZmlu YWw7CiAgICAgdm9pZCByZXN1bWUoKSBmaW5hbDsKLSAgICB2b2lkIGRpc2FibGVSZWxheSgpIGZp bmFsIHsgbV9pc1JlbGF5RGlzYWJsZWQgPSB0cnVlOyB9CiAKIHByaXZhdGU6CiAgICAgU3RyaW5n IG1fdXNlckFnZW50OwpAQCAtMTI2LDcgKzEyNyw3IEBAIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQq IFJUQ1NvY2tldEZhY3Rvcnk6OkNyZWF0ZVNlcnZlclRjcFNvY2tldChjb25zdCBydGM6OlNvY2tl CiAKIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIFJUQ1NvY2tldEZhY3Rvcnk6OkNyZWF0ZUNsaWVu dFRjcFNvY2tldChjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIGxvY2FsQWRkcmVzcywgY29uc3Qg cnRjOjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBjb25zdCBydGM6OlByb3h5SW5mbyYs IGNvbnN0IHN0ZDo6c3RyaW5nJiwgY29uc3QgcnRjOjpQYWNrZXRTb2NrZXRUY3BPcHRpb25zJiBv cHRpb25zKQogewotICAgIHJldHVybiBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5saWJXZWJSVENO ZXR3b3JrKCkuc29ja2V0RmFjdG9yeSgpLmNyZWF0ZUNsaWVudFRjcFNvY2tldCh0aGlzLCBsb2Nh bEFkZHJlc3MsIHJlbW90ZUFkZHJlc3MsIFN0cmluZyB7IG1fdXNlckFnZW50IH0sIG9wdGlvbnMp OworICAgIHJldHVybiBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5saWJXZWJSVENOZXR3b3JrKCku c29ja2V0RmFjdG9yeSgpLmNyZWF0ZUNsaWVudFRjcFNvY2tldCh0aGlzLCBsb2NhbEFkZHJlc3Ms IHJlbW90ZUFkZHJlc3MsIFN0cmluZyB7IG1fdXNlckFnZW50IH0sIG9wdGlvbnMsIG1faXNSZWxh eURpc2FibGVkKTsKIH0KIAogcnRjOjpBc3luY1Jlc29sdmVySW50ZXJmYWNlKiBSVENTb2NrZXRG YWN0b3J5OjpDcmVhdGVBc3luY1Jlc29sdmVyKCkKQEAgLTE1OSw3ICsxNjAsMTMgQEAgdm9pZCBM aWJXZWJSVENQcm92aWRlcjo6c3RhcnRlZE5ldHdvcmtUaHJlYWQoKQogCiBzdGQ6OnVuaXF1ZV9w dHI8TGliV2ViUlRDUHJvdmlkZXI6OlN1c3BlbmRhYmxlU29ja2V0RmFjdG9yeT4gTGliV2ViUlRD UHJvdmlkZXI6OmNyZWF0ZVNvY2tldEZhY3RvcnkoU3RyaW5nJiYgdXNlckFnZW50LCBib29sIGlz Rmlyc3RQYXJ0eSwgUmVnaXN0cmFibGVEb21haW4mJiBkb21haW4pCiB7Ci0gICAgcmV0dXJuIG1h a2VVbmlxdWU8UlRDU29ja2V0RmFjdG9yeT4oV1RGTW92ZSh1c2VyQWdlbnQpLCBpc0ZpcnN0UGFy dHksIFdURk1vdmUoZG9tYWluKSk7CisgICAgYXV0byBmYWN0b3J5ID0gbWFrZVVuaXF1ZTxSVENT b2NrZXRGYWN0b3J5PihXVEZNb3ZlKHVzZXJBZ2VudCksIGlzRmlyc3RQYXJ0eSwgV1RGTW92ZShk b21haW4pKTsKKworICAgIGF1dG8qIHBhZ2UgPSBtX3dlYlBhZ2UuY29yZVBhZ2UoKTsKKyAgICBp ZiAoIXBhZ2UgfHwgIXBhZ2UtPnNldHRpbmdzKCkud2ViUlRDU29ja2V0c1Byb3h5aW5nRW5hYmxl ZCgpKQorICAgICAgICBmYWN0b3J5LT5kaXNhYmxlUmVsYXkoKTsKKworICAgIHJldHVybiBmYWN0 b3J5OwogfQogCiBSZWZQdHI8UlRDRGF0YUNoYW5uZWxSZW1vdGVIYW5kbGVyQ29ubmVjdGlvbj4g TGliV2ViUlRDUHJvdmlkZXI6OmNyZWF0ZVJUQ0RhdGFDaGFubmVsUmVtb3RlSGFuZGxlckNvbm5l Y3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvd2Vi cnRjL0xpYldlYlJUQ1NvY2tldEZhY3RvcnkuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1NvY2tldEZhY3RvcnkuY3BwCmluZGV4IGEzOTM5YmMx NDVlMGI5ODNkYjE4Yjc5YWQ3YTYyZmU2OTY2NmNiMzkuLjIwMjdjMjg4MDc1MmJhNTU3ZmMyY2Uz MzlhZmQ3MzIzZTMzMjRhMGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9O ZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRGYWN0b3J5LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay93ZWJydGMvTGliV2ViUlRDU29ja2V0RmFjdG9yeS5jcHAK QEAgLTEwNCw3ICsxMDQsNyBAQCBydGM6OkFzeW5jUGFja2V0U29ja2V0KiBMaWJXZWJSVENTb2Nr ZXRGYWN0b3J5OjpjcmVhdGVVZHBTb2NrZXQoY29uc3Qgdm9pZCogc29jawogICAgIHJldHVybiBz b2NrZXQucmVsZWFzZSgpOwogfQogCi1ydGM6OkFzeW5jUGFja2V0U29ja2V0KiBMaWJXZWJSVENT b2NrZXRGYWN0b3J5OjpjcmVhdGVDbGllbnRUY3BTb2NrZXQoY29uc3Qgdm9pZCogc29ja2V0R3Jv dXAsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYgbG9jYWxBZGRyZXNzLCBjb25zdCBydGM6OlNv Y2tldEFkZHJlc3MmIHJlbW90ZUFkZHJlc3MsIFN0cmluZyYmIHVzZXJBZ2VudCwgY29uc3QgcnRj OjpQYWNrZXRTb2NrZXRUY3BPcHRpb25zJiBvcHRpb25zKQorcnRjOjpBc3luY1BhY2tldFNvY2tl dCogTGliV2ViUlRDU29ja2V0RmFjdG9yeTo6Y3JlYXRlQ2xpZW50VGNwU29ja2V0KGNvbnN0IHZv aWQqIHNvY2tldEdyb3VwLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIGxvY2FsQWRkcmVzcywg Y29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBTdHJpbmcmJiB1c2VyQWdl bnQsIGNvbnN0IHJ0Yzo6UGFja2V0U29ja2V0VGNwT3B0aW9ucyYgb3B0aW9ucywgYm9vbCBpc1Jl bGF5RGlzYWJsZWQpCiB7CiAgICAgQVNTRVJUKCFXVEY6OmlzTWFpblJ1bkxvb3AoKSk7CiAKQEAg LTExMywxMyArMTEzLDEzIEBAIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIExpYldlYlJUQ1NvY2tl dEZhY3Rvcnk6OmNyZWF0ZUNsaWVudFRjcFNvY2tldChjb25zdCB2b2lkCiAKICAgICAvLyBGSVhN RTogV2Ugb25seSB0cmFuc2ZlciBvcHRpb25zLm9wdHMgYnV0IHNob3VsZCBhbHNvIGhhbmRsZSBv dGhlciBtZW1iZXJzLgogICAgIGlmIChtX2Nvbm5lY3Rpb24pCi0gICAgICAgIG1fY29ubmVjdGlv bi0+c2VuZChNZXNzYWdlczo6TmV0d29ya1JUQ1Byb3ZpZGVyOjpDcmVhdGVDbGllbnRUQ1BTb2Nr ZXQoc29ja2V0LT5pZGVudGlmaWVyKCksIFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MocHJlcGFy ZVNvY2tldEFkZHJlc3MobG9jYWxBZGRyZXNzLCBtX2Rpc2FibGVOb25Mb2NhbGhvc3RDb25uZWN0 aW9ucykpLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBhcmVTb2NrZXRBZGRyZXNzKHJl bW90ZUFkZHJlc3MsIG1fZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5lY3Rpb25zKSksIHVzZXJBZ2Vu dCwgb3B0aW9ucy5vcHRzKSwgMCk7CisgICAgICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdl czo6TmV0d29ya1JUQ1Byb3ZpZGVyOjpDcmVhdGVDbGllbnRUQ1BTb2NrZXQoc29ja2V0LT5pZGVu dGlmaWVyKCksIFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MocHJlcGFyZVNvY2tldEFkZHJlc3Mo bG9jYWxBZGRyZXNzLCBtX2Rpc2FibGVOb25Mb2NhbGhvc3RDb25uZWN0aW9ucykpLCBSVENOZXR3 b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBhcmVTb2NrZXRBZGRyZXNzKHJlbW90ZUFkZHJlc3MsIG1f ZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5lY3Rpb25zKSksIHVzZXJBZ2VudCwgb3B0aW9ucy5vcHRz LCAgaXNSZWxheURpc2FibGVkKSwgMCk7CiAgICAgZWxzZSB7CiAgICAgICAgIGNhbGxPbk1haW5S dW5Mb29wKFtdIHsKICAgICAgICAgICAgIFdlYlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZU5l dHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpOwogICAgICAgICB9KTsKLSAgICAgICAgbV9wZW5kaW5n TWVzc2FnZVRhc2tzLmFwcGVuZChbaWRlbnRpZmllciA9IHNvY2tldC0+aWRlbnRpZmllcigpLCBs b2NhbEFkZHJlc3MgPSBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBhcmVTb2NrZXRBZGRy ZXNzKGxvY2FsQWRkcmVzcywgbV9kaXNhYmxlTm9uTG9jYWxob3N0Q29ubmVjdGlvbnMpKSwgcmVt b3RlQWRkcmVzcyA9IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MocHJlcGFyZVNvY2tldEFkZHJl c3MocmVtb3RlQWRkcmVzcywgbV9kaXNhYmxlTm9uTG9jYWxob3N0Q29ubmVjdGlvbnMpKSwgdXNl ckFnZW50LCBvcHRzID0gb3B0aW9ucy5vcHRzXShhdXRvJiBjb25uZWN0aW9uKSB7Ci0gICAgICAg ICAgICBjb25uZWN0aW9uLnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtSVENQcm92aWRlcjo6Q3JlYXRl Q2xpZW50VENQU29ja2V0KGlkZW50aWZpZXIsIGxvY2FsQWRkcmVzcywgcmVtb3RlQWRkcmVzcywg dXNlckFnZW50LCBvcHRzKSwgMCk7CisgICAgICAgIG1fcGVuZGluZ01lc3NhZ2VUYXNrcy5hcHBl bmQoW2lkZW50aWZpZXIgPSBzb2NrZXQtPmlkZW50aWZpZXIoKSwgbG9jYWxBZGRyZXNzID0gUlRD TmV0d29yazo6U29ja2V0QWRkcmVzcyhwcmVwYXJlU29ja2V0QWRkcmVzcyhsb2NhbEFkZHJlc3Ms IG1fZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5lY3Rpb25zKSksIHJlbW90ZUFkZHJlc3MgPSBSVENO ZXR3b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBhcmVTb2NrZXRBZGRyZXNzKHJlbW90ZUFkZHJlc3Ms IG1fZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5lY3Rpb25zKSksIHVzZXJBZ2VudCwgb3B0cyA9IG9w dGlvbnMub3B0cywgaXNSZWxheURpc2FibGVkXShhdXRvJiBjb25uZWN0aW9uKSB7CisgICAgICAg ICAgICBjb25uZWN0aW9uLnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtSVENQcm92aWRlcjo6Q3JlYXRl Q2xpZW50VENQU29ja2V0KGlkZW50aWZpZXIsIGxvY2FsQWRkcmVzcywgcmVtb3RlQWRkcmVzcywg dXNlckFnZW50LCBvcHRzLCBpc1JlbGF5RGlzYWJsZWQpLCAwKTsKICAgICAgICAgfSk7CiAgICAg fQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay93ZWJydGMv TGliV2ViUlRDU29ja2V0RmFjdG9yeS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdv cmsvd2VicnRjL0xpYldlYlJUQ1NvY2tldEZhY3RvcnkuaAppbmRleCA3MWQxMjQ4MjdhYjJhNmVh MjliMTg5OWJkYzA3NDQyYjRiOTFiZDg4Li43ZDA4MTE3NGZiZmExMDc5YWE5MjVhMTA4MTcwMmY0 MGI1NWNjMjZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay93 ZWJydGMvTGliV2ViUlRDU29ja2V0RmFjdG9yeS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRGYWN0b3J5LmgKQEAgLTUzLDcgKzUz LDcgQEAgcHVibGljOgogICAgIHZvaWQgZm9yU29ja2V0SW5Hcm91cChjb25zdCB2b2lkKiBzb2Nr ZXRHcm91cCwgY29uc3QgRnVuY3Rpb248dm9pZChMaWJXZWJSVENTb2NrZXQmKT4mKTsKICAgICBy dGM6OkFzeW5jUGFja2V0U29ja2V0KiBjcmVhdGVVZHBTb2NrZXQoY29uc3Qgdm9pZCogc29ja2V0 R3JvdXAsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYsIHVpbnQxNl90IG1pblBvcnQsIHVpbnQx Nl90IG1heFBvcnQsIGJvb2wgaXNGaXJzdFBhcnR5LCBib29sIGlzUmVsYXlEaXNhYmxlZCwgY29u c3QgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mKTsKICAgICBydGM6OkFzeW5jUGFja2V0U29j a2V0KiBjcmVhdGVTZXJ2ZXJUY3BTb2NrZXQoY29uc3Qgdm9pZCogc29ja2V0R3JvdXAsIGNvbnN0 IHJ0Yzo6U29ja2V0QWRkcmVzcyYsIHVpbnQxNl90IG1pblBvcnQsIHVpbnQxNl90IG1heFBvcnQs IGludCBvcHRpb25zKTsKLSAgICBydGM6OkFzeW5jUGFja2V0U29ja2V0KiBjcmVhdGVDbGllbnRU Y3BTb2NrZXQoY29uc3Qgdm9pZCogc29ja2V0R3JvdXAsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVz cyYgbG9jYWxBZGRyZXNzLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIHJlbW90ZUFkZHJlc3Ms IFN0cmluZyYmIHVzZXJBZ2VudCwgY29uc3QgcnRjOjpQYWNrZXRTb2NrZXRUY3BPcHRpb25zJik7 CisgICAgcnRjOjpBc3luY1BhY2tldFNvY2tldCogY3JlYXRlQ2xpZW50VGNwU29ja2V0KGNvbnN0 IHZvaWQqIHNvY2tldEdyb3VwLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIGxvY2FsQWRkcmVz cywgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBTdHJpbmcmJiB1c2Vy QWdlbnQsIGNvbnN0IHJ0Yzo6UGFja2V0U29ja2V0VGNwT3B0aW9ucyYsIGJvb2wgaXNSZWxheURp c2FibGVkKTsKICAgICBydGM6OkFzeW5jUGFja2V0U29ja2V0KiBjcmVhdGVOZXdDb25uZWN0aW9u U29ja2V0KExpYldlYlJUQ1NvY2tldCYsIFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZp ZXIgbmV3Q29ubmVjdGlvblNvY2tldElkZW50aWZpZXIsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVz cyYpOwogCiAgICAgTGliV2ViUlRDUmVzb2x2ZXIqIHJlc29sdmVyKExpYldlYlJUQ1Jlc29sdmVy SWRlbnRpZmllciBpZGVudGlmaWVyKSB7IHJldHVybiBtX3Jlc29sdmVycy5nZXQoaWRlbnRpZmll cik7IH0K 434702 2021-07-31 11:26:36 -0700 2021-08-01 08:03:41 -0700 Patch bug-228681-20210731202634.patch text/plain 21183 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNTE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IGE0MjEyNjg2MGQxYzkyNTY1OTk2NmRm NDY4OWRiMGY3M2M2YzJkMmEuLjE1YjI5ODYxM2I5Y2Q1NjI4MTI5ZjlkMTRkNDFjYzA2NmVjNDdi ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDctMzEgIFlvdWVubiBGYWJsZXQgIDx5b3Vl bm5AYXBwbGUuY29tPgorCisgICAgICAgIEludHJvZHVjZSBhbiBleHBlcmltZW50YWwgZmVhdHVy ZSB0byB0b2dnbGUgV2ViUlRDIHNvY2tldCBwcm94eWluZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4NjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZl cmVuY2VzRXhwZXJpbWVudGFsLnlhbWw6CisKIDIwMjEtMDctMzAgIFJvYiBCdWlzICA8cmJ1aXNA aWdhbGlhLmNvbT4KIAogICAgICAgICBbY3NzLW92ZXJmbG93XSBJbXBsZW1lbnQgY2xpcCB2YWx1 ZSBmb3Igb3ZlcmZsb3cKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMDI5YTI2ZGExOTk3NDI0Nzg2ZTkwMTZkYWZiNTE4 YTYxMDA2YWNhYS4uZDRjNTNmN2NkNmQzMjMxZTUyYzZjMzBhYzg3ZTk4ZmMxODk1Nzk5YyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKQEAgLTEsNSArMSwzMSBAQAogMjAyMS0wNy0zMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CiAKKyAgICAgICAgSW50cm9kdWNlIGFuIGV4cGVyaW1lbnRhbCBmZWF0dXJl IHRvIHRvZ2dsZSBXZWJSVEMgc29ja2V0IHByb3h5aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg2ODEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWNpZGUgd2hldGhlciB0byBkaXNhYmxlIHByb3h5 aW5nIGJhc2VkIG9uIGV4cGVyaW1lbnRhbCBmZWF0dXJlIGluIFdlYlByb2Nlc3MuCisgICAgICAg IFNlbmQgdGhlIGRpc2FibGUgcmVsYXkgdmFsdWUgZnJvbSBXZWJQcm9jZXNzIHRvIE5ldHdvcmtQ cm9jZXNzIGZvciBUQ1Agc29ja2V0cy4KKyAgICAgICAgTWFudWFsbHkgdGVzdGVkLgorCisgICAg ICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5jcHA6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRlQ2xpZW50VENQU29ja2V0KToK KyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmg6Cisg ICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5tZXNzYWdl cy5pbjoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tl dENvY29hLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENUQ1BT b2NrZXRDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1JUQ1RDUFNvY2tldENvY29h OjpjcmVhdGVDbGllbnRUQ1BTb2NrZXQpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDVENQ U29ja2V0Q29jb2E6Ok5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYSk6CisgICAgICAgICogV2ViUHJv Y2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJL aXQ6OlJUQ1NvY2tldEZhY3Rvcnk6OkNyZWF0ZUNsaWVudFRjcFNvY2tldCk6CisgICAgICAgIChX ZWJLaXQ6OkxpYldlYlJUQ1Byb3ZpZGVyOjpjcmVhdGVTb2NrZXRGYWN0b3J5KToKKyAgICAgICAg KiBXZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1NvY2tldEZhY3RvcnkuY3BwOgor ICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2NrZXRGYWN0b3J5OjpjcmVhdGVDbGllbnRUY3BT b2NrZXQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay93ZWJydGMvTGliV2ViUlRDU29j a2V0RmFjdG9yeS5oOgorCisyMDIxLTA3LTMwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxl LmNvbT4KKwogICAgICAgICBSZW1vdGVBdWRpb01lZGlhU3RyZWFtVHJhY2tSZW5kZXJlckludGVy bmFsVW5pdCBzaG91bGQgaGFuZGxlIGNoYW5nZXMgb2YgcmVxdWVzdGVkIHNhbXBsZUNvdW50CiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg2MzEKICAg ICAgICAgPHJkYXI6Ly84MDY5MDE5MT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvU2NyaXB0cy9Q cmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRhbC55YW1sIGIvU291cmNlL1dURi9T Y3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKaW5kZXgg ZDE4M2IyY2IxZjcyN2QxZmRlN2MxYTQ1MmIzZjA5NGU1NDg5ODA3NC4uZjE3ZWUyNDM5NDg1NDE1 MTgzNWVjZDg4MDkwZGM0MWNmOTAwZWEwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dURi9TY3JpcHRz L1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwKKysrIGIvU291cmNl L1dURi9TY3JpcHRzL1ByZWZlcmVuY2VzL1dlYlByZWZlcmVuY2VzRXhwZXJpbWVudGFsLnlhbWwK QEAgLTEzNTcsNiArMTM1NywxOSBAQCBXZWJSVENQbGF0Zm9ybVVEUFNvY2tldHNFbmFibGVkOgog ICAgIFdlYktpdDoKICAgICAgIGRlZmF1bHQ6IGZhbHNlCiAKK1dlYlJUQ1NvY2tldHNQcm94eWlu Z0VuYWJsZWQ6CisgIHR5cGU6IGJvb2wKKyAgaHVtYW5SZWFkYWJsZU5hbWU6ICJXZWJSVEMgU29j a2V0cyBQcm94eWluZyIKKyAgaHVtYW5SZWFkYWJsZURlc2NyaXB0aW9uOiAiRW5hYmxlIFdlYlJU QyBTb2NrZXRzIFByb3h5aW5nIgorICBjb25kaXRpb246IEVOQUJMRShXRUJfUlRDKQorICBkZWZh dWx0VmFsdWU6CisgICAgV2ViS2l0TGVnYWN5OgorICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBX ZWJLaXQ6CisgICAgICBkZWZhdWx0OiBmYWxzZQorICAgIFdlYkNvcmU6CisgICAgICBkZWZhdWx0 OiBmYWxzZQorCiBXZWJSVENWUDlQcm9maWxlMENvZGVjRW5hYmxlZDoKICAgdHlwZTogYm9vbAog ICBodW1hblJlYWRhYmxlTmFtZTogIldlYlJUQyBWUDkgcHJvZmlsZSAwIGNvZGVjIgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3Zp ZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQ cm92aWRlci5jcHAKaW5kZXggOThiMzA2ZWM1MDM2ZjZhOWNmZWVkMmRlYjA3YTE5YTM0NTE2Y2Nh Ny4uY2FiNTgyMWZhZWQ2YTcxZjhhZTBlZmM0MzVlZjdmNjJkNmVlYTBiMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJv dmlkZXIuY3BwCkBAIC0xNzcsOSArMTc3LDkgQEAgcnRjOjpQcm94eUluZm8gTmV0d29ya1JUQ1By b3ZpZGVyOjpwcm94eUluZm9Gcm9tU2Vzc2lvbihjb25zdCBSVENOZXR3b3JrOjpTb2NrZXQKIH0K ICNlbmRpZgogCi12b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRlQ2xpZW50VENQU29ja2V0 KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwgY29uc3QgUlRDTmV0d29yazo6 U29ja2V0QWRkcmVzcyYgbG9jYWxBZGRyZXNzLCBjb25zdCBSVENOZXR3b3JrOjpTb2NrZXRBZGRy ZXNzJiByZW1vdGVBZGRyZXNzLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGludCBvcHRpb25zKQordm9p ZCBOZXR3b3JrUlRDUHJvdmlkZXI6OmNyZWF0ZUNsaWVudFRDUFNvY2tldChMaWJXZWJSVENTb2Nr ZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3Mm IGxvY2FsQWRkcmVzcywgY29uc3QgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRk cmVzcywgU3RyaW5nJiYgdXNlckFnZW50LCBpbnQgb3B0aW9ucywgYm9vbCBpc1JlbGF5RGlzYWJs ZWQpCiB7Ci0gICAgY2FsbE9uTWFpblJ1bkxvb3AoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgaWRlbnRpZmllciwgbG9jYWxBZGRyZXNzLCByZW1vdGVBZGRyZXNzLCB1c2Vy QWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCkuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnNdKCkgbXV0 YWJsZSB7CisgICAgY2FsbE9uTWFpblJ1bkxvb3AoW3RoaXMsIHByb3RlY3RlZFRoaXMgPSBtYWtl UmVmKCp0aGlzKSwgaWRlbnRpZmllciwgbG9jYWxBZGRyZXNzLCByZW1vdGVBZGRyZXNzLCB1c2Vy QWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCkuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMsIGlzUmVs YXlEaXNhYmxlZF0oKSBtdXRhYmxlIHsKICAgICAgICAgaWYgKCFtX2Nvbm5lY3Rpb24pCiAgICAg ICAgICAgICByZXR1cm47CiAKQEAgLTE4OCwxMCArMTg4LDEwIEBAIHZvaWQgTmV0d29ya1JUQ1By b3ZpZGVyOjpjcmVhdGVDbGllbnRUQ1BTb2NrZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBp ZGVudGlmCiAgICAgICAgICAgICBtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS5zZW5kKE1lc3Nh Z2VzOjpMaWJXZWJSVENOZXR3b3JrOjpTaWduYWxDbG9zZShpZGVudGlmaWVyLCAxKSwgMCk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KLSAgICAgICAgY2FsbE9uUlRDTmV0d29ya1Ro cmVhZChbdGhpcywgaWRlbnRpZmllciwgbG9jYWxBZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0 ZWRDb3B5KGxvY2FsQWRkcmVzcy52YWx1ZSksIHJlbW90ZUFkZHJlc3MgPSBSVENOZXR3b3JrOjpp c29sYXRlZENvcHkocmVtb3RlQWRkcmVzcy52YWx1ZSksIHByb3h5SW5mbyA9IHByb3h5SW5mb0Zy b21TZXNzaW9uKHJlbW90ZUFkZHJlc3MsICpzZXNzaW9uKSwgdXNlckFnZW50ID0gV1RGTW92ZSh1 c2VyQWdlbnQpLmlzb2xhdGVkQ29weSgpLCBvcHRpb25zXSgpIG11dGFibGUgeworICAgICAgICBj YWxsT25SVENOZXR3b3JrVGhyZWFkKFt0aGlzLCBpZGVudGlmaWVyLCBsb2NhbEFkZHJlc3MgPSBS VENOZXR3b3JrOjppc29sYXRlZENvcHkobG9jYWxBZGRyZXNzLnZhbHVlKSwgcmVtb3RlQWRkcmVz cyA9IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShyZW1vdGVBZGRyZXNzLnZhbHVlKSwgcHJveHlJ bmZvID0gcHJveHlJbmZvRnJvbVNlc3Npb24ocmVtb3RlQWRkcmVzcywgKnNlc3Npb24pLCB1c2Vy QWdlbnQgPSBXVEZNb3ZlKHVzZXJBZ2VudCkuaXNvbGF0ZWRDb3B5KCksIG9wdGlvbnMsIGlzUmVs YXlEaXNhYmxlZF0oKSBtdXRhYmxlIHsKICNpZiBQTEFURk9STShDT0NPQSkKICAgICAgICAgICAg IGlmIChtX3BsYXRmb3JtVENQU29ja2V0c0VuYWJsZWQpIHsKLSAgICAgICAgICAgICAgICBpZiAo YXV0byBzb2NrZXQgPSBOZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6OmNyZWF0ZUNsaWVudFRDUFNv Y2tldChpZGVudGlmaWVyLCAqdGhpcywgcmVtb3RlQWRkcmVzcywgb3B0aW9ucywgbV9pcGNDb25u ZWN0aW9uLmNvcHlSZWYoKSkpIHsKKyAgICAgICAgICAgICAgICBpZiAoYXV0byBzb2NrZXQgPSBO ZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6OmNyZWF0ZUNsaWVudFRDUFNvY2tldChpZGVudGlmaWVy LCAqdGhpcywgcmVtb3RlQWRkcmVzcywgb3B0aW9ucywgaXNSZWxheURpc2FibGVkLCBtX2lwY0Nv bm5lY3Rpb24uY29weVJlZigpKSkgewogICAgICAgICAgICAgICAgICAgICBhZGRTb2NrZXQoaWRl bnRpZmllciwgV1RGTW92ZShzb2NrZXQpKTsKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJv Y2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmgKaW5kZXggYmZmZmViYzRhZTljZjNmZDhh NTFlZDU3ODE0MGNkZTk4MzdhYWEzMC4uYzljY2VkNjJmYzYyNTlmNTNhZjI0NzVlMGEzNGMwMDMx OWEzODk1YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMv TmV0d29ya1JUQ1Byb3ZpZGVyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93 ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmgKQEAgLTExNCw3ICsxMTQsNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgc3RhcnRMaXN0ZW5pbmdGb3JJUEMoKTsKIAogICAgIHZvaWQgY3JlYXRlVURQU29j a2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6 OlNvY2tldEFkZHJlc3MmLCB1aW50MTZfdCwgdWludDE2X3QsIGJvb2wgaXNGaXJzdFBhcnR5LCBi b29sIGlzUmVsYXlEaXNhYmxlZCwgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mJik7Ci0gICAg dm9pZCBjcmVhdGVDbGllbnRUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRp ZmllciwgY29uc3QgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyYsIGNvbnN0IFJUQ05ldHdvcms6 OlNvY2tldEFkZHJlc3MmLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGludCk7CisgICAgdm9pZCBjcmVh dGVDbGllbnRUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciwgY29u c3QgUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyYsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFk ZHJlc3MmLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGludCwgYm9vbCBpc1JlbGF5RGlzYWJsZWQpOwog ICAgIHZvaWQgY3JlYXRlU2VydmVyVENQU29ja2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElk ZW50aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MmLCB1aW50MTZfdCBtaW5Q b3J0LCB1aW50MTZfdCBtYXhQb3J0LCBpbnQpOwogICAgIHZvaWQgd3JhcE5ld1RDUENvbm5lY3Rp b24oV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJDb3Jl OjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIG5ld0Nvbm5lY3Rpb25Tb2NrZXRJZGVudGlmaWVy KTsKICAgICB2b2lkIHNlbmRUb1NvY2tldChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlm aWVyLCBjb25zdCBJUEM6OkRhdGFSZWZlcmVuY2UmLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNz JiYsIFJUQ1BhY2tldE9wdGlvbnMmJik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIubWVzc2FnZXMuaW4gYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIubWVzc2FnZXMu aW4KaW5kZXggMTk1NDA5NmFiMTU2MWE3YTdmZGY1YzUwZTNhMzAzMjQ4NjQ2ZTM2Ni4uN2Y3ZDc5 ZWM1MTZhOGNlY2FjMmJiZDg5ODgxZWQxYmRhMzJiY2Q0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLm1lc3NhZ2VzLmlu CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92 aWRlci5tZXNzYWdlcy5pbgpAQCAtMjUsNyArMjUsNyBAQAogbWVzc2FnZXMgLT4gTmV0d29ya1JU Q1Byb3ZpZGVyIHsKICAgICBDcmVhdGVVRFBTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0 SWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJLaXQ6OlJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3Mg bG9jYWxBZGRyZXNzLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQb3J0LCBib29sIGlz Rmlyc3RQYXJ0eSwgYm9vbCBpc1JlbGF5RGlzYWJsZWQsIFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9t YWluIGRvbWFpbikKICAgICBDcmVhdGVTZXJ2ZXJUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRD U29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJLaXQ6OlJUQ05ldHdvcms6OlNvY2tldEFk ZHJlc3MgbG9jYWxBZGRyZXNzLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQb3J0LCBp bnQgb3B0aW9ucykKLSAgICBDcmVhdGVDbGllbnRUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRD U29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBXZWJLaXQ6OlJUQ05ldHdvcms6OlNvY2tldEFk ZHJlc3MgbG9jYWxBZGRyZXNzLCBXZWJLaXQ6OlJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MgcmVt b3RlQWRkcmVzcywgU3RyaW5nIHVzZXJBZ2VudCwgaW50IG9wdGlvbnMpCisgICAgQ3JlYXRlQ2xp ZW50VENQU29ja2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmll ciwgV2ViS2l0OjpSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzIGxvY2FsQWRkcmVzcywgV2ViS2l0 OjpSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzIHJlbW90ZUFkZHJlc3MsIFN0cmluZyB1c2VyQWdl bnQsIGludCBvcHRpb25zLCBib29sIGlzUmVsYXlEaXNhYmxlZCkKICAgICBXcmFwTmV3VENQQ29u bmVjdGlvbihXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIFdl YkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgbmV3Q29ubmVjdGlvblNvY2tldElkZW50 aWZpZXIpCiAKICAgICB2b2lkIFNldFBsYXRmb3JtVENQU29ja2V0c0VuYWJsZWQoYm9vbCBlbmFi bGVkKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0 d29ya1JUQ1RDUFNvY2tldENvY29hLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dl YnJ0Yy9OZXR3b3JrUlRDVENQU29ja2V0Q29jb2EuaAppbmRleCAzZTVmYTk0YzMxNDdkNTU3ZjUx ZGUwMTdlNDY4Y2MxNDc4ZDhhZDg5Li5mNDEyNWQzY2IwOGZlY2Y5MjYzNjMzODdiOWNhMDAzNDNk ODJkYTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9O ZXR3b3JrUlRDVENQU29ja2V0Q29jb2EuaAorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVENQU29ja2V0Q29jb2EuaApAQCAtMzksOSArMzksOSBAQCBu YW1lc3BhY2UgV2ViS2l0IHsKIGNsYXNzIE5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYSBmaW5hbCA6 IHB1YmxpYyBOZXR3b3JrUlRDUHJvdmlkZXI6OlNvY2tldCB7CiAgICAgV1RGX01BS0VfRkFTVF9B TExPQ0FURUQ7CiBwdWJsaWM6Ci0gICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxOZXR3b3JrUlRD UHJvdmlkZXI6OlNvY2tldD4gY3JlYXRlQ2xpZW50VENQU29ja2V0KFdlYkNvcmU6OkxpYldlYlJU Q1NvY2tldElkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYsIGNvbnN0IHJ0Yzo6U29ja2V0 QWRkcmVzcyYsIGludCBvcHRpb25zLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmKTsKKyAgICBzdGF0 aWMgc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtSVENQcm92aWRlcjo6U29ja2V0PiBjcmVhdGVDbGll bnRUQ1BTb2NrZXQoV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciwgTmV0d29ya1JU Q1Byb3ZpZGVyJiwgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiwgaW50IG9wdGlvbnMsIGJvb2wg aXNSZWxheURpc2FibGVkLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmKTsKIAotICAgIE5ldHdvcmtS VENUQ1BTb2NrZXRDb2NvYShXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyLCBOZXR3 b3JrUlRDUHJvdmlkZXImLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmLCBpbnQgb3B0aW9ucywg UmVmPElQQzo6Q29ubmVjdGlvbj4mJik7CisgICAgTmV0d29ya1JUQ1RDUFNvY2tldENvY29hKFdl YkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYsIGNv bnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYsIGludCBvcHRpb25zLCBib29sIGlzUmVsYXlEaXNhYmxl ZCwgUmVmPElQQzo6Q29ubmVjdGlvbj4mJik7CiAKIHByaXZhdGU6CiAgICAgLy8gTmV0d29ya1JU Q1Byb3ZpZGVyOjpTb2NrZXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVENQU29ja2V0Q29jb2EubW0gYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDVENQU29ja2V0Q29jb2EubW0KaW5kZXggZmFm ZmQyYzlmYjlkMjllNTAyZGE5OWE5OTMyZDQ0MGI1YmNmYjk3YS4uM2ZiZDBlMGIyYWYwYTJmYWFk NWUwMjQ2MmJhN2MyODI5NTcwNjY2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tldENvY29hLm1tCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYS5tbQpA QCAtNTAsMTIgKzUwLDEyIEBAIHN0YXRpYyBkaXNwYXRjaF9xdWV1ZV90IHRjcFNvY2tldFF1ZXVl KCkKICAgICByZXR1cm4gcXVldWU7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxOZXR3b3JrUlRDUHJv dmlkZXI6OlNvY2tldD4gTmV0d29ya1JUQ1RDUFNvY2tldENvY29hOjpjcmVhdGVDbGllbnRUQ1BT b2NrZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBOZXR3b3JrUlRDUHJv dmlkZXImIHJ0Y1Byb3ZpZGVyLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIHJlbW90ZUFkZHJl c3MsIGludCB0Y3BPcHRpb25zLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmIGNvbm5lY3Rpb24pCitz dGQ6OnVuaXF1ZV9wdHI8TmV0d29ya1JUQ1Byb3ZpZGVyOjpTb2NrZXQ+IE5ldHdvcmtSVENUQ1BT b2NrZXRDb2NvYTo6Y3JlYXRlQ2xpZW50VENQU29ja2V0KExpYldlYlJUQ1NvY2tldElkZW50aWZp ZXIgaWRlbnRpZmllciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwgY29uc3QgcnRj OjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBpbnQgdGNwT3B0aW9ucywgYm9vbCBpc1Jl bGF5RGlzYWJsZWQsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKIHsKICAgICAv LyBGSVhNRTogV2Ugc2hvdWxkIG1pZ3JhdGUgc3NsdGNwIGNhbmRpZGF0ZXMsIG1heWJlIHN1cHBv cnQgT1BUX1RMU19JTlNFQ1VSRSBhcyB3ZWxsLgogICAgIGlmICgodGNwT3B0aW9ucyAmIHJ0Yzo6 UGFja2V0U29ja2V0RmFjdG9yeTo6T1BUX1RMU19GQUtFKSB8fCAodGNwT3B0aW9ucyAmIHJ0Yzo6 UGFja2V0U29ja2V0RmFjdG9yeTo6T1BUX1RMU19JTlNFQ1VSRSkpCiAgICAgICAgIHJldHVybiBu dWxscHRyOwotICAgIHJldHVybiBtYWtlVW5pcXVlPE5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYT4o aWRlbnRpZmllciwgcnRjUHJvdmlkZXIsIHJlbW90ZUFkZHJlc3MsIHRjcE9wdGlvbnMsIFdURk1v dmUoY29ubmVjdGlvbikpOworICAgIHJldHVybiBtYWtlVW5pcXVlPE5ldHdvcmtSVENUQ1BTb2Nr ZXRDb2NvYT4oaWRlbnRpZmllciwgcnRjUHJvdmlkZXIsIHJlbW90ZUFkZHJlc3MsIHRjcE9wdGlv bnMsIGlzUmVsYXlEaXNhYmxlZCwgV1RGTW92ZShjb25uZWN0aW9uKSk7CiB9CiAKIHN0YXRpYyBp bmxpbmUgdm9pZCBwcm9jZXNzSW5jb21pbmdEYXRhKFJldGFpblB0cjxud19jb25uZWN0aW9uX3Q+ JiYgbndDb25uZWN0aW9uLCBGdW5jdGlvbjxWZWN0b3I8dWludDhfdD4oVmVjdG9yPHVpbnQ4X3Q+ JiYpPiYmIHByb2Nlc3NEYXRhLCBWZWN0b3I8dWludDhfdD4mJiBidWZmZXIgPSB7IH0pCkBAIC04 MCw3ICs4MCw3IEBAIHN0YXRpYyBpbmxpbmUgdm9pZCBwcm9jZXNzSW5jb21pbmdEYXRhKFJldGFp blB0cjxud19jb25uZWN0aW9uX3Q+JiYgbndDb25uZWN0aW9uCiAgICAgfSkuZ2V0KCkpOwogfQog Ci1OZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6Ok5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYShMaWJX ZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYgcnRj UHJvdmlkZXIsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRkcmVzcywgaW50IG9w dGlvbnMsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKK05ldHdvcmtSVENUQ1BT b2NrZXRDb2NvYTo6TmV0d29ya1JUQ1RDUFNvY2tldENvY29hKExpYldlYlJUQ1NvY2tldElkZW50 aWZpZXIgaWRlbnRpZmllciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwgY29uc3Qg cnRjOjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBpbnQgb3B0aW9ucywgYm9vbCBpc1Jl bGF5RGlzYWJsZWQsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYgY29ubmVjdGlvbikKICAgICA6IG1f aWRlbnRpZmllcihpZGVudGlmaWVyKQogICAgICwgbV9ydGNQcm92aWRlcihydGNQcm92aWRlcikK ICAgICAsIG1fY29ubmVjdGlvbihXVEZNb3ZlKGNvbm5lY3Rpb24pKQpAQCAtOTgsNiArOTgsOCBA QCBOZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6Ok5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYShMaWJX ZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZQogCiAgICAgaWYgKGF1dG8gdG9rZW4gPSBydGNQcm92 aWRlci5zb3VyY2VBcHBsaWNhdGlvbkF1ZGl0VG9rZW4oKSkKICAgICAgICAgbndfcGFyYW1ldGVy c19zZXRfc291cmNlX2FwcGxpY2F0aW9uKHRjcFRMUy5nZXQoKSwgKnRva2VuKTsKKyAgICBpZiAo aXNSZWxheURpc2FibGVkKQorICAgICAgICBud19wYXJhbWV0ZXJzX3NldF9hY2NvdW50X2lkKHRj cFRMUy5nZXQoKSwgImNvbS5hcHBsZS5zYWZhcmkucGVlcnRvcGVlciIpOwogCiAgICAgbV9ud0Nv bm5lY3Rpb24gPSBhZG9wdE5TKG53X2Nvbm5lY3Rpb25fY3JlYXRlKGhvc3QuZ2V0KCksIHRjcFRM Uy5nZXQoKSkpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29y ay93ZWJydGMvTGliV2ViUlRDUHJvdmlkZXIuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmNwcAppbmRleCA1MjIyYmI5ZDAxMmIx NjUzYjA3ZmIwOWQ0ZjFmNzg3YjZhN2RlOGI4Li5mZmIzYWEwYjcwZTZjYWUzOWY0OTI1Y2IyYzJl MmUwMDYyOTU3YzRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29y ay93ZWJydGMvTGliV2ViUlRDUHJvdmlkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENQcm92aWRlci5jcHAKQEAgLTkwLDYgKzkwLDgg QEAgY2xhc3MgUlRDU29ja2V0RmFjdG9yeSBmaW5hbCA6IHB1YmxpYyBMaWJXZWJSVENQcm92aWRl cjo6U3VzcGVuZGFibGVTb2NrZXRGYWN0b3IKIHB1YmxpYzoKICAgICBSVENTb2NrZXRGYWN0b3J5 KFN0cmluZyYmIHVzZXJBZ2VudCwgYm9vbCBpc0ZpcnN0UGFydHksIFJlZ2lzdHJhYmxlRG9tYWlu JiYpOwogCisgICAgdm9pZCBkaXNhYmxlUmVsYXkoKSBmaW5hbCB7IG1faXNSZWxheURpc2FibGVk ID0gdHJ1ZTsgfQorCiBwcml2YXRlOgogICAgIC8vIFN1c3BlbmRhYmxlU29ja2V0RmFjdG9yeQog ICAgIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIENyZWF0ZVVkcFNvY2tldChjb25zdCBydGM6OlNv Y2tldEFkZHJlc3MmLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQb3J0KSBmaW5hbDsK QEAgLTk4LDcgKzEwMCw2IEBAIHByaXZhdGU6CiAgICAgcnRjOjpBc3luY1Jlc29sdmVySW50ZXJm YWNlKiBDcmVhdGVBc3luY1Jlc29sdmVyKCkgZmluYWw7CiAgICAgdm9pZCBzdXNwZW5kKCkgZmlu YWw7CiAgICAgdm9pZCByZXN1bWUoKSBmaW5hbDsKLSAgICB2b2lkIGRpc2FibGVSZWxheSgpIGZp bmFsIHsgbV9pc1JlbGF5RGlzYWJsZWQgPSB0cnVlOyB9CiAKIHByaXZhdGU6CiAgICAgU3RyaW5n IG1fdXNlckFnZW50OwpAQCAtMTI2LDcgKzEyNyw3IEBAIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQq IFJUQ1NvY2tldEZhY3Rvcnk6OkNyZWF0ZVNlcnZlclRjcFNvY2tldChjb25zdCBydGM6OlNvY2tl CiAKIHJ0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIFJUQ1NvY2tldEZhY3Rvcnk6OkNyZWF0ZUNsaWVu dFRjcFNvY2tldChjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIGxvY2FsQWRkcmVzcywgY29uc3Qg cnRjOjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBjb25zdCBydGM6OlByb3h5SW5mbyYs IGNvbnN0IHN0ZDo6c3RyaW5nJiwgY29uc3QgcnRjOjpQYWNrZXRTb2NrZXRUY3BPcHRpb25zJiBv cHRpb25zKQogewotICAgIHJldHVybiBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5saWJXZWJSVENO ZXR3b3JrKCkuc29ja2V0RmFjdG9yeSgpLmNyZWF0ZUNsaWVudFRjcFNvY2tldCh0aGlzLCBsb2Nh bEFkZHJlc3MsIHJlbW90ZUFkZHJlc3MsIFN0cmluZyB7IG1fdXNlckFnZW50IH0sIG9wdGlvbnMp OworICAgIHJldHVybiBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5saWJXZWJSVENOZXR3b3JrKCku c29ja2V0RmFjdG9yeSgpLmNyZWF0ZUNsaWVudFRjcFNvY2tldCh0aGlzLCBsb2NhbEFkZHJlc3Ms IHJlbW90ZUFkZHJlc3MsIFN0cmluZyB7IG1fdXNlckFnZW50IH0sIG9wdGlvbnMsIG1faXNSZWxh eURpc2FibGVkKTsKIH0KIAogcnRjOjpBc3luY1Jlc29sdmVySW50ZXJmYWNlKiBSVENTb2NrZXRG YWN0b3J5OjpDcmVhdGVBc3luY1Jlc29sdmVyKCkKQEAgLTE1OSw3ICsxNjAsMTMgQEAgdm9pZCBM aWJXZWJSVENQcm92aWRlcjo6c3RhcnRlZE5ldHdvcmtUaHJlYWQoKQogCiBzdGQ6OnVuaXF1ZV9w dHI8TGliV2ViUlRDUHJvdmlkZXI6OlN1c3BlbmRhYmxlU29ja2V0RmFjdG9yeT4gTGliV2ViUlRD UHJvdmlkZXI6OmNyZWF0ZVNvY2tldEZhY3RvcnkoU3RyaW5nJiYgdXNlckFnZW50LCBib29sIGlz Rmlyc3RQYXJ0eSwgUmVnaXN0cmFibGVEb21haW4mJiBkb21haW4pCiB7Ci0gICAgcmV0dXJuIG1h a2VVbmlxdWU8UlRDU29ja2V0RmFjdG9yeT4oV1RGTW92ZSh1c2VyQWdlbnQpLCBpc0ZpcnN0UGFy dHksIFdURk1vdmUoZG9tYWluKSk7CisgICAgYXV0byBmYWN0b3J5ID0gbWFrZVVuaXF1ZTxSVENT b2NrZXRGYWN0b3J5PihXVEZNb3ZlKHVzZXJBZ2VudCksIGlzRmlyc3RQYXJ0eSwgV1RGTW92ZShk b21haW4pKTsKKworICAgIGF1dG8qIHBhZ2UgPSBtX3dlYlBhZ2UuY29yZVBhZ2UoKTsKKyAgICBp ZiAoIXBhZ2UgfHwgIXBhZ2UtPnNldHRpbmdzKCkud2ViUlRDU29ja2V0c1Byb3h5aW5nRW5hYmxl ZCgpKQorICAgICAgICBmYWN0b3J5LT5kaXNhYmxlUmVsYXkoKTsKKworICAgIHJldHVybiBmYWN0 b3J5OwogfQogCiBSZWZQdHI8UlRDRGF0YUNoYW5uZWxSZW1vdGVIYW5kbGVyQ29ubmVjdGlvbj4g TGliV2ViUlRDUHJvdmlkZXI6OmNyZWF0ZVJUQ0RhdGFDaGFubmVsUmVtb3RlSGFuZGxlckNvbm5l Y3Rpb24oKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvd2Vi cnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29y ay93ZWJydGMvTGliV2ViUlRDUHJvdmlkZXIuaAppbmRleCA2MDU4ZTU0YzE1Mzg5NDhkOGE2YjQ0 MzUyN2Q1M2MwZDg3OGFiZmY5Li43MmFkM2E0MjlmZWZiZmExZDRjYWVmNWMyYmY3Yzk1NzMwMWUx MjAxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay93ZWJydGMv TGliV2ViUlRDUHJvdmlkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29y ay93ZWJydGMvTGliV2ViUlRDUHJvdmlkZXIuaApAQCAtNjMsMTYgKzYzLDE0IEBAIHByaXZhdGU6 CiAgICAgUmVmUHRyPFdlYkNvcmU6OlJUQ0RhdGFDaGFubmVsUmVtb3RlSGFuZGxlckNvbm5lY3Rp b24+IGNyZWF0ZVJUQ0RhdGFDaGFubmVsUmVtb3RlSGFuZGxlckNvbm5lY3Rpb24oKSBmaW5hbDsK ICAgICB2b2lkIHNldExvZ2dpbmdMZXZlbChXVEZMb2dMZXZlbCkgZmluYWw7CiAKLSNpZiBFTkFC TEUoR1BVX1BST0NFU1MpICYmIFBMQVRGT1JNKENPQ09BKSAmJiAhUExBVEZPUk0oTUFDQ0FUQUxZ U1QpCiAgICAgV2ViUGFnZSYgbV93ZWJQYWdlOworI2lmIEVOQUJMRShHUFVfUFJPQ0VTUykgJiYg UExBVEZPUk0oQ09DT0EpICYmICFQTEFURk9STShNQUNDQVRBTFlTVCkKICAgICBib29sIG1fZGlk SW5pdGlhbGl6ZUNhbGxiYWNrIHsgZmFsc2UgfTsKICNlbmRpZgogfTsKIAogaW5saW5lIExpYldl YlJUQ1Byb3ZpZGVyOjpMaWJXZWJSVENQcm92aWRlcihXZWJQYWdlJiB3ZWJQYWdlKQotI2lmIEVO QUJMRShHUFVfUFJPQ0VTUykgJiYgUExBVEZPUk0oQ09DT0EpICYmICFQTEFURk9STShNQUNDQVRB TFlTVCkKICAgICA6IG1fd2ViUGFnZSh3ZWJQYWdlKQotI2VuZGlmCiB7CiAgICAgbV91c2VOZXR3 b3JrVGhyZWFkV2l0aFNvY2tldFNlcnZlciA9IGZhbHNlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1NvY2tldEZhY3Rvcnku Y3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1Nv Y2tldEZhY3RvcnkuY3BwCmluZGV4IGEzOTM5YmMxNDVlMGI5ODNkYjE4Yjc5YWQ3YTYyZmU2OTY2 NmNiMzkuLjIwMjdjMjg4MDc1MmJhNTU3ZmMyY2UzMzlhZmQ3MzIzZTMzMjRhMGYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENTb2Nr ZXRGYWN0b3J5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay93ZWJy dGMvTGliV2ViUlRDU29ja2V0RmFjdG9yeS5jcHAKQEAgLTEwNCw3ICsxMDQsNyBAQCBydGM6OkFz eW5jUGFja2V0U29ja2V0KiBMaWJXZWJSVENTb2NrZXRGYWN0b3J5OjpjcmVhdGVVZHBTb2NrZXQo Y29uc3Qgdm9pZCogc29jawogICAgIHJldHVybiBzb2NrZXQucmVsZWFzZSgpOwogfQogCi1ydGM6 OkFzeW5jUGFja2V0U29ja2V0KiBMaWJXZWJSVENTb2NrZXRGYWN0b3J5OjpjcmVhdGVDbGllbnRU Y3BTb2NrZXQoY29uc3Qgdm9pZCogc29ja2V0R3JvdXAsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVz cyYgbG9jYWxBZGRyZXNzLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIHJlbW90ZUFkZHJlc3Ms IFN0cmluZyYmIHVzZXJBZ2VudCwgY29uc3QgcnRjOjpQYWNrZXRTb2NrZXRUY3BPcHRpb25zJiBv cHRpb25zKQorcnRjOjpBc3luY1BhY2tldFNvY2tldCogTGliV2ViUlRDU29ja2V0RmFjdG9yeTo6 Y3JlYXRlQ2xpZW50VGNwU29ja2V0KGNvbnN0IHZvaWQqIHNvY2tldEdyb3VwLCBjb25zdCBydGM6 OlNvY2tldEFkZHJlc3MmIGxvY2FsQWRkcmVzcywgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiBy ZW1vdGVBZGRyZXNzLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGNvbnN0IHJ0Yzo6UGFja2V0U29ja2V0 VGNwT3B0aW9ucyYgb3B0aW9ucywgYm9vbCBpc1JlbGF5RGlzYWJsZWQpCiB7CiAgICAgQVNTRVJU KCFXVEY6OmlzTWFpblJ1bkxvb3AoKSk7CiAKQEAgLTExMywxMyArMTEzLDEzIEBAIHJ0Yzo6QXN5 bmNQYWNrZXRTb2NrZXQqIExpYldlYlJUQ1NvY2tldEZhY3Rvcnk6OmNyZWF0ZUNsaWVudFRjcFNv Y2tldChjb25zdCB2b2lkCiAKICAgICAvLyBGSVhNRTogV2Ugb25seSB0cmFuc2ZlciBvcHRpb25z Lm9wdHMgYnV0IHNob3VsZCBhbHNvIGhhbmRsZSBvdGhlciBtZW1iZXJzLgogICAgIGlmIChtX2Nv bm5lY3Rpb24pCi0gICAgICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TmV0d29ya1JU Q1Byb3ZpZGVyOjpDcmVhdGVDbGllbnRUQ1BTb2NrZXQoc29ja2V0LT5pZGVudGlmaWVyKCksIFJU Q05ldHdvcms6OlNvY2tldEFkZHJlc3MocHJlcGFyZVNvY2tldEFkZHJlc3MobG9jYWxBZGRyZXNz LCBtX2Rpc2FibGVOb25Mb2NhbGhvc3RDb25uZWN0aW9ucykpLCBSVENOZXR3b3JrOjpTb2NrZXRB ZGRyZXNzKHByZXBhcmVTb2NrZXRBZGRyZXNzKHJlbW90ZUFkZHJlc3MsIG1fZGlzYWJsZU5vbkxv Y2FsaG9zdENvbm5lY3Rpb25zKSksIHVzZXJBZ2VudCwgb3B0aW9ucy5vcHRzKSwgMCk7CisgICAg ICAgIG1fY29ubmVjdGlvbi0+c2VuZChNZXNzYWdlczo6TmV0d29ya1JUQ1Byb3ZpZGVyOjpDcmVh dGVDbGllbnRUQ1BTb2NrZXQoc29ja2V0LT5pZGVudGlmaWVyKCksIFJUQ05ldHdvcms6OlNvY2tl dEFkZHJlc3MocHJlcGFyZVNvY2tldEFkZHJlc3MobG9jYWxBZGRyZXNzLCBtX2Rpc2FibGVOb25M b2NhbGhvc3RDb25uZWN0aW9ucykpLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBhcmVT b2NrZXRBZGRyZXNzKHJlbW90ZUFkZHJlc3MsIG1fZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5lY3Rp b25zKSksIHVzZXJBZ2VudCwgb3B0aW9ucy5vcHRzLCAgaXNSZWxheURpc2FibGVkKSwgMCk7CiAg ICAgZWxzZSB7CiAgICAgICAgIGNhbGxPbk1haW5SdW5Mb29wKFtdIHsKICAgICAgICAgICAgIFdl YlByb2Nlc3M6OnNpbmdsZXRvbigpLmVuc3VyZU5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbigpOwog ICAgICAgICB9KTsKLSAgICAgICAgbV9wZW5kaW5nTWVzc2FnZVRhc2tzLmFwcGVuZChbaWRlbnRp ZmllciA9IHNvY2tldC0+aWRlbnRpZmllcigpLCBsb2NhbEFkZHJlc3MgPSBSVENOZXR3b3JrOjpT b2NrZXRBZGRyZXNzKHByZXBhcmVTb2NrZXRBZGRyZXNzKGxvY2FsQWRkcmVzcywgbV9kaXNhYmxl Tm9uTG9jYWxob3N0Q29ubmVjdGlvbnMpKSwgcmVtb3RlQWRkcmVzcyA9IFJUQ05ldHdvcms6OlNv Y2tldEFkZHJlc3MocHJlcGFyZVNvY2tldEFkZHJlc3MocmVtb3RlQWRkcmVzcywgbV9kaXNhYmxl Tm9uTG9jYWxob3N0Q29ubmVjdGlvbnMpKSwgdXNlckFnZW50LCBvcHRzID0gb3B0aW9ucy5vcHRz XShhdXRvJiBjb25uZWN0aW9uKSB7Ci0gICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQoTWVzc2Fn ZXM6Ok5ldHdvcmtSVENQcm92aWRlcjo6Q3JlYXRlQ2xpZW50VENQU29ja2V0KGlkZW50aWZpZXIs IGxvY2FsQWRkcmVzcywgcmVtb3RlQWRkcmVzcywgdXNlckFnZW50LCBvcHRzKSwgMCk7CisgICAg ICAgIG1fcGVuZGluZ01lc3NhZ2VUYXNrcy5hcHBlbmQoW2lkZW50aWZpZXIgPSBzb2NrZXQtPmlk ZW50aWZpZXIoKSwgbG9jYWxBZGRyZXNzID0gUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyhwcmVw YXJlU29ja2V0QWRkcmVzcyhsb2NhbEFkZHJlc3MsIG1fZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5l Y3Rpb25zKSksIHJlbW90ZUFkZHJlc3MgPSBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBh cmVTb2NrZXRBZGRyZXNzKHJlbW90ZUFkZHJlc3MsIG1fZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5l Y3Rpb25zKSksIHVzZXJBZ2VudCwgb3B0cyA9IG9wdGlvbnMub3B0cywgaXNSZWxheURpc2FibGVk XShhdXRvJiBjb25uZWN0aW9uKSB7CisgICAgICAgICAgICBjb25uZWN0aW9uLnNlbmQoTWVzc2Fn ZXM6Ok5ldHdvcmtSVENQcm92aWRlcjo6Q3JlYXRlQ2xpZW50VENQU29ja2V0KGlkZW50aWZpZXIs IGxvY2FsQWRkcmVzcywgcmVtb3RlQWRkcmVzcywgdXNlckFnZW50LCBvcHRzLCBpc1JlbGF5RGlz YWJsZWQpLCAwKTsKICAgICAgICAgfSk7CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvTmV0d29yay93ZWJydGMvTGliV2ViUlRDU29ja2V0RmFjdG9yeS5oIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1NvY2tldEZh Y3RvcnkuaAppbmRleCA3MWQxMjQ4MjdhYjJhNmVhMjliMTg5OWJkYzA3NDQyYjRiOTFiZDg4Li43 ZDA4MTE3NGZiZmExMDc5YWE5MjVhMTA4MTcwMmY0MGI1NWNjMjZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay93ZWJydGMvTGliV2ViUlRDU29ja2V0RmFjdG9y eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJS VENTb2NrZXRGYWN0b3J5LmgKQEAgLTUzLDcgKzUzLDcgQEAgcHVibGljOgogICAgIHZvaWQgZm9y U29ja2V0SW5Hcm91cChjb25zdCB2b2lkKiBzb2NrZXRHcm91cCwgY29uc3QgRnVuY3Rpb248dm9p ZChMaWJXZWJSVENTb2NrZXQmKT4mKTsKICAgICBydGM6OkFzeW5jUGFja2V0U29ja2V0KiBjcmVh dGVVZHBTb2NrZXQoY29uc3Qgdm9pZCogc29ja2V0R3JvdXAsIGNvbnN0IHJ0Yzo6U29ja2V0QWRk cmVzcyYsIHVpbnQxNl90IG1pblBvcnQsIHVpbnQxNl90IG1heFBvcnQsIGJvb2wgaXNGaXJzdFBh cnR5LCBib29sIGlzUmVsYXlEaXNhYmxlZCwgY29uc3QgV2ViQ29yZTo6UmVnaXN0cmFibGVEb21h aW4mKTsKICAgICBydGM6OkFzeW5jUGFja2V0U29ja2V0KiBjcmVhdGVTZXJ2ZXJUY3BTb2NrZXQo Y29uc3Qgdm9pZCogc29ja2V0R3JvdXAsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYsIHVpbnQx Nl90IG1pblBvcnQsIHVpbnQxNl90IG1heFBvcnQsIGludCBvcHRpb25zKTsKLSAgICBydGM6OkFz eW5jUGFja2V0U29ja2V0KiBjcmVhdGVDbGllbnRUY3BTb2NrZXQoY29uc3Qgdm9pZCogc29ja2V0 R3JvdXAsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYgbG9jYWxBZGRyZXNzLCBjb25zdCBydGM6 OlNvY2tldEFkZHJlc3MmIHJlbW90ZUFkZHJlc3MsIFN0cmluZyYmIHVzZXJBZ2VudCwgY29uc3Qg cnRjOjpQYWNrZXRTb2NrZXRUY3BPcHRpb25zJik7CisgICAgcnRjOjpBc3luY1BhY2tldFNvY2tl dCogY3JlYXRlQ2xpZW50VGNwU29ja2V0KGNvbnN0IHZvaWQqIHNvY2tldEdyb3VwLCBjb25zdCBy dGM6OlNvY2tldEFkZHJlc3MmIGxvY2FsQWRkcmVzcywgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNz JiByZW1vdGVBZGRyZXNzLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGNvbnN0IHJ0Yzo6UGFja2V0U29j a2V0VGNwT3B0aW9ucyYsIGJvb2wgaXNSZWxheURpc2FibGVkKTsKICAgICBydGM6OkFzeW5jUGFj a2V0U29ja2V0KiBjcmVhdGVOZXdDb25uZWN0aW9uU29ja2V0KExpYldlYlJUQ1NvY2tldCYsIFdl YkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgbmV3Q29ubmVjdGlvblNvY2tldElkZW50 aWZpZXIsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYpOwogCiAgICAgTGliV2ViUlRDUmVzb2x2 ZXIqIHJlc29sdmVyKExpYldlYlJUQ1Jlc29sdmVySWRlbnRpZmllciBpZGVudGlmaWVyKSB7IHJl dHVybiBtX3Jlc29sdmVycy5nZXQoaWRlbnRpZmllcik7IH0K 434722 2021-08-01 08:03:47 -0700 2021-08-01 09:02:29 -0700 Patch for landing bug-228681-20210801170345.patch text/plain 21088 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNDgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDIzYzIzMzg0M2YwMTE5ZTQ1M2VkYjcw YjgxODZmM2U5NWZkMjMzYzQuLjVkYTdhMDhjZjc2ODk4ZDk2ZmQ0ODc1NGY1NWY3NmVjMjFhMTJj NWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMjEtMDgtMDEgIFlvdWVubiBGYWJsZXQgIDx5b3Vl bm5AYXBwbGUuY29tPgorCisgICAgICAgIEludHJvZHVjZSBhbiBleHBlcmltZW50YWwgZmVhdHVy ZSB0byB0b2dnbGUgV2ViUlRDIHNvY2tldCBwcm94eWluZworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4NjgxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RXJpYyBDYXJsc29uLgorCisgICAgICAgICogU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJl bmNlc0V4cGVyaW1lbnRhbC55YW1sOgorCiAyMDIxLTA3LTI5ICBNeWxlcyBDLiBNYXhmaWVsZCAg PG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgU3RvcCBidWlsZGluZyBXZWJHUFUgYW5k IHRoZSBXSExTTCBjb21waWxlciB0byBkZWNyZWFzZSBiaW5hcnkgc2l6ZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAx YjNmZGEzMzExYzEzYzRlODgxNzcyZWM5NGM3Yzg5NzUwYWIwMDY1Li5hYmJlYWU0NGE5NTcyYWMx YTY5Mzk4YjEyZGViMTY0YTMxOTdhYWY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDIx LTA4LTAxICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBJbnRy b2R1Y2UgYW4gZXhwZXJpbWVudGFsIGZlYXR1cmUgdG8gdG9nZ2xlIFdlYlJUQyBzb2NrZXQgcHJv eHlpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy ODY4MQorCisgICAgICAgIFJldmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBEZWNp ZGUgd2hldGhlciB0byBkaXNhYmxlIHByb3h5aW5nIGJhc2VkIG9uIGV4cGVyaW1lbnRhbCBmZWF0 dXJlIGluIFdlYlByb2Nlc3MuCisgICAgICAgIFNlbmQgdGhlIGRpc2FibGUgcmVsYXkgdmFsdWUg ZnJvbSBXZWJQcm9jZXNzIHRvIE5ldHdvcmtQcm9jZXNzIGZvciBUQ1Agc29ja2V0cy4KKyAgICAg ICAgTWFudWFsbHkgdGVzdGVkLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05l dHdvcmtSVENQcm92aWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtSVENQcm92aWRl cjo6Y3JlYXRlQ2xpZW50VENQU29ja2V0KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy93ZWJy dGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mvd2VicnRj L05ldHdvcmtSVENQcm92aWRlci5tZXNzYWdlcy5pbjoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vz cy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tldENvY29hLmg6CisgICAgICAgICogTmV0d29ya1By b2Nlc3Mvd2VicnRjL05ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYS5tbToKKyAgICAgICAgKFdlYktp dDo6TmV0d29ya1JUQ1RDUFNvY2tldENvY29hOjpjcmVhdGVDbGllbnRUQ1BTb2NrZXQpOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6Ok5ldHdvcmtSVENUQ1BTb2Nr ZXRDb2NvYSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENQ cm92aWRlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJUQ1NvY2tldEZhY3Rvcnk6OkNyZWF0ZUNs aWVudFRjcFNvY2tldCk6CisgICAgICAgIChXZWJLaXQ6OkxpYldlYlJUQ1Byb3ZpZGVyOjpjcmVh dGVTb2NrZXRGYWN0b3J5KToKKyAgICAgICAgKiBXZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xp YldlYlJUQ1NvY2tldEZhY3RvcnkuY3BwOgorICAgICAgICAoV2ViS2l0OjpMaWJXZWJSVENTb2Nr ZXRGYWN0b3J5OjpjcmVhdGVDbGllbnRUY3BTb2NrZXQpOgorICAgICAgICAqIFdlYlByb2Nlc3Mv TmV0d29yay93ZWJydGMvTGliV2ViUlRDU29ja2V0RmFjdG9yeS5oOgorCiAyMDIxLTA3LTMwICBZ b3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBzb2Z0bGluayBud19w YXJhbWV0ZXJzX2FsbG93X3NoYXJpbmdfcG9ydF93aXRoX2xpc3RlbmVyCmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL1NjcmlwdHMvUHJlZmVyZW5jZXMvV2ViUHJlZmVyZW5jZXNFeHBlcmltZW50YWwu eWFtbCBiL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVy aW1lbnRhbC55YW1sCmluZGV4IDlmOTI2MWQ3NjcyMDFkMjI5YTc5ZDQzZTBlMTVlYjhkNjBlZGJi MWEuLjllNWQ3OWJmMTMxNDJmZDY0NGJjZmM0M2I3ZWJmNmQ0ZWVmMzQ5Y2QgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNlc0V4cGVyaW1lbnRh bC55YW1sCisrKyBiL1NvdXJjZS9XVEYvU2NyaXB0cy9QcmVmZXJlbmNlcy9XZWJQcmVmZXJlbmNl c0V4cGVyaW1lbnRhbC55YW1sCkBAIC0xMzMzLDYgKzEzMzMsMTkgQEAgV2ViUlRDUGxhdGZvcm1V RFBTb2NrZXRzRW5hYmxlZDoKICAgICBXZWJLaXQ6CiAgICAgICBkZWZhdWx0OiBmYWxzZQogCitX ZWJSVENTb2NrZXRzUHJveHlpbmdFbmFibGVkOgorICB0eXBlOiBib29sCisgIGh1bWFuUmVhZGFi bGVOYW1lOiAiV2ViUlRDIFNvY2tldHMgUHJveHlpbmciCisgIGh1bWFuUmVhZGFibGVEZXNjcmlw dGlvbjogIkVuYWJsZSBXZWJSVEMgU29ja2V0cyBQcm94eWluZyIKKyAgY29uZGl0aW9uOiBFTkFC TEUoV0VCX1JUQykKKyAgZGVmYXVsdFZhbHVlOgorICAgIFdlYktpdExlZ2FjeToKKyAgICAgIGRl ZmF1bHQ6IGZhbHNlCisgICAgV2ViS2l0OgorICAgICAgZGVmYXVsdDogZmFsc2UKKyAgICBXZWJD b3JlOgorICAgICAgZGVmYXVsdDogZmFsc2UKKwogV2ViUlRDVlA5UHJvZmlsZTBDb2RlY0VuYWJs ZWQ6CiAgIHR5cGU6IGJvb2wKICAgaHVtYW5SZWFkYWJsZU5hbWU6ICJXZWJSVEMgVlA5IHByb2Zp bGUgMCBjb2RlYyIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2Vi cnRjL05ldHdvcmtSVENQcm92aWRlci5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuY3BwCmluZGV4IDk4YjMwNmVjNTAzNmY2YTljZmVl ZDJkZWIwN2ExOWEzNDUxNmNjYTcuLmNhYjU4MjFmYWVkNmE3MWY4YWUwZWZjNDM1ZWY3ZjYyZDZl ZWEwYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05l dHdvcmtSVENQcm92aWRlci5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93 ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLmNwcApAQCAtMTc3LDkgKzE3Nyw5IEBAIHJ0Yzo6UHJv eHlJbmZvIE5ldHdvcmtSVENQcm92aWRlcjo6cHJveHlJbmZvRnJvbVNlc3Npb24oY29uc3QgUlRD TmV0d29yazo6U29ja2V0CiB9CiAjZW5kaWYKIAotdm9pZCBOZXR3b3JrUlRDUHJvdmlkZXI6OmNy ZWF0ZUNsaWVudFRDUFNvY2tldChMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIs IGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MmIGxvY2FsQWRkcmVzcywgY29uc3QgUlRD TmV0d29yazo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRkcmVzcywgU3RyaW5nJiYgdXNlckFnZW50 LCBpbnQgb3B0aW9ucykKK3ZvaWQgTmV0d29ya1JUQ1Byb3ZpZGVyOjpjcmVhdGVDbGllbnRUQ1BT b2NrZXQoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBjb25zdCBSVENOZXR3 b3JrOjpTb2NrZXRBZGRyZXNzJiBsb2NhbEFkZHJlc3MsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tl dEFkZHJlc3MmIHJlbW90ZUFkZHJlc3MsIFN0cmluZyYmIHVzZXJBZ2VudCwgaW50IG9wdGlvbnMs IGJvb2wgaXNSZWxheURpc2FibGVkKQogewotICAgIGNhbGxPbk1haW5SdW5Mb29wKFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGlkZW50aWZpZXIsIGxvY2FsQWRkcmVzcywg cmVtb3RlQWRkcmVzcywgdXNlckFnZW50ID0gV1RGTW92ZSh1c2VyQWdlbnQpLmlzb2xhdGVkQ29w eSgpLCBvcHRpb25zXSgpIG11dGFibGUgeworICAgIGNhbGxPbk1haW5SdW5Mb29wKFt0aGlzLCBw cm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGlkZW50aWZpZXIsIGxvY2FsQWRkcmVzcywg cmVtb3RlQWRkcmVzcywgdXNlckFnZW50ID0gV1RGTW92ZSh1c2VyQWdlbnQpLmlzb2xhdGVkQ29w eSgpLCBvcHRpb25zLCBpc1JlbGF5RGlzYWJsZWRdKCkgbXV0YWJsZSB7CiAgICAgICAgIGlmICgh bV9jb25uZWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCkBAIC0xODgsMTAgKzE4OCwxMCBA QCB2b2lkIE5ldHdvcmtSVENQcm92aWRlcjo6Y3JlYXRlQ2xpZW50VENQU29ja2V0KExpYldlYlJU Q1NvY2tldElkZW50aWZpZXIgaWRlbnRpZgogICAgICAgICAgICAgbV9jb25uZWN0aW9uLT5jb25u ZWN0aW9uKCkuc2VuZChNZXNzYWdlczo6TGliV2ViUlRDTmV0d29yazo6U2lnbmFsQ2xvc2UoaWRl bnRpZmllciwgMSksIDApOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAg IGNhbGxPblJUQ05ldHdvcmtUaHJlYWQoW3RoaXMsIGlkZW50aWZpZXIsIGxvY2FsQWRkcmVzcyA9 IFJUQ05ldHdvcms6Omlzb2xhdGVkQ29weShsb2NhbEFkZHJlc3MudmFsdWUpLCByZW1vdGVBZGRy ZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5KHJlbW90ZUFkZHJlc3MudmFsdWUpLCBwcm94 eUluZm8gPSBwcm94eUluZm9Gcm9tU2Vzc2lvbihyZW1vdGVBZGRyZXNzLCAqc2Vzc2lvbiksIHVz ZXJBZ2VudCA9IFdURk1vdmUodXNlckFnZW50KS5pc29sYXRlZENvcHkoKSwgb3B0aW9uc10oKSBt dXRhYmxlIHsKKyAgICAgICAgY2FsbE9uUlRDTmV0d29ya1RocmVhZChbdGhpcywgaWRlbnRpZmll ciwgbG9jYWxBZGRyZXNzID0gUlRDTmV0d29yazo6aXNvbGF0ZWRDb3B5KGxvY2FsQWRkcmVzcy52 YWx1ZSksIHJlbW90ZUFkZHJlc3MgPSBSVENOZXR3b3JrOjppc29sYXRlZENvcHkocmVtb3RlQWRk cmVzcy52YWx1ZSksIHByb3h5SW5mbyA9IHByb3h5SW5mb0Zyb21TZXNzaW9uKHJlbW90ZUFkZHJl c3MsICpzZXNzaW9uKSwgdXNlckFnZW50ID0gV1RGTW92ZSh1c2VyQWdlbnQpLmlzb2xhdGVkQ29w eSgpLCBvcHRpb25zLCBpc1JlbGF5RGlzYWJsZWRdKCkgbXV0YWJsZSB7CiAjaWYgUExBVEZPUk0o Q09DT0EpCiAgICAgICAgICAgICBpZiAobV9wbGF0Zm9ybVRDUFNvY2tldHNFbmFibGVkKSB7Ci0g ICAgICAgICAgICAgICAgaWYgKGF1dG8gc29ja2V0ID0gTmV0d29ya1JUQ1RDUFNvY2tldENvY29h OjpjcmVhdGVDbGllbnRUQ1BTb2NrZXQoaWRlbnRpZmllciwgKnRoaXMsIHJlbW90ZUFkZHJlc3Ms IG9wdGlvbnMsIG1faXBjQ29ubmVjdGlvbi5jb3B5UmVmKCkpKSB7CisgICAgICAgICAgICAgICAg aWYgKGF1dG8gc29ja2V0ID0gTmV0d29ya1JUQ1RDUFNvY2tldENvY29hOjpjcmVhdGVDbGllbnRU Q1BTb2NrZXQoaWRlbnRpZmllciwgKnRoaXMsIHJlbW90ZUFkZHJlc3MsIG9wdGlvbnMsIGlzUmVs YXlEaXNhYmxlZCwgbV9pcGNDb25uZWN0aW9uLmNvcHlSZWYoKSkpIHsKICAgICAgICAgICAgICAg ICAgICAgYWRkU29ja2V0KGlkZW50aWZpZXIsIFdURk1vdmUoc29ja2V0KSk7CiAgICAgICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIuaCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5oCmluZGV4 IGJmZmZlYmM0YWU5Y2YzZmQ4YTUxZWQ1NzgxNDBjZGU5ODM3YWFhMzAuLmM5Y2NlZDYyZmM2MjU5 ZjUzYWYyNDc1ZTBhMzRjMDAzMTlhMzg5NWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5oCisrKyBiL1NvdXJjZS9XZWJL aXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQcm92aWRlci5oCkBAIC0xMTQsNyAr MTE0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHN0YXJ0TGlzdGVuaW5nRm9ySVBDKCk7CiAKICAg ICB2b2lkIGNyZWF0ZVVEUFNvY2tldChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVy LCBjb25zdCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzJiwgdWludDE2X3QsIHVpbnQxNl90LCBi b29sIGlzRmlyc3RQYXJ0eSwgYm9vbCBpc1JlbGF5RGlzYWJsZWQsIFdlYkNvcmU6OlJlZ2lzdHJh YmxlRG9tYWluJiYpOwotICAgIHZvaWQgY3JlYXRlQ2xpZW50VENQU29ja2V0KFdlYkNvcmU6Okxp YldlYlJUQ1NvY2tldElkZW50aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3Mm LCBjb25zdCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzJiwgU3RyaW5nJiYgdXNlckFnZW50LCBp bnQpOworICAgIHZvaWQgY3JlYXRlQ2xpZW50VENQU29ja2V0KFdlYkNvcmU6OkxpYldlYlJUQ1Nv Y2tldElkZW50aWZpZXIsIGNvbnN0IFJUQ05ldHdvcms6OlNvY2tldEFkZHJlc3MmLCBjb25zdCBS VENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzJiwgU3RyaW5nJiYgdXNlckFnZW50LCBpbnQsIGJvb2wg aXNSZWxheURpc2FibGVkKTsKICAgICB2b2lkIGNyZWF0ZVNlcnZlclRDUFNvY2tldChXZWJDb3Jl OjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyLCBjb25zdCBSVENOZXR3b3JrOjpTb2NrZXRBZGRy ZXNzJiwgdWludDE2X3QgbWluUG9ydCwgdWludDE2X3QgbWF4UG9ydCwgaW50KTsKICAgICB2b2lk IHdyYXBOZXdUQ1BDb25uZWN0aW9uKFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIg aWRlbnRpZmllciwgV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBuZXdDb25uZWN0 aW9uU29ja2V0SWRlbnRpZmllcik7CiAgICAgdm9pZCBzZW5kVG9Tb2NrZXQoV2ViQ29yZTo6TGli V2ViUlRDU29ja2V0SWRlbnRpZmllciwgY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiwgUlRDTmV0 d29yazo6U29ja2V0QWRkcmVzcyYmLCBSVENQYWNrZXRPcHRpb25zJiYpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1Byb3ZpZGVyLm1l c3NhZ2VzLmluIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JU Q1Byb3ZpZGVyLm1lc3NhZ2VzLmluCmluZGV4IDE5NTQwOTZhYjE1NjFhN2E3ZmRmNWM1MGUzYTMw MzI0ODY0NmUzNjYuLjdmN2Q3OWVjNTE2YThjZWNhYzJiYmQ4OTg4MWVkMWJkYTMyYmNkNDMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENQ cm92aWRlci5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dl YnJ0Yy9OZXR3b3JrUlRDUHJvdmlkZXIubWVzc2FnZXMuaW4KQEAgLTI1LDcgKzI1LDcgQEAKIG1l c3NhZ2VzIC0+IE5ldHdvcmtSVENQcm92aWRlciB7CiAgICAgQ3JlYXRlVURQU29ja2V0KFdlYkNv cmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwgV2ViS2l0OjpSVENOZXR3 b3JrOjpTb2NrZXRBZGRyZXNzIGxvY2FsQWRkcmVzcywgdWludDE2X3QgbWluUG9ydCwgdWludDE2 X3QgbWF4UG9ydCwgYm9vbCBpc0ZpcnN0UGFydHksIGJvb2wgaXNSZWxheURpc2FibGVkLCBXZWJD b3JlOjpSZWdpc3RyYWJsZURvbWFpbiBkb21haW4pCiAgICAgQ3JlYXRlU2VydmVyVENQU29ja2V0 KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwgV2ViS2l0OjpS VENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzIGxvY2FsQWRkcmVzcywgdWludDE2X3QgbWluUG9ydCwg dWludDE2X3QgbWF4UG9ydCwgaW50IG9wdGlvbnMpCi0gICAgQ3JlYXRlQ2xpZW50VENQU29ja2V0 KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRpZmllciwgV2ViS2l0OjpS VENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzIGxvY2FsQWRkcmVzcywgV2ViS2l0OjpSVENOZXR3b3Jr OjpTb2NrZXRBZGRyZXNzIHJlbW90ZUFkZHJlc3MsIFN0cmluZyB1c2VyQWdlbnQsIGludCBvcHRp b25zKQorICAgIENyZWF0ZUNsaWVudFRDUFNvY2tldChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJ ZGVudGlmaWVyIGlkZW50aWZpZXIsIFdlYktpdDo6UlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyBs b2NhbEFkZHJlc3MsIFdlYktpdDo6UlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyByZW1vdGVBZGRy ZXNzLCBTdHJpbmcgdXNlckFnZW50LCBpbnQgb3B0aW9ucywgYm9vbCBpc1JlbGF5RGlzYWJsZWQp CiAgICAgV3JhcE5ld1RDUENvbm5lY3Rpb24oV2ViQ29yZTo6TGliV2ViUlRDU29ja2V0SWRlbnRp ZmllciBpZGVudGlmaWVyLCBXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIG5ld0Nv bm5lY3Rpb25Tb2NrZXRJZGVudGlmaWVyKQogCiAgICAgdm9pZCBTZXRQbGF0Zm9ybVRDUFNvY2tl dHNFbmFibGVkKGJvb2wgZW5hYmxlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYS5oIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tldENvY29hLmgKaW5kZXgg M2U1ZmE5NGMzMTQ3ZDU1N2Y1MWRlMDE3ZTQ2OGNjMTQ3OGQ4YWQ4OS4uZjQxMjVkM2NiMDhmZWNm OTI2MzYzMzg3YjljYTAwMzQzZDgyZGEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tldENvY29hLmgKKysrIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tldENvY29hLmgK QEAgLTM5LDkgKzM5LDkgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBOZXR3b3JrUlRDVENQ U29ja2V0Q29jb2EgZmluYWwgOiBwdWJsaWMgTmV0d29ya1JUQ1Byb3ZpZGVyOjpTb2NrZXQgewog ICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwogcHVibGljOgotICAgIHN0YXRpYyBzdGQ6OnVu aXF1ZV9wdHI8TmV0d29ya1JUQ1Byb3ZpZGVyOjpTb2NrZXQ+IGNyZWF0ZUNsaWVudFRDUFNvY2tl dChXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyLCBOZXR3b3JrUlRDUHJvdmlkZXIm LCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmLCBpbnQgb3B0aW9ucywgUmVmPElQQzo6Q29ubmVj dGlvbj4mJik7CisgICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxOZXR3b3JrUlRDUHJvdmlkZXI6 OlNvY2tldD4gY3JlYXRlQ2xpZW50VENQU29ja2V0KFdlYkNvcmU6OkxpYldlYlJUQ1NvY2tldElk ZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYs IGludCBvcHRpb25zLCBib29sIGlzUmVsYXlEaXNhYmxlZCwgUmVmPElQQzo6Q29ubmVjdGlvbj4m Jik7CiAKLSAgICBOZXR3b3JrUlRDVENQU29ja2V0Q29jb2EoV2ViQ29yZTo6TGliV2ViUlRDU29j a2V0SWRlbnRpZmllciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiwgY29uc3QgcnRjOjpTb2NrZXRBZGRy ZXNzJiwgaW50IG9wdGlvbnMsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYpOworICAgIE5ldHdvcmtS VENUQ1BTb2NrZXRDb2NvYShXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyLCBOZXR3 b3JrUlRDUHJvdmlkZXImLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmLCBpbnQgb3B0aW9ucywg Ym9vbCBpc1JlbGF5RGlzYWJsZWQsIFJlZjxJUEM6OkNvbm5lY3Rpb24+JiYpOwogCiBwcml2YXRl OgogICAgIC8vIE5ldHdvcmtSVENQcm92aWRlcjo6U29ja2V0LgpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tldENvY29hLm1t IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy93ZWJydGMvTmV0d29ya1JUQ1RDUFNvY2tl dENvY29hLm1tCmluZGV4IGZhZmZkMmM5ZmI5ZDI5ZTUwMmRhOTlhOTkzMmQ0NDBiNWJjZmI5N2Eu LjNmYmQwZTBiMmFmMGEyZmFhZDVlMDI0NjJiYTdjMjgyOTU3MDY2NjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvd2VicnRjL05ldHdvcmtSVENUQ1BTb2NrZXRDb2Nv YS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL3dlYnJ0Yy9OZXR3b3JrUlRD VENQU29ja2V0Q29jb2EubW0KQEAgLTUwLDEyICs1MCwxMiBAQCBzdGF0aWMgZGlzcGF0Y2hfcXVl dWVfdCB0Y3BTb2NrZXRRdWV1ZSgpCiAgICAgcmV0dXJuIHF1ZXVlOwogfQogCi1zdGQ6OnVuaXF1 ZV9wdHI8TmV0d29ya1JUQ1Byb3ZpZGVyOjpTb2NrZXQ+IE5ldHdvcmtSVENUQ1BTb2NrZXRDb2Nv YTo6Y3JlYXRlQ2xpZW50VENQU29ja2V0KExpYldlYlJUQ1NvY2tldElkZW50aWZpZXIgaWRlbnRp ZmllciwgTmV0d29ya1JUQ1Byb3ZpZGVyJiBydGNQcm92aWRlciwgY29uc3QgcnRjOjpTb2NrZXRB ZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBpbnQgdGNwT3B0aW9ucywgUmVmPElQQzo6Q29ubmVjdGlv bj4mJiBjb25uZWN0aW9uKQorc3RkOjp1bmlxdWVfcHRyPE5ldHdvcmtSVENQcm92aWRlcjo6U29j a2V0PiBOZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6OmNyZWF0ZUNsaWVudFRDUFNvY2tldChMaWJX ZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYgcnRj UHJvdmlkZXIsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRkcmVzcywgaW50IHRj cE9wdGlvbnMsIGJvb2wgaXNSZWxheURpc2FibGVkLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmIGNv bm5lY3Rpb24pCiB7CiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBtaWdyYXRlIHNzbHRjcCBjYW5k aWRhdGVzLCBtYXliZSBzdXBwb3J0IE9QVF9UTFNfSU5TRUNVUkUgYXMgd2VsbC4KICAgICBpZiAo KHRjcE9wdGlvbnMgJiBydGM6OlBhY2tldFNvY2tldEZhY3Rvcnk6Ok9QVF9UTFNfRkFLRSkgfHwg KHRjcE9wdGlvbnMgJiBydGM6OlBhY2tldFNvY2tldEZhY3Rvcnk6Ok9QVF9UTFNfSU5TRUNVUkUp KQogICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICByZXR1cm4gbWFrZVVuaXF1ZTxOZXR3b3Jr UlRDVENQU29ja2V0Q29jb2E+KGlkZW50aWZpZXIsIHJ0Y1Byb3ZpZGVyLCByZW1vdGVBZGRyZXNz LCB0Y3BPcHRpb25zLCBXVEZNb3ZlKGNvbm5lY3Rpb24pKTsKKyAgICByZXR1cm4gbWFrZVVuaXF1 ZTxOZXR3b3JrUlRDVENQU29ja2V0Q29jb2E+KGlkZW50aWZpZXIsIHJ0Y1Byb3ZpZGVyLCByZW1v dGVBZGRyZXNzLCB0Y3BPcHRpb25zLCBpc1JlbGF5RGlzYWJsZWQsIFdURk1vdmUoY29ubmVjdGlv bikpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgcHJvY2Vzc0luY29taW5nRGF0YShSZXRhaW5Q dHI8bndfY29ubmVjdGlvbl90PiYmIG53Q29ubmVjdGlvbiwgRnVuY3Rpb248VmVjdG9yPHVpbnQ4 X3Q+KFZlY3Rvcjx1aW50OF90PiYmKT4mJiBwcm9jZXNzRGF0YSwgVmVjdG9yPHVpbnQ4X3Q+JiYg YnVmZmVyID0geyB9KQpAQCAtODAsNyArODAsNyBAQCBzdGF0aWMgaW5saW5lIHZvaWQgcHJvY2Vz c0luY29taW5nRGF0YShSZXRhaW5QdHI8bndfY29ubmVjdGlvbl90PiYmIG53Q29ubmVjdGlvbgog ICAgIH0pLmdldCgpKTsKIH0KIAotTmV0d29ya1JUQ1RDUFNvY2tldENvY29hOjpOZXR3b3JrUlRD VENQU29ja2V0Q29jb2EoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGVudGlmaWVyLCBOZXR3 b3JrUlRDUHJvdmlkZXImIHJ0Y1Byb3ZpZGVyLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIHJl bW90ZUFkZHJlc3MsIGludCBvcHRpb25zLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmIGNvbm5lY3Rp b24pCitOZXR3b3JrUlRDVENQU29ja2V0Q29jb2E6Ok5ldHdvcmtSVENUQ1BTb2NrZXRDb2NvYShM aWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIGlkZW50aWZpZXIsIE5ldHdvcmtSVENQcm92aWRlciYg cnRjUHJvdmlkZXIsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRkcmVzcywgaW50 IG9wdGlvbnMsIGJvb2wgaXNSZWxheURpc2FibGVkLCBSZWY8SVBDOjpDb25uZWN0aW9uPiYmIGNv bm5lY3Rpb24pCiAgICAgOiBtX2lkZW50aWZpZXIoaWRlbnRpZmllcikKICAgICAsIG1fcnRjUHJv dmlkZXIocnRjUHJvdmlkZXIpCiAgICAgLCBtX2Nvbm5lY3Rpb24oV1RGTW92ZShjb25uZWN0aW9u KSkKQEAgLTk4LDYgKzk4LDggQEAgTmV0d29ya1JUQ1RDUFNvY2tldENvY29hOjpOZXR3b3JrUlRD VENQU29ja2V0Q29jb2EoTGliV2ViUlRDU29ja2V0SWRlbnRpZmllciBpZGUKIAogICAgIGlmIChh dXRvIHRva2VuID0gcnRjUHJvdmlkZXIuc291cmNlQXBwbGljYXRpb25BdWRpdFRva2VuKCkpCiAg ICAgICAgIG53X3BhcmFtZXRlcnNfc2V0X3NvdXJjZV9hcHBsaWNhdGlvbih0Y3BUTFMuZ2V0KCks ICp0b2tlbik7CisgICAgaWYgKGlzUmVsYXlEaXNhYmxlZCkKKyAgICAgICAgbndfcGFyYW1ldGVy c19zZXRfYWNjb3VudF9pZCh0Y3BUTFMuZ2V0KCksICJjb20uYXBwbGUuc2FmYXJpLnBlZXJ0b3Bl ZXIiKTsKIAogICAgIG1fbndDb25uZWN0aW9uID0gYWRvcHROUyhud19jb25uZWN0aW9uX2NyZWF0 ZShob3N0LmdldCgpLCB0Y3BUTFMuZ2V0KCkpKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmNwcCBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENQcm92aWRlci5jcHAK aW5kZXggNTIyMmJiOWQwMTJiMTY1M2IwN2ZiMDlkNGYxZjc4N2I2YTdkZThiOC4uZmZiM2FhMGI3 MGU2Y2FlMzlmNDkyNWNiMmMyZTJlMDA2Mjk1N2M0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay93ZWJydGMvTGliV2ViUlRDUHJvdmlkZXIu Y3BwCkBAIC05MCw2ICs5MCw4IEBAIGNsYXNzIFJUQ1NvY2tldEZhY3RvcnkgZmluYWwgOiBwdWJs aWMgTGliV2ViUlRDUHJvdmlkZXI6OlN1c3BlbmRhYmxlU29ja2V0RmFjdG9yCiBwdWJsaWM6CiAg ICAgUlRDU29ja2V0RmFjdG9yeShTdHJpbmcmJiB1c2VyQWdlbnQsIGJvb2wgaXNGaXJzdFBhcnR5 LCBSZWdpc3RyYWJsZURvbWFpbiYmKTsKIAorICAgIHZvaWQgZGlzYWJsZVJlbGF5KCkgZmluYWwg eyBtX2lzUmVsYXlEaXNhYmxlZCA9IHRydWU7IH0KKwogcHJpdmF0ZToKICAgICAvLyBTdXNwZW5k YWJsZVNvY2tldEZhY3RvcnkKICAgICBydGM6OkFzeW5jUGFja2V0U29ja2V0KiBDcmVhdGVVZHBT b2NrZXQoY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiwgdWludDE2X3QgbWluUG9ydCwgdWludDE2 X3QgbWF4UG9ydCkgZmluYWw7CkBAIC05OCw3ICsxMDAsNiBAQCBwcml2YXRlOgogICAgIHJ0Yzo6 QXN5bmNSZXNvbHZlckludGVyZmFjZSogQ3JlYXRlQXN5bmNSZXNvbHZlcigpIGZpbmFsOwogICAg IHZvaWQgc3VzcGVuZCgpIGZpbmFsOwogICAgIHZvaWQgcmVzdW1lKCkgZmluYWw7Ci0gICAgdm9p ZCBkaXNhYmxlUmVsYXkoKSBmaW5hbCB7IG1faXNSZWxheURpc2FibGVkID0gdHJ1ZTsgfQogCiBw cml2YXRlOgogICAgIFN0cmluZyBtX3VzZXJBZ2VudDsKQEAgLTEyNiw3ICsxMjcsNyBAQCBydGM6 OkFzeW5jUGFja2V0U29ja2V0KiBSVENTb2NrZXRGYWN0b3J5OjpDcmVhdGVTZXJ2ZXJUY3BTb2Nr ZXQoY29uc3QgcnRjOjpTb2NrZQogCiBydGM6OkFzeW5jUGFja2V0U29ja2V0KiBSVENTb2NrZXRG YWN0b3J5OjpDcmVhdGVDbGllbnRUY3BTb2NrZXQoY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiBs b2NhbEFkZHJlc3MsIGNvbnN0IHJ0Yzo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRkcmVzcywgY29u c3QgcnRjOjpQcm94eUluZm8mLCBjb25zdCBzdGQ6OnN0cmluZyYsIGNvbnN0IHJ0Yzo6UGFja2V0 U29ja2V0VGNwT3B0aW9ucyYgb3B0aW9ucykKIHsKLSAgICByZXR1cm4gV2ViUHJvY2Vzczo6c2lu Z2xldG9uKCkubGliV2ViUlRDTmV0d29yaygpLnNvY2tldEZhY3RvcnkoKS5jcmVhdGVDbGllbnRU Y3BTb2NrZXQodGhpcywgbG9jYWxBZGRyZXNzLCByZW1vdGVBZGRyZXNzLCBTdHJpbmcgeyBtX3Vz ZXJBZ2VudCB9LCBvcHRpb25zKTsKKyAgICByZXR1cm4gV2ViUHJvY2Vzczo6c2luZ2xldG9uKCku bGliV2ViUlRDTmV0d29yaygpLnNvY2tldEZhY3RvcnkoKS5jcmVhdGVDbGllbnRUY3BTb2NrZXQo dGhpcywgbG9jYWxBZGRyZXNzLCByZW1vdGVBZGRyZXNzLCBTdHJpbmcgeyBtX3VzZXJBZ2VudCB9 LCBvcHRpb25zLCBtX2lzUmVsYXlEaXNhYmxlZCk7CiB9CiAKIHJ0Yzo6QXN5bmNSZXNvbHZlcklu dGVyZmFjZSogUlRDU29ja2V0RmFjdG9yeTo6Q3JlYXRlQXN5bmNSZXNvbHZlcigpCkBAIC0xNTks NyArMTYwLDEzIEBAIHZvaWQgTGliV2ViUlRDUHJvdmlkZXI6OnN0YXJ0ZWROZXR3b3JrVGhyZWFk KCkKIAogc3RkOjp1bmlxdWVfcHRyPExpYldlYlJUQ1Byb3ZpZGVyOjpTdXNwZW5kYWJsZVNvY2tl dEZhY3Rvcnk+IExpYldlYlJUQ1Byb3ZpZGVyOjpjcmVhdGVTb2NrZXRGYWN0b3J5KFN0cmluZyYm IHVzZXJBZ2VudCwgYm9vbCBpc0ZpcnN0UGFydHksIFJlZ2lzdHJhYmxlRG9tYWluJiYgZG9tYWlu KQogewotICAgIHJldHVybiBtYWtlVW5pcXVlPFJUQ1NvY2tldEZhY3Rvcnk+KFdURk1vdmUodXNl ckFnZW50KSwgaXNGaXJzdFBhcnR5LCBXVEZNb3ZlKGRvbWFpbikpOworICAgIGF1dG8gZmFjdG9y eSA9IG1ha2VVbmlxdWU8UlRDU29ja2V0RmFjdG9yeT4oV1RGTW92ZSh1c2VyQWdlbnQpLCBpc0Zp cnN0UGFydHksIFdURk1vdmUoZG9tYWluKSk7CisKKyAgICBhdXRvKiBwYWdlID0gbV93ZWJQYWdl LmNvcmVQYWdlKCk7CisgICAgaWYgKCFwYWdlIHx8ICFwYWdlLT5zZXR0aW5ncygpLndlYlJUQ1Nv Y2tldHNQcm94eWluZ0VuYWJsZWQoKSkKKyAgICAgICAgZmFjdG9yeS0+ZGlzYWJsZVJlbGF5KCk7 CisKKyAgICByZXR1cm4gZmFjdG9yeTsKIH0KIAogUmVmUHRyPFJUQ0RhdGFDaGFubmVsUmVtb3Rl SGFuZGxlckNvbm5lY3Rpb24+IExpYldlYlJUQ1Byb3ZpZGVyOjpjcmVhdGVSVENEYXRhQ2hhbm5l bFJlbW90ZUhhbmRsZXJDb25uZWN0aW9uKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJXZWJSVENQcm92aWRlci5oIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmgKaW5kZXggNjA1 OGU1NGMxNTM4OTQ4ZDhhNmI0NDM1MjdkNTNjMGQ4NzhhYmZmOS4uNzJhZDNhNDI5ZmVmYmZhMWQ0 Y2FlZjVjMmJmN2M5NTczMDFlMTIwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmgKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1Byb3ZpZGVyLmgKQEAgLTYzLDE2 ICs2MywxNCBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxXZWJDb3JlOjpSVENEYXRhQ2hhbm5lbFJl bW90ZUhhbmRsZXJDb25uZWN0aW9uPiBjcmVhdGVSVENEYXRhQ2hhbm5lbFJlbW90ZUhhbmRsZXJD b25uZWN0aW9uKCkgZmluYWw7CiAgICAgdm9pZCBzZXRMb2dnaW5nTGV2ZWwoV1RGTG9nTGV2ZWwp IGZpbmFsOwogCi0jaWYgRU5BQkxFKEdQVV9QUk9DRVNTKSAmJiBQTEFURk9STShDT0NPQSkgJiYg IVBMQVRGT1JNKE1BQ0NBVEFMWVNUKQogICAgIFdlYlBhZ2UmIG1fd2ViUGFnZTsKKyNpZiBFTkFC TEUoR1BVX1BST0NFU1MpICYmIFBMQVRGT1JNKENPQ09BKSAmJiAhUExBVEZPUk0oTUFDQ0FUQUxZ U1QpCiAgICAgYm9vbCBtX2RpZEluaXRpYWxpemVDYWxsYmFjayB7IGZhbHNlIH07CiAjZW5kaWYK IH07CiAKIGlubGluZSBMaWJXZWJSVENQcm92aWRlcjo6TGliV2ViUlRDUHJvdmlkZXIoV2ViUGFn ZSYgd2ViUGFnZSkKLSNpZiBFTkFCTEUoR1BVX1BST0NFU1MpICYmIFBMQVRGT1JNKENPQ09BKSAm JiAhUExBVEZPUk0oTUFDQ0FUQUxZU1QpCiAgICAgOiBtX3dlYlBhZ2Uod2ViUGFnZSkKLSNlbmRp ZgogewogICAgIG1fdXNlTmV0d29ya1RocmVhZFdpdGhTb2NrZXRTZXJ2ZXIgPSBmYWxzZTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0Yy9MaWJX ZWJSVENTb2NrZXRGYWN0b3J5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3Jr L3dlYnJ0Yy9MaWJXZWJSVENTb2NrZXRGYWN0b3J5LmNwcAppbmRleCBhMzkzOWJjMTQ1ZTBiOTgz ZGIxOGI3OWFkN2E2MmZlNjk2NjZjYjM5Li4yMDI3YzI4ODA3NTJiYTU1N2ZjMmNlMzM5YWZkNzMy M2UzMzI0YTBmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay93 ZWJydGMvTGliV2ViUlRDU29ja2V0RmFjdG9yeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJUQ1NvY2tldEZhY3RvcnkuY3BwCkBAIC0xMDQs NyArMTA0LDcgQEAgcnRjOjpBc3luY1BhY2tldFNvY2tldCogTGliV2ViUlRDU29ja2V0RmFjdG9y eTo6Y3JlYXRlVWRwU29ja2V0KGNvbnN0IHZvaWQqIHNvY2sKICAgICByZXR1cm4gc29ja2V0LnJl bGVhc2UoKTsKIH0KIAotcnRjOjpBc3luY1BhY2tldFNvY2tldCogTGliV2ViUlRDU29ja2V0RmFj dG9yeTo6Y3JlYXRlQ2xpZW50VGNwU29ja2V0KGNvbnN0IHZvaWQqIHNvY2tldEdyb3VwLCBjb25z dCBydGM6OlNvY2tldEFkZHJlc3MmIGxvY2FsQWRkcmVzcywgY29uc3QgcnRjOjpTb2NrZXRBZGRy ZXNzJiByZW1vdGVBZGRyZXNzLCBTdHJpbmcmJiB1c2VyQWdlbnQsIGNvbnN0IHJ0Yzo6UGFja2V0 U29ja2V0VGNwT3B0aW9ucyYgb3B0aW9ucykKK3J0Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIExpYldl YlJUQ1NvY2tldEZhY3Rvcnk6OmNyZWF0ZUNsaWVudFRjcFNvY2tldChjb25zdCB2b2lkKiBzb2Nr ZXRHcm91cCwgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiBsb2NhbEFkZHJlc3MsIGNvbnN0IHJ0 Yzo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRkcmVzcywgU3RyaW5nJiYgdXNlckFnZW50LCBjb25z dCBydGM6OlBhY2tldFNvY2tldFRjcE9wdGlvbnMmIG9wdGlvbnMsIGJvb2wgaXNSZWxheURpc2Fi bGVkKQogewogICAgIEFTU0VSVCghV1RGOjppc01haW5SdW5Mb29wKCkpOwogCkBAIC0xMTMsMTMg KzExMywxMyBAQCBydGM6OkFzeW5jUGFja2V0U29ja2V0KiBMaWJXZWJSVENTb2NrZXRGYWN0b3J5 OjpjcmVhdGVDbGllbnRUY3BTb2NrZXQoY29uc3Qgdm9pZAogCiAgICAgLy8gRklYTUU6IFdlIG9u bHkgdHJhbnNmZXIgb3B0aW9ucy5vcHRzIGJ1dCBzaG91bGQgYWxzbyBoYW5kbGUgb3RoZXIgbWVt YmVycy4KICAgICBpZiAobV9jb25uZWN0aW9uKQotICAgICAgICBtX2Nvbm5lY3Rpb24tPnNlbmQo TWVzc2FnZXM6Ok5ldHdvcmtSVENQcm92aWRlcjo6Q3JlYXRlQ2xpZW50VENQU29ja2V0KHNvY2tl dC0+aWRlbnRpZmllcigpLCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBhcmVTb2NrZXRB ZGRyZXNzKGxvY2FsQWRkcmVzcywgbV9kaXNhYmxlTm9uTG9jYWxob3N0Q29ubmVjdGlvbnMpKSwg UlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyhwcmVwYXJlU29ja2V0QWRkcmVzcyhyZW1vdGVBZGRy ZXNzLCBtX2Rpc2FibGVOb25Mb2NhbGhvc3RDb25uZWN0aW9ucykpLCB1c2VyQWdlbnQsIG9wdGlv bnMub3B0cyksIDApOworICAgICAgICBtX2Nvbm5lY3Rpb24tPnNlbmQoTWVzc2FnZXM6Ok5ldHdv cmtSVENQcm92aWRlcjo6Q3JlYXRlQ2xpZW50VENQU29ja2V0KHNvY2tldC0+aWRlbnRpZmllcigp LCBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBhcmVTb2NrZXRBZGRyZXNzKGxvY2FsQWRk cmVzcywgbV9kaXNhYmxlTm9uTG9jYWxob3N0Q29ubmVjdGlvbnMpKSwgUlRDTmV0d29yazo6U29j a2V0QWRkcmVzcyhwcmVwYXJlU29ja2V0QWRkcmVzcyhyZW1vdGVBZGRyZXNzLCBtX2Rpc2FibGVO b25Mb2NhbGhvc3RDb25uZWN0aW9ucykpLCB1c2VyQWdlbnQsIG9wdGlvbnMub3B0cywgIGlzUmVs YXlEaXNhYmxlZCksIDApOwogICAgIGVsc2UgewogICAgICAgICBjYWxsT25NYWluUnVuTG9vcChb XSB7CiAgICAgICAgICAgICBXZWJQcm9jZXNzOjpzaW5nbGV0b24oKS5lbnN1cmVOZXR3b3JrUHJv Y2Vzc0Nvbm5lY3Rpb24oKTsKICAgICAgICAgfSk7Ci0gICAgICAgIG1fcGVuZGluZ01lc3NhZ2VU YXNrcy5hcHBlbmQoW2lkZW50aWZpZXIgPSBzb2NrZXQtPmlkZW50aWZpZXIoKSwgbG9jYWxBZGRy ZXNzID0gUlRDTmV0d29yazo6U29ja2V0QWRkcmVzcyhwcmVwYXJlU29ja2V0QWRkcmVzcyhsb2Nh bEFkZHJlc3MsIG1fZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5lY3Rpb25zKSksIHJlbW90ZUFkZHJl c3MgPSBSVENOZXR3b3JrOjpTb2NrZXRBZGRyZXNzKHByZXBhcmVTb2NrZXRBZGRyZXNzKHJlbW90 ZUFkZHJlc3MsIG1fZGlzYWJsZU5vbkxvY2FsaG9zdENvbm5lY3Rpb25zKSksIHVzZXJBZ2VudCwg b3B0cyA9IG9wdGlvbnMub3B0c10oYXV0byYgY29ubmVjdGlvbikgewotICAgICAgICAgICAgY29u bmVjdGlvbi5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUlRDUHJvdmlkZXI6OkNyZWF0ZUNsaWVudFRD UFNvY2tldChpZGVudGlmaWVyLCBsb2NhbEFkZHJlc3MsIHJlbW90ZUFkZHJlc3MsIHVzZXJBZ2Vu dCwgb3B0cyksIDApOworICAgICAgICBtX3BlbmRpbmdNZXNzYWdlVGFza3MuYXBwZW5kKFtpZGVu dGlmaWVyID0gc29ja2V0LT5pZGVudGlmaWVyKCksIGxvY2FsQWRkcmVzcyA9IFJUQ05ldHdvcms6 OlNvY2tldEFkZHJlc3MocHJlcGFyZVNvY2tldEFkZHJlc3MobG9jYWxBZGRyZXNzLCBtX2Rpc2Fi bGVOb25Mb2NhbGhvc3RDb25uZWN0aW9ucykpLCByZW1vdGVBZGRyZXNzID0gUlRDTmV0d29yazo6 U29ja2V0QWRkcmVzcyhwcmVwYXJlU29ja2V0QWRkcmVzcyhyZW1vdGVBZGRyZXNzLCBtX2Rpc2Fi bGVOb25Mb2NhbGhvc3RDb25uZWN0aW9ucykpLCB1c2VyQWdlbnQsIG9wdHMgPSBvcHRpb25zLm9w dHMsIGlzUmVsYXlEaXNhYmxlZF0oYXV0byYgY29ubmVjdGlvbikgeworICAgICAgICAgICAgY29u bmVjdGlvbi5zZW5kKE1lc3NhZ2VzOjpOZXR3b3JrUlRDUHJvdmlkZXI6OkNyZWF0ZUNsaWVudFRD UFNvY2tldChpZGVudGlmaWVyLCBsb2NhbEFkZHJlc3MsIHJlbW90ZUFkZHJlc3MsIHVzZXJBZ2Vu dCwgb3B0cywgaXNSZWxheURpc2FibGVkKSwgMCk7CiAgICAgICAgIH0pOwogICAgIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xpYldlYlJU Q1NvY2tldEZhY3RvcnkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL3dlYnJ0 Yy9MaWJXZWJSVENTb2NrZXRGYWN0b3J5LmgKaW5kZXggNzFkMTI0ODI3YWIyYTZlYTI5YjE4OTli ZGMwNzQ0MmI0YjkxYmQ4OC4uN2QwODExNzRmYmZhMTA3OWFhOTI1YTEwODE3MDJmNDBiNTVjYzI2 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsvd2VicnRjL0xp YldlYlJUQ1NvY2tldEZhY3RvcnkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0 d29yay93ZWJydGMvTGliV2ViUlRDU29ja2V0RmFjdG9yeS5oCkBAIC01Myw3ICs1Myw3IEBAIHB1 YmxpYzoKICAgICB2b2lkIGZvclNvY2tldEluR3JvdXAoY29uc3Qgdm9pZCogc29ja2V0R3JvdXAs IGNvbnN0IEZ1bmN0aW9uPHZvaWQoTGliV2ViUlRDU29ja2V0Jik+Jik7CiAgICAgcnRjOjpBc3lu Y1BhY2tldFNvY2tldCogY3JlYXRlVWRwU29ja2V0KGNvbnN0IHZvaWQqIHNvY2tldEdyb3VwLCBj b25zdCBydGM6OlNvY2tldEFkZHJlc3MmLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQ b3J0LCBib29sIGlzRmlyc3RQYXJ0eSwgYm9vbCBpc1JlbGF5RGlzYWJsZWQsIGNvbnN0IFdlYkNv cmU6OlJlZ2lzdHJhYmxlRG9tYWluJik7CiAgICAgcnRjOjpBc3luY1BhY2tldFNvY2tldCogY3Jl YXRlU2VydmVyVGNwU29ja2V0KGNvbnN0IHZvaWQqIHNvY2tldEdyb3VwLCBjb25zdCBydGM6OlNv Y2tldEFkZHJlc3MmLCB1aW50MTZfdCBtaW5Qb3J0LCB1aW50MTZfdCBtYXhQb3J0LCBpbnQgb3B0 aW9ucyk7Ci0gICAgcnRjOjpBc3luY1BhY2tldFNvY2tldCogY3JlYXRlQ2xpZW50VGNwU29ja2V0 KGNvbnN0IHZvaWQqIHNvY2tldEdyb3VwLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmIGxvY2Fs QWRkcmVzcywgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiByZW1vdGVBZGRyZXNzLCBTdHJpbmcm JiB1c2VyQWdlbnQsIGNvbnN0IHJ0Yzo6UGFja2V0U29ja2V0VGNwT3B0aW9ucyYpOworICAgIHJ0 Yzo6QXN5bmNQYWNrZXRTb2NrZXQqIGNyZWF0ZUNsaWVudFRjcFNvY2tldChjb25zdCB2b2lkKiBz b2NrZXRHcm91cCwgY29uc3QgcnRjOjpTb2NrZXRBZGRyZXNzJiBsb2NhbEFkZHJlc3MsIGNvbnN0 IHJ0Yzo6U29ja2V0QWRkcmVzcyYgcmVtb3RlQWRkcmVzcywgU3RyaW5nJiYgdXNlckFnZW50LCBj b25zdCBydGM6OlBhY2tldFNvY2tldFRjcE9wdGlvbnMmLCBib29sIGlzUmVsYXlEaXNhYmxlZCk7 CiAgICAgcnRjOjpBc3luY1BhY2tldFNvY2tldCogY3JlYXRlTmV3Q29ubmVjdGlvblNvY2tldChM aWJXZWJSVENTb2NrZXQmLCBXZWJDb3JlOjpMaWJXZWJSVENTb2NrZXRJZGVudGlmaWVyIG5ld0Nv bm5lY3Rpb25Tb2NrZXRJZGVudGlmaWVyLCBjb25zdCBydGM6OlNvY2tldEFkZHJlc3MmKTsKIAog ICAgIExpYldlYlJUQ1Jlc29sdmVyKiByZXNvbHZlcihMaWJXZWJSVENSZXNvbHZlcklkZW50aWZp ZXIgaWRlbnRpZmllcikgeyByZXR1cm4gbV9yZXNvbHZlcnMuZ2V0KGlkZW50aWZpZXIpOyB9Cg==