213437 2020-06-20 14:00:00 -0700 RecoveryOS: PAL::getAVPlayerLayerClass() will crash when AVFoundation is missing 2020-06-20 19:49:31 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble eric.carlson ews-watchlist glenn peng.liu6 philipj sergio simon.fraser thorton webkit-bug-importer oldest_to_newest 1664775 0 jer.noble 2020-06-20 14:00:00 -0700 RecoveryOS: PAL::getAVPlayerLayerClass() will crash when AVFoundation is missing 1664776 1 webkit-bug-importer 2020-06-20 14:02:15 -0700 <rdar://problem/64563064> 1664777 2 402401 jer.noble 2020-06-20 14:04:16 -0700 Created attachment 402401 Patch 1664781 3 402401 peng.liu6 2020-06-20 14:18:51 -0700 Comment on attachment 402401 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=402401&action=review > Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:1281 > + if (PAL::isAVFoundationFrameworkAvailable()) Seems incorrect? 1664787 4 402401 eric.carlson 2020-06-20 14:46:46 -0700 Comment on attachment 402401 Patch r=me with the issue Peng point out changed 1664805 5 402411 jer.noble 2020-06-20 18:00:53 -0700 Created attachment 402411 Patch for landing 1664809 6 jer.noble 2020-06-20 18:11:02 -0700 (In reply to Peng Liu from comment #3) > Comment on attachment 402401 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=402401&action=review > > > Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:1281 > > + if (PAL::isAVFoundationFrameworkAvailable()) > > Seems incorrect? Good catch! 1664816 7 ews-feeder 2020-06-20 19:49:31 -0700 Committed r263323: <https://trac.webkit.org/changeset/263323> All reviewed patches have been landed. Closing bug and clearing flags on attachment 402411. 402401 2020-06-20 14:04:16 -0700 2020-06-20 14:46:46 -0700 Patch bug-213437-20200620140415.patch text/plain 6344 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZiMWE3YWI5NThmNDE5 M2RiMDgxZWQ4NTY4NDlkMjYwNjFhMjNlZC4uN2I5YWUzYzM3NmQ3NjBlNTEzZmJjZTJiMDIxNTE1 ZmEzMTJhMmYzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA2LTIwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJlY292ZXJ5T1M6IFBBTDo6 Z2V0QVZQbGF5ZXJMYXllckNsYXNzKCkgd2lsbCBjcmFzaCB3aGVuIEFWRm91bmRhdGlvbiBpcyBt aXNzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTM0MzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NTYzMDY0PgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoZWNrIFBBTDo6aXNBVkZvdW5kYXRp b25BdmFpbGFibGUoKSBiZWZvcmUgY2FsbGluZyBQQUw6OmdldEFWUGxheWVyTGF5ZXJDbGFzcygp OworCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvVmlkZW9M YXllck1hbmFnZXJPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6VmlkZW9MYXllck1hbmFnZXJP YmpDOjpzZXRWaWRlb0xheWVyKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYS9jb2Nv YS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtQ0FM YXllckNvY29hOjpsYXllclR5cGVGb3JQbGF0Zm9ybUxheWVyKToKKyAgICAgICAgKFdlYkNvcmU6 OlBsYXRmb3JtQ0FMYXllckNvY29hOjpQbGF0Zm9ybUNBTGF5ZXJDb2NvYSk6CisgICAgICAgIChX ZWJDb3JlOjpQbGF0Zm9ybUNBTGF5ZXJDb2NvYTo6Y2xvbmUgY29uc3QpOgorICAgICAgICAoV2Vi Q29yZTo6UGxhdGZvcm1DQUxheWVyQ29jb2E6OmF2UGxheWVyTGF5ZXIgY29uc3QpOgorCiAyMDIw LTA2LTIwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYktp dCBmYWlscyB0byBsZWF2ZSBhdWRpbyByb3V0aW5nIGFyYml0cmF0aW9uIGR1cmluZyBuYXZpZ2F0 aW9uLCBjbG9zaW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCBlODA0ZmZjNWI3OTlmMWI0ZDk0NmRhZmU4MGUzMmY2 MGFlMTRjYzBlLi5kZjJjZjQwYjdmMzE4OTdlZTViNjU5YjE5NDQzNzJiZjEzMThkYTkzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA2LTIwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVA YXBwbGUuY29tPgorCisgICAgICAgIFJlY292ZXJ5T1M6IFBBTDo6Z2V0QVZQbGF5ZXJMYXllckNs YXNzKCkgd2lsbCBjcmFzaCB3aGVuIEFWRm91bmRhdGlvbiBpcyBtaXNzaW5nCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTM0MzcKKyAgICAgICAgPHJk YXI6Ly9wcm9ibGVtLzY0NTYzMDY0PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIENoZWNrIFBBTDo6aXNBVkZvdW5kYXRpb25BdmFpbGFibGUoKSBiZWZv cmUgY2FsbGluZyBQQUw6OmdldEFWUGxheWVyTGF5ZXJDbGFzcygpOworCisgICAgICAgICogV2Vi UHJvY2Vzcy9XZWJQYWdlL1JlbW90ZUxheWVyVHJlZS9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGVDdXN0 b20ubW06CisgICAgICAgIChXZWJLaXQ6OlBsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3RvbTo6Y2xv bmUgY29uc3QpOgorCiAyMDIwLTA2LTIwICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29t PgogCiAgICAgICAgIFJFR1JFU1NJT04ocjI1OTIxOSk6IFNsZWVwIGFzc2VydGlvbiByZW1haW5z IGFjdGl2ZSBpZiBXS1dlYlZpZXcgaXMgY2xvc2VkIG9yIFdlYkNvbnRlbnQgcHJvY2VzcyBjcmFz aGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9WaWRlb0xheWVyTWFuYWdlck9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9WaWRlb0xheWVyTWFuYWdlck9iakMubW0K aW5kZXggYjZlMGY0ZTYyYzUyZGQ2YzRhZDg4NmNlYjY4YjIxN2RjZTMxMzMwYy4uZmRmNWI2NWQ5 MzU0ODhlZTIyYTFmZTJlZjQ1NDYzMTJhYmE0NjNkMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvVmlkZW9MYXllck1hbmFnZXJP YmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL1ZpZGVvTGF5ZXJNYW5hZ2VyT2JqQy5tbQpAQCAtNjEsNyArNjEsNyBAQCB2b2lkIFZp ZGVvTGF5ZXJNYW5hZ2VyT2JqQzo6c2V0VmlkZW9MYXllcihQbGF0Zm9ybUxheWVyICp2aWRlb0xh eWVyLCBJbnRTaXplIGNvbgogICAgIG1fdmlkZW9JbmxpbmVGcmFtZSA9IENHUmVjdE1ha2UoMCwg MCwgY29udGVudFNpemUud2lkdGgoKSwgY29udGVudFNpemUuaGVpZ2h0KCkpOwogICAgIFttX3Zp ZGVvSW5saW5lTGF5ZXIgc2V0RnJhbWU6bV92aWRlb0lubGluZUZyYW1lXTsKICAgICBbbV92aWRl b0lubGluZUxheWVyIHNldENvbnRlbnRzR3Jhdml0eTprQ0FHcmF2aXR5UmVzaXplQXNwZWN0XTsK LSAgICBpZiAoW3ZpZGVvTGF5ZXIgaXNLaW5kT2ZDbGFzczpQQUw6OmdldEFWUGxheWVyTGF5ZXJD bGFzcygpXSkKKyAgICBpZiAoUEFMOjppc0FWRm91bmRhdGlvbkZyYW1ld29ya0F2YWlsYWJsZSgp ICYmIFt2aWRlb0xheWVyIGlzS2luZE9mQ2xhc3M6UEFMOjpnZXRBVlBsYXllckxheWVyQ2xhc3Mo KV0pCiAgICAgICAgIFttX3ZpZGVvSW5saW5lTGF5ZXIgc2V0UGxheWVyTGF5ZXI6KEFWUGxheWVy TGF5ZXIgKil2aWRlb0xheWVyXTsKIAogI2lmIEVOQUJMRShWSURFT19QUkVTRU5UQVRJT05fTU9E RSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL2NvY29h L1BsYXRmb3JtQ0FMYXllckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW0KaW5kZXggOTU3ZDcyYWQ3MTg1MzZk NTRhMTE5ZDkxODQxNWU0ZWNjNjBmYTBjOS4uMTFjZWI1Zjk3Y2I1ZGIwZmZhY2ViN2EzNjk4MjVm YjkxMTZiYmVlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Y2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxhdGZvcm1DQUxheWVyQ29jb2EubW0KQEAgLTIwNCw3 ICsyMDQsNyBAQCBzdGF0aWMgTlNTdHJpbmcgKnRvQ0FGaWx0ZXJUeXBlKFBsYXRmb3JtQ0FMYXll cjo6RmlsdGVyVHlwZSB0eXBlKQogCiBQbGF0Zm9ybUNBTGF5ZXI6OkxheWVyVHlwZSBQbGF0Zm9y bUNBTGF5ZXJDb2NvYTo6bGF5ZXJUeXBlRm9yUGxhdGZvcm1MYXllcihQbGF0Zm9ybUxheWVyKiBs YXllcikKIHsKLSAgICBpZiAoW2xheWVyIGlzS2luZE9mQ2xhc3M6UEFMOjpnZXRBVlBsYXllckxh eWVyQ2xhc3MoKV0pCisgICAgaWYgKFBBTDo6aXNBVkZvdW5kYXRpb25GcmFtZXdvcmtBdmFpbGFi bGUoKSAmJiBbbGF5ZXIgaXNLaW5kT2ZDbGFzczpQQUw6OmdldEFWUGxheWVyTGF5ZXJDbGFzcygp XSkKICAgICAgICAgcmV0dXJuIExheWVyVHlwZUFWUGxheWVyTGF5ZXI7CiAKICAgICBpZiAoW2xh eWVyIGlzS2luZE9mQ2xhc3M6V2ViVmlkZW9Db250YWluZXJMYXllci5jbGFzc10KQEAgLTI2OCw3 ICsyNjgsOCBAQCBQbGF0Zm9ybUNBTGF5ZXJDb2NvYTo6UGxhdGZvcm1DQUxheWVyQ29jb2EoTGF5 ZXJUeXBlIGxheWVyVHlwZSwgUGxhdGZvcm1DQUxheWVyQwogICAgICAgICBsYXllckNsYXNzID0g W1dlYlRpbGVkQmFja2luZ0xheWVyIGNsYXNzXTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBM YXllclR5cGVBVlBsYXllckxheWVyOgotICAgICAgICBsYXllckNsYXNzID0gUEFMOjpnZXRBVlBs YXllckxheWVyQ2xhc3MoKTsKKyAgICAgICAgaWYgKFBBTDo6aXNBVkZvdW5kYXRpb25GcmFtZXdv cmtBdmFpbGFibGUoKSkKKyAgICAgICAgICAgIGxheWVyQ2xhc3MgPSBQQUw6OmdldEFWUGxheWVy TGF5ZXJDbGFzcygpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIExheWVyVHlwZUNvbnRlbnRz UHJvdmlkZWRMYXllcjoKICAgICAgICAgLy8gV2UgZG9uJ3QgY3JlYXRlIFBsYXRmb3JtQ0FMYXll ckNvY29hcyB3cmFwcGVkIGFyb3VuZCBXZWJHTExheWVycyBvciBXZWJHUFVMYXllcnMuCkBAIC0z NjUsNyArMzY2LDcgQEAgUmVmPFBsYXRmb3JtQ0FMYXllcj4gUGxhdGZvcm1DQUxheWVyQ29jb2E6 OmNsb25lKFBsYXRmb3JtQ0FMYXllckNsaWVudCogb3duZXIpIGMKICAgICBuZXdMYXllci0+dXBk YXRlQ3VzdG9tQXBwZWFyYW5jZShjdXN0b21BcHBlYXJhbmNlKCkpOwogCiAgICAgaWYgKHR5cGUg PT0gTGF5ZXJUeXBlQVZQbGF5ZXJMYXllcikgewotICAgICAgICBBU1NFUlQoW25ld0xheWVyLT5w bGF0Zm9ybUxheWVyKCkgaXNLaW5kT2ZDbGFzczpQQUw6OmdldEFWUGxheWVyTGF5ZXJDbGFzcygp XSk7CisgICAgICAgIEFTU0VSVChQQUw6OmlzQVZGb3VuZGF0aW9uRnJhbWV3b3JrQXZhaWxhYmxl KCkgJiYgW25ld0xheWVyLT5wbGF0Zm9ybUxheWVyKCkgaXNLaW5kT2ZDbGFzczpQQUw6OmdldEFW UGxheWVyTGF5ZXJDbGFzcygpXSk7CiAKICAgICAgICAgQVZQbGF5ZXJMYXllciAqZGVzdGluYXRp b25QbGF5ZXJMYXllciA9IG5ld0xheWVyLT5hdlBsYXllckxheWVyKCk7CiAgICAgICAgIEFWUGxh eWVyTGF5ZXIgKnNvdXJjZVBsYXllckxheWVyID0gYXZQbGF5ZXJMYXllcigpOwpAQCAtMTI3Nyw2 ICsxMjc4LDkgQEAgdW5zaWduZWQgUGxhdGZvcm1DQUxheWVyQ29jb2E6OmJhY2tpbmdTdG9yZUJ5 dGVzUGVyUGl4ZWwoKSBjb25zdAogCiBBVlBsYXllckxheWVyICpQbGF0Zm9ybUNBTGF5ZXJDb2Nv YTo6YXZQbGF5ZXJMYXllcigpIGNvbnN0CiB7CisgICAgaWYgKFBBTDo6aXNBVkZvdW5kYXRpb25G cmFtZXdvcmtBdmFpbGFibGUoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKwogICAgIGlmIChsYXll clR5cGUoKSAhPSBMYXllclR5cGVBVlBsYXllckxheWVyKQogICAgICAgICByZXR1cm4gbmlsOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXll clRyZWUvUGxhdGZvcm1DQUxheWVyUmVtb3RlQ3VzdG9tLm1tIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1BsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3Rv bS5tbQppbmRleCA0MjMxMGI0N2I0OTY5NmJkOTVhMWUwN2JlYWU0YTYwYzM0MDEwN2E1Li4xOTI3 MTU4ZTdiYWVmYWE0NzdjY2YzOTAzZTQ0MjkyYmJiNGQyNDc1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUGxhdGZvcm1DQUxheWVy UmVtb3RlQ3VzdG9tLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1Jl bW90ZUxheWVyVHJlZS9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGVDdXN0b20ubW0KQEAgLTEwNyw3ICsx MDcsNyBAQCBSZWY8V2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyPiBQbGF0Zm9ybUNBTGF5ZXJSZW1v dGVDdXN0b206OmNsb25lKFBsYXRmb3JtQ0FMYXllcgogCiAgICAgaWYgKGxheWVyVHlwZSgpID09 IExheWVyVHlwZUFWUGxheWVyTGF5ZXIpIHsKICAgICAgICAgCi0gICAgICAgIGlmIChbcGxhdGZv cm1MYXllcigpIGlzS2luZE9mQ2xhc3M6UEFMOjpnZXRBVlBsYXllckxheWVyQ2xhc3MoKV0pIHsK KyAgICAgICAgaWYgKFBBTDo6aXNBVkZvdW5kYXRpb25GcmFtZXdvcmtBdmFpbGFibGUoKSAmJiBb cGxhdGZvcm1MYXllcigpIGlzS2luZE9mQ2xhc3M6UEFMOjpnZXRBVlBsYXllckxheWVyQ2xhc3Mo KV0pIHsKICAgICAgICAgICAgIGNsb25lZExheWVyID0gYWRvcHROUyhbUEFMOjphbGxvY0FWUGxh eWVyTGF5ZXJJbnN0YW5jZSgpIGluaXRdKTsKIAogICAgICAgICAgICAgQVZQbGF5ZXJMYXllciAq ZGVzdGluYXRpb25QbGF5ZXJMYXllciA9IHN0YXRpY19jYXN0PEFWUGxheWVyTGF5ZXIgKj4oY2xv bmVkTGF5ZXIuZ2V0KCkpOwo= 402411 2020-06-20 18:00:53 -0700 2020-06-20 19:49:31 -0700 Patch for landing bug-213437-20200620180052.patch text/plain 6341 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYzMTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZiMWE3YWI5NThmNDE5 M2RiMDgxZWQ4NTY4NDlkMjYwNjFhMjNlZC4uZjM3NTQ5Nzk2M2UwOGFhOTdlOTM3Y2FlZWEyNzFh MTMyMmY1NzU0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTA2LTIwICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIFJlY292ZXJ5T1M6IFBBTDo6 Z2V0QVZQbGF5ZXJMYXllckNsYXNzKCkgd2lsbCBjcmFzaCB3aGVuIEFWRm91bmRhdGlvbiBpcyBt aXNzaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MTM0MzcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzY0NTYzMDY0PgorCisgICAgICAgIFJldmll d2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBDaGVjayBQQUw6OmlzQVZGb3VuZGF0aW9u QXZhaWxhYmxlKCkgYmVmb3JlIGNhbGxpbmcgUEFMOjpnZXRBVlBsYXllckxheWVyQ2xhc3MoKTsK KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1ZpZGVvTGF5 ZXJNYW5hZ2VyT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlZpZGVvTGF5ZXJNYW5hZ2VyT2Jq Qzo6c2V0VmlkZW9MYXllcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2Ev UGxhdGZvcm1DQUxheWVyQ29jb2EubW06CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNBTGF5 ZXJDb2NvYTo6bGF5ZXJUeXBlRm9yUGxhdGZvcm1MYXllcik6CisgICAgICAgIChXZWJDb3JlOjpQ bGF0Zm9ybUNBTGF5ZXJDb2NvYTo6UGxhdGZvcm1DQUxheWVyQ29jb2EpOgorICAgICAgICAoV2Vi Q29yZTo6UGxhdGZvcm1DQUxheWVyQ29jb2E6OmNsb25lIGNvbnN0KToKKyAgICAgICAgKFdlYkNv cmU6OlBsYXRmb3JtQ0FMYXllckNvY29hOjphdlBsYXllckxheWVyIGNvbnN0KToKKwogMjAyMC0w Ni0yMCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWJLaXQg ZmFpbHMgdG8gbGVhdmUgYXVkaW8gcm91dGluZyBhcmJpdHJhdGlvbiBkdXJpbmcgbmF2aWdhdGlv biwgY2xvc2luZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNl L1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggZTgwNGZmYzViNzk5ZjFiNGQ5NDZkYWZlODBlMzJmNjBh ZTE0Y2MwZS4uZTY0OTBlM2QxNmRhYTI4NWJhYmU0MzhkYjlmYjRlMmIxMmFkNDdlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMC0wNi0yMCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFw cGxlLmNvbT4KKworICAgICAgICBSZWNvdmVyeU9TOiBQQUw6OmdldEFWUGxheWVyTGF5ZXJDbGFz cygpIHdpbGwgY3Jhc2ggd2hlbiBBVkZvdW5kYXRpb24gaXMgbWlzc2luZworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzNDM3CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82NDU2MzA2ND4KKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24u CisKKyAgICAgICAgQ2hlY2sgUEFMOjppc0FWRm91bmRhdGlvbkF2YWlsYWJsZSgpIGJlZm9yZSBj YWxsaW5nIFBBTDo6Z2V0QVZQbGF5ZXJMYXllckNsYXNzKCk7CisKKyAgICAgICAgKiBXZWJQcm9j ZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1BsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3RvbS5t bToKKyAgICAgICAgKFdlYktpdDo6UGxhdGZvcm1DQUxheWVyUmVtb3RlQ3VzdG9tOjpjbG9uZSBj b25zdCk6CisKIDIwMjAtMDYtMjAgIEplciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAK ICAgICAgICAgUkVHUkVTU0lPTihyMjU5MjE5KTogU2xlZXAgYXNzZXJ0aW9uIHJlbWFpbnMgYWN0 aXZlIGlmIFdLV2ViVmlldyBpcyBjbG9zZWQgb3IgV2ViQ29udGVudCBwcm9jZXNzIGNyYXNoZXMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL1ZpZGVvTGF5ZXJNYW5hZ2VyT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1ZpZGVvTGF5ZXJNYW5hZ2VyT2JqQy5tbQppbmRl eCBiNmUwZjRlNjJjNTJkZDZjNGFkODg2Y2ViNjhiMjE3ZGNlMzEzMzBjLi5mZGY1YjY1ZDkzNTQ4 OGVlMjJhMWZlMmVmNDU0NjMxMmFiYTQ2M2QzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9WaWRlb0xheWVyTWFuYWdlck9iakMu bW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvVmlkZW9MYXllck1hbmFnZXJPYmpDLm1tCkBAIC02MSw3ICs2MSw3IEBAIHZvaWQgVmlkZW9M YXllck1hbmFnZXJPYmpDOjpzZXRWaWRlb0xheWVyKFBsYXRmb3JtTGF5ZXIgKnZpZGVvTGF5ZXIs IEludFNpemUgY29uCiAgICAgbV92aWRlb0lubGluZUZyYW1lID0gQ0dSZWN0TWFrZSgwLCAwLCBj b250ZW50U2l6ZS53aWR0aCgpLCBjb250ZW50U2l6ZS5oZWlnaHQoKSk7CiAgICAgW21fdmlkZW9J bmxpbmVMYXllciBzZXRGcmFtZTptX3ZpZGVvSW5saW5lRnJhbWVdOwogICAgIFttX3ZpZGVvSW5s aW5lTGF5ZXIgc2V0Q29udGVudHNHcmF2aXR5OmtDQUdyYXZpdHlSZXNpemVBc3BlY3RdOwotICAg IGlmIChbdmlkZW9MYXllciBpc0tpbmRPZkNsYXNzOlBBTDo6Z2V0QVZQbGF5ZXJMYXllckNsYXNz KCldKQorICAgIGlmIChQQUw6OmlzQVZGb3VuZGF0aW9uRnJhbWV3b3JrQXZhaWxhYmxlKCkgJiYg W3ZpZGVvTGF5ZXIgaXNLaW5kT2ZDbGFzczpQQUw6OmdldEFWUGxheWVyTGF5ZXJDbGFzcygpXSkK ICAgICAgICAgW21fdmlkZW9JbmxpbmVMYXllciBzZXRQbGF5ZXJMYXllcjooQVZQbGF5ZXJMYXll ciAqKXZpZGVvTGF5ZXJdOwogCiAjaWYgRU5BQkxFKFZJREVPX1BSRVNFTlRBVElPTl9NT0RFKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvY29jb2EvUGxh dGZvcm1DQUxheWVyQ29jb2EubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQppbmRleCA5NTdkNzJhZDcxODUzNmQ1NGEx MTlkOTE4NDE1ZTRlY2M2MGZhMGM5Li5hYjFmNzY3YzJlYmY4OTQ1ZjIzNjE1OTJiN2ZlYTU1MDY5 M2UxMjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9j b2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9jb2NvYS9QbGF0Zm9ybUNBTGF5ZXJDb2NvYS5tbQpAQCAtMjA0LDcgKzIw NCw3IEBAIHN0YXRpYyBOU1N0cmluZyAqdG9DQUZpbHRlclR5cGUoUGxhdGZvcm1DQUxheWVyOjpG aWx0ZXJUeXBlIHR5cGUpCiAKIFBsYXRmb3JtQ0FMYXllcjo6TGF5ZXJUeXBlIFBsYXRmb3JtQ0FM YXllckNvY29hOjpsYXllclR5cGVGb3JQbGF0Zm9ybUxheWVyKFBsYXRmb3JtTGF5ZXIqIGxheWVy KQogewotICAgIGlmIChbbGF5ZXIgaXNLaW5kT2ZDbGFzczpQQUw6OmdldEFWUGxheWVyTGF5ZXJD bGFzcygpXSkKKyAgICBpZiAoUEFMOjppc0FWRm91bmRhdGlvbkZyYW1ld29ya0F2YWlsYWJsZSgp ICYmIFtsYXllciBpc0tpbmRPZkNsYXNzOlBBTDo6Z2V0QVZQbGF5ZXJMYXllckNsYXNzKCldKQog ICAgICAgICByZXR1cm4gTGF5ZXJUeXBlQVZQbGF5ZXJMYXllcjsKIAogICAgIGlmIChbbGF5ZXIg aXNLaW5kT2ZDbGFzczpXZWJWaWRlb0NvbnRhaW5lckxheWVyLmNsYXNzXQpAQCAtMjY4LDcgKzI2 OCw4IEBAIFBsYXRmb3JtQ0FMYXllckNvY29hOjpQbGF0Zm9ybUNBTGF5ZXJDb2NvYShMYXllclR5 cGUgbGF5ZXJUeXBlLCBQbGF0Zm9ybUNBTGF5ZXJDCiAgICAgICAgIGxheWVyQ2xhc3MgPSBbV2Vi VGlsZWRCYWNraW5nTGF5ZXIgY2xhc3NdOwogICAgICAgICBicmVhazsKICAgICBjYXNlIExheWVy VHlwZUFWUGxheWVyTGF5ZXI6Ci0gICAgICAgIGxheWVyQ2xhc3MgPSBQQUw6OmdldEFWUGxheWVy TGF5ZXJDbGFzcygpOworICAgICAgICBpZiAoUEFMOjppc0FWRm91bmRhdGlvbkZyYW1ld29ya0F2 YWlsYWJsZSgpKQorICAgICAgICAgICAgbGF5ZXJDbGFzcyA9IFBBTDo6Z2V0QVZQbGF5ZXJMYXll ckNsYXNzKCk7CiAgICAgICAgIGJyZWFrOwogICAgIGNhc2UgTGF5ZXJUeXBlQ29udGVudHNQcm92 aWRlZExheWVyOgogICAgICAgICAvLyBXZSBkb24ndCBjcmVhdGUgUGxhdGZvcm1DQUxheWVyQ29j b2FzIHdyYXBwZWQgYXJvdW5kIFdlYkdMTGF5ZXJzIG9yIFdlYkdQVUxheWVycy4KQEAgLTM2NSw3 ICszNjYsNyBAQCBSZWY8UGxhdGZvcm1DQUxheWVyPiBQbGF0Zm9ybUNBTGF5ZXJDb2NvYTo6Y2xv bmUoUGxhdGZvcm1DQUxheWVyQ2xpZW50KiBvd25lcikgYwogICAgIG5ld0xheWVyLT51cGRhdGVD dXN0b21BcHBlYXJhbmNlKGN1c3RvbUFwcGVhcmFuY2UoKSk7CiAKICAgICBpZiAodHlwZSA9PSBM YXllclR5cGVBVlBsYXllckxheWVyKSB7Ci0gICAgICAgIEFTU0VSVChbbmV3TGF5ZXItPnBsYXRm b3JtTGF5ZXIoKSBpc0tpbmRPZkNsYXNzOlBBTDo6Z2V0QVZQbGF5ZXJMYXllckNsYXNzKCldKTsK KyAgICAgICAgQVNTRVJUKFBBTDo6aXNBVkZvdW5kYXRpb25GcmFtZXdvcmtBdmFpbGFibGUoKSAm JiBbbmV3TGF5ZXItPnBsYXRmb3JtTGF5ZXIoKSBpc0tpbmRPZkNsYXNzOlBBTDo6Z2V0QVZQbGF5 ZXJMYXllckNsYXNzKCldKTsKIAogICAgICAgICBBVlBsYXllckxheWVyICpkZXN0aW5hdGlvblBs YXllckxheWVyID0gbmV3TGF5ZXItPmF2UGxheWVyTGF5ZXIoKTsKICAgICAgICAgQVZQbGF5ZXJM YXllciAqc291cmNlUGxheWVyTGF5ZXIgPSBhdlBsYXllckxheWVyKCk7CkBAIC0xMjc3LDYgKzEy NzgsOSBAQCB1bnNpZ25lZCBQbGF0Zm9ybUNBTGF5ZXJDb2NvYTo6YmFja2luZ1N0b3JlQnl0ZXNQ ZXJQaXhlbCgpIGNvbnN0CiAKIEFWUGxheWVyTGF5ZXIgKlBsYXRmb3JtQ0FMYXllckNvY29hOjph dlBsYXllckxheWVyKCkgY29uc3QKIHsKKyAgICBpZiAoIVBBTDo6aXNBVkZvdW5kYXRpb25GcmFt ZXdvcmtBdmFpbGFibGUoKSkKKyAgICAgICAgcmV0dXJuIG5pbDsKKwogICAgIGlmIChsYXllclR5 cGUoKSAhPSBMYXllclR5cGVBVlBsYXllckxheWVyKQogICAgICAgICByZXR1cm4gbmlsOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRy ZWUvUGxhdGZvcm1DQUxheWVyUmVtb3RlQ3VzdG9tLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL1dlYlBhZ2UvUmVtb3RlTGF5ZXJUcmVlL1BsYXRmb3JtQ0FMYXllclJlbW90ZUN1c3RvbS5t bQppbmRleCA0MjMxMGI0N2I0OTY5NmJkOTVhMWUwN2JlYWU0YTYwYzM0MDEwN2E1Li4xOTI3MTU4 ZTdiYWVmYWE0NzdjY2YzOTAzZTQ0MjkyYmJiNGQyNDc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9SZW1vdGVMYXllclRyZWUvUGxhdGZvcm1DQUxheWVyUmVt b3RlQ3VzdG9tLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1JlbW90 ZUxheWVyVHJlZS9QbGF0Zm9ybUNBTGF5ZXJSZW1vdGVDdXN0b20ubW0KQEAgLTEwNyw3ICsxMDcs NyBAQCBSZWY8V2ViQ29yZTo6UGxhdGZvcm1DQUxheWVyPiBQbGF0Zm9ybUNBTGF5ZXJSZW1vdGVD dXN0b206OmNsb25lKFBsYXRmb3JtQ0FMYXllcgogCiAgICAgaWYgKGxheWVyVHlwZSgpID09IExh eWVyVHlwZUFWUGxheWVyTGF5ZXIpIHsKICAgICAgICAgCi0gICAgICAgIGlmIChbcGxhdGZvcm1M YXllcigpIGlzS2luZE9mQ2xhc3M6UEFMOjpnZXRBVlBsYXllckxheWVyQ2xhc3MoKV0pIHsKKyAg ICAgICAgaWYgKFBBTDo6aXNBVkZvdW5kYXRpb25GcmFtZXdvcmtBdmFpbGFibGUoKSAmJiBbcGxh dGZvcm1MYXllcigpIGlzS2luZE9mQ2xhc3M6UEFMOjpnZXRBVlBsYXllckxheWVyQ2xhc3MoKV0p IHsKICAgICAgICAgICAgIGNsb25lZExheWVyID0gYWRvcHROUyhbUEFMOjphbGxvY0FWUGxheWVy TGF5ZXJJbnN0YW5jZSgpIGluaXRdKTsKIAogICAgICAgICAgICAgQVZQbGF5ZXJMYXllciAqZGVz dGluYXRpb25QbGF5ZXJMYXllciA9IHN0YXRpY19jYXN0PEFWUGxheWVyTGF5ZXIgKj4oY2xvbmVk TGF5ZXIuZ2V0KCkpOwo=