227937 2021-07-13 19:05:20 -0700 [iOS] REGRESSION(r279720): changing Subtitles to Off doesn't hide them or do anything 2021-07-14 11:39:24 -0700 1 1 1 Unclassified WebKit Media WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 227742 1 hi hi calvaris cdumez changseok eric.carlson esprehn+autocc ews-watchlist glenn gyuyoung.kim hi jer.noble kangil.han philipj pvollan sergio webkit-bug-importer oldest_to_newest 1776840 0 hi 2021-07-13 19:05:20 -0700 # STEPS TO REPRODUCE 1. go to<https://developer.apple.com/videos/play/wwdc2021/101/> 2. play the video in full screen 3. select any language in the "Subtitles" menu 4. select "Off" in the "Subtitles" menu # EXPECTED no subtitles are shown # ACTUAL subtitles are still shown 1776841 1 hi 2021-07-13 19:05:35 -0700 <rdar://problem/79069662> 1776855 2 433475 hi 2021-07-13 20:58:27 -0700 Created attachment 433475 Patch 1776985 3 ews-feeder 2021-07-14 11:39:20 -0700 Committed r279914 (239663@main): <https://commits.webkit.org/239663@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 433475. 433475 2021-07-13 20:58:27 -0700 2021-07-14 11:39:22 -0700 Patch bug-227937-20210713205826.patch text/plain 25800 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAwNWZjM2Q2OGY1MDFjZDY1YmY5N2E2NWNlMDVlZDAwNzA4OGVhOGRmLi4w ZDM5NWZmMzM2ZGQ0MWM5NjRmNDU2YzFlZTBmNTM3YmQ1N2Y0YzE5IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsNjIgQEAKKzIwMjEtMDctMTMgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFtpT1NdIFJFR1JFU1NJT04ocjI3OTcyMCk6IGNoYW5naW5nIFN1YnRpdGxl cyB0byBPZmYgZG9lc24ndCBoaWRlIHRoZW0gb3IgZG8gYW55dGhpbmcKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNzkzNworICAgICAgICA8cmRhcjov L3Byb2JsZW0vNzkwNjk2NjI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgcjI3OTcyMCBtYWRlIGl0IHNvIHRoYXQgYENhcHRpb25Vc2VyUHJlZmVyZW5j ZXNNZWRpYUFGOjpzZXRDYXB0aW9uRGlzcGxheU1vZGVgIG5vIGxvbmdlcgorICAgICAgICBkaXJl Y3RseSBtb2RpZmllcyBga01BQ2FwdGlvbkFwcGVhcmFuY2VEb21haW5Vc2VyYCBpbiB0aGUgV2Vi UHJvY2VzcywgdXNpbmcgYSBjYWNoZWQgdmFsdWUKKyAgICAgICAgYXMgYSB3YXkgb2YgcHJldmVu dGluZyB0aGUgV2ViUHJvY2VzcyBmcm9tIHRyeWluZyB0byByZWFkIGJhY2sgdGhhdCB2YWx1ZSBh ZnRlciBpdCdzIHNldCwKKyAgICAgICAgaW5zdGVhZCBoYXZpbmcgdGhlIFVJUHJvY2VzcyBzZW5k IGBNZXNzYWdlczo6V2ViUHJvY2Vzczo6U2V0TWVkaWFBY2Nlc3NpYmlsaXR5UHJlZmVyZW5jZXNg CisgICAgICAgIHdoZW5ldmVyIHRoaXMgY2hhbmdlcyB0byB1cGRhdGUgdGhhdCBjYWNoZWQgdmFs dWUuIFVuZm9ydHVuYXRlbHksIGJlY2F1c2UgdGhlIFdlYlByb2Nlc3MKKyAgICAgICAgbmVlZHMg dG8gcmVhZCB0aGlzIHZhbHVlIGltbWVkaWF0ZWx5IGFmdGVyIGNoYW5naW5nIGl0LCB0aGlzIElQ QyByb3VuZCB0cmlwIGNhdXNlcyB0aGUKKyAgICAgICAgV2ViUHJvY2VzcyB0byByZWFkIHRoZSBv bGQgdmFsdWUsIHdoaWNoIHJlc3VsdHMgaW4gbm8gb2JzZXJ2YWJsZSBjaGFuZ2VzLiBJbiBvcmRl ciB0byBmaXgKKyAgICAgICAgdGhpcywgbm90aWZ5IGBDYXB0aW9uVXNlclByZWZlcmVuY2VzYCB0 aGF0IGBjYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2VkYCB3aGVuIHRoZSBhYm92ZSBJUEMKKyAgICAg ICAgbWVzc2FnZSBpcyByZWNlaXZlZCAod2hpY2ggd2lsbCBhbHNvIGhhbmRsZSBjYXNlcyB3aGVu IHRoZSB2YWx1ZSBjaGFuZ2VzIG91dHNpZGUgV2ViS2l0KS4KKworICAgICAgICAqIE1vZHVsZXMv bWVkaWFjb250cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYUNvbnRyb2xzSG9zdDo6c29ydGVkVHJhY2tMaXN0Rm9yTWVudSk6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6ZGlzcGxheU5hbWVGb3JUcmFjayk6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYUNvbnRyb2xzSG9zdDo6Y2FwdGlvbkRpc3BsYXlNb2RlIGNvbnN0KToKKyAg ICAgICAgKFdlYkNvcmU6Ok1lZGlhQ29udHJvbHNIb3N0OjpzaG93TWVkaWFDb250cm9sc0NvbnRl eHRNZW51KToKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnQ6OnJlZ2lzdGVyRm9yQ2FwdGlvblByZWZlcmVuY2VzQ2hhbmdlZENhbGxiYWNrcyk6 CisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkhUTUxNZWRpYUVsZW1lbnQ6OmFkZFRleHRUcmFjayk6CisgICAgICAgIChXZWJDb3JlOjpIVE1M TWVkaWFFbGVtZW50Ojpjb25maWd1cmVUZXh0VHJhY2tHcm91cCk6CisgICAgICAgIChXZWJDb3Jl OjpIVE1MTWVkaWFFbGVtZW50OjpzZXRTZWxlY3RlZFRleHRUcmFjayk6CisgICAgICAgIChXZWJD b3JlOjpIVE1MTWVkaWFFbGVtZW50OjpjYXB0aW9uUHJlZmVyZW5jZXNDaGFuZ2VkKToKKyAgICAg ICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNhcHRpb25EaXNwbGF5TW9kZSk6CisgICAg ICAgIChXZWJDb3JlOjpIVE1MTWVkaWFFbGVtZW50OjptZWRpYVBsYXllclByZWZlcnJlZEF1ZGlv Q2hhcmFjdGVyaXN0aWNzIGNvbnN0KToKKyAgICAgICAgKiBodG1sL3NoYWRvdy9NZWRpYUNvbnRy b2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh Q29udHJvbFRleHRUcmFja0NvbnRhaW5lckVsZW1lbnQ6OnVwZGF0ZUFjdGl2ZUN1ZXNGb250U2l6 ZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVt ZW50Ojp1cGRhdGVUZXh0U3Ryb2tlU3R5bGUpOgorICAgICAgICAqIHBhZ2UvUGFnZUdyb3VwLmg6 CisgICAgICAgIChXZWJDb3JlOjpQYWdlR3JvdXA6OmNhcHRpb25QcmVmZXJlbmNlcyBjb25zdCk6 IEFkZGVkLgorICAgICAgICAqIHBhZ2UvUGFnZUdyb3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OlBhZ2VHcm91cDo6ZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKTogQWRkZWQuCisgICAgICAgIChX ZWJDb3JlOjpQYWdlR3JvdXA6OmNhcHRpb25QcmVmZXJlbmNlcyk6IERlbGV0ZWQuCisgICAgICAg ICogcGxhdGZvcm0vY29jb2EvUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQubW06Cisg ICAgICAgIChXZWJDb3JlOjpQbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlhRWxlbWVudDo6dXBkYXRl TWVkaWFTZWxlY3Rpb25PcHRpb25zKToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXliYWNrU2Vzc2lv bk1vZGVsTWVkaWFFbGVtZW50OjphdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9ucyBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpQbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlhRWxlbWVudDo6bGVnaWJs ZU1lZGlhU2VsZWN0aW9uT3B0aW9ucyBjb25zdCk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5h bFNldHRpbmdzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsU2V0dGluZ3M6OnNldFNo b3VsZERpc3BsYXlUcmFja0tpbmQpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxTZXR0aW5n czo6c2hvdWxkRGlzcGxheVRyYWNrS2luZCk6CisgICAgICAgICogdGVzdGluZy9JbnRlcm5hbHMu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpyZXNldFRvQ29uc2lzdGVudFN0YXRl KToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6SW50ZXJuYWxzKToKKyAgICAgICAgKFdl YkNvcmU6OkludGVybmFsczo6dXNlclByZWZlcnJlZEF1ZGlvQ2hhcmFjdGVyaXN0aWNzIGNvbnN0 KToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0VXNlclByZWZlcnJlZEF1ZGlvQ2hh cmFjdGVyaXN0aWMpOgorICAgICAgICAoV2ViQ29yZTo6SW50ZXJuYWxzOjpjYXB0aW9uc1N0eWxl U2hlZXRPdmVycmlkZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnRlcm5hbHM6OnNldENhcHRpb25z U3R5bGVTaGVldE92ZXJyaWRlKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVybmFsczo6c2V0UHJp bWFyeUF1ZGlvVHJhY2tMYW5ndWFnZU92ZXJyaWRlKToKKyAgICAgICAgKFdlYkNvcmU6OkludGVy bmFsczo6c2V0Q2FwdGlvbkRpc3BsYXlNb2RlKToKKyAgICAgICAgUmVuYW1lIGBQYWdlR3JvdXA6 OmNhcHRpb25QcmVmZXJlbmNlc2AgdG8gYFBhZ2VHcm91cDo6ZW5zdXJlQ2FwdGlvblByZWZlcmVu Y2VzYCBzbyB0aGF0IGl0J3MKKyAgICAgICAgcG9zc2libGUgdG8gZ2V0IHRoZSBgQ2FwdGlvblVz ZXJQcmVmZXJlbmNlc2Agd2l0aG91dCBhbHdheXMgY3JlYXRpbmcgaXQuCisKIDIwMjEtMDctMTMg IFBoaWxpcHBlIE5vcm1hbmQgIDxwbm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHU3Ry ZWFtZXJdIEFsbG93IHJ1bnRpbWUgb3B0LW91dCBvZiBHTCByZW5kZXJpbmcKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXgg YWM4NzcwNDcwOWVhNWMwMzgzM2QwODFjYmU0ZTY4YzI4OGFmODY3Yy4uOTRlNWQwZDhhMTAwYmQ2 MGVlZTY2MzczODcyZWEyNWE0NWQ5MTEzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAy MS0wNy0xMyAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgW2lP U10gUkVHUkVTU0lPTihyMjc5NzIwKTogY2hhbmdpbmcgU3VidGl0bGVzIHRvIE9mZiBkb2Vzbid0 IGhpZGUgdGhlbSBvciBkbyBhbnl0aGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI3OTM3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83OTA2OTY2 Mj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICByMjc5 NzIwIG1hZGUgaXQgc28gdGhhdCBgQ2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnNldENh cHRpb25EaXNwbGF5TW9kZWAgbm8gbG9uZ2VyCisgICAgICAgIGRpcmVjdGx5IG1vZGlmaWVzIGBr TUFDYXB0aW9uQXBwZWFyYW5jZURvbWFpblVzZXJgIGluIHRoZSBXZWJQcm9jZXNzLCB1c2luZyBh IGNhY2hlZCB2YWx1ZQorICAgICAgICBhcyBhIHdheSBvZiBwcmV2ZW50aW5nIHRoZSBXZWJQcm9j ZXNzIGZyb20gdHJ5aW5nIHRvIHJlYWQgYmFjayB0aGF0IHZhbHVlIGFmdGVyIGl0J3Mgc2V0LAor ICAgICAgICBpbnN0ZWFkIGhhdmluZyB0aGUgVUlQcm9jZXNzIHNlbmQgYE1lc3NhZ2VzOjpXZWJQ cm9jZXNzOjpTZXRNZWRpYUFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlc2AKKyAgICAgICAgd2hlbmV2 ZXIgdGhpcyBjaGFuZ2VzIHRvIHVwZGF0ZSB0aGF0IGNhY2hlZCB2YWx1ZS4gVW5mb3J0dW5hdGVs eSwgYmVjYXVzZSB0aGUgV2ViUHJvY2VzcworICAgICAgICBuZWVkcyB0byByZWFkIHRoaXMgdmFs dWUgaW1tZWRpYXRlbHkgYWZ0ZXIgY2hhbmdpbmcgaXQsIHRoaXMgSVBDIHJvdW5kIHRyaXAgY2F1 c2VzIHRoZQorICAgICAgICBXZWJQcm9jZXNzIHRvIHJlYWQgdGhlIG9sZCB2YWx1ZSwgd2hpY2gg cmVzdWx0cyBpbiBubyBvYnNlcnZhYmxlIGNoYW5nZXMuIEluIG9yZGVyIHRvIGZpeAorICAgICAg ICB0aGlzLCBub3RpZnkgYENhcHRpb25Vc2VyUHJlZmVyZW5jZXNgIHRoYXQgYGNhcHRpb25QcmVm ZXJlbmNlc0NoYW5nZWRgIHdoZW4gdGhlIGFib3ZlIElQQworICAgICAgICBtZXNzYWdlIGlzIHJl Y2VpdmVkICh3aGljaCB3aWxsIGFsc28gaGFuZGxlIGNhc2VzIHdoZW4gdGhlIHZhbHVlIGNoYW5n ZXMgb3V0c2lkZSBXZWJLaXQpLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9j ZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3M6OnNldE1lZGlhQWNjZXNz aWJpbGl0eVByZWZlcmVuY2VzKToKKyAgICAgICAgTWFrZSBzdXJlIHRvIGFsc28gdXBkYXRlIGV2 ZXJ5IGBDYXB0aW9uVXNlclByZWZlcmVuY2VzYCBvbmNlIHRoZSBjYWNoZWQgcHJlZmVyZW5jZSB2 YWx1ZXMKKyAgICAgICAgYXJlIHNhdmVkIHNvIHRoYXQgYW55IGFjdGl2ZSBtZWRpYSBjYW4gdXBk YXRlIGFjY29yZGluZ2x5LgorCiAyMDIxLTA3LTEzICBLYXRlIENoZW5leSAgPGthdGhlcmluZV9j aGVuZXlAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgaU9TL3R2T1Mvd2F0Y2hPUyBi dWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJv bHMvTWVkaWFDb250cm9sc0hvc3QuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYWNv bnRyb2xzL01lZGlhQ29udHJvbHNIb3N0LmNwcAppbmRleCAwMThkNzI2MjcwOTgwYmJhYzg5ODI3 ZDA3OWQ5YTA2NDBlNzA4ZTQ4Li45YzA5ZmU4Y2I5NjdlZWNiOTRkYmY4YjZkOWI5YjM4NmY4YzAz OTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhY29udHJvbHMvTWVk aWFDb250cm9sc0hvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFjb250 cm9scy9NZWRpYUNvbnRyb2xzSG9zdC5jcHAKQEAgLTE0Miw3ICsxNDIsNyBAQCBWZWN0b3I8UmVm UHRyPFRleHRUcmFjaz4+IE1lZGlhQ29udHJvbHNIb3N0Ojpzb3J0ZWRUcmFja0xpc3RGb3JNZW51 KFRleHRUcmFja0xpcwogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAg IHJldHVybiBwYWdlLT5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLnNvcnRlZFRyYWNrTGlz dEZvck1lbnUoJnRyYWNrTGlzdCwgeyBUZXh0VHJhY2s6OktpbmQ6OlN1YnRpdGxlcywgVGV4dFRy YWNrOjpLaW5kOjpDYXB0aW9ucywgVGV4dFRyYWNrOjpLaW5kOjpEZXNjcmlwdGlvbnMgfSk7Cisg ICAgcmV0dXJuIHBhZ2UtPmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCkuc29ydGVk VHJhY2tMaXN0Rm9yTWVudSgmdHJhY2tMaXN0LCB7IFRleHRUcmFjazo6S2luZDo6U3VidGl0bGVz LCBUZXh0VHJhY2s6OktpbmQ6OkNhcHRpb25zLCBUZXh0VHJhY2s6OktpbmQ6OkRlc2NyaXB0aW9u cyB9KTsKIH0KIAogVmVjdG9yPFJlZlB0cjxBdWRpb1RyYWNrPj4gTWVkaWFDb250cm9sc0hvc3Q6 OnNvcnRlZFRyYWNrTGlzdEZvck1lbnUoQXVkaW9UcmFja0xpc3QmIHRyYWNrTGlzdCkKQEAgLTE1 NCw3ICsxNTQsNyBAQCBWZWN0b3I8UmVmUHRyPEF1ZGlvVHJhY2s+PiBNZWRpYUNvbnRyb2xzSG9z dDo6c29ydGVkVHJhY2tMaXN0Rm9yTWVudShBdWRpb1RyYWNrTAogICAgIGlmICghcGFnZSkKICAg ICAgICAgcmV0dXJuIHsgfTsKIAotICAgIHJldHVybiBwYWdlLT5ncm91cCgpLmNhcHRpb25QcmVm ZXJlbmNlcygpLnNvcnRlZFRyYWNrTGlzdEZvck1lbnUoJnRyYWNrTGlzdCk7CisgICAgcmV0dXJu IHBhZ2UtPmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCkuc29ydGVkVHJhY2tMaXN0 Rm9yTWVudSgmdHJhY2tMaXN0KTsKIH0KIAogU3RyaW5nIE1lZGlhQ29udHJvbHNIb3N0OjpkaXNw bGF5TmFtZUZvclRyYWNrKGNvbnN0IHN0ZDo6b3B0aW9uYWw8VGV4dE9yQXVkaW9UcmFjaz4mIHRy YWNrKQpAQCAtMTY3LDcgKzE2Nyw3IEBAIFN0cmluZyBNZWRpYUNvbnRyb2xzSG9zdDo6ZGlzcGxh eU5hbWVGb3JUcmFjayhjb25zdCBzdGQ6Om9wdGlvbmFsPFRleHRPckF1ZGlvVHJhCiAgICAgICAg IHJldHVybiBlbXB0eVN0cmluZygpOwogCiAgICAgcmV0dXJuIFdURjo6dmlzaXQoW3BhZ2VdIChh dXRvJiB0cmFjaykgewotICAgICAgICByZXR1cm4gcGFnZS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVy ZW5jZXMoKS5kaXNwbGF5TmFtZUZvclRyYWNrKHRyYWNrLmdldCgpKTsKKyAgICAgICAgcmV0dXJu IHBhZ2UtPmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCkuZGlzcGxheU5hbWVGb3JU cmFjayh0cmFjay5nZXQoKSk7CiAgICAgfSwgdHJhY2sudmFsdWUoKSk7CiB9CiAKQEAgLTE5MCw3 ICsxOTAsNyBAQCBBdG9tU3RyaW5nIE1lZGlhQ29udHJvbHNIb3N0OjpjYXB0aW9uRGlzcGxheU1v ZGUoKSBjb25zdAogICAgIGlmICghcGFnZSkKICAgICAgICAgcmV0dXJuIGVtcHR5QXRvbSgpOwog Ci0gICAgc3dpdGNoIChwYWdlLT5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLmNhcHRpb25E aXNwbGF5TW9kZSgpKSB7CisgICAgc3dpdGNoIChwYWdlLT5ncm91cCgpLmVuc3VyZUNhcHRpb25Q cmVmZXJlbmNlcygpLmNhcHRpb25EaXNwbGF5TW9kZSgpKSB7CiAgICAgY2FzZSBDYXB0aW9uVXNl clByZWZlcmVuY2VzOjpBdXRvbWF0aWM6CiAgICAgICAgIHJldHVybiBhdXRvbWF0aWNLZXl3b3Jk KCk7CiAgICAgY2FzZSBDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpGb3JjZWRPbmx5OgpAQCAtNTU2 LDcgKzU1Niw3IEBAIGJvb2wgTWVkaWFDb250cm9sc0hvc3Q6OnNob3dNZWRpYUNvbnRyb2xzQ29u dGV4dE1lbnUoSFRNTEVsZW1lbnQmIHRhcmdldCwgU3RyaW5nCiAgICAgICAgIGlmIChhdXRvKiBh dWRpb1RyYWNrcyA9IG1lZGlhRWxlbWVudC5hdWRpb1RyYWNrcygpOyBhdWRpb1RyYWNrcyAmJiBh dWRpb1RyYWNrcy0+bGVuZ3RoKCkgPiAxKSB7CiAgICAgICAgICAgICBWZWN0b3I8TWVudUl0ZW0+ IGxhbmd1YWdlTWVudUl0ZW1zOwogCi0gICAgICAgICAgICBhdXRvJiBjYXB0aW9uUHJlZmVyZW5j ZXMgPSBwYWdlLT5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpOworICAgICAgICAgICAgYXV0 byYgY2FwdGlvblByZWZlcmVuY2VzID0gcGFnZS0+Z3JvdXAoKS5lbnN1cmVDYXB0aW9uUHJlZmVy ZW5jZXMoKTsKICAgICAgICAgICAgIGZvciAoYXV0byYgYXVkaW9UcmFjayA6IGNhcHRpb25QcmVm ZXJlbmNlcy5zb3J0ZWRUcmFja0xpc3RGb3JNZW51KGF1ZGlvVHJhY2tzKSkKICAgICAgICAgICAg ICAgICBsYW5ndWFnZU1lbnVJdGVtcy5hcHBlbmQoY3JlYXRlTWVudUl0ZW0oYXVkaW9UcmFjaywg Y2FwdGlvblByZWZlcmVuY2VzLmRpc3BsYXlOYW1lRm9yVHJhY2soYXVkaW9UcmFjay5nZXQoKSks IGF1ZGlvVHJhY2stPmVuYWJsZWQoKSkpOwogCkBAIC01NjksNyArNTY5LDcgQEAgYm9vbCBNZWRp YUNvbnRyb2xzSG9zdDo6c2hvd01lZGlhQ29udHJvbHNDb250ZXh0TWVudShIVE1MRWxlbWVudCYg dGFyZ2V0LCBTdHJpbmcKICAgICAgICAgaWYgKGF1dG8qIHRleHRUcmFja3MgPSBtZWRpYUVsZW1l bnQudGV4dFRyYWNrcygpOyB0ZXh0VHJhY2tzICYmIHRleHRUcmFja3MtPmxlbmd0aCgpKSB7CiAg ICAgICAgICAgICBWZWN0b3I8TWVudUl0ZW0+IHN1YnRpdGxlTWVudUl0ZW1zOwogCi0gICAgICAg ICAgICBhdXRvJiBjYXB0aW9uUHJlZmVyZW5jZXMgPSBwYWdlLT5ncm91cCgpLmNhcHRpb25QcmVm ZXJlbmNlcygpOworICAgICAgICAgICAgYXV0byYgY2FwdGlvblByZWZlcmVuY2VzID0gcGFnZS0+ Z3JvdXAoKS5lbnN1cmVDYXB0aW9uUHJlZmVyZW5jZXMoKTsKICAgICAgICAgICAgIGF1dG8gc29y dGVkVGV4dFRyYWNrcyA9IGNhcHRpb25QcmVmZXJlbmNlcy5zb3J0ZWRUcmFja0xpc3RGb3JNZW51 KHRleHRUcmFja3MsIHsgVGV4dFRyYWNrOjpLaW5kOjpTdWJ0aXRsZXMsIFRleHRUcmFjazo6S2lu ZDo6Q2FwdGlvbnMsIFRleHRUcmFjazo6S2luZDo6RGVzY3JpcHRpb25zIH0pOwogICAgICAgICAg ICAgYm9vbCBhbGxUcmFja3NEaXNhYmxlZCA9IG5vdEZvdW5kID09IHNvcnRlZFRleHRUcmFja3Mu ZmluZE1hdGNoaW5nKFtdIChjb25zdCBhdXRvJiB0ZXh0VHJhY2spIHsKICAgICAgICAgICAgICAg ICByZXR1cm4gdGV4dFRyYWNrLT5tb2RlKCkgPT0gVGV4dFRyYWNrOjpNb2RlOjpTaG93aW5nOwpA QCAtNTkzLDcgKzU5Myw3IEBAIGJvb2wgTWVkaWFDb250cm9sc0hvc3Q6OnNob3dNZWRpYUNvbnRy b2xzQ29udGV4dE1lbnUoSFRNTEVsZW1lbnQmIHRhcmdldCwgU3RyaW5nCiAKICAgICBpZiAob3B0 aW9uc0pTT05PYmplY3QtPmdldEJvb2xlYW4oImluY2x1ZGVDaGFwdGVycyJfcykudmFsdWVfb3Io ZmFsc2UpKSB7CiAgICAgICAgIGlmIChhdXRvKiB0ZXh0VHJhY2tzID0gbWVkaWFFbGVtZW50LnRl eHRUcmFja3MoKTsgdGV4dFRyYWNrcyAmJiB0ZXh0VHJhY2tzLT5sZW5ndGgoKSkgewotICAgICAg ICAgICAgYXV0byYgY2FwdGlvblByZWZlcmVuY2VzID0gcGFnZS0+Z3JvdXAoKS5jYXB0aW9uUHJl ZmVyZW5jZXMoKTsKKyAgICAgICAgICAgIGF1dG8mIGNhcHRpb25QcmVmZXJlbmNlcyA9IHBhZ2Ut Pmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCk7CiAKICAgICAgICAgICAgIGZvciAo YXV0byYgdGV4dFRyYWNrIDogY2FwdGlvblByZWZlcmVuY2VzLnNvcnRlZFRyYWNrTGlzdEZvck1l bnUodGV4dFRyYWNrcywgeyBUZXh0VHJhY2s6OktpbmQ6OkNoYXB0ZXJzIH0pKSB7CiAgICAgICAg ICAgICAgICAgVmVjdG9yPE1lbnVJdGVtPiBjaGFwdGVyTWVudUl0ZW1zOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1 bWVudC5jcHAKaW5kZXggMWU5MDMxMjIzMDRhNmMxNmY3YTExMDI3MjgzZTY5Mzc4YmVmYWQyNS4u YjdhMzY2OTI2MzI1MjA5MDRjYmYzYzEzYmYxYTZiZDdjOTU4OGJmMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9j dW1lbnQuY3BwCkBAIC01Njk1LDcgKzU2OTUsNyBAQCB2b2lkIERvY3VtZW50Ojpwcml2YXRlQnJv d3NpbmdTdGF0ZURpZENoYW5nZShQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQpCiB2b2lkIERvY3Vt ZW50OjpyZWdpc3RlckZvckNhcHRpb25QcmVmZXJlbmNlc0NoYW5nZWRDYWxsYmFja3MoSFRNTE1l ZGlhRWxlbWVudCYgZWxlbWVudCkKIHsKICAgICBpZiAocGFnZSgpKQotICAgICAgICBwYWdlKCkt Pmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCkuc2V0SW50ZXJlc3RlZEluQ2FwdGlvblByZWZl cmVuY2VDaGFuZ2VzKCk7CisgICAgICAgIHBhZ2UoKS0+Z3JvdXAoKS5lbnN1cmVDYXB0aW9uUHJl ZmVyZW5jZXMoKS5zZXRJbnRlcmVzdGVkSW5DYXB0aW9uUHJlZmVyZW5jZUNoYW5nZXMoKTsKIAog ICAgIG1fY2FwdGlvblByZWZlcmVuY2VzQ2hhbmdlZEVsZW1lbnRzLmFkZChlbGVtZW50KTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCmluZGV4IDFiNTVjNTBlMzE0 M2I0NzZjZWM3ZGQyODIyNjljZmM3NDk2NWFiNzcuLmYwMWNjYWNiNjM1MmY0ZTYxZmY5MGU5MjFj N2Q0YmIyMjAwYmU5NGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlh RWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNw cApAQCAtNDAyNSw3ICs0MDI1LDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjphZGRUZXh0VHJh Y2soUmVmPFRleHRUcmFjaz4mJiB0cmFjaykKICAgICAgICAgRG9jdW1lbnQmIGRvY3VtZW50ID0g dGhpcy0+ZG9jdW1lbnQoKTsKICAgICAgICAgZG9jdW1lbnQucmVnaXN0ZXJGb3JDYXB0aW9uUHJl ZmVyZW5jZXNDaGFuZ2VkQ2FsbGJhY2tzKCp0aGlzKTsKICAgICAgICAgaWYgKFBhZ2UqIHBhZ2Ug PSBkb2N1bWVudC5wYWdlKCkpCi0gICAgICAgICAgICBtX2NhcHRpb25EaXNwbGF5TW9kZSA9IHBh Z2UtPmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCkuY2FwdGlvbkRpc3BsYXlNb2RlKCk7Cisg ICAgICAgICAgICBtX2NhcHRpb25EaXNwbGF5TW9kZSA9IHBhZ2UtPmdyb3VwKCkuZW5zdXJlQ2Fw dGlvblByZWZlcmVuY2VzKCkuY2FwdGlvbkRpc3BsYXlNb2RlKCk7CiAgICAgfQogCiAgICAgZW5z dXJlVGV4dFRyYWNrcygpLmFwcGVuZChXVEZNb3ZlKHRyYWNrKSk7CkBAIC00MTgwLDcgKzQxODAs NyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmNvbmZpZ3VyZVRleHRUcmFja0dyb3VwKGNvbnN0 IFRyYWNrR3JvdXAmIGdyb3VwKQogICAgIEFTU0VSVChncm91cC50cmFja3Muc2l6ZSgpKTsKIAog ICAgIFBhZ2UqIHBhZ2UgPSBkb2N1bWVudCgpLnBhZ2UoKTsKLSAgICBDYXB0aW9uVXNlclByZWZl cmVuY2VzKiBjYXB0aW9uUHJlZmVyZW5jZXMgPSBwYWdlID8gJnBhZ2UtPmdyb3VwKCkuY2FwdGlv blByZWZlcmVuY2VzKCkgOiAwOworICAgIENhcHRpb25Vc2VyUHJlZmVyZW5jZXMqIGNhcHRpb25Q cmVmZXJlbmNlcyA9IHBhZ2UgPyAmcGFnZS0+Z3JvdXAoKS5lbnN1cmVDYXB0aW9uUHJlZmVyZW5j ZXMoKSA6IDA7CiAgICAgQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6Q2FwdGlvbkRpc3BsYXlNb2Rl IGRpc3BsYXlNb2RlID0gY2FwdGlvblByZWZlcmVuY2VzID8gY2FwdGlvblByZWZlcmVuY2VzLT5j YXB0aW9uRGlzcGxheU1vZGUoKSA6IENhcHRpb25Vc2VyUHJlZmVyZW5jZXM6OkF1dG9tYXRpYzsK IAogICAgIC8vIEZpcnN0LCBmaW5kIHRoZSB0cmFjayBpbiB0aGUgZ3JvdXAgdGhhdCBzaG91bGQg YmUgZW5hYmxlZCAoaWYgYW55KS4KQEAgLTQ0NTYsNyArNDQ1Niw3IEBAIHZvaWQgSFRNTE1lZGlh RWxlbWVudDo6c2V0U2VsZWN0ZWRUZXh0VHJhY2soVGV4dFRyYWNrKiB0cmFja1RvU2VsZWN0KQog ICAgIGlmICghZG9jdW1lbnQoKS5wYWdlKCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGF1dG8m IGNhcHRpb25QcmVmZXJlbmNlcyA9IGRvY3VtZW50KCkucGFnZSgpLT5ncm91cCgpLmNhcHRpb25Q cmVmZXJlbmNlcygpOworICAgIGF1dG8mIGNhcHRpb25QcmVmZXJlbmNlcyA9IGRvY3VtZW50KCku cGFnZSgpLT5ncm91cCgpLmVuc3VyZUNhcHRpb25QcmVmZXJlbmNlcygpOwogICAgIENhcHRpb25V c2VyUHJlZmVyZW5jZXM6OkNhcHRpb25EaXNwbGF5TW9kZSBkaXNwbGF5TW9kZTsKICAgICBpZiAo dHJhY2tUb1NlbGVjdCA9PSAmVGV4dFRyYWNrOjpjYXB0aW9uTWVudU9mZkl0ZW0oKSkKICAgICAg ICAgZGlzcGxheU1vZGUgPSBDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpGb3JjZWRPbmx5OwpAQCAt NjYxMyw3ICs2NjEzLDcgQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpjYXB0aW9uUHJlZmVyZW5j ZXNDaGFuZ2VkKCkKICAgICBpZiAoIWRvY3VtZW50KCkucGFnZSgpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpDYXB0aW9uRGlzcGxheU1vZGUgZGlzcGxh eU1vZGUgPSBkb2N1bWVudCgpLnBhZ2UoKS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKS5j YXB0aW9uRGlzcGxheU1vZGUoKTsKKyAgICBDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpDYXB0aW9u RGlzcGxheU1vZGUgZGlzcGxheU1vZGUgPSBkb2N1bWVudCgpLnBhZ2UoKS0+Z3JvdXAoKS5lbnN1 cmVDYXB0aW9uUHJlZmVyZW5jZXMoKS5jYXB0aW9uRGlzcGxheU1vZGUoKTsKICAgICBpZiAoY2Fw dGlvbkRpc3BsYXlNb2RlKCkgPT0gZGlzcGxheU1vZGUpCiAgICAgICAgIHJldHVybjsKIApAQCAt NjYyNSw3ICs2NjI1LDcgQEAgQ2FwdGlvblVzZXJQcmVmZXJlbmNlczo6Q2FwdGlvbkRpc3BsYXlN b2RlIEhUTUxNZWRpYUVsZW1lbnQ6OmNhcHRpb25EaXNwbGF5TW9kZSgKIHsKICAgICBpZiAoIW1f Y2FwdGlvbkRpc3BsYXlNb2RlKSB7CiAgICAgICAgIGlmIChkb2N1bWVudCgpLnBhZ2UoKSkKLSAg ICAgICAgICAgIG1fY2FwdGlvbkRpc3BsYXlNb2RlID0gZG9jdW1lbnQoKS5wYWdlKCktPmdyb3Vw KCkuY2FwdGlvblByZWZlcmVuY2VzKCkuY2FwdGlvbkRpc3BsYXlNb2RlKCk7CisgICAgICAgICAg ICBtX2NhcHRpb25EaXNwbGF5TW9kZSA9IGRvY3VtZW50KCkucGFnZSgpLT5ncm91cCgpLmVuc3Vy ZUNhcHRpb25QcmVmZXJlbmNlcygpLmNhcHRpb25EaXNwbGF5TW9kZSgpOwogICAgICAgICBlbHNl CiAgICAgICAgICAgICBtX2NhcHRpb25EaXNwbGF5TW9kZSA9IENhcHRpb25Vc2VyUHJlZmVyZW5j ZXM6OkF1dG9tYXRpYzsKICAgICB9CkBAIC03MTExLDcgKzcxMTEsNyBAQCB2b2lkIEhUTUxNZWRp YUVsZW1lbnQ6OnNldE92ZXJyaWRlUHJlZmVycmVkRHluYW1pY1JhbmdlTW9kZShEeW5hbWljUmFu Z2VNb2RlIG1vZAogVmVjdG9yPFN0cmluZz4gSFRNTE1lZGlhRWxlbWVudDo6bWVkaWFQbGF5ZXJQ cmVmZXJyZWRBdWRpb0NoYXJhY3RlcmlzdGljcygpIGNvbnN0CiB7CiAgICAgaWYgKFBhZ2UqIHBh Z2UgPSBkb2N1bWVudCgpLnBhZ2UoKSkKLSAgICAgICAgcmV0dXJuIHBhZ2UtPmdyb3VwKCkuY2Fw dGlvblByZWZlcmVuY2VzKCkucHJlZmVycmVkQXVkaW9DaGFyYWN0ZXJpc3RpY3MoKTsKKyAgICAg ICAgcmV0dXJuIHBhZ2UtPmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCkucHJlZmVy cmVkQXVkaW9DaGFyYWN0ZXJpc3RpY3MoKTsKICAgICByZXR1cm4gVmVjdG9yPFN0cmluZz4oKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9s VGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50LmNwcAppbmRleCA2YTlkZDc5 NGJiNDEwZDQ1MzA4ZmM0OTdjMjUwNDFhZTU3YzgwM2M3Li5lY2U4ZjRjYzRmY2I2NTYxYzRmMDc5 MTY1M2FiZTBkMTU3MWEyOWNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRv dy9NZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xUZXh0VHJhY2tDb250YWluZXJFbGVtZW50 LmNwcApAQCAtMjM0LDcgKzIzNCw3IEBAIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFp bmVyRWxlbWVudDo6dXBkYXRlQWN0aXZlQ3Vlc0ZvbnRTaXplKCkKICAgICAgICAgcmV0dXJuOwog CiAgICAgZmxvYXQgc21hbGxlc3REaW1lbnNpb24gPSBzdGQ6Om1pbihtX3ZpZGVvRGlzcGxheVNp emUuc2l6ZSgpLmhlaWdodCgpLCBtX3ZpZGVvRGlzcGxheVNpemUuc2l6ZSgpLndpZHRoKCkpOwot ICAgIGZsb2F0IGZvbnRTY2FsZSA9IGRvY3VtZW50KCkucGFnZSgpLT5ncm91cCgpLmNhcHRpb25Q cmVmZXJlbmNlcygpLmNhcHRpb25Gb250U2l6ZVNjYWxlQW5kSW1wb3J0YW5jZShtX2ZvbnRTaXpl SXNJbXBvcnRhbnQpOworICAgIGZsb2F0IGZvbnRTY2FsZSA9IGRvY3VtZW50KCkucGFnZSgpLT5n cm91cCgpLmVuc3VyZUNhcHRpb25QcmVmZXJlbmNlcygpLmNhcHRpb25Gb250U2l6ZVNjYWxlQW5k SW1wb3J0YW5jZShtX2ZvbnRTaXplSXNJbXBvcnRhbnQpOwogICAgIG1fZm9udFNpemUgPSBscm91 bmRmKHNtYWxsZXN0RGltZW5zaW9uICogZm9udFNjYWxlKTsKIAogICAgIGZvciAoYXV0byYgYWN0 aXZlQ3VlIDogbV9tZWRpYUVsZW1lbnQtPmN1cnJlbnRseUFjdGl2ZUN1ZXMoKSkgewpAQCAtMjcx LDcgKzI3MSw3IEBAIHZvaWQgTWVkaWFDb250cm9sVGV4dFRyYWNrQ29udGFpbmVyRWxlbWVudDo6 dXBkYXRlVGV4dFN0cm9rZVN0eWxlKCkKICAgICBib29sIGltcG9ydGFudDsKIAogICAgIC8vIEZJ WE1FOiBmaW5kIGEgd2F5IHRvIHNldCB0aGlzIHByb3BlcnR5IGluIHRoZSBzdHlsZXNoZWV0IGxp a2UgdGhlIG90aGVyIHVzZXIgc3R5bGUgcHJlZmVyZW5jZXMsIHNlZSA8aHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTg3ND4uCi0gICAgaWYgKGRvY3VtZW50KCkucGFn ZSgpLT5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLmNhcHRpb25TdHJva2VXaWR0aEZvckZv bnQobV9mb250U2l6ZSwgbGFuZ3VhZ2UsIHN0cm9rZVdpZHRoLCBpbXBvcnRhbnQpKQorICAgIGlm IChkb2N1bWVudCgpLnBhZ2UoKS0+Z3JvdXAoKS5lbnN1cmVDYXB0aW9uUHJlZmVyZW5jZXMoKS5j YXB0aW9uU3Ryb2tlV2lkdGhGb3JGb250KG1fZm9udFNpemUsIGxhbmd1YWdlLCBzdHJva2VXaWR0 aCwgaW1wb3J0YW50KSkKICAgICAgICAgc2V0SW5saW5lU3R5bGVQcm9wZXJ0eShDU1NQcm9wZXJ0 eVN0cm9rZVdpZHRoLCBzdHJva2VXaWR0aCwgQ1NTVW5pdFR5cGU6OkNTU19QWCwgaW1wb3J0YW50 KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9QYWdlR3JvdXAuY3BwCmluZGV4IGIyMmViM2JmNTI2OWQyZjcy NWVlMDMwYWE2NGRlYmM1MzcxNDY0NzAuLjE5NTUyNjkxM2QzZTRhZmZhMDI1NjM5ZDFmZDI0MjIw MzgzODZlZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2VHcm91cC5jcHAKQEAgLTEwOSw3ICsxMDksNyBA QCB2b2lkIFBhZ2VHcm91cDo6Y2FwdGlvblByZWZlcmVuY2VzQ2hhbmdlZCgpCiAgICAgQmFja0Zv cndhcmRDYWNoZTo6c2luZ2xldG9uKCkubWFya1BhZ2VzRm9yQ2FwdGlvblByZWZlcmVuY2VzQ2hh bmdlZCgpOwogfQogCi1DYXB0aW9uVXNlclByZWZlcmVuY2VzJiBQYWdlR3JvdXA6OmNhcHRpb25Q cmVmZXJlbmNlcygpCitDYXB0aW9uVXNlclByZWZlcmVuY2VzJiBQYWdlR3JvdXA6OmVuc3VyZUNh cHRpb25QcmVmZXJlbmNlcygpCiB7CiAgICAgaWYgKCFtX2NhcHRpb25QcmVmZXJlbmNlcykgewog I2lmIFBMQVRGT1JNKE1BQykgfHwgSEFWRShNRURJQV9BQ0NFU1NJQklMSVRZX0ZSQU1FV09SSykK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmggYi9Tb3VyY2UvV2Vi Q29yZS9wYWdlL1BhZ2VHcm91cC5oCmluZGV4IGVmN2RlMmIyMWFlYTk4ODVkNDI2Yzg0YThhOGI4 NTlhZDJiYzJlZWYuLmMwYWFmYjdmY2U3ZDhjMTA4YzY0Yzc2NjQ4NGRmNzk5MDhmNGEyODUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZUdyb3VwLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGFnZS9QYWdlR3JvdXAuaApAQCAtNTUsNyArNTUsOCBAQCBwdWJsaWM6CiAKICNpZiBF TkFCTEUoVklERU8pCiAgICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBjYXB0aW9uUHJlZmVyZW5jZXND aGFuZ2VkKCk7Ci0gICAgV0VCQ09SRV9FWFBPUlQgQ2FwdGlvblVzZXJQcmVmZXJlbmNlcyYgY2Fw dGlvblByZWZlcmVuY2VzKCk7CisgICAgV0VCQ09SRV9FWFBPUlQgQ2FwdGlvblVzZXJQcmVmZXJl bmNlcyYgZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCk7CisgICAgQ2FwdGlvblVzZXJQcmVmZXJl bmNlcyogY2FwdGlvblByZWZlcmVuY2VzKCkgY29uc3QgeyByZXR1cm4gbV9jYXB0aW9uUHJlZmVy ZW5jZXMuZ2V0KCk7IH0KICNlbmRpZgogCiBwcml2YXRlOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY29jb2EvUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQubW0g Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlh RWxlbWVudC5tbQppbmRleCA0YjNkMzE5MWY1MzBkNjEzMDY5MmVkNWI3NDA3NmZkZjc2ZmVhZjJj Li5iZjAxMzRkODc2NjA4YjY1MmVlNTM4NDM2ZmJhMGRmOWMyYWNhOGMzIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFja1Nlc3Npb25Nb2RlbE1lZGlhRWxl bWVudC5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QbGF5YmFja1Nlc3Np b25Nb2RlbE1lZGlhRWxlbWVudC5tbQpAQCAtMzg3LDcgKzM4Nyw3IEBAIHZvaWQgUGxheWJhY2tT ZXNzaW9uTW9kZWxNZWRpYUVsZW1lbnQ6OnVwZGF0ZU1lZGlhU2VsZWN0aW9uT3B0aW9ucygpCiAg ICAgaWYgKCFtX21lZGlhRWxlbWVudC0+ZG9jdW1lbnQoKS5wYWdlKCkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGF1dG8mIGNhcHRpb25QcmVmZXJlbmNlcyA9IG1fbWVkaWFFbGVtZW50LT5kb2N1 bWVudCgpLnBhZ2UoKS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKTsKKyAgICBhdXRvJiBj YXB0aW9uUHJlZmVyZW5jZXMgPSBtX21lZGlhRWxlbWVudC0+ZG9jdW1lbnQoKS5wYWdlKCktPmdy b3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCk7CiAgICAgYXV0byogdGV4dFRyYWNrcyA9 IG1fbWVkaWFFbGVtZW50LT50ZXh0VHJhY2tzKCk7CiAgICAgaWYgKHRleHRUcmFja3MgJiYgdGV4 dFRyYWNrcy0+bGVuZ3RoKCkpCiAgICAgICAgIG1fbGVnaWJsZVRyYWNrc0Zvck1lbnUgPSBjYXB0 aW9uUHJlZmVyZW5jZXMuc29ydGVkVHJhY2tMaXN0Rm9yTWVudSh0ZXh0VHJhY2tzLCB7IFRleHRU cmFjazo6S2luZDo6U3VidGl0bGVzLCBUZXh0VHJhY2s6OktpbmQ6OkNhcHRpb25zLCBUZXh0VHJh Y2s6OktpbmQ6OkRlc2NyaXB0aW9ucyB9KTsKQEAgLTUxNiw3ICs1MTYsNyBAQCBWZWN0b3I8TWVk aWFTZWxlY3Rpb25PcHRpb24+IFBsYXliYWNrU2Vzc2lvbk1vZGVsTWVkaWFFbGVtZW50OjphdWRp b01lZGlhU2VsZWN0aQogICAgIGlmICghbV9tZWRpYUVsZW1lbnQgfHwgIW1fbWVkaWFFbGVtZW50 LT5kb2N1bWVudCgpLnBhZ2UoKSkKICAgICAgICAgcmV0dXJuIGF1ZGlvT3B0aW9uczsKIAotICAg IGF1dG8mIGNhcHRpb25QcmVmZXJlbmNlcyA9IG1fbWVkaWFFbGVtZW50LT5kb2N1bWVudCgpLnBh Z2UoKS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKTsKKyAgICBhdXRvJiBjYXB0aW9uUHJl ZmVyZW5jZXMgPSBtX21lZGlhRWxlbWVudC0+ZG9jdW1lbnQoKS5wYWdlKCktPmdyb3VwKCkuZW5z dXJlQ2FwdGlvblByZWZlcmVuY2VzKCk7CiAKICAgICBhdWRpb09wdGlvbnMucmVzZXJ2ZUluaXRp YWxDYXBhY2l0eShtX2F1ZGlvVHJhY2tzRm9yTWVudS5zaXplKCkpOwogICAgIGZvciAoYXV0byYg YXVkaW9UcmFjayA6IG1fYXVkaW9UcmFja3NGb3JNZW51KQpAQCAtNTQxLDcgKzU0MSw3IEBAIFZl Y3RvcjxNZWRpYVNlbGVjdGlvbk9wdGlvbj4gUGxheWJhY2tTZXNzaW9uTW9kZWxNZWRpYUVsZW1l bnQ6OmxlZ2libGVNZWRpYVNlbGVjCiAgICAgaWYgKCFtX21lZGlhRWxlbWVudCB8fCAhbV9tZWRp YUVsZW1lbnQtPmRvY3VtZW50KCkucGFnZSgpKQogICAgICAgICByZXR1cm4gbGVnaWJsZU9wdGlv bnM7CiAKLSAgICBhdXRvJiBjYXB0aW9uUHJlZmVyZW5jZXMgPSBtX21lZGlhRWxlbWVudC0+ZG9j dW1lbnQoKS5wYWdlKCktPmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCk7CisgICAgYXV0byYg Y2FwdGlvblByZWZlcmVuY2VzID0gbV9tZWRpYUVsZW1lbnQtPmRvY3VtZW50KCkucGFnZSgpLT5n cm91cCgpLmVuc3VyZUNhcHRpb25QcmVmZXJlbmNlcygpOwogCiAgICAgZm9yIChhdXRvJiB0cmFj ayA6IG1fbGVnaWJsZVRyYWNrc0Zvck1lbnUpCiAgICAgICAgIGxlZ2libGVPcHRpb25zLmFwcGVu ZChjYXB0aW9uUHJlZmVyZW5jZXMubWVkaWFTZWxlY3Rpb25PcHRpb25Gb3JUcmFjayh0cmFjay5n ZXQoKSkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbFNldHRp bmdzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxTZXR0aW5ncy5jcHAKaW5k ZXggMWM3MmE1MzVjYTg5ZjJhYzk0ZWEzZTY1NWQyNjYzOTBlNWZmOTliOS4uZWJlMzY3Nzk0NGE1 MGJiYzM1YzEzMDFlNWU4MGFmMThhMDk5YjQwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv dGVzdGluZy9JbnRlcm5hbFNldHRpbmdzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5n L0ludGVybmFsU2V0dGluZ3MuY3BwCkBAIC00NjIsNyArNDYyLDcgQEAgRXhjZXB0aW9uT3I8dm9p ZD4gSW50ZXJuYWxTZXR0aW5nczo6c2V0U2hvdWxkRGlzcGxheVRyYWNrS2luZChUcmFja0tpbmQg a2luZCwgYm8KICAgICBpZiAoIW1fcGFnZSkKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IElu dmFsaWRBY2Nlc3NFcnJvciB9OwogI2lmIEVOQUJMRShWSURFTykKLSAgICBhdXRvJiBjYXB0aW9u UHJlZmVyZW5jZXMgPSBtX3BhZ2UtPmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCk7CisgICAg YXV0byYgY2FwdGlvblByZWZlcmVuY2VzID0gbV9wYWdlLT5ncm91cCgpLmVuc3VyZUNhcHRpb25Q cmVmZXJlbmNlcygpOwogICAgIHN3aXRjaCAoa2luZCkgewogICAgIGNhc2UgVHJhY2tLaW5kOjpT dWJ0aXRsZXM6CiAgICAgICAgIGNhcHRpb25QcmVmZXJlbmNlcy5zZXRVc2VyUHJlZmVyc1N1YnRp dGxlcyhlbmFibGVkKTsKQEAgLTQ4Niw3ICs0ODYsNyBAQCBFeGNlcHRpb25Pcjxib29sPiBJbnRl cm5hbFNldHRpbmdzOjpzaG91bGREaXNwbGF5VHJhY2tLaW5kKFRyYWNrS2luZCBraW5kKQogICAg IGlmICghbV9wYWdlKQogICAgICAgICByZXR1cm4gRXhjZXB0aW9uIHsgSW52YWxpZEFjY2Vzc0Vy cm9yIH07CiAjaWYgRU5BQkxFKFZJREVPKQotICAgIGF1dG8mIGNhcHRpb25QcmVmZXJlbmNlcyA9 IG1fcGFnZS0+Z3JvdXAoKS5jYXB0aW9uUHJlZmVyZW5jZXMoKTsKKyAgICBhdXRvJiBjYXB0aW9u UHJlZmVyZW5jZXMgPSBtX3BhZ2UtPmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCk7 CiAgICAgc3dpdGNoIChraW5kKSB7CiAgICAgY2FzZSBUcmFja0tpbmQ6OlN1YnRpdGxlczoKICAg ICAgICAgcmV0dXJuIGNhcHRpb25QcmVmZXJlbmNlcy51c2VyUHJlZmVyc1N1YnRpdGxlcygpOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwIGIvU291cmNl L1dlYkNvcmUvdGVzdGluZy9JbnRlcm5hbHMuY3BwCmluZGV4IGU1N2Q4NWEwNWUxMzEwZjhkMjRj OWNlZDRkNDViNTk3ZDg3Y2M4OWEuLmRmOTNhNGI5YTYzYzViZWJhNGFlYTk5YzUyYjljN2M3YzQ2 NTk0MzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvSW50ZXJuYWxzLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL0ludGVybmFscy5jcHAKQEAgLTUzOCwxMCArNTM4 LDEwIEBAIHZvaWQgSW50ZXJuYWxzOjpyZXNldFRvQ29uc2lzdGVudFN0YXRlKFBhZ2UmIHBhZ2Up CiAgICAgcGFnZS5tYWluRnJhbWUoKS5sb2FkZXIoKS5jbGVhclRlc3RpbmdPdmVycmlkZXMoKTsK ICAgICBwYWdlLmFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlKCkuc2V0RGVmYXVsdE9yaWdpblF1b3Rh KEFwcGxpY2F0aW9uQ2FjaGVTdG9yYWdlOjpub1F1b3RhKCkpOwogI2lmIEVOQUJMRShWSURFTykK LSAgICBwYWdlLmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCkuc2V0VGVzdGluZ01vZGUodHJ1 ZSk7Ci0gICAgcGFnZS5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLnNldENhcHRpb25EaXNw bGF5TW9kZShDYXB0aW9uVXNlclByZWZlcmVuY2VzOjpGb3JjZWRPbmx5KTsKLSAgICBwYWdlLmdy b3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCkuc2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUo ZW1wdHlTdHJpbmcoKSk7Ci0gICAgcGFnZS5ncm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLnNl dFRlc3RpbmdNb2RlKGZhbHNlKTsKKyAgICBwYWdlLmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZl cmVuY2VzKCkuc2V0VGVzdGluZ01vZGUodHJ1ZSk7CisgICAgcGFnZS5ncm91cCgpLmVuc3VyZUNh cHRpb25QcmVmZXJlbmNlcygpLnNldENhcHRpb25EaXNwbGF5TW9kZShDYXB0aW9uVXNlclByZWZl cmVuY2VzOjpGb3JjZWRPbmx5KTsKKyAgICBwYWdlLmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZl cmVuY2VzKCkuc2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUoZW1wdHlTdHJpbmcoKSk7Cisg ICAgcGFnZS5ncm91cCgpLmVuc3VyZUNhcHRpb25QcmVmZXJlbmNlcygpLnNldFRlc3RpbmdNb2Rl KGZhbHNlKTsKICAgICBQbGF0Zm9ybU1lZGlhU2Vzc2lvbk1hbmFnZXI6OnNoYXJlZE1hbmFnZXIo KS5yZXNldEhhdmVFdmVyUmVnaXN0ZXJlZEFzTm93UGxheWluZ0FwcGxpY2F0aW9uRm9yVGVzdGlu ZygpOwogICAgIFBsYXRmb3JtTWVkaWFTZXNzaW9uTWFuYWdlcjo6c2hhcmVkTWFuYWdlcigpLnJl c2V0UmVzdHJpY3Rpb25zKCk7CiAgICAgUGxhdGZvcm1NZWRpYVNlc3Npb25NYW5hZ2VyOjpzaGFy ZWRNYW5hZ2VyKCkuc2V0V2lsbElnbm9yZVN5c3RlbUludGVycnVwdGlvbnModHJ1ZSk7CkBAIC02 MTYsNyArNjE2LDcgQEAgSW50ZXJuYWxzOjpJbnRlcm5hbHMoRG9jdW1lbnQmIGRvY3VtZW50KQog ewogI2lmIEVOQUJMRShWSURFTykKICAgICBpZiAoZG9jdW1lbnQucGFnZSgpKQotICAgICAgICBk b2N1bWVudC5wYWdlKCktPmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCkuc2V0VGVzdGluZ01v ZGUodHJ1ZSk7CisgICAgICAgIGRvY3VtZW50LnBhZ2UoKS0+Z3JvdXAoKS5lbnN1cmVDYXB0aW9u UHJlZmVyZW5jZXMoKS5zZXRUZXN0aW5nTW9kZSh0cnVlKTsKICNlbmRpZgogCiAjaWYgRU5BQkxF KFdJUkVMRVNTX1BMQVlCQUNLX1RBUkdFVCkKQEAgLTIyNDUsNyArMjI0NSw3IEBAIFZlY3RvcjxT dHJpbmc+IEludGVybmFsczo6dXNlclByZWZlcnJlZEF1ZGlvQ2hhcmFjdGVyaXN0aWNzKCkgY29u c3QKICAgICBpZiAoIWRvY3VtZW50IHx8ICFkb2N1bWVudC0+cGFnZSgpKQogICAgICAgICByZXR1 cm4gVmVjdG9yPFN0cmluZz4oKTsKICNpZiBFTkFCTEUoVklERU8pCi0gICAgcmV0dXJuIGRvY3Vt ZW50LT5wYWdlKCktPmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCkucHJlZmVycmVkQXVkaW9D aGFyYWN0ZXJpc3RpY3MoKTsKKyAgICByZXR1cm4gZG9jdW1lbnQtPnBhZ2UoKS0+Z3JvdXAoKS5l bnN1cmVDYXB0aW9uUHJlZmVyZW5jZXMoKS5wcmVmZXJyZWRBdWRpb0NoYXJhY3RlcmlzdGljcygp OwogI2Vsc2UKICAgICByZXR1cm4gVmVjdG9yPFN0cmluZz4oKTsKICNlbmRpZgpAQCAtMjI1Nyw3 ICsyMjU3LDcgQEAgdm9pZCBJbnRlcm5hbHM6OnNldFVzZXJQcmVmZXJyZWRBdWRpb0NoYXJhY3Rl cmlzdGljKGNvbnN0IFN0cmluZyYgY2hhcmFjdGVyaXN0aWMKICAgICBpZiAoIWRvY3VtZW50IHx8 ICFkb2N1bWVudC0+cGFnZSgpKQogICAgICAgICByZXR1cm47CiAjaWYgRU5BQkxFKFZJREVPKQot ICAgIGRvY3VtZW50LT5wYWdlKCktPmdyb3VwKCkuY2FwdGlvblByZWZlcmVuY2VzKCkuc2V0UHJl ZmVycmVkQXVkaW9DaGFyYWN0ZXJpc3RpYyhjaGFyYWN0ZXJpc3RpYyk7CisgICAgZG9jdW1lbnQt PnBhZ2UoKS0+Z3JvdXAoKS5lbnN1cmVDYXB0aW9uUHJlZmVyZW5jZXMoKS5zZXRQcmVmZXJyZWRB dWRpb0NoYXJhY3RlcmlzdGljKGNoYXJhY3RlcmlzdGljKTsKICNlbHNlCiAgICAgVU5VU0VEX1BB UkFNKGNoYXJhY3RlcmlzdGljKTsKICNlbmRpZgpAQCAtNDAxNSw3ICs0MDE1LDcgQEAgRXhjZXB0 aW9uT3I8U3RyaW5nPiBJbnRlcm5hbHM6OmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKCkKICAg ICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IEludmFsaWRBY2Nlc3NFcnJvciB9OwogCiAjaWYgRU5B QkxFKFZJREVPKQotICAgIHJldHVybiBkb2N1bWVudC0+cGFnZSgpLT5ncm91cCgpLmNhcHRpb25Q cmVmZXJlbmNlcygpLmNhcHRpb25zU3R5bGVTaGVldE92ZXJyaWRlKCk7CisgICAgcmV0dXJuIGRv Y3VtZW50LT5wYWdlKCktPmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCkuY2FwdGlv bnNTdHlsZVNoZWV0T3ZlcnJpZGUoKTsKICNlbHNlCiAgICAgcmV0dXJuIFN0cmluZyB7IGVtcHR5 U3RyaW5nKCkgfTsKICNlbmRpZgpAQCAtNDAyOCw3ICs0MDI4LDcgQEAgRXhjZXB0aW9uT3I8dm9p ZD4gSW50ZXJuYWxzOjpzZXRDYXB0aW9uc1N0eWxlU2hlZXRPdmVycmlkZShjb25zdCBTdHJpbmcm IG92ZXJyaWQKICAgICAgICAgcmV0dXJuIEV4Y2VwdGlvbiB7IEludmFsaWRBY2Nlc3NFcnJvciB9 OwogCiAjaWYgRU5BQkxFKFZJREVPKQotICAgIGRvY3VtZW50LT5wYWdlKCktPmdyb3VwKCkuY2Fw dGlvblByZWZlcmVuY2VzKCkuc2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUob3ZlcnJpZGUp OworICAgIGRvY3VtZW50LT5wYWdlKCktPmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2Vz KCkuc2V0Q2FwdGlvbnNTdHlsZVNoZWV0T3ZlcnJpZGUob3ZlcnJpZGUpOwogI2Vsc2UKICAgICBV TlVTRURfUEFSQU0ob3ZlcnJpZGUpOwogI2VuZGlmCkBAIC00MDQyLDcgKzQwNDIsNyBAQCBFeGNl cHRpb25Pcjx2b2lkPiBJbnRlcm5hbHM6OnNldFByaW1hcnlBdWRpb1RyYWNrTGFuZ3VhZ2VPdmVy cmlkZShjb25zdCBTdHJpbmcmCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBJbnZhbGlkQWNj ZXNzRXJyb3IgfTsKIAogI2lmIEVOQUJMRShWSURFTykKLSAgICBkb2N1bWVudC0+cGFnZSgpLT5n cm91cCgpLmNhcHRpb25QcmVmZXJlbmNlcygpLnNldFByaW1hcnlBdWRpb1RyYWNrTGFuZ3VhZ2VP dmVycmlkZShsYW5ndWFnZSk7CisgICAgZG9jdW1lbnQtPnBhZ2UoKS0+Z3JvdXAoKS5lbnN1cmVD YXB0aW9uUHJlZmVyZW5jZXMoKS5zZXRQcmltYXJ5QXVkaW9UcmFja0xhbmd1YWdlT3ZlcnJpZGUo bGFuZ3VhZ2UpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0obGFuZ3VhZ2UpOwogI2VuZGlmCkBA IC00MDU2LDcgKzQwNTYsNyBAQCBFeGNlcHRpb25Pcjx2b2lkPiBJbnRlcm5hbHM6OnNldENhcHRp b25EaXNwbGF5TW9kZShjb25zdCBTdHJpbmcmIG1vZGUpCiAgICAgICAgIHJldHVybiBFeGNlcHRp b24geyBJbnZhbGlkQWNjZXNzRXJyb3IgfTsKIAogI2lmIEVOQUJMRShWSURFTykKLSAgICBhdXRv JiBjYXB0aW9uUHJlZmVyZW5jZXMgPSBkb2N1bWVudC0+cGFnZSgpLT5ncm91cCgpLmNhcHRpb25Q cmVmZXJlbmNlcygpOworICAgIGF1dG8mIGNhcHRpb25QcmVmZXJlbmNlcyA9IGRvY3VtZW50LT5w YWdlKCktPmdyb3VwKCkuZW5zdXJlQ2FwdGlvblByZWZlcmVuY2VzKCk7CiAKICAgICBpZiAoZXF1 YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UobW9kZSwgImF1dG9tYXRpYyIpKQogICAgICAgICBj YXB0aW9uUHJlZmVyZW5jZXMuc2V0Q2FwdGlvbkRpc3BsYXlNb2RlKENhcHRpb25Vc2VyUHJlZmVy ZW5jZXM6OkF1dG9tYXRpYyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv Y29jb2EvV2ViUHJvY2Vzc0NvY29hLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL2NvY29h L1dlYlByb2Nlc3NDb2NvYS5tbQppbmRleCAxMzMxZmFmNWU1MWM1ZDlkMzE4MWY1ZDY0OGQ5OGRh NzdmYTRlZGZjLi4zYjMzNDFhODVkNTdiNzVlMDFhY2ZkNWI1YTA3ODZmNjcxNjdmNDMzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvY29jb2EvV2ViUHJvY2Vzc0NvY29hLm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9jb2NvYS9XZWJQcm9jZXNzQ29jb2EubW0K QEAgLTQ2LDYgKzQ2LDcgQEAKICNpbXBvcnQgIldlYkZyYW1lLmgiCiAjaW1wb3J0ICJXZWJJbnNw ZWN0b3IuaCIKICNpbXBvcnQgIldlYlBhZ2UuaCIKKyNpbXBvcnQgIldlYlBhZ2VHcm91cFByb3h5 LmgiCiAjaW1wb3J0ICJXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgiCiAjaW1wb3J0ICJX ZWJQcm9jZXNzRGF0YVN0b3JlUGFyYW1ldGVycy5oIgogI2ltcG9ydCAiV2ViUHJvY2Vzc01lc3Nh Z2VzLmgiCkBAIC03MCw2ICs3MSw3IEBACiAjaW1wb3J0IDxXZWJDb3JlL01haW5UaHJlYWRTaGFy ZWRUaW1lci5oPgogI2ltcG9ydCA8V2ViQ29yZS9NZW1vcnlSZWxlYXNlLmg+CiAjaW1wb3J0IDxX ZWJDb3JlL05TU2Nyb2xsZXJJbXBEZXRhaWxzLmg+CisjaW1wb3J0IDxXZWJDb3JlL1BhZ2VHcm91 cC5oPgogI2ltcG9ydCA8V2ViQ29yZS9QZXJmb3JtYW5jZUxvZ2dpbmcuaD4KICNpbXBvcnQgPFdl YkNvcmUvUGljdHVyZUluUGljdHVyZVN1cHBvcnQuaD4KICNpbXBvcnQgPFdlYkNvcmUvUGxhdGZv cm1NZWRpYVNlc3Npb25NYW5hZ2VyLmg+CkBAIC0xMTIxLDYgKzExMjMsMTEgQEAgdm9pZCBXZWJQ cm9jZXNzOjpzZXRNZWRpYUFjY2Vzc2liaWxpdHlQcmVmZXJlbmNlcyhXZWJDb3JlOjpDYXB0aW9u VXNlclByZWZlcmVuY2UKIHsKICAgICBXZWJDb3JlOjpDYXB0aW9uVXNlclByZWZlcmVuY2VzTWVk aWFBRjo6c2V0Q2FjaGVkQ2FwdGlvbkRpc3BsYXlNb2RlKGNhcHRpb25EaXNwbGF5TW9kZSk7CiAg ICAgV2ViQ29yZTo6Q2FwdGlvblVzZXJQcmVmZXJlbmNlc01lZGlhQUY6OnNldENhY2hlZFByZWZl cnJlZExhbmd1YWdlcyhwcmVmZXJyZWRMYW5ndWFnZXMpOworCisgICAgZm9yIChhdXRvJiBwYWdl R3JvdXAgOiBtX3BhZ2VHcm91cE1hcC52YWx1ZXMoKSkgeworICAgICAgICBpZiAoYXV0byogY2Fw dGlvblByZWZlcmVuY2VzID0gcGFnZUdyb3VwLT5jb3JlUGFnZUdyb3VwKCktPmNhcHRpb25QcmVm ZXJlbmNlcygpKQorICAgICAgICAgICAgY2FwdGlvblByZWZlcmVuY2VzLT5jYXB0aW9uUHJlZmVy ZW5jZXNDaGFuZ2VkKCk7CisgICAgfQogfQogI2VuZGlmCiAK