226128 2021-05-21 17:04:59 -0700 [Cocoa] Hang in WebM format reader when loading content from https://powerrangers.fandom.com/ 2021-05-28 13:13:45 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=226217 InRadar P2 Normal --- 1 jer.noble jer.noble eric.carlson ews-watchlist glenn jean-yves.avenard kkinnunen peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1762678 0 jer.noble 2021-05-21 17:04:59 -0700 [Cocoa] Hang in WebM format reader when loading content from https://powerrangers.fandom.com/ 1762680 1 jer.noble 2021-05-21 17:05:31 -0700 <rdar://77645877> 1762683 2 429371 jer.noble 2021-05-21 17:09:07 -0700 Created attachment 429371 Patch 1762691 3 429375 jer.noble 2021-05-21 17:18:54 -0700 Created attachment 429375 Patch for landing 1763474 4 kkinnunen 2021-05-25 04:53:33 -0700 Immediately after the lines that query these properties are queries for other properties. The hangs cannot most likely be solved like this. Bug 226217 should contain the general purpose test case to solve. 1764525 5 jer.noble 2021-05-27 15:08:56 -0700 (In reply to Kimmo Kinnunen from comment #4) > Immediately after the lines that query these properties are queries for > other properties. The hangs cannot most likely be solved like this. The only property we support querying for is `kMTPluginFormatReaderProperty_Duration`, so with this patch, regardless of what property they query for, unless it's Duration, we won't block. 1764689 6 kkinnunen 2021-05-27 23:00:10 -0700 (In reply to Jer Noble from comment #5) > The only property we support querying for is > `kMTPluginFormatReaderProperty_Duration`, so with this patch, regardless of > what property they query for, unless it's Duration, we won't block. I mean: track array blocks, stuff inside tracks block... 1764796 7 430020 jer.noble 2021-05-28 09:38:08 -0700 Created attachment 430020 Patch for landing 1764798 8 jer.noble 2021-05-28 09:39:26 -0700 (In reply to Kimmo Kinnunen from comment #6) > (In reply to Jer Noble from comment #5) > > The only property we support querying for is > > `kMTPluginFormatReaderProperty_Duration`, so with this patch, regardless of > > what property they query for, unless it's Duration, we won't block. > > I mean: track array blocks, stuff inside tracks block... Right, we have to systematically remove sources of deadlocks; this is just one of them. 1764900 9 ews-feeder 2021-05-28 13:13:43 -0700 Committed r278223 (238261@main): <https://commits.webkit.org/238261@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430020. 429371 2021-05-21 17:09:07 -0700 2021-05-21 17:13:18 -0700 Patch bug-226128-20210521170906.patch text/plain 3142 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3ODcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDA2MWRjM2VlNDg0ZGMwZDgx NjMyZmQ2MzAyMjk3Y2I5OTA0ZmEzOTYuLjVmYjRlYTA1MGJkOGM5YjQxYWFhZGM5NTRlMzFmZjc1 ZDFlZjM5NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMjEgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBIYW5nIGluIFdlYk0g Zm9ybWF0IHJlYWRlciB3aGVuIGxvYWRpbmcgY29udGVudCBmcm9tIGh0dHBzOi8vcG93ZXJyYW5n ZXJzLmZhbmRvbS5jb20vCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjYxMjgKKyAgICAgICAgPHJkYXI6Ly83NzY0NTg3Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGNyZWF0aW5nIGEgZm9ybWF0 IHJlYWRlciwgTWVkaWFUb29sYm94IHdpbGwgcXVlcnkgZm9yIHZhcmlvdXMgcHJvcGVydGllcyBp bmNsdWRpbmcgb25lcyBhYm91dAorICAgICAgICBNZXRhZGF0YUZvcm1hdCBhbmQgTWV0YWRhdGFL ZXlTcGFjZS4gV2UgZG9uJ3Qgc3VwcG9ydCB0aG9zZSBwcm9wZXJ0aWVzLCBidXQgd2Ugc3RpbGwg YmxvY2sgdW50aWwKKyAgICAgICAgdHJhY2tzIGFyZSBsb2FkZWQgYmVmb3JlIGFuc3dlcmluZyB0 aGF0IHdlIGRvbid0IHN1cHBvcnQgdGhlbS4gSW5zdGVhZCwganVzdCByZXR1cm4gZWFybHkgdW5s ZXNzCisgICAgICAgIHRoZSBxdWVyeSBpcyBmb3IgdGhlIG9uZSBwcm9wZXJ0eSB3aGljaCB3ZSBk byBzdXBwb3J0LCBEdXJhdGlvbi4KKworICAgICAgICAqIFNoYXJlZC9tYWMvTWVkaWFGb3JtYXRS ZWFkZXIvTWVkaWFGb3JtYXRSZWFkZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpNZWRpYUZvcm1h dFJlYWRlcjo6Y29weVByb3BlcnR5KToKKwogMjAyMS0wNS0yMSAgSmVyIE5vYmxlICA8amVyLm5v YmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OKHIyNzY5OTMpOiA1IFRlc3RXZWJL aXRBUEkuQXVkaW9Sb3V0aW5nQXJiaXRyYXRpb24gKGFwaS10ZXN0cykgYXJlIGNvbnN0YW50IGZh aWx1cmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRS ZWFkZXIvTWVkaWFGb3JtYXRSZWFkZXIuY3BwIGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01l ZGlhRm9ybWF0UmVhZGVyL01lZGlhRm9ybWF0UmVhZGVyLmNwcAppbmRleCBkOTQwMDBiYTM1ZTgz MjU2OGY5YTE5OWMzYzg5MDFkYWFiNjA2ZmEyLi4xNTRmMTVkMmU4MmZkMzg4YzljY2ZiMGY5MDZh MzMzYmQzYmE5MjU3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFG b3JtYXRSZWFkZXIvTWVkaWFGb3JtYXRSZWFkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hh cmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9NZWRpYUZvcm1hdFJlYWRlci5jcHAKQEAgLTIzMCwy MiArMjMwLDI1IEBAIHZvaWQgTWVkaWFGb3JtYXRSZWFkZXI6OmZpbmlzaFBhcnNpbmcoUmVmPFNv dXJjZUJ1ZmZlclBhcnNlcj4mJiBwYXJzZXIpCiAKIE9TU3RhdHVzIE1lZGlhRm9ybWF0UmVhZGVy Ojpjb3B5UHJvcGVydHkoQ0ZTdHJpbmdSZWYga2V5LCBDRkFsbG9jYXRvclJlZiBhbGxvY2F0b3Is IHZvaWQqIHZhbHVlQ29weSkKIHsKKyAgICBpZiAoIUNGRXF1YWwoa2V5LCBQQUw6OmdldF9NZWRp YVRvb2xib3hfa01UUGx1Z2luRm9ybWF0UmVhZGVyUHJvcGVydHlfRHVyYXRpb24oKSkpIHsKKyAg ICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJRVIsICJhc2tlZCBmb3IgdW5zdXBwb3J0ZWQgcHJv cGVydHkgIiwgU3RyaW5nKGtleSkpOworICAgICAgICByZXR1cm4ga0NNQmFzZU9iamVjdEVycm9y X1ZhbHVlTm90QXZhaWxhYmxlOworICAgIH0KKwogICAgIGF1dG8gbG9ja2VyID0gaG9sZExvY2so bV9wYXJzZVRyYWNrc0xvY2spOwogICAgIG1fcGFyc2VUcmFja3NDb25kaXRpb24ud2FpdChtX3Bh cnNlVHJhY2tzTG9jaywgWyZdIHsKICAgICAgICAgcmV0dXJuIG1fcGFyc2VUcmFja3NTdGF0dXMu aGFzVmFsdWUoKTsKICAgICB9KTsKIAotICAgIGlmIChDRkVxdWFsKGtleSwgUEFMOjpnZXRfTWVk aWFUb29sYm94X2tNVFBsdWdpbkZvcm1hdFJlYWRlclByb3BlcnR5X0R1cmF0aW9uKCkpKSB7Ci0g ICAgICAgIGlmIChtX2R1cmF0aW9uLmlzSW5kZWZpbml0ZSgpKQotICAgICAgICAgICAgcmV0dXJu IGtDTUJhc2VPYmplY3RFcnJvcl9WYWx1ZU5vdEF2YWlsYWJsZTsKKyAgICBpZiAobV9kdXJhdGlv bi5pc0luZGVmaW5pdGUoKSkKKyAgICAgICAgcmV0dXJuIGtDTUJhc2VPYmplY3RFcnJvcl9WYWx1 ZU5vdEF2YWlsYWJsZTsKIAotICAgICAgICBpZiAoYXV0byBsZWFrZWREdXJhdGlvbiA9IGFkb3B0 Q0YoQ01UaW1lQ29weUFzRGljdGlvbmFyeShQQUw6OnRvQ01UaW1lKG1fZHVyYXRpb24pLCBhbGxv Y2F0b3IpKS5sZWFrUmVmKCkpIHsKLSAgICAgICAgICAgICpyZWludGVycHJldF9jYXN0PENGRGlj dGlvbmFyeVJlZio+KHZhbHVlQ29weSkgPSBsZWFrZWREdXJhdGlvbjsKLSAgICAgICAgICAgIHJl dHVybiBub0VycjsKLSAgICAgICAgfQorICAgIGlmIChhdXRvIGxlYWtlZER1cmF0aW9uID0gYWRv cHRDRihDTVRpbWVDb3B5QXNEaWN0aW9uYXJ5KFBBTDo6dG9DTVRpbWUobV9kdXJhdGlvbiksIGFs bG9jYXRvcikpLmxlYWtSZWYoKSkgeworICAgICAgICAqcmVpbnRlcnByZXRfY2FzdDxDRkRpY3Rp b25hcnlSZWYqPih2YWx1ZUNvcHkpID0gbGVha2VkRHVyYXRpb247CisgICAgICAgIHJldHVybiBu b0VycjsKICAgICB9CiAKLSAgICBFUlJPUl9MT0coTE9HSURFTlRJRklFUiwgImFza2VkIGZvciB1 bnN1cHBvcnRlZCBwcm9wZXJ0eSAiLCBTdHJpbmcoa2V5KSk7CisgICAgRVJST1JfTE9HKExPR0lE RU5USUZJRVIsICJDb3VsZCBub3QgcmV0cmlldmUgdmFsdWUgZm9yIHByb3BlcnR5ICIsIFN0cmlu ZyhrZXkpKTsKICAgICByZXR1cm4ga0NNQmFzZU9iamVjdEVycm9yX1ZhbHVlTm90QXZhaWxhYmxl OwogfQogCg== 429375 2021-05-21 17:18:54 -0700 2021-05-28 09:38:54 -0700 Patch for landing bug-226128-20210521171854.patch text/plain 3176 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDMzNGUwNzNkNWQwZjIzMWI5 ZWQ5NDQzZjYzOTVmNDhkYTM0MjhmNzcuLjhiOWIwYTBiODM0MDQyYjk4MDlmNjEzZDY1ZWRiZjBh NDY1NGQzMDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMjEgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBIYW5nIGluIFdlYk0g Zm9ybWF0IHJlYWRlciB3aGVuIGxvYWRpbmcgY29udGVudCBmcm9tIGh0dHBzOi8vcG93ZXJyYW5n ZXJzLmZhbmRvbS5jb20vCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjYxMjgKKyAgICAgICAgPHJkYXI6Ly83NzY0NTg3Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgV2hlbiBjcmVhdGluZyBhIGZvcm1hdCBy ZWFkZXIsIE1lZGlhVG9vbGJveCB3aWxsIHF1ZXJ5IGZvciB2YXJpb3VzIHByb3BlcnRpZXMgaW5j bHVkaW5nIG9uZXMgYWJvdXQKKyAgICAgICAgTWV0YWRhdGFGb3JtYXQgYW5kIE1ldGFkYXRhS2V5 U3BhY2UuIFdlIGRvbid0IHN1cHBvcnQgdGhvc2UgcHJvcGVydGllcywgYnV0IHdlIHN0aWxsIGJs b2NrIHVudGlsCisgICAgICAgIHRyYWNrcyBhcmUgbG9hZGVkIGJlZm9yZSBhbnN3ZXJpbmcgdGhh dCB3ZSBkb24ndCBzdXBwb3J0IHRoZW0uIEluc3RlYWQsIGp1c3QgcmV0dXJuIGVhcmx5IHVubGVz cworICAgICAgICB0aGUgcXVlcnkgaXMgZm9yIHRoZSBvbmUgcHJvcGVydHkgd2hpY2ggd2UgZG8g c3VwcG9ydCwgRHVyYXRpb24uCisKKyAgICAgICAgKiBTaGFyZWQvbWFjL01lZGlhRm9ybWF0UmVh ZGVyL01lZGlhRm9ybWF0UmVhZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TWVkaWFGb3JtYXRS ZWFkZXI6OmNvcHlQcm9wZXJ0eSk6CisKIDIwMjEtMDUtMjEgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjc2OTkzKTogNSBUZXN0V2ViS2l0 QVBJLkF1ZGlvUm91dGluZ0FyYml0cmF0aW9uIChhcGktdGVzdHMpIGFyZSBjb25zdGFudCBmYWls dXJlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01lZGlhRm9ybWF0UmVh ZGVyL01lZGlhRm9ybWF0UmVhZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9NZWRp YUZvcm1hdFJlYWRlci9NZWRpYUZvcm1hdFJlYWRlci5jcHAKaW5kZXggMGRlYTA5NmQ5YWEwN2Fi YTliNmFkYzM0Yjc0MTdiYjViNWYzNjU4OS4uNWU4MjdiNjkxY2IwNGI5NDE5NjNiOTRmZjc1ODZk YzhmMTZkN2RiZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01lZGlhRm9y bWF0UmVhZGVyL01lZGlhRm9ybWF0UmVhZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJl ZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvTWVkaWFGb3JtYXRSZWFkZXIuY3BwCkBAIC0yMzEsMjMg KzIzMSwyNiBAQCB2b2lkIE1lZGlhRm9ybWF0UmVhZGVyOjpmaW5pc2hQYXJzaW5nKFJlZjxTb3Vy Y2VCdWZmZXJQYXJzZXI+JiYgcGFyc2VyKQogCiBPU1N0YXR1cyBNZWRpYUZvcm1hdFJlYWRlcjo6 Y29weVByb3BlcnR5KENGU3RyaW5nUmVmIGtleSwgQ0ZBbGxvY2F0b3JSZWYgYWxsb2NhdG9yLCB2 b2lkKiB2YWx1ZUNvcHkpCiB7CisgICAgaWYgKCFDRkVxdWFsKGtleSwgUEFMOjpnZXRfTWVkaWFU b29sYm94X2tNVFBsdWdpbkZvcm1hdFJlYWRlclByb3BlcnR5X0R1cmF0aW9uKCkpKSB7CisgICAg ICAgIEVSUk9SX0xPRyhMT0dJREVOVElGSUVSLCAiYXNrZWQgZm9yIHVuc3VwcG9ydGVkIHByb3Bl cnR5ICIsIFN0cmluZyhrZXkpKTsKKyAgICAgICAgcmV0dXJuIGtDTUJhc2VPYmplY3RFcnJvcl9W YWx1ZU5vdEF2YWlsYWJsZTsKKyAgICB9CisKICAgICBMb2NrZXIgbG9ja2VyIHsgbV9wYXJzZVRy YWNrc0xvY2sgfTsKICAgICBtX3BhcnNlVHJhY2tzQ29uZGl0aW9uLndhaXQobV9wYXJzZVRyYWNr c0xvY2ssIFsmXSB7CiAgICAgICAgIGFzc2VydElzSGVsZChtX3BhcnNlVHJhY2tzTG9jayk7CiAg ICAgICAgIHJldHVybiBtX3BhcnNlVHJhY2tzU3RhdHVzLmhhc1ZhbHVlKCk7CiAgICAgfSk7CiAK LSAgICBpZiAoQ0ZFcXVhbChrZXksIFBBTDo6Z2V0X01lZGlhVG9vbGJveF9rTVRQbHVnaW5Gb3Jt YXRSZWFkZXJQcm9wZXJ0eV9EdXJhdGlvbigpKSkgewotICAgICAgICBpZiAobV9kdXJhdGlvbi5p c0luZGVmaW5pdGUoKSkKLSAgICAgICAgICAgIHJldHVybiBrQ01CYXNlT2JqZWN0RXJyb3JfVmFs dWVOb3RBdmFpbGFibGU7CisgICAgaWYgKG1fZHVyYXRpb24uaXNJbmRlZmluaXRlKCkpCisgICAg ICAgIHJldHVybiBrQ01CYXNlT2JqZWN0RXJyb3JfVmFsdWVOb3RBdmFpbGFibGU7CiAKLSAgICAg ICAgaWYgKGF1dG8gbGVha2VkRHVyYXRpb24gPSBhZG9wdENGKENNVGltZUNvcHlBc0RpY3Rpb25h cnkoUEFMOjp0b0NNVGltZShtX2R1cmF0aW9uKSwgYWxsb2NhdG9yKSkubGVha1JlZigpKSB7Ci0g ICAgICAgICAgICAqcmVpbnRlcnByZXRfY2FzdDxDRkRpY3Rpb25hcnlSZWYqPih2YWx1ZUNvcHkp ID0gbGVha2VkRHVyYXRpb247Ci0gICAgICAgICAgICByZXR1cm4gbm9FcnI7Ci0gICAgICAgIH0K KyAgICBpZiAoYXV0byBsZWFrZWREdXJhdGlvbiA9IGFkb3B0Q0YoQ01UaW1lQ29weUFzRGljdGlv bmFyeShQQUw6OnRvQ01UaW1lKG1fZHVyYXRpb24pLCBhbGxvY2F0b3IpKS5sZWFrUmVmKCkpIHsK KyAgICAgICAgKnJlaW50ZXJwcmV0X2Nhc3Q8Q0ZEaWN0aW9uYXJ5UmVmKj4odmFsdWVDb3B5KSA9 IGxlYWtlZER1cmF0aW9uOworICAgICAgICByZXR1cm4gbm9FcnI7CiAgICAgfQogCi0gICAgRVJS T1JfTE9HKExPR0lERU5USUZJRVIsICJhc2tlZCBmb3IgdW5zdXBwb3J0ZWQgcHJvcGVydHkgIiwg U3RyaW5nKGtleSkpOworICAgIEVSUk9SX0xPRyhMT0dJREVOVElGSUVSLCAiQ291bGQgbm90IHJl dHJpZXZlIHZhbHVlIGZvciBwcm9wZXJ0eSAiLCBTdHJpbmcoa2V5KSk7CiAgICAgcmV0dXJuIGtD TUJhc2VPYmplY3RFcnJvcl9WYWx1ZU5vdEF2YWlsYWJsZTsKIH0KIAo= 430020 2021-05-28 09:38:08 -0700 2021-05-28 13:13:44 -0700 Patch for landing bug-226128-20210528093807.patch text/plain 5152 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3OTAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDg4ZTIyZWM2ODRlMTJjZDQz ZGFlMmI1NGM0YzNjNjFlMWNjYmFiMjEuLmI5YTk0ZWM1YjdmOGIzMGM4YTNiYjQ3NDhlMzg0N2Vk N2MyOWM1NzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMjEtMDUtMjEgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CisKKyAgICAgICAgW0NvY29hXSBIYW5nIGluIFdlYk0g Zm9ybWF0IHJlYWRlciB3aGVuIGxvYWRpbmcgY29udGVudCBmcm9tIGh0dHBzOi8vcG93ZXJyYW5n ZXJzLmZhbmRvbS5jb20vCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjYxMjgKKyAgICAgICAgPHJkYXI6Ly83NzY0NTg3Nz4KKworICAgICAgICBSZXZp ZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgV2hlbiBjcmVhdGluZyBhIGZvcm1hdCBy ZWFkZXIsIE1lZGlhVG9vbGJveCB3aWxsIHF1ZXJ5IGZvciB2YXJpb3VzIHByb3BlcnRpZXMgaW5j bHVkaW5nIG9uZXMgYWJvdXQKKyAgICAgICAgTWV0YWRhdGFGb3JtYXQgYW5kIE1ldGFkYXRhS2V5 U3BhY2UuIFdlIGRvbid0IHN1cHBvcnQgdGhvc2UgcHJvcGVydGllcywgYnV0IHdlIHN0aWxsIGJs b2NrIHVudGlsCisgICAgICAgIHRyYWNrcyBhcmUgbG9hZGVkIGJlZm9yZSBhbnN3ZXJpbmcgdGhh dCB3ZSBkb24ndCBzdXBwb3J0IHRoZW0uIEluc3RlYWQsIGp1c3QgcmV0dXJuIGVhcmx5IHVubGVz cworICAgICAgICB0aGUgcXVlcnkgaXMgZm9yIHRoZSBvbmUgcHJvcGVydHkgd2hpY2ggd2UgZG8g c3VwcG9ydCwgRHVyYXRpb24uCisKKyAgICAgICAgKiBTaGFyZWQvbWFjL01lZGlhRm9ybWF0UmVh ZGVyL01lZGlhRm9ybWF0UmVhZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TWVkaWFGb3JtYXRS ZWFkZXI6OmNvcHlQcm9wZXJ0eSk6CisKIDIwMjEtMDUtMjcgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBIRFIgdmFyaWFudHMgaW4gSExTIHBsYXls aXN0cyBub3Qgc2VsZWN0ZWQgd2hlbiBzY3JlZW4gaXMgSERSCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvTWVkaWFGb3JtYXRSZWFkZXIuY3Bw IGIvU291cmNlL1dlYktpdC9TaGFyZWQvbWFjL01lZGlhRm9ybWF0UmVhZGVyL01lZGlhRm9ybWF0 UmVhZGVyLmNwcAppbmRleCAwZGVhMDk2ZDlhYTA3YWJhOWI2YWRjMzRiNzQxN2JiNWI1ZjM2NTg5 Li4xNzgwNTczYTU5M2NjN2RhM2ZiZDQwYTlkMzhkNzE1NDljYjBhMjA3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1NoYXJlZC9tYWMvTWVkaWFGb3JtYXRSZWFkZXIvTWVkaWFGb3JtYXRSZWFk ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9N ZWRpYUZvcm1hdFJlYWRlci5jcHAKQEAgLTExMCw3ICsxMTAsNyBAQCB2b2lkIE1lZGlhRm9ybWF0 UmVhZGVyOjpwYXJzZUJ5dGVTb3VyY2UoUmV0YWluUHRyPE1UUGx1Z2luQnl0ZVNvdXJjZVJlZj4m JiBieXRlUwogICAgICAgICBtX2xvZ0lkZW50aWZpZXIgPSBuZXh0TG9nSWRlbnRpZmllcigpOwog ICAgIH0KIAotICAgIEFMV0FZU19MT0coTE9HSURFTlRJRklFUik7CisgICAgQUxXQVlTX0xPR19J Rl9QT1NTSUJMRShMT0dJREVOVElGSUVSKTsKICAgICBwYXJzZXItPnNldExvZ2dlcigqbV9sb2dn ZXIsIG1fbG9nSWRlbnRpZmllcik7CiAKICAgICAvLyBTZXQgYSBtaW5pbXVtIGF1ZGlvIHNhbXBs ZSBkdXJhdGlvbiBvZiAwIHNvIHRoZSBwYXJzZXIgY3JlYXRlcyBpbmRpdmlzaWJsZSBzYW1wbGVz IHdpdGggYnl0ZSBzb3VyY2UgcmFuZ2VzLgpAQCAtMTU1LDkgKzE1NSw5IEBAIHZvaWQgTWVkaWFG b3JtYXRSZWFkZXI6OmRpZFBhcnNlVHJhY2tzKFNvdXJjZUJ1ZmZlclByaXZhdGVDbGllbnQ6Oklu aXRpYWxpemF0aW9uCiAgICAgQVNTRVJUKG1fZHVyYXRpb24uaXNJbnZhbGlkKCkpOwogICAgIEFT U0VSVChtX3RyYWNrUmVhZGVycy5pc0VtcHR5KCkpOwogCi0gICAgQUxXQVlTX0xPRyhMT0dJREVO VElGSUVSKTsKKyAgICBBTFdBWVNfTE9HX0lGX1BPU1NJQkxFKExPR0lERU5USUZJRVIpOwogICAg IGlmIChlcnJvckNvZGUpCi0gICAgICAgIEVSUk9SX0xPRyhMT0dJREVOVElGSUVSLCBlcnJvckNv ZGUpOworICAgICAgICBFUlJPUl9MT0dfSUZfUE9TU0lCTEUoTE9HSURFTlRJRklFUiwgZXJyb3JD b2RlKTsKIAogICAgIG1fcGFyc2VUcmFja3NTdGF0dXMgPSBlcnJvckNvZGUgPyBrTVRQbHVnaW5G b3JtYXRSZWFkZXJFcnJvcl9QYXJzaW5nRmFpbHVyZSA6IG5vRXJyOwogICAgIG1fZHVyYXRpb24g PSBXVEZNb3ZlKHNlZ21lbnQuZHVyYXRpb24pOwpAQCAtMjA1LDcgKzIwNSw3IEBAIHZvaWQgTWVk aWFGb3JtYXRSZWFkZXI6OmRpZFByb3ZpZGVNZWRpYURhdGEoUmVmPE1lZGlhU2FtcGxlPiYmIG1l ZGlhU2FtcGxlLCB1aW50CiB2b2lkIE1lZGlhRm9ybWF0UmVhZGVyOjpmaW5pc2hQYXJzaW5nKFJl ZjxTb3VyY2VCdWZmZXJQYXJzZXI+JiYgcGFyc2VyKQogewogICAgIEFTU0VSVCghaXNNYWluUnVu TG9vcCgpKTsKLSAgICBBTFdBWVNfTE9HKExPR0lERU5USUZJRVIpOworICAgIEFMV0FZU19MT0df SUZfUE9TU0lCTEUoTE9HSURFTlRJRklFUik7CiAKICAgICBMb2NrZXIgbG9ja2VyIHsgbV9wYXJz ZVRyYWNrc0xvY2sgfTsKICAgICBBU1NFUlQobV9wYXJzZVRyYWNrc1N0YXR1cy5oYXNWYWx1ZSgp KTsKQEAgLTIzMSwyMyArMjMxLDI2IEBAIHZvaWQgTWVkaWFGb3JtYXRSZWFkZXI6OmZpbmlzaFBh cnNpbmcoUmVmPFNvdXJjZUJ1ZmZlclBhcnNlcj4mJiBwYXJzZXIpCiAKIE9TU3RhdHVzIE1lZGlh Rm9ybWF0UmVhZGVyOjpjb3B5UHJvcGVydHkoQ0ZTdHJpbmdSZWYga2V5LCBDRkFsbG9jYXRvclJl ZiBhbGxvY2F0b3IsIHZvaWQqIHZhbHVlQ29weSkKIHsKKyAgICBpZiAoIUNGRXF1YWwoa2V5LCBQ QUw6OmdldF9NZWRpYVRvb2xib3hfa01UUGx1Z2luRm9ybWF0UmVhZGVyUHJvcGVydHlfRHVyYXRp b24oKSkpIHsKKyAgICAgICAgRVJST1JfTE9HX0lGX1BPU1NJQkxFKExPR0lERU5USUZJRVIsICJh c2tlZCBmb3IgdW5zdXBwb3J0ZWQgcHJvcGVydHkgIiwgU3RyaW5nKGtleSkpOworICAgICAgICBy ZXR1cm4ga0NNQmFzZU9iamVjdEVycm9yX1ZhbHVlTm90QXZhaWxhYmxlOworICAgIH0KKwogICAg IExvY2tlciBsb2NrZXIgeyBtX3BhcnNlVHJhY2tzTG9jayB9OwogICAgIG1fcGFyc2VUcmFja3ND b25kaXRpb24ud2FpdChtX3BhcnNlVHJhY2tzTG9jaywgWyZdIHsKICAgICAgICAgYXNzZXJ0SXNI ZWxkKG1fcGFyc2VUcmFja3NMb2NrKTsKICAgICAgICAgcmV0dXJuIG1fcGFyc2VUcmFja3NTdGF0 dXMuaGFzVmFsdWUoKTsKICAgICB9KTsKIAotICAgIGlmIChDRkVxdWFsKGtleSwgUEFMOjpnZXRf TWVkaWFUb29sYm94X2tNVFBsdWdpbkZvcm1hdFJlYWRlclByb3BlcnR5X0R1cmF0aW9uKCkpKSB7 Ci0gICAgICAgIGlmIChtX2R1cmF0aW9uLmlzSW5kZWZpbml0ZSgpKQotICAgICAgICAgICAgcmV0 dXJuIGtDTUJhc2VPYmplY3RFcnJvcl9WYWx1ZU5vdEF2YWlsYWJsZTsKKyAgICBpZiAobV9kdXJh dGlvbi5pc0luZGVmaW5pdGUoKSkKKyAgICAgICAgcmV0dXJuIGtDTUJhc2VPYmplY3RFcnJvcl9W YWx1ZU5vdEF2YWlsYWJsZTsKIAotICAgICAgICBpZiAoYXV0byBsZWFrZWREdXJhdGlvbiA9IGFk b3B0Q0YoQ01UaW1lQ29weUFzRGljdGlvbmFyeShQQUw6OnRvQ01UaW1lKG1fZHVyYXRpb24pLCBh bGxvY2F0b3IpKS5sZWFrUmVmKCkpIHsKLSAgICAgICAgICAgICpyZWludGVycHJldF9jYXN0PENG RGljdGlvbmFyeVJlZio+KHZhbHVlQ29weSkgPSBsZWFrZWREdXJhdGlvbjsKLSAgICAgICAgICAg IHJldHVybiBub0VycjsKLSAgICAgICAgfQorICAgIGlmIChhdXRvIGxlYWtlZER1cmF0aW9uID0g YWRvcHRDRihDTVRpbWVDb3B5QXNEaWN0aW9uYXJ5KFBBTDo6dG9DTVRpbWUobV9kdXJhdGlvbiks IGFsbG9jYXRvcikpLmxlYWtSZWYoKSkgeworICAgICAgICAqcmVpbnRlcnByZXRfY2FzdDxDRkRp Y3Rpb25hcnlSZWYqPih2YWx1ZUNvcHkpID0gbGVha2VkRHVyYXRpb247CisgICAgICAgIHJldHVy biBub0VycjsKICAgICB9CiAKLSAgICBFUlJPUl9MT0coTE9HSURFTlRJRklFUiwgImFza2VkIGZv ciB1bnN1cHBvcnRlZCBwcm9wZXJ0eSAiLCBTdHJpbmcoa2V5KSk7CisgICAgRVJST1JfTE9HX0lG X1BPU1NJQkxFKExPR0lERU5USUZJRVIsICJDb3VsZCBub3QgcmV0cmlldmUgdmFsdWUgZm9yIHBy b3BlcnR5ICIsIFN0cmluZyhrZXkpKTsKICAgICByZXR1cm4ga0NNQmFzZU9iamVjdEVycm9yX1Zh bHVlTm90QXZhaWxhYmxlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9t YWMvTWVkaWFGb3JtYXRSZWFkZXIvTWVkaWFGb3JtYXRSZWFkZXIuaCBiL1NvdXJjZS9XZWJLaXQv U2hhcmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9NZWRpYUZvcm1hdFJlYWRlci5oCmluZGV4IGM3 NmViYzQ0ODZhNTM1MTQ5YTUyM2M4YjA3ZDc5ZDEyODZlYjU0MzguLmYzYzlhMzRhZmY0MjYyMjlm NmYxNjkwY2JiNWQyNGJlM2ZkYTUxOWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVk L21hYy9NZWRpYUZvcm1hdFJlYWRlci9NZWRpYUZvcm1hdFJlYWRlci5oCisrKyBiL1NvdXJjZS9X ZWJLaXQvU2hhcmVkL21hYy9NZWRpYUZvcm1hdFJlYWRlci9NZWRpYUZvcm1hdFJlYWRlci5oCkBA IC01Nyw2ICs1Nyw3IEBAIHB1YmxpYzoKICAgICBjb25zdCBNZWRpYVRpbWUmIGR1cmF0aW9uKCkg Y29uc3QgeyByZXR1cm4gbV9kdXJhdGlvbjsgfQogCiAgICAgY29uc3QgTG9nZ2VyJiBsb2dnZXIo KSBjb25zdCB7IEFTU0VSVChtX2xvZ2dlcik7IHJldHVybiAqbV9sb2dnZXIuZ2V0KCk7IH0KKyAg ICBjb25zdCBMb2dnZXIqIGxvZ2dlclB0cigpIGNvbnN0IHsgcmV0dXJuIG1fbG9nZ2VyLmdldCgp OyB9CiAgICAgY29uc3Qgdm9pZCogbmV4dFRyYWNrUmVhZGVyTG9nSWRlbnRpZmllcih1aW50NjRf dCkgY29uc3Q7CiAKIHByaXZhdGU6Cg==