212646 2020-06-02 10:50:02 -0700 Crash with uncaught exception: *** -[AVSampleBufferAudioRenderer enqueueSampleBuffer:] Sample buffer has media type 'vide' instead of 'soun' 2020-06-03 12:25:56 -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 peng.liu6 webkit-bug-importer oldest_to_newest 1658372 0 jer.noble 2020-06-02 10:50:02 -0700 Crash with uncaught exception: *** -[AVSampleBufferAudioRenderer enqueueSampleBuffer:] Sample buffer has media type 'vide' instead of 'soun' 1658373 1 jer.noble 2020-06-02 10:52:15 -0700 <rdar://problem/63040834> 1658375 2 400839 jer.noble 2020-06-02 10:57:17 -0700 Created attachment 400839 Patch 1658376 3 400839 eric.carlson 2020-06-02 10:59:50 -0700 Comment on attachment 400839 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400839&action=review > Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:1140 > + // AVSampleBufferDisplayLayer will throw an un-documented exception is passed a sample s/is/if/ > Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:1206 > + // AVSampleBufferAudioRenderer will throw an un-documented exception is passed a sample Ditto 1658381 4 400841 jer.noble 2020-06-02 11:04:20 -0700 Created attachment 400841 Patch for landing 1658384 5 400839 peng.liu6 2020-06-02 11:07:35 -0700 Comment on attachment 400839 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400839&action=review > Source/WebCore/ChangeLog:9 > + Protect against the possibility of AVStreamDataParser generating non-video or -audio saples in an otherwise s/saples/samples? 1658836 6 jer.noble 2020-06-03 12:25:56 -0700 Committed r262506: <https://trac.webkit.org/changeset/262506> 400839 2020-06-02 10:57:17 -0700 2020-06-02 10:59:50 -0700 Patch bug-212646-20200602105716.patch text/plain 5172 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU4YWJmZmY3MDY1YTBm ZjQ2N2Y5YmYyZjUzMWNmOThhYTRlZDFjMS4uMTAwMDY3MGE1ZGRhNmJlYjg5ZWEwNTMzNzAxYTFj YTExMjFmZDRmYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA2LTAyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIENyYXNoIHdpdGggdW5jYXVn aHQgZXhjZXB0aW9uOiAqKiogLVtBVlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXIgZW5xdWV1ZVNh bXBsZUJ1ZmZlcjpdIFNhbXBsZSBidWZmZXIgaGFzIG1lZGlhIHR5cGUgJ3ZpZGUnIGluc3RlYWQg b2YgJ3NvdW4nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTI2NDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYzMDQwODM0PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3RlY3QgYWdhaW5zdCB0aGUg cG9zc2liaWxpdHkgb2YgQVZTdHJlYW1EYXRhUGFyc2VyIGdlbmVyYXRpbmcgbm9uLXZpZGVvIG9y IC1hdWRpbyBzYXBsZXMgaW4gYW4gb3RoZXJ3aXNlCisgICAgICAgIHZpZGVvLSBvciBhdWRpby10 cmFjay4gQ2hlY2sgdGhlIGZvcm1hdCBkZXNjcmlwdGlvbiBhdHRhY2hlZCB0byB0aGUgc2FtcGxl IGJlZm9yZSBhcHBlbmRpbmcsIGFuZCBBU1NFUlQgaW4KKyAgICAgICAgZGVidWcgYnVpbGRzIGFu ZCBFUlJPUl9MT0cgaW4gcmVsZWFzZSBidWlsZHMsIGFzIHRoaXMgaXMgYW4gZXhjZXB0aW9uYWwg Y29uZGl0aW9uLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvRm91ckNDLmg6CisgICAg ICAgIChXVEY6OkxvZ0FyZ3VtZW50PFdlYkNvcmU6OkZvdXJDQz46OnRvU3RyaW5nKToKKyAgICAg ICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2 YXRlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlNvdXJjZUJ1ZmZlclByaXZhdGVBVkZP YmpDOjplbnF1ZXVlU2FtcGxlKToKKwogMjAyMC0wNS0yOSAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBbQ29jb2FdIEVNRSBzaG91bGQgcmV0dXJuIG1vcmUgaGVs cGZ1bCBlcnJvciBjb2RlIGR1cmluZyBrZXkgZXhjaGFuZ2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvdXJDQy5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvRm91ckNDLmgKaW5kZXggYjVhZGY1OTVhY2U3OTIwNDRhZWVjMzczZjFiZDQ2 NTJmODBjYmM1ZC4uMWNhMDA1MGZkNjEwMmI5ODJlY2Q2MjIwODcxOTI2MWExN2FmZDI0MSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm91ckNDLmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm91ckNDLmgKQEAgLTQ5LDQgKzQ5LDE0 IEBAIHN0cnVjdCBGb3VyQ0MgewogICAgIHVpbnQzMl90IHZhbHVlIHsgMCB9OwogfTsKIAotfQor fSAvLyBuYW1lc3BhY2UgV2ViQ29yZQorCituYW1lc3BhY2UgV1RGIHsKKwordGVtcGxhdGU8dHlw ZW5hbWU+IHN0cnVjdCBMb2dBcmd1bWVudDsKKwordGVtcGxhdGU8PiBzdHJ1Y3QgTG9nQXJndW1l bnQ8V2ViQ29yZTo6Rm91ckNDPiB7CisgICAgc3RhdGljIFN0cmluZyB0b1N0cmluZyhjb25zdCBX ZWJDb3JlOjpGb3VyQ0MmIGNvZGUpIHsgcmV0dXJuIGNvZGUudG9TdHJpbmcoKTsgfQorfTsKKwor fSAvLyBuYW1lc3BhY2UgV1RGCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJj ZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1tCmluZGV4IGJiYTQ4MWI4ZmQyYjllYzM4MzM4NTVmMTk1 MGIyMjU4YWE5MzYyN2YuLjM1ZWU4ZGI4ZDQ4Mjc4MzRiNTQ4ZjZmMWYzNjY5NmE2YWYxYjU0M2Mg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1tCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVB VkZPYmpDLm1tCkBAIC0zNCw2ICszNCw3IEBACiAjaW1wb3J0ICJDRE1JbnN0YW5jZUZhaXJQbGF5 U3RyZWFtaW5nQVZGT2JqQy5oIgogI2ltcG9ydCAiQ0RNU2Vzc2lvbkFWQ29udGVudEtleVNlc3Np b24uaCIKICNpbXBvcnQgIkNETVNlc3Npb25NZWRpYVNvdXJjZUFWRk9iakMuaCIKKyNpbXBvcnQg IkZvdXJDQy5oIgogI2ltcG9ydCAiSW5iYW5kVGV4dFRyYWNrUHJpdmF0ZUFWRk9iakMuaCIKICNp bXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIk1lZGlhRGVzY3JpcHRpb24uaCIKQEAgLTExMjcs OCArMTEyOCwyNCBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDOjplbnF1ZXVlU2Ft cGxlKFJlZjxNZWRpYVNhbXBsZT4mJiBzYW1wbGUsIGNvbnN0CiAgICAgYXV0byBsb2dTaXRlSWRl bnRpZmllciA9IExPR0lERU5USUZJRVI7CiAgICAgREVCVUdfTE9HKGxvZ1NpdGVJZGVudGlmaWVy LCAidHJhY2sgSUQgPSAiLCB0cmFja0lELCAiLCBzYW1wbGUgPSAiLCBzYW1wbGUuZ2V0KCkpOwog CisgICAgQ01Gb3JtYXREZXNjcmlwdGlvblJlZiBmb3JtYXREZXNjcmlwdGlvbiA9IENNU2FtcGxl QnVmZmVyR2V0Rm9ybWF0RGVzY3JpcHRpb24ocGxhdGZvcm1TYW1wbGUuc2FtcGxlLmNtU2FtcGxl QnVmZmVyKTsKKyAgICBBU1NFUlQoZm9ybWF0RGVzY3JpcHRpb24pOworICAgIGlmICghZm9ybWF0 RGVzY3JpcHRpb24pIHsKKyAgICAgICAgRVJST1JfTE9HKGxvZ1NpdGVJZGVudGlmaWVyLCAiUmVj ZWl2ZWQgc2FtcGxlIHdpdGggYSBudWxsIGZvcm1hdERlc2NyaXB0aW9uLiBCYWlsaW5nLiIpOwor ICAgICAgICByZXR1cm47CisgICAgfQorICAgIGF1dG8gbWVkaWFUeXBlID0gQ01Gb3JtYXREZXNj cmlwdGlvbkdldE1lZGlhVHlwZShmb3JtYXREZXNjcmlwdGlvbik7CisKICAgICBpZiAodHJhY2tJ RCA9PSBtX2VuYWJsZWRWaWRlb1RyYWNrSUQpIHsKLSAgICAgICAgQ01Gb3JtYXREZXNjcmlwdGlv blJlZiBmb3JtYXREZXNjcmlwdGlvbiA9IENNU2FtcGxlQnVmZmVyR2V0Rm9ybWF0RGVzY3JpcHRp b24ocGxhdGZvcm1TYW1wbGUuc2FtcGxlLmNtU2FtcGxlQnVmZmVyKTsKKyAgICAgICAgLy8gQVZT YW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIgd2lsbCB0aHJvdyBhbiB1bi1kb2N1bWVudGVkIGV4Y2Vw dGlvbiBpcyBwYXNzZWQgYSBzYW1wbGUKKyAgICAgICAgLy8gd2hvc2UgbWVkaWEgdHlwZSBpcyBu b3Qga0NNTWVkaWFUeXBlX1ZpZGVvLiBUaGlzIGNvbmRpdGlvbiBpcyBleGNlcHRpb25hbDsgd2Ug c2hvdWxkCisgICAgICAgIC8vIG5ldmVyIGVucXVldWUgYSBub24tdmlkZW8gc2FtcGxlIGluIGEg QVZTYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIuCisgICAgICAgIEFTU0VSVChtZWRpYVR5cGUgPT0g a0NNTWVkaWFUeXBlX1ZpZGVvKTsKKyAgICAgICAgaWYgKG1lZGlhVHlwZSAhPSBrQ01NZWRpYVR5 cGVfVmlkZW8pIHsKKyAgICAgICAgICAgIEVSUk9SX0xPRyhsb2dTaXRlSWRlbnRpZmllciwgIkV4 cGVjdGVkIHNhbXBsZSBvZiB0eXBlICciLCBGb3VyQ0Moa0NNTWVkaWFUeXBlX1ZpZGVvKSwgIics IGdvdCAnIiwgRm91ckNDKG1lZGlhVHlwZSksICInLiBCYWlsaW5nLiIpOworICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgRmxvYXRTaXplIGZvcm1hdFNpemUgPSBGbG9h dFNpemUoQ01WaWRlb0Zvcm1hdERlc2NyaXB0aW9uR2V0UHJlc2VudGF0aW9uRGltZW5zaW9ucyhm b3JtYXREZXNjcmlwdGlvbiwgdHJ1ZSwgdHJ1ZSkpOwogICAgICAgICBpZiAoIW1fY2FjaGVkU2l6 ZSB8fCBmb3JtYXRTaXplICE9IG1fY2FjaGVkU2l6ZS52YWx1ZSgpKSB7CiAgICAgICAgICAgICBE RUJVR19MT0cobG9nU2l0ZUlkZW50aWZpZXIsICJzaXplIGNoYW5nZWQgdG8gIiwgZm9ybWF0U2l6 ZSk7CkBAIC0xMTg2LDYgKzEyMDMsMTUgQEAgdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2Jq Qzo6ZW5xdWV1ZVNhbXBsZShSZWY8TWVkaWFTYW1wbGU+JiYgc2FtcGxlLCBjb25zdAogICAgICAg ICAgICAgW21fZGlzcGxheUxheWVyIGVucXVldWVTYW1wbGVCdWZmZXI6cGxhdGZvcm1TYW1wbGUu c2FtcGxlLmNtU2FtcGxlQnVmZmVyXTsKIAogICAgIH0gZWxzZSB7CisgICAgICAgIC8vIEFWU2Ft cGxlQnVmZmVyQXVkaW9SZW5kZXJlciB3aWxsIHRocm93IGFuIHVuLWRvY3VtZW50ZWQgZXhjZXB0 aW9uIGlzIHBhc3NlZCBhIHNhbXBsZQorICAgICAgICAvLyB3aG9zZSBtZWRpYSB0eXBlIGlzIG5v dCBrQ01NZWRpYVR5cGVfQXVkaW8uIFRoaXMgY29uZGl0aW9uIGlzIGV4Y2VwdGlvbmFsOyB3ZSBz aG91bGQKKyAgICAgICAgLy8gbmV2ZXIgZW5xdWV1ZSBhIG5vbi12aWRlbyBzYW1wbGUgaW4gYSBB VlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXIuCisgICAgICAgIEFTU0VSVChtZWRpYVR5cGUgPT0g a0NNTWVkaWFUeXBlX0F1ZGlvKTsKKyAgICAgICAgaWYgKG1lZGlhVHlwZSAhPSBrQ01NZWRpYVR5 cGVfQXVkaW8pIHsKKyAgICAgICAgICAgIEVSUk9SX0xPRyhsb2dTaXRlSWRlbnRpZmllciwgIkV4 cGVjdGVkIHNhbXBsZSBvZiB0eXBlICciLCBGb3VyQ0Moa0NNTWVkaWFUeXBlX0F1ZGlvKSwgIics IGdvdCAnIiwgRm91ckNDKG1lZGlhVHlwZSksICInLiBCYWlsaW5nLiIpOworICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB9CisKICAgICAgICAgYXV0byByZW5kZXJlciA9IG1fYXVkaW9SZW5k ZXJlcnMuZ2V0KHRyYWNrSUQpOwogICAgICAgICBbcmVuZGVyZXIgZW5xdWV1ZVNhbXBsZUJ1ZmZl cjpwbGF0Zm9ybVNhbXBsZS5zYW1wbGUuY21TYW1wbGVCdWZmZXJdOwogICAgICAgICBpZiAobV9t ZWRpYVNvdXJjZSAmJiAhc2FtcGxlLT5pc05vbkRpc3BsYXlpbmcoKSkK 400841 2020-06-02 11:04:20 -0700 2020-06-03 12:08:18 -0700 Patch for landing bug-212646-20200602110420.patch text/plain 5170 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjYyMTk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGU4YWJmZmY3MDY1YTBm ZjQ2N2Y5YmYyZjUzMWNmOThhYTRlZDFjMS4uNjI5ZTExZmRkOTBhYWI1MzFlNTU4MjlmMWI5YTRh MjRjNDhiZjljNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA2LTAyICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIENyYXNoIHdpdGggdW5jYXVn aHQgZXhjZXB0aW9uOiAqKiogLVtBVlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXIgZW5xdWV1ZVNh bXBsZUJ1ZmZlcjpdIFNhbXBsZSBidWZmZXIgaGFzIG1lZGlhIHR5cGUgJ3ZpZGUnIGluc3RlYWQg b2YgJ3NvdW4nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTI2NDYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzYzMDQwODM0PgorCisgICAgICAgIFJl dmlld2VkIGJ5IEVyaWMgQ2FybHNvbi4KKworICAgICAgICBQcm90ZWN0IGFnYWluc3QgdGhlIHBv c3NpYmlsaXR5IG9mIEFWU3RyZWFtRGF0YVBhcnNlciBnZW5lcmF0aW5nIG5vbi12aWRlbyBvciAt YXVkaW8gc2FwbGVzIGluIGFuIG90aGVyd2lzZQorICAgICAgICB2aWRlby0gb3IgYXVkaW8tdHJh Y2suIENoZWNrIHRoZSBmb3JtYXQgZGVzY3JpcHRpb24gYXR0YWNoZWQgdG8gdGhlIHNhbXBsZSBi ZWZvcmUgYXBwZW5kaW5nLCBhbmQgQVNTRVJUIGluCisgICAgICAgIGRlYnVnIGJ1aWxkcyBhbmQg RVJST1JfTE9HIGluIHJlbGVhc2UgYnVpbGRzLCBhcyB0aGlzIGlzIGFuIGV4Y2VwdGlvbmFsIGNv bmRpdGlvbi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvdXJDQy5oOgorICAgICAg ICAoV1RGOjpMb2dBcmd1bWVudDxXZWJDb3JlOjpGb3VyQ0M+Ojp0b1N0cmluZyk6CisgICAgICAg ICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0 ZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2Jq Qzo6ZW5xdWV1ZVNhbXBsZSk6CisKIDIwMjAtMDUtMjkgIEplciBOb2JsZSAgPGplci5ub2JsZUBh cHBsZS5jb20+CiAKICAgICAgICAgW0NvY29hXSBFTUUgc2hvdWxkIHJldHVybiBtb3JlIGhlbHBm dWwgZXJyb3IgY29kZSBkdXJpbmcga2V5IGV4Y2hhbmdlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb3VyQ0MuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0ZvdXJDQy5oCmluZGV4IGI1YWRmNTk1YWNlNzkyMDQ0YWVlYzM3M2YxYmQ0NjUy ZjgwY2JjNWQuLjFjYTAwNTBmZDYxMDJiOTgyZWNkNjIyMDg3MTkyNjFhMTdhZmQyNDEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvdXJDQy5oCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvdXJDQy5oCkBAIC00OSw0ICs0OSwxNCBA QCBzdHJ1Y3QgRm91ckNDIHsKICAgICB1aW50MzJfdCB2YWx1ZSB7IDAgfTsKIH07CiAKLX0KK30g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKKworbmFtZXNwYWNlIFdURiB7CisKK3RlbXBsYXRlPHR5cGVu YW1lPiBzdHJ1Y3QgTG9nQXJndW1lbnQ7CisKK3RlbXBsYXRlPD4gc3RydWN0IExvZ0FyZ3VtZW50 PFdlYkNvcmU6OkZvdXJDQz4geworICAgIHN0YXRpYyBTdHJpbmcgdG9TdHJpbmcoY29uc3QgV2Vi Q29yZTo6Rm91ckNDJiBjb2RlKSB7IHJldHVybiBjb2RlLnRvU3RyaW5nKCk7IH0KK307CisKK30g Ly8gbmFtZXNwYWNlIFdURgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0gYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VC dWZmZXJQcml2YXRlQVZGT2JqQy5tbQppbmRleCBiYmE0ODFiOGZkMmI5ZWMzODMzODU1ZjE5NTBi MjI1OGFhOTM2MjdmLi5lNWJlMTY4YTM0ZTkxZDk2NGFhMTA5MmZjYmQwNWJjZDU0ZjcxNzBlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZG T2JqQy5tbQpAQCAtMzQsNiArMzQsNyBAQAogI2ltcG9ydCAiQ0RNSW5zdGFuY2VGYWlyUGxheVN0 cmVhbWluZ0FWRk9iakMuaCIKICNpbXBvcnQgIkNETVNlc3Npb25BVkNvbnRlbnRLZXlTZXNzaW9u LmgiCiAjaW1wb3J0ICJDRE1TZXNzaW9uTWVkaWFTb3VyY2VBVkZPYmpDLmgiCisjaW1wb3J0ICJG b3VyQ0MuaCIKICNpbXBvcnQgIkluYmFuZFRleHRUcmFja1ByaXZhdGVBVkZPYmpDLmgiCiAjaW1w b3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJNZWRpYURlc2NyaXB0aW9uLmgiCkBAIC0xMTI3LDgg KzExMjgsMjQgQEAgdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQzo6ZW5xdWV1ZVNhbXBs ZShSZWY8TWVkaWFTYW1wbGU+JiYgc2FtcGxlLCBjb25zdAogICAgIGF1dG8gbG9nU2l0ZUlkZW50 aWZpZXIgPSBMT0dJREVOVElGSUVSOwogICAgIERFQlVHX0xPRyhsb2dTaXRlSWRlbnRpZmllciwg InRyYWNrIElEID0gIiwgdHJhY2tJRCwgIiwgc2FtcGxlID0gIiwgc2FtcGxlLmdldCgpKTsKIAor ICAgIENNRm9ybWF0RGVzY3JpcHRpb25SZWYgZm9ybWF0RGVzY3JpcHRpb24gPSBDTVNhbXBsZUJ1 ZmZlckdldEZvcm1hdERlc2NyaXB0aW9uKHBsYXRmb3JtU2FtcGxlLnNhbXBsZS5jbVNhbXBsZUJ1 ZmZlcik7CisgICAgQVNTRVJUKGZvcm1hdERlc2NyaXB0aW9uKTsKKyAgICBpZiAoIWZvcm1hdERl c2NyaXB0aW9uKSB7CisgICAgICAgIEVSUk9SX0xPRyhsb2dTaXRlSWRlbnRpZmllciwgIlJlY2Vp dmVkIHNhbXBsZSB3aXRoIGEgbnVsbCBmb3JtYXREZXNjcmlwdGlvbi4gQmFpbGluZy4iKTsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKyAgICBhdXRvIG1lZGlhVHlwZSA9IENNRm9ybWF0RGVzY3Jp cHRpb25HZXRNZWRpYVR5cGUoZm9ybWF0RGVzY3JpcHRpb24pOworCiAgICAgaWYgKHRyYWNrSUQg PT0gbV9lbmFibGVkVmlkZW9UcmFja0lEKSB7Ci0gICAgICAgIENNRm9ybWF0RGVzY3JpcHRpb25S ZWYgZm9ybWF0RGVzY3JpcHRpb24gPSBDTVNhbXBsZUJ1ZmZlckdldEZvcm1hdERlc2NyaXB0aW9u KHBsYXRmb3JtU2FtcGxlLnNhbXBsZS5jbVNhbXBsZUJ1ZmZlcik7CisgICAgICAgIC8vIEFWU2Ft cGxlQnVmZmVyRGlzcGxheUxheWVyIHdpbGwgdGhyb3cgYW4gdW4tZG9jdW1lbnRlZCBleGNlcHRp b24gaWYgcGFzc2VkIGEgc2FtcGxlCisgICAgICAgIC8vIHdob3NlIG1lZGlhIHR5cGUgaXMgbm90 IGtDTU1lZGlhVHlwZV9WaWRlby4gVGhpcyBjb25kaXRpb24gaXMgZXhjZXB0aW9uYWw7IHdlIHNo b3VsZAorICAgICAgICAvLyBuZXZlciBlbnF1ZXVlIGEgbm9uLXZpZGVvIHNhbXBsZSBpbiBhIEFW U2FtcGxlQnVmZmVyRGlzcGxheUxheWVyLgorICAgICAgICBBU1NFUlQobWVkaWFUeXBlID09IGtD TU1lZGlhVHlwZV9WaWRlbyk7CisgICAgICAgIGlmIChtZWRpYVR5cGUgIT0ga0NNTWVkaWFUeXBl X1ZpZGVvKSB7CisgICAgICAgICAgICBFUlJPUl9MT0cobG9nU2l0ZUlkZW50aWZpZXIsICJFeHBl Y3RlZCBzYW1wbGUgb2YgdHlwZSAnIiwgRm91ckNDKGtDTU1lZGlhVHlwZV9WaWRlbyksICInLCBn b3QgJyIsIEZvdXJDQyhtZWRpYVR5cGUpLCAiJy4gQmFpbGluZy4iKTsKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIEZsb2F0U2l6ZSBmb3JtYXRTaXplID0gRmxvYXRT aXplKENNVmlkZW9Gb3JtYXREZXNjcmlwdGlvbkdldFByZXNlbnRhdGlvbkRpbWVuc2lvbnMoZm9y bWF0RGVzY3JpcHRpb24sIHRydWUsIHRydWUpKTsKICAgICAgICAgaWYgKCFtX2NhY2hlZFNpemUg fHwgZm9ybWF0U2l6ZSAhPSBtX2NhY2hlZFNpemUudmFsdWUoKSkgewogICAgICAgICAgICAgREVC VUdfTE9HKGxvZ1NpdGVJZGVudGlmaWVyLCAic2l6ZSBjaGFuZ2VkIHRvICIsIGZvcm1hdFNpemUp OwpAQCAtMTE4Niw2ICsxMjAzLDE1IEBAIHZvaWQgU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakM6 OmVucXVldWVTYW1wbGUoUmVmPE1lZGlhU2FtcGxlPiYmIHNhbXBsZSwgY29uc3QKICAgICAgICAg ICAgIFttX2Rpc3BsYXlMYXllciBlbnF1ZXVlU2FtcGxlQnVmZmVyOnBsYXRmb3JtU2FtcGxlLnNh bXBsZS5jbVNhbXBsZUJ1ZmZlcl07CiAKICAgICB9IGVsc2UgeworICAgICAgICAvLyBBVlNhbXBs ZUJ1ZmZlckF1ZGlvUmVuZGVyZXIgd2lsbCB0aHJvdyBhbiB1bi1kb2N1bWVudGVkIGV4Y2VwdGlv biBpZiBwYXNzZWQgYSBzYW1wbGUKKyAgICAgICAgLy8gd2hvc2UgbWVkaWEgdHlwZSBpcyBub3Qg a0NNTWVkaWFUeXBlX0F1ZGlvLiBUaGlzIGNvbmRpdGlvbiBpcyBleGNlcHRpb25hbDsgd2Ugc2hv dWxkCisgICAgICAgIC8vIG5ldmVyIGVucXVldWUgYSBub24tdmlkZW8gc2FtcGxlIGluIGEgQVZT YW1wbGVCdWZmZXJBdWRpb1JlbmRlcmVyLgorICAgICAgICBBU1NFUlQobWVkaWFUeXBlID09IGtD TU1lZGlhVHlwZV9BdWRpbyk7CisgICAgICAgIGlmIChtZWRpYVR5cGUgIT0ga0NNTWVkaWFUeXBl X0F1ZGlvKSB7CisgICAgICAgICAgICBFUlJPUl9MT0cobG9nU2l0ZUlkZW50aWZpZXIsICJFeHBl Y3RlZCBzYW1wbGUgb2YgdHlwZSAnIiwgRm91ckNDKGtDTU1lZGlhVHlwZV9BdWRpbyksICInLCBn b3QgJyIsIEZvdXJDQyhtZWRpYVR5cGUpLCAiJy4gQmFpbGluZy4iKTsKKyAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIGF1dG8gcmVuZGVyZXIgPSBtX2F1ZGlvUmVuZGVy ZXJzLmdldCh0cmFja0lEKTsKICAgICAgICAgW3JlbmRlcmVyIGVucXVldWVTYW1wbGVCdWZmZXI6 cGxhdGZvcm1TYW1wbGUuc2FtcGxlLmNtU2FtcGxlQnVmZmVyXTsKICAgICAgICAgaWYgKG1fbWVk aWFTb3VyY2UgJiYgIXNhbXBsZS0+aXNOb25EaXNwbGF5aW5nKCkpCg==