229251 2021-08-18 14:56:04 -0700 [WebAudio/WebM] Incorrect number of frames returned if decoding frame rate doesn't match original 2021-09-09 00:02:31 -0700 1 1 1 Unclassified WebKit Web Audio Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 227111 1 jean-yves.avenard jean-yves.avenard cdumez eric.carlson ews-watchlist glenn jer.noble philipj sergio webkit-bug-importer oldest_to_newest 1785230 0 jean-yves.avenard 2021-08-18 14:56:04 -0700 When calling decodeAudioData with a context where a sampling rate set is different to the original content, the number of frames returned may be incorrect STR: 1- Open https://jyavenard.github.io/htmltests/tests/webaudio/decodeAudioData.html 2- Select opus.webm as the file to use 3- Set the sampling rate to 44100 4- Press play The numbers showing are 88254 frames 2.001224489795918 which indicates that we've returned 88254 frames and that the length of the blob decoded is over 2s This file is originally encoded at 48kHz and is exactly 2s long. When forcing the content to be decoded at 44.1kHz we should be getting 88200 frames and a 2s duration. Something is wrong in the resampling and the trimming. 1785232 1 webkit-bug-importer 2021-08-18 14:56:31 -0700 <rdar://problem/82095650> 1791425 2 437617 jean-yves.avenard 2021-09-08 03:40:10 -0700 Created attachment 437617 Patch 1791641 3 437617 eric.carlson 2021-09-08 15:19:30 -0700 Comment on attachment 437617 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=437617&action=review > Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.cpp:339 > + uint32_t leadingTrim = m_webmData->m_track->codecDelay().value_or(MediaTime()).toDouble() * outFormat.mSampleRate; `MediaTime::zeroTime()` should be cheaper than `MediaTime()` > Source/WebCore/platform/audio/cocoa/AudioFileReaderCocoa.cpp:341 > + uint32_t trailingTrim = (m_webmData->m_track->codecDelay().value_or(MediaTime()) + m_webmData->m_track->discardPadding().value_or(MediaTime())).toDouble() * outFormat.mSampleRate - leadingTrim + 0.5; Ditto 1791734 4 437698 jean-yves.avenard 2021-09-08 19:34:27 -0700 Created attachment 437698 Patch 1791784 5 ews-feeder 2021-09-09 00:02:29 -0700 Committed r282196 (241483@main): <https://commits.webkit.org/241483@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 437698. 437617 2021-09-08 03:40:10 -0700 2021-09-08 19:34:23 -0700 Patch bug-229251-20210908204009.patch text/plain 9160 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTczYzI2ZTJmNjViODg0 YzJkNDM1ZDkyZGMwNWExOGRlZGU0NWRkYS4uY2VjY2I2MDllODNiMDVlZDg5MjIxNWY5M2YyOGNm NTNlYzNlNTE1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA5LTA4ICBKZWFu LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1ZGlvL1dlYk1d IEluY29ycmVjdCBudW1iZXIgb2YgZnJhbWVzIHJldHVybmVkIGlmIGRlY29kaW5nIGZyYW1lIHJh dGUgZG9lc24ndCBtYXRjaCBvcmlnaW5hbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjUxCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzgyMDk1NjUw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgV2UgY2Fu J3QgcmVseSBvbiBDb3JlTWVkaWEgdG8gcGVyZm9ybWVkIHRoZSB0cmltbWluZyBjb3JyZWN0bHkg d2hlbiByZXNhbXBsaW5nIGlzIGFsc28gdG8gYmUgZG9uZS4KKyAgICAgICAgSXQgZ2l2ZXMgdW5l eHBlY3RlZCByZXN1bHRzLiBMZXQncyBkbyBpdCBvdXJzZWx2ZXMgaW5zdGVhZC4KKyAgICAgICAg VGVzdDogd2ViYXVkaW8vZGVjb2RlLWF1ZGlvLWRhdGEtd2VibS1vcHVzLXJlc2FtcGxlLmh0bWwK KworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2NvY29hL0F1ZGlvRmlsZVJlYWRlckNvY29hLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkF1ZGlvRmlsZVJlYWRlcjo6ZGVjb2RlV2ViTURhdGEgY29u c3QpOgorCiAyMDIxLTA5LTA3ICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CiAK ICAgICAgICAgU2FmYXJpIFRQIDEzMSBhdWRpbyBjYW5QbGF5VHlwZSgpIHJlcG9ydHMgZmFsc2Ug bmVnYXRpdmVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2Nv YS9BdWRpb0ZpbGVSZWFkZXJDb2NvYS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRp by9jb2NvYS9BdWRpb0ZpbGVSZWFkZXJDb2NvYS5jcHAKaW5kZXggMTM3NzUwYTdjNWViOWEyOGFk YWNiYTcwM2Q5MTA4MjE1ZDdiMjFhNC4uMTUyZTE2ZTM3MmI3ODExOWUyNTA1Y2UwZmUxNzE4NGIw MWY4ZWM3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vY29jb2Ev QXVkaW9GaWxlUmVhZGVyQ29jb2EuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1 ZGlvL2NvY29hL0F1ZGlvRmlsZVJlYWRlckNvY29hLmNwcApAQCAtMzIzLDE5ICszMjMsMjYgQEAg c3RkOjpvcHRpb25hbDxzaXplX3Q+IEF1ZGlvRmlsZVJlYWRlcjo6ZGVjb2RlV2ViTURhdGEoQXVk aW9CdWZmZXJMaXN0JiBidWZmZXJMaXMKICAgICBpZiAobGF5b3V0ICYmIGxheW91dFNpemUpCiAg ICAgICAgIFBBTDo6QXVkaW9Db252ZXJ0ZXJTZXRQcm9wZXJ0eShjb252ZXJ0ZXIsIGtBdWRpb0Nv bnZlcnRlcklucHV0Q2hhbm5lbExheW91dCwgbGF5b3V0U2l6ZSwgbGF5b3V0KTsKIAotICAgIEF1 ZGlvQ29udmVydGVyUHJpbWVJbmZvIHByaW1lSW5mbyA9IHsgVUludDMyKG1fd2VibURhdGEtPm1f dHJhY2stPmNvZGVjRGVsYXkoKS52YWx1ZV9vcihNZWRpYVRpbWUoKSkudG9Eb3VibGUoKSAqIG91 dEZvcm1hdC5tU2FtcGxlUmF0ZSksIDAgfTsKLSAgICBJTkZPX0xPRyhMT0dJREVOVElGSUVSLCAi V2lsbCBkcm9wICV1IGxlYWRpbmcgZnJhbWVzIG91dCBvZiAlbGx1IiwgcHJpbWVJbmZvLmxlYWRp bmdGcmFtZXMsIG51bWJlck9mRnJhbWVzKTsKLSAgICBQQUw6OkF1ZGlvQ29udmVydGVyU2V0UHJv cGVydHkoY29udmVydGVyLCBrQXVkaW9Db252ZXJ0ZXJQcmltZUluZm8sIHNpemVvZihwcmltZUlu Zm8pLCAmcHJpbWVJbmZvKTsKLSAgICBVSW50MzIgcHJpbWVNZXRob2QgPSBrQ29udmVydGVyUHJp bWVNZXRob2RfTm9uZTsKLSAgICBQQUw6OkF1ZGlvQ29udmVydGVyU2V0UHJvcGVydHkoY29udmVy dGVyLCBrQXVkaW9Db252ZXJ0ZXJQcmltZU1ldGhvZCwgc2l6ZW9mKHByaW1lTWV0aG9kKSwgJnBy aW1lTWV0aG9kKTsKLQogICAgIEF1ZGlvQnVmZmVyTGlzdEhvbGRlciBkZWNvZGVkQnVmZmVyTGlz dChpbkZvcm1hdC5tQ2hhbm5lbHNQZXJGcmFtZSk7CiAgICAgaWYgKCFkZWNvZGVkQnVmZmVyTGlz dCkgewogICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChXZWJBdWRpbywgIlVuYWJsZSB0byBjcmVh dGUgZGVjb2RlciIpOwogICAgICAgICByZXR1cm4geyB9OwogICAgIH0KIAorICAgIC8vIEluc3Ry dWN0IHRoZSBkZWNvZGVyIHRvIG5vdCBkcm9wIGFueSBmcmFtZXMKKyAgICAvLyAoYnkgZGVmYXVs dCB0aGUgT3B1cyBkZWNvZGVyIGFzc3VtZXMgdGhhdCBTYW1wbGVSYXRlIC8gNDAwIGZyYW1lcyBh cmUgdG8gYmUgZHJvcHBlZC4KKyAgICBBdWRpb0NvbnZlcnRlclByaW1lSW5mbyBwcmltZUluZm8g PSB7IDAsIDAgfTsKKyAgICBQQUw6OkF1ZGlvQ29udmVydGVyU2V0UHJvcGVydHkoY29udmVydGVy LCBrQXVkaW9Db252ZXJ0ZXJQcmltZUluZm8sIHNpemVvZihwcmltZUluZm8pLCAmcHJpbWVJbmZv KTsKKyAgICBVSW50MzIgcHJpbWVNZXRob2QgPSBrQ29udmVydGVyUHJpbWVNZXRob2RfTm9uZTsK KyAgICBQQUw6OkF1ZGlvQ29udmVydGVyU2V0UHJvcGVydHkoY29udmVydGVyLCBrQXVkaW9Db252 ZXJ0ZXJQcmltZU1ldGhvZCwgc2l6ZW9mKHByaW1lTWV0aG9kKSwgJnByaW1lTWV0aG9kKTsKKwor ICAgIHVpbnQzMl90IGxlYWRpbmdUcmltID0gbV93ZWJtRGF0YS0+bV90cmFjay0+Y29kZWNEZWxh eSgpLnZhbHVlX29yKE1lZGlhVGltZSgpKS50b0RvdWJsZSgpICogb3V0Rm9ybWF0Lm1TYW1wbGVS YXRlOworICAgIC8vIENhbGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHRyYWlsaW5nIGZyYW1lcyB0byBi ZSB0cmltbWVkIGJ5IHJvdW5kaW5nIHRvIG5lYXJlc3QgaW50ZWdlciB3aGlsZSBtaW5pbWl6aW5n IGN1bW11bGF0aXZlIHJvdW5kaW5nIGVycm9ycy4KKyAgICB1aW50MzJfdCB0cmFpbGluZ1RyaW0g PSAobV93ZWJtRGF0YS0+bV90cmFjay0+Y29kZWNEZWxheSgpLnZhbHVlX29yKE1lZGlhVGltZSgp KSArIG1fd2VibURhdGEtPm1fdHJhY2stPmRpc2NhcmRQYWRkaW5nKCkudmFsdWVfb3IoTWVkaWFU aW1lKCkpKS50b0RvdWJsZSgpICogb3V0Rm9ybWF0Lm1TYW1wbGVSYXRlIC0gbGVhZGluZ1RyaW0g KyAwLjU7CisgICAgSU5GT19MT0coTE9HSURFTlRJRklFUiwgIldpbGwgZHJvcCAiLCBsZWFkaW5n VHJpbSwgIiBsZWFkaW5nIGFuZCAiLCB0cmFpbGluZ1RyaW0sICIgdHJhaWxpbmcgZnJhbWVzIG91 dCBvZiAiLCBudW1iZXJPZkZyYW1lcyk7CisKICAgICBzaXplX3QgZGVjb2RlZEZyYW1lcyA9IDA7 CisgICAgc2l6ZV90IHRvdGFsRGVjb2RlZEZyYW1lcyA9IDA7CiAgICAgT1NTdGF0dXMgc3RhdHVz OwogICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwgbV93ZWJtRGF0YS0+bV9zYW1wbGVzLnNpemUo KTsgaSsrKSB7CiAgICAgICAgIGF1dG8mIHNhbXBsZSA9IG1fd2VibURhdGEtPm1fc2FtcGxlc1tp XTsKQEAgLTM2MiwxMiArMzY5LDE0IEBAIHN0ZDo6b3B0aW9uYWw8c2l6ZV90PiBBdWRpb0ZpbGVS ZWFkZXI6OmRlY29kZVdlYk1EYXRhKEF1ZGlvQnVmZmVyTGlzdCYgYnVmZmVyTGlzCiAKICAgICAg ICAgZG8gewogICAgICAgICAgICAgaWYgKG51bWJlck9mRnJhbWVzIDwgZGVjb2RlZEZyYW1lcykg ewotICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKFdlYkF1ZGlvLCAiRGVjb2RlZCBt b3JlIGZyYW1lcyB0aGFuIGZpcnN0IGNhbGN1bGF0ZWQiKTsKKyAgICAgICAgICAgICAgICBSRUxF QVNFX0xPR19GQVVMVChXZWJBdWRpbywgIkRlY29kZWQgbW9yZSBmcmFtZXMgdGhhbiBmaXJzdCBj YWxjdWxhdGVkLCBubyBhdmFpbGFibGUgc3BhY2UgbGVmdCIpOwogICAgICAgICAgICAgICAgIHJl dHVybiB7IH07CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICAvLyBpbjogdGhlIG1heCBudW1i ZXIgb2YgcGFja2V0cyB3ZSBjYW4gaGFuZGxlIGZyb20gdGhlIGRlY29kZXIuCiAgICAgICAgICAg ICAvLyBvdXQ6IHRoZSBudW1iZXIgb2YgcGFja2V0cyB0aGUgZGVjb2RlciBpcyBhY3R1YWxseSBy ZXR1cm5pbmcuCi0gICAgICAgICAgICBVSW50MzIgbnVtRnJhbWVzID0gc3RkOjptaW48dWludDMy X3Q+KHN0ZDo6bnVtZXJpY19saW1pdHM8aW50MzJfdD46Om1heCgpIC8gc2l6ZW9mKGZsb2F0KSwg bnVtYmVyT2ZGcmFtZXMgLSBkZWNvZGVkRnJhbWVzKTsKKyAgICAgICAgICAgIC8vIFRoZSBBdWRp b0NvbnZlcnRlciB3aWxsIHNvbWV0aW1lcyBwYWQgd2l0aCB0cmFpbGluZyBzaWxlbmNlIGlmIHdl IHNldCB0aGUgZnJlZSBzcGFjZSB0byB3aGF0IGl0IGFjdHVhbGx5IGlzIChudW1iZXJPZkZyYW1l cyAtIGRlY29kZWRGcmFtZXMpLgorICAgICAgICAgICAgLy8gU28gd2Ugc2V0IGl0IHRvIHdoYXQg dGhlcmUgaXMgbGVmdCB0byBkZWNvZGUgaW5zdGVhZC4KKyAgICAgICAgICAgIFVJbnQzMiBudW1G cmFtZXMgPSBzdGQ6Om1pbjx1aW50MzJfdD4oc3RkOjpudW1lcmljX2xpbWl0czxpbnQzMl90Pjo6 bWF4KCkgLyBzaXplb2YoZmxvYXQpLCBudW1iZXJPZkZyYW1lcyAtIHRvdGFsRGVjb2RlZEZyYW1l cyk7CiAKICAgICAgICAgICAgIGZvciAoVUludDMyIGkgPSAwOyBpIDwgaW5Gb3JtYXQubUNoYW5u ZWxzUGVyRnJhbWU7IGkrKykgewogICAgICAgICAgICAgICAgIGRlY29kZWRCdWZmZXJMaXN0LT5t QnVmZmVyc1tpXS5tTnVtYmVyQ2hhbm5lbHMgPSAxOwpAQCAtMzc5LDEyICszODgsMTkgQEAgc3Rk OjpvcHRpb25hbDxzaXplX3Q+IEF1ZGlvRmlsZVJlYWRlcjo6ZGVjb2RlV2ViTURhdGEoQXVkaW9C dWZmZXJMaXN0JiBidWZmZXJMaXMKICAgICAgICAgICAgICAgICBSRUxFQVNFX0xPR19GQVVMVChX ZWJBdWRpbywgIkVycm9yIGRlY29kaW5nIGRhdGEiKTsKICAgICAgICAgICAgICAgICByZXR1cm4g eyB9OwogICAgICAgICAgICAgfQorICAgICAgICAgICAgdG90YWxEZWNvZGVkRnJhbWVzICs9IG51 bUZyYW1lczsKKyAgICAgICAgICAgIGlmIChsZWFkaW5nVHJpbSA+IDApIHsKKyAgICAgICAgICAg ICAgICBVSW50MzIgdG9UcmltID0gc3RkOjptaW4obGVhZGluZ1RyaW0sIG51bUZyYW1lcyk7Cisg ICAgICAgICAgICAgICAgZm9yIChVSW50MzIgaSA9IDA7IGkgPCBvdXRGb3JtYXQubUNoYW5uZWxz UGVyRnJhbWU7IGkrKykKKyAgICAgICAgICAgICAgICAgICAgbWVtY3B5KGRlY29kZWRCdWZmZXJM aXN0LT5tQnVmZmVyc1tpXS5tRGF0YSwgc3RhdGljX2Nhc3Q8ZmxvYXQqPihkZWNvZGVkQnVmZmVy TGlzdC0+bUJ1ZmZlcnNbaV0ubURhdGEpICsgdG9UcmltLCAobnVtRnJhbWVzIC0gdG9UcmltKSAq IHNpemVvZihmbG9hdCkpOworICAgICAgICAgICAgICAgIGxlYWRpbmdUcmltIC09IHRvVHJpbTsK KyAgICAgICAgICAgICAgICBudW1GcmFtZXMgLT0gdG9UcmltOworICAgICAgICAgICAgfQogICAg ICAgICAgICAgZGVjb2RlZEZyYW1lcyArPSBudW1GcmFtZXM7CiAgICAgICAgIH0gd2hpbGUgKHN0 YXR1cyAhPSBrTm9Nb3JlRGF0YUVyciAmJiBzdGF0dXMgIT0gbm9FcnIpOwogICAgIH0KLSAgICBz aXplX3QgcGFkZGluZ0ZyYW1lcyA9IG1fd2VibURhdGEtPm1fdHJhY2stPmRpc2NhcmRQYWRkaW5n KCkudmFsdWVfb3IoTWVkaWFUaW1lKCkpLnRvRG91YmxlKCkgKiBvdXRGb3JtYXQubVNhbXBsZVJh dGU7Ci0gICAgaWYgKGRlY29kZWRGcmFtZXMgPiBwYWRkaW5nRnJhbWVzKQotICAgICAgICByZXR1 cm4gZGVjb2RlZEZyYW1lcyAtIHBhZGRpbmdGcmFtZXM7CisgICAgaWYgKGRlY29kZWRGcmFtZXMg PiB0cmFpbGluZ1RyaW0pCisgICAgICAgIHJldHVybiBkZWNvZGVkRnJhbWVzIC0gdHJhaWxpbmdU cmltOwogICAgIHJldHVybiAwOwogfQogI2VuZGlmCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9U ZXN0RXhwZWN0YXRpb25zCmluZGV4IDY3NGZkY2IwNDg5MjFkNjAwMmMwODcxMTIzYWUzMWQ2ZTFh ODI3ZTQuLjBmOWEwZGY0OGJiNzNhYThlYTVhZTg0ZGJhNWEzOGY5YWFmNGQ5YjMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCisrKyBiL0xheW91 dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCkBAIC0xNzE5LDYgKzE3MTksNyBA QCB3ZWJraXQub3JnL2IvMjE0MTU1IGltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvaHRt bC9jcm9zcy1vcmlnaW4tZW1iZWRkZXItcAogWyBDYXRhbGluYSBNb2phdmUgQmlnU3VyIF0gbWVk aWEvbWVkaWEtc291cmNlL21lZGlhLXdlYm0tb3B1cy1wYXJ0aWFsLmh0bWwgWyBTa2lwIF0KIFsg Q2F0YWxpbmEgTW9qYXZlIEJpZ1N1ciBdIG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS13ZWJtLW9w dXMtcGFydGlhbC1hYm9ydC5odG1sIFsgU2tpcCBdCiBbIENhdGFsaW5hIE1vamF2ZSBCaWdTdXIg XSB3ZWJhdWRpby9kZWNvZGUtYXVkaW8tZGF0YS13ZWJtLW9wdXMuaHRtbCBbIFNraXAgXQorWyBD YXRhbGluYSBNb2phdmUgQmlnU3VyIF0gd2ViYXVkaW8vZGVjb2RlLWF1ZGlvLWRhdGEtd2VibS1v cHVzLXJlc2FtcGxlLmh0bWwgWyBTa2lwIF0KIFsgQ2F0YWxpbmEgTW9qYXZlIEJpZ1N1ciBdIHdl YmF1ZGlvL2RlY29kZS1hdWRpby1kYXRhLXdlYm0tdm9yYmlzLmh0bWwgWyBTa2lwIF0KIAogd2Vi a2l0Lm9yZy9iLzIxNDQyMiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3dlYmF1ZGlv L3RoZS1hdWRpby1hcGkvdGhlLWF1ZGlvY29udGV4dC1pbnRlcmZhY2Uvc3VzcGVuZC1hZnRlci1j b25zdHJ1Y3QuaHRtbCBbIFBhc3MgRmFpbHVyZSBdCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy93 ZWJhdWRpby9kZWNvZGUtYXVkaW8tZGF0YS13ZWJtLW9wdXMtcmVzYW1wbGUtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvd2ViYXVkaW8vZGVjb2RlLWF1ZGlvLWRhdGEtd2VibS1vcHVzLXJlc2Ft cGxlLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kMzM4ZTJiNTc0YTcwY2IxZjVmNDc4OTQ0ZjVi M2NjZjA0OGYyYWU4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvd2ViYXVkaW8vZGVj b2RlLWF1ZGlvLWRhdGEtd2VibS1vcHVzLXJlc2FtcGxlLWV4cGVjdGVkLnR4dApAQCAtMCwwICsx LDExIEBACitUZXN0IHRoYXQgZGVjb2RpbmcgYW4gb3B1cyB3ZWJtIGZpbGUgd2l0aCByZXNhbXBs aW5nIHN1Y2NlZWRzCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFT UyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitQQVNTIFN1Y2Nl c3NmdWxseSBkZWNvZGVkIGNvbnRlbnQKK1BBU1MgRGVjb2RpbmcgcmV0dXJuZWQgdGhlIHJpZ2h0 IG51bWJlciBvZiBmcmFtZXMuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RF U1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvd2ViYXVkaW8vZGVjb2RlLWF1 ZGlvLWRhdGEtd2VibS1vcHVzLXJlc2FtcGxlLmh0bWwgYi9MYXlvdXRUZXN0cy93ZWJhdWRpby9k ZWNvZGUtYXVkaW8tZGF0YS13ZWJtLW9wdXMtcmVzYW1wbGUuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42YTVi M2M1OTc1NTNlOWEyZmE5YzE5NmQ3MTU3MDYzYmVkZjRlYmYzCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvd2ViYXVkaW8vZGVjb2RlLWF1ZGlvLWRhdGEtd2VibS1vcHVzLXJlc2FtcGxl Lmh0bWwKQEAgLTAsMCArMSwzNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor PHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQg dHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9InJlc291cmNlcy9hdWRpby10ZXN0aW5nLmpzIj48 L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHNjcmlwdD4KK2Rlc2NyaXB0aW9uKCJUZXN0IHRo YXQgZGVjb2RpbmcgYW4gb3B1cyB3ZWJtIGZpbGUgd2l0aCByZXNhbXBsaW5nIHN1Y2NlZWRzIik7 CisKK3dpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKwordmFyIGNvbnRleHQgPSBuZXcgd2lu ZG93LkF1ZGlvQ29udGV4dCh7IHNhbXBsZVJhdGU6IDQ0MTAwIH0pOwordmFyIHJlcXVlc3QgPSBu ZXcgWE1MSHR0cFJlcXVlc3QoKTsKK3JlcXVlc3Qub3BlbigiR0VUIiwgJ3Jlc291cmNlcy9tZWRp YS9vcHVzLndlYm0nLCB0cnVlKTsKK3JlcXVlc3QucmVzcG9uc2VUeXBlID0gImFycmF5YnVmZmVy IjsKKworcmVxdWVzdC5vbmxvYWQgPSBmdW5jdGlvbigpIHsKKyAgICBjb250ZXh0LmRlY29kZUF1 ZGlvRGF0YShyZXF1ZXN0LnJlc3BvbnNlLCAoYnVmZmVyKSA9PiB7CisgICAgICAgIHRlc3RQYXNz ZWQoIlN1Y2Nlc3NmdWxseSBkZWNvZGVkIGNvbnRlbnQiKTsKKyAgICAgICAgLy8gRmlsZSBpcyBl eGFjdGx5IDEtMC4wMDY1cyBsb25nIEAgNDgwMDBIeiwgc28gNDc2ODggZnJhbWVzLCBhZnRlciBy ZXNhbXBsaW5nIGl0IHNob3VsZCBiZSA0NzY4OC80ODAwMCo0NDEwMCA9IDQzODEzLgorICAgICAg ICBpZiAoYnVmZmVyLmxlbmd0aCA9PT0gNDM4MTMpCisgICAgICAgICAgdGVzdFBhc3NlZCgiRGVj b2RpbmcgcmV0dXJuZWQgdGhlIHJpZ2h0IG51bWJlciBvZiBmcmFtZXMuIik7CisgICAgICAgIGVs c2UKKyAgICAgICAgICB0ZXN0RmFpbGVkKCJEZWNvZGluZyByZXR1cm5lZCB0aGUgd3JvbmcgbnVt YmVyIG9mIGZyYW1lczogIiArIGJ1ZmZlci5sZW5ndGgpOworICAgICAgICBmaW5pc2hKU1Rlc3Qo KTsKKyAgICAgIH0sICgpID0+IHsKKyAgICAgICAgdGVzdEZhaWxlZCgiRmFpbGVkIHRvIGRlY29k ZSBmaWxlIik7CisgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgfSk7Cit9CityZXF1ZXN0 LnNlbmQoKTsKKworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 437698 2021-09-08 19:34:27 -0700 2021-09-09 00:02:30 -0700 Patch bug-229251-20210909123426.patch text/plain 9978 jean-yves.avenard U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTczYzI2ZTJmNjViODg0 YzJkNDM1ZDkyZGMwNWExOGRlZGU0NWRkYS4uOGY0YTBiNTgwNDNmOGE5MGVjNGMyYWI4NTZhODkw ZGRkOGMwODZhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIxLTA5LTA4ICBKZWFu LVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+CisKKyAgICAgICAgW1dlYkF1ZGlvL1dlYk1d IEluY29ycmVjdCBudW1iZXIgb2YgZnJhbWVzIHJldHVybmVkIGlmIGRlY29kaW5nIGZyYW1lIHJh dGUgZG9lc24ndCBtYXRjaCBvcmlnaW5hbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI5MjUxCisgICAgICAgIHJkYXI6Ly9wcm9ibGVtLzgyMDk1NjUw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBDYXJsc29uLi4KKworICAgICAgICBXZSBjYW4n dCByZWx5IG9uIENvcmVNZWRpYSB0byBwZXJmb3JtZWQgdGhlIHRyaW1taW5nIGNvcnJlY3RseSB3 aGVuIHJlc2FtcGxpbmcgaXMgYWxzbyB0byBiZSBkb25lLgorICAgICAgICBJdCBnaXZlcyB1bmV4 cGVjdGVkIHJlc3VsdHMuIExldCdzIGRvIGl0IG91cnNlbHZlcyBpbnN0ZWFkLgorICAgICAgICBU ZXN0OiB3ZWJhdWRpby9kZWNvZGUtYXVkaW8tZGF0YS13ZWJtLW9wdXMtcmVzYW1wbGUuaHRtbAor CisgICAgICAgICogcGxhdGZvcm0vYXVkaW8vY29jb2EvQXVkaW9GaWxlUmVhZGVyQ29jb2EuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6QXVkaW9GaWxlUmVhZGVyOjpkZWNvZGVXZWJNRGF0YSBjb25z dCk6CisKIDIwMjEtMDktMDcgIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KIAog ICAgICAgICBTYWZhcmkgVFAgMTMxIGF1ZGlvIGNhblBsYXlUeXBlKCkgcmVwb3J0cyBmYWxzZSBu ZWdhdGl2ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2NvY29h L0F1ZGlvRmlsZVJlYWRlckNvY29hLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlv L2NvY29hL0F1ZGlvRmlsZVJlYWRlckNvY29hLmNwcAppbmRleCAxMzc3NTBhN2M1ZWI5YTI4YWRh Y2JhNzAzZDkxMDgyMTVkN2IyMWE0Li44YjM4ZDExN2IzMWQyOWZhODgyMWJjOGQxYTM2NzJiM2Iz NzQ4ZDBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9jb2NvYS9B dWRpb0ZpbGVSZWFkZXJDb2NvYS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVk aW8vY29jb2EvQXVkaW9GaWxlUmVhZGVyQ29jb2EuY3BwCkBAIC0zMjMsMTkgKzMyMywyNiBAQCBz dGQ6Om9wdGlvbmFsPHNpemVfdD4gQXVkaW9GaWxlUmVhZGVyOjpkZWNvZGVXZWJNRGF0YShBdWRp b0J1ZmZlckxpc3QmIGJ1ZmZlckxpcwogICAgIGlmIChsYXlvdXQgJiYgbGF5b3V0U2l6ZSkKICAg ICAgICAgUEFMOjpBdWRpb0NvbnZlcnRlclNldFByb3BlcnR5KGNvbnZlcnRlciwga0F1ZGlvQ29u dmVydGVySW5wdXRDaGFubmVsTGF5b3V0LCBsYXlvdXRTaXplLCBsYXlvdXQpOwogCi0gICAgQXVk aW9Db252ZXJ0ZXJQcmltZUluZm8gcHJpbWVJbmZvID0geyBVSW50MzIobV93ZWJtRGF0YS0+bV90 cmFjay0+Y29kZWNEZWxheSgpLnZhbHVlX29yKE1lZGlhVGltZSgpKS50b0RvdWJsZSgpICogb3V0 Rm9ybWF0Lm1TYW1wbGVSYXRlKSwgMCB9OwotICAgIElORk9fTE9HKExPR0lERU5USUZJRVIsICJX aWxsIGRyb3AgJXUgbGVhZGluZyBmcmFtZXMgb3V0IG9mICVsbHUiLCBwcmltZUluZm8ubGVhZGlu Z0ZyYW1lcywgbnVtYmVyT2ZGcmFtZXMpOwotICAgIFBBTDo6QXVkaW9Db252ZXJ0ZXJTZXRQcm9w ZXJ0eShjb252ZXJ0ZXIsIGtBdWRpb0NvbnZlcnRlclByaW1lSW5mbywgc2l6ZW9mKHByaW1lSW5m byksICZwcmltZUluZm8pOwotICAgIFVJbnQzMiBwcmltZU1ldGhvZCA9IGtDb252ZXJ0ZXJQcmlt ZU1ldGhvZF9Ob25lOwotICAgIFBBTDo6QXVkaW9Db252ZXJ0ZXJTZXRQcm9wZXJ0eShjb252ZXJ0 ZXIsIGtBdWRpb0NvbnZlcnRlclByaW1lTWV0aG9kLCBzaXplb2YocHJpbWVNZXRob2QpLCAmcHJp bWVNZXRob2QpOwotCiAgICAgQXVkaW9CdWZmZXJMaXN0SG9sZGVyIGRlY29kZWRCdWZmZXJMaXN0 KGluRm9ybWF0Lm1DaGFubmVsc1BlckZyYW1lKTsKICAgICBpZiAoIWRlY29kZWRCdWZmZXJMaXN0 KSB7CiAgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKFdlYkF1ZGlvLCAiVW5hYmxlIHRvIGNyZWF0 ZSBkZWNvZGVyIik7CiAgICAgICAgIHJldHVybiB7IH07CiAgICAgfQogCisgICAgLy8gSW5zdHJ1 Y3QgdGhlIGRlY29kZXIgdG8gbm90IGRyb3AgYW55IGZyYW1lcworICAgIC8vIChieSBkZWZhdWx0 IHRoZSBPcHVzIGRlY29kZXIgYXNzdW1lcyB0aGF0IFNhbXBsZVJhdGUgLyA0MDAgZnJhbWVzIGFy ZSB0byBiZSBkcm9wcGVkLgorICAgIEF1ZGlvQ29udmVydGVyUHJpbWVJbmZvIHByaW1lSW5mbyA9 IHsgMCwgMCB9OworICAgIFBBTDo6QXVkaW9Db252ZXJ0ZXJTZXRQcm9wZXJ0eShjb252ZXJ0ZXIs IGtBdWRpb0NvbnZlcnRlclByaW1lSW5mbywgc2l6ZW9mKHByaW1lSW5mbyksICZwcmltZUluZm8p OworICAgIFVJbnQzMiBwcmltZU1ldGhvZCA9IGtDb252ZXJ0ZXJQcmltZU1ldGhvZF9Ob25lOwor ICAgIFBBTDo6QXVkaW9Db252ZXJ0ZXJTZXRQcm9wZXJ0eShjb252ZXJ0ZXIsIGtBdWRpb0NvbnZl cnRlclByaW1lTWV0aG9kLCBzaXplb2YocHJpbWVNZXRob2QpLCAmcHJpbWVNZXRob2QpOworCisg ICAgdWludDMyX3QgbGVhZGluZ1RyaW0gPSBtX3dlYm1EYXRhLT5tX3RyYWNrLT5jb2RlY0RlbGF5 KCkudmFsdWVfb3IoTWVkaWFUaW1lOjp6ZXJvVGltZSgpKS50b0RvdWJsZSgpICogb3V0Rm9ybWF0 Lm1TYW1wbGVSYXRlOworICAgIC8vIENhbGN1bGF0ZSB0aGUgbnVtYmVyIG9mIHRyYWlsaW5nIGZy YW1lcyB0byBiZSB0cmltbWVkIGJ5IHJvdW5kaW5nIHRvIG5lYXJlc3QgaW50ZWdlciB3aGlsZSBt aW5pbWl6aW5nIGN1bW11bGF0aXZlIHJvdW5kaW5nIGVycm9ycy4KKyAgICB1aW50MzJfdCB0cmFp bGluZ1RyaW0gPSAobV93ZWJtRGF0YS0+bV90cmFjay0+Y29kZWNEZWxheSgpLnZhbHVlX29yKE1l ZGlhVGltZTo6emVyb1RpbWUoKSkgKyBtX3dlYm1EYXRhLT5tX3RyYWNrLT5kaXNjYXJkUGFkZGlu ZygpLnZhbHVlX29yKE1lZGlhVGltZTo6emVyb1RpbWUoKSkpLnRvRG91YmxlKCkgKiBvdXRGb3Jt YXQubVNhbXBsZVJhdGUgLSBsZWFkaW5nVHJpbSArIDAuNTsKKyAgICBJTkZPX0xPRyhMT0dJREVO VElGSUVSLCAiV2lsbCBkcm9wICIsIGxlYWRpbmdUcmltLCAiIGxlYWRpbmcgYW5kICIsIHRyYWls aW5nVHJpbSwgIiB0cmFpbGluZyBmcmFtZXMgb3V0IG9mICIsIG51bWJlck9mRnJhbWVzKTsKKwog ICAgIHNpemVfdCBkZWNvZGVkRnJhbWVzID0gMDsKKyAgICBzaXplX3QgdG90YWxEZWNvZGVkRnJh bWVzID0gMDsKICAgICBPU1N0YXR1cyBzdGF0dXM7CiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkg PCBtX3dlYm1EYXRhLT5tX3NhbXBsZXMuc2l6ZSgpOyBpKyspIHsKICAgICAgICAgYXV0byYgc2Ft cGxlID0gbV93ZWJtRGF0YS0+bV9zYW1wbGVzW2ldOwpAQCAtMzYyLDEyICszNjksMTQgQEAgc3Rk OjpvcHRpb25hbDxzaXplX3Q+IEF1ZGlvRmlsZVJlYWRlcjo6ZGVjb2RlV2ViTURhdGEoQXVkaW9C dWZmZXJMaXN0JiBidWZmZXJMaXMKIAogICAgICAgICBkbyB7CiAgICAgICAgICAgICBpZiAobnVt YmVyT2ZGcmFtZXMgPCBkZWNvZGVkRnJhbWVzKSB7Ci0gICAgICAgICAgICAgICAgUkVMRUFTRV9M T0dfRkFVTFQoV2ViQXVkaW8sICJEZWNvZGVkIG1vcmUgZnJhbWVzIHRoYW4gZmlyc3QgY2FsY3Vs YXRlZCIpOworICAgICAgICAgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKFdlYkF1ZGlvLCAiRGVj b2RlZCBtb3JlIGZyYW1lcyB0aGFuIGZpcnN0IGNhbGN1bGF0ZWQsIG5vIGF2YWlsYWJsZSBzcGFj ZSBsZWZ0Iik7CiAgICAgICAgICAgICAgICAgcmV0dXJuIHsgfTsKICAgICAgICAgICAgIH0KICAg ICAgICAgICAgIC8vIGluOiB0aGUgbWF4IG51bWJlciBvZiBwYWNrZXRzIHdlIGNhbiBoYW5kbGUg ZnJvbSB0aGUgZGVjb2Rlci4KICAgICAgICAgICAgIC8vIG91dDogdGhlIG51bWJlciBvZiBwYWNr ZXRzIHRoZSBkZWNvZGVyIGlzIGFjdHVhbGx5IHJldHVybmluZy4KLSAgICAgICAgICAgIFVJbnQz MiBudW1GcmFtZXMgPSBzdGQ6Om1pbjx1aW50MzJfdD4oc3RkOjpudW1lcmljX2xpbWl0czxpbnQz Ml90Pjo6bWF4KCkgLyBzaXplb2YoZmxvYXQpLCBudW1iZXJPZkZyYW1lcyAtIGRlY29kZWRGcmFt ZXMpOworICAgICAgICAgICAgLy8gVGhlIEF1ZGlvQ29udmVydGVyIHdpbGwgc29tZXRpbWVzIHBh ZCB3aXRoIHRyYWlsaW5nIHNpbGVuY2UgaWYgd2Ugc2V0IHRoZSBmcmVlIHNwYWNlIHRvIHdoYXQg aXQgYWN0dWFsbHkgaXMgKG51bWJlck9mRnJhbWVzIC0gZGVjb2RlZEZyYW1lcykuCisgICAgICAg ICAgICAvLyBTbyB3ZSBzZXQgaXQgdG8gd2hhdCB0aGVyZSBpcyBsZWZ0IHRvIGRlY29kZSBpbnN0 ZWFkLgorICAgICAgICAgICAgVUludDMyIG51bUZyYW1lcyA9IHN0ZDo6bWluPHVpbnQzMl90Pihz dGQ6Om51bWVyaWNfbGltaXRzPGludDMyX3Q+OjptYXgoKSAvIHNpemVvZihmbG9hdCksIG51bWJl ck9mRnJhbWVzIC0gdG90YWxEZWNvZGVkRnJhbWVzKTsKIAogICAgICAgICAgICAgZm9yIChVSW50 MzIgaSA9IDA7IGkgPCBpbkZvcm1hdC5tQ2hhbm5lbHNQZXJGcmFtZTsgaSsrKSB7CiAgICAgICAg ICAgICAgICAgZGVjb2RlZEJ1ZmZlckxpc3QtPm1CdWZmZXJzW2ldLm1OdW1iZXJDaGFubmVscyA9 IDE7CkBAIC0zNzksMTIgKzM4OCwxOSBAQCBzdGQ6Om9wdGlvbmFsPHNpemVfdD4gQXVkaW9GaWxl UmVhZGVyOjpkZWNvZGVXZWJNRGF0YShBdWRpb0J1ZmZlckxpc3QmIGJ1ZmZlckxpcwogICAgICAg ICAgICAgICAgIFJFTEVBU0VfTE9HX0ZBVUxUKFdlYkF1ZGlvLCAiRXJyb3IgZGVjb2RpbmcgZGF0 YSIpOwogICAgICAgICAgICAgICAgIHJldHVybiB7IH07CiAgICAgICAgICAgICB9CisgICAgICAg ICAgICB0b3RhbERlY29kZWRGcmFtZXMgKz0gbnVtRnJhbWVzOworICAgICAgICAgICAgaWYgKGxl YWRpbmdUcmltID4gMCkgeworICAgICAgICAgICAgICAgIFVJbnQzMiB0b1RyaW0gPSBzdGQ6Om1p bihsZWFkaW5nVHJpbSwgbnVtRnJhbWVzKTsKKyAgICAgICAgICAgICAgICBmb3IgKFVJbnQzMiBp ID0gMDsgaSA8IG91dEZvcm1hdC5tQ2hhbm5lbHNQZXJGcmFtZTsgaSsrKQorICAgICAgICAgICAg ICAgICAgICBtZW1jcHkoZGVjb2RlZEJ1ZmZlckxpc3QtPm1CdWZmZXJzW2ldLm1EYXRhLCBzdGF0 aWNfY2FzdDxmbG9hdCo+KGRlY29kZWRCdWZmZXJMaXN0LT5tQnVmZmVyc1tpXS5tRGF0YSkgKyB0 b1RyaW0sIChudW1GcmFtZXMgLSB0b1RyaW0pICogc2l6ZW9mKGZsb2F0KSk7CisgICAgICAgICAg ICAgICAgbGVhZGluZ1RyaW0gLT0gdG9UcmltOworICAgICAgICAgICAgICAgIG51bUZyYW1lcyAt PSB0b1RyaW07CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBkZWNvZGVkRnJhbWVzICs9IG51 bUZyYW1lczsKICAgICAgICAgfSB3aGlsZSAoc3RhdHVzICE9IGtOb01vcmVEYXRhRXJyICYmIHN0 YXR1cyAhPSBub0Vycik7CiAgICAgfQotICAgIHNpemVfdCBwYWRkaW5nRnJhbWVzID0gbV93ZWJt RGF0YS0+bV90cmFjay0+ZGlzY2FyZFBhZGRpbmcoKS52YWx1ZV9vcihNZWRpYVRpbWUoKSkudG9E b3VibGUoKSAqIG91dEZvcm1hdC5tU2FtcGxlUmF0ZTsKLSAgICBpZiAoZGVjb2RlZEZyYW1lcyA+ IHBhZGRpbmdGcmFtZXMpCi0gICAgICAgIHJldHVybiBkZWNvZGVkRnJhbWVzIC0gcGFkZGluZ0Zy YW1lczsKKyAgICBpZiAoZGVjb2RlZEZyYW1lcyA+IHRyYWlsaW5nVHJpbSkKKyAgICAgICAgcmV0 dXJuIGRlY29kZWRGcmFtZXMgLSB0cmFpbGluZ1RyaW07CiAgICAgcmV0dXJuIDA7CiB9CiAjZW5k aWYKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwppbmRleCAxOGQ1YTJiNWJlMzE4MDRjNDI0YzE2NTNmNjQyNTcyNWQyNmIwOGVlLi5lN2E2 ZTMyZGMxNDM1Y2Q1YjZhNmYxNjZhOTJkZTY4NzEwNTBjZDE2IDEwMDY0NAotLS0gYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQg QEAKKzIwMjEtMDktMDggIEplYW4tWXZlcyBBdmVuYXJkICA8anlhQGFwcGxlLmNvbT4KKworICAg ICAgICBbV2ViQXVkaW8vV2ViTV0gSW5jb3JyZWN0IG51bWJlciBvZiBmcmFtZXMgcmV0dXJuZWQg aWYgZGVjb2RpbmcgZnJhbWUgcmF0ZSBkb2Vzbid0IG1hdGNoIG9yaWdpbmFsCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjkyNTEKKyAgICAgICAgcmRh cjovL3Byb2JsZW0vODIwOTU2NTAKKworICAgICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24u CisKKyAgICAgICAgKiB3ZWJhdWRpby9kZWNvZGUtYXVkaW8tZGF0YS13ZWJtLW9wdXMtcmVzYW1w bGUtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiB3ZWJhdWRpby9kZWNvZGUtYXVkaW8t ZGF0YS13ZWJtLW9wdXMtcmVzYW1wbGUuaHRtbDogQWRkZWQuCisKIDIwMjEtMDgtMjQgIEtpbW1v IEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBBTkdMRSBNZXRhbCBp bmZpbml0aWVzIGFuZCBOYU5zIGdlbmVyYXRlZCB3aXRoIGluY29ycmVjdCBzeW50YXgKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0 VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggNjc0ZmRjYjA0ODkyMWQ2 MDAyYzA4NzExMjNhZTMxZDZlMWE4MjdlNC4uMGY5YTBkZjQ4YmI3M2FhOGVhNWFlODRkYmE1YTM4 ZjlhYWY0ZDliMyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBl Y3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMK QEAgLTE3MTksNiArMTcxOSw3IEBAIHdlYmtpdC5vcmcvYi8yMTQxNTUgaW1wb3J0ZWQvdzNjL3dl Yi1wbGF0Zm9ybS10ZXN0cy9odG1sL2Nyb3NzLW9yaWdpbi1lbWJlZGRlci1wCiBbIENhdGFsaW5h IE1vamF2ZSBCaWdTdXIgXSBtZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtd2VibS1vcHVzLXBhcnRp YWwuaHRtbCBbIFNraXAgXQogWyBDYXRhbGluYSBNb2phdmUgQmlnU3VyIF0gbWVkaWEvbWVkaWEt c291cmNlL21lZGlhLXdlYm0tb3B1cy1wYXJ0aWFsLWFib3J0Lmh0bWwgWyBTa2lwIF0KIFsgQ2F0 YWxpbmEgTW9qYXZlIEJpZ1N1ciBdIHdlYmF1ZGlvL2RlY29kZS1hdWRpby1kYXRhLXdlYm0tb3B1 cy5odG1sIFsgU2tpcCBdCitbIENhdGFsaW5hIE1vamF2ZSBCaWdTdXIgXSB3ZWJhdWRpby9kZWNv ZGUtYXVkaW8tZGF0YS13ZWJtLW9wdXMtcmVzYW1wbGUuaHRtbCBbIFNraXAgXQogWyBDYXRhbGlu YSBNb2phdmUgQmlnU3VyIF0gd2ViYXVkaW8vZGVjb2RlLWF1ZGlvLWRhdGEtd2VibS12b3JiaXMu aHRtbCBbIFNraXAgXQogCiB3ZWJraXQub3JnL2IvMjE0NDIyIGltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvd2ViYXVkaW8vdGhlLWF1ZGlvLWFwaS90aGUtYXVkaW9jb250ZXh0LWludGVy ZmFjZS9zdXNwZW5kLWFmdGVyLWNvbnN0cnVjdC5odG1sIFsgUGFzcyBGYWlsdXJlIF0KZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL3dlYmF1ZGlvL2RlY29kZS1hdWRpby1kYXRhLXdlYm0tb3B1cy1y ZXNhbXBsZS1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy93ZWJhdWRpby9kZWNvZGUtYXVkaW8t ZGF0YS13ZWJtLW9wdXMtcmVzYW1wbGUtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQzMzhlMmI1 NzRhNzBjYjFmNWY0Nzg5NDRmNWIzY2NmMDQ4ZjJhZTgKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy93ZWJhdWRpby9kZWNvZGUtYXVkaW8tZGF0YS13ZWJtLW9wdXMtcmVzYW1wbGUtZXhw ZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTEgQEAKK1Rlc3QgdGhhdCBkZWNvZGluZyBhbiBvcHVzIHdl Ym0gZmlsZSB3aXRoIHJlc2FtcGxpbmcgc3VjY2VlZHMKKworT24gc3VjY2VzcywgeW91IHdpbGwg c2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExF VEUiLgorCisKK1BBU1MgU3VjY2Vzc2Z1bGx5IGRlY29kZWQgY29udGVudAorUEFTUyBEZWNvZGlu ZyByZXR1cm5lZCB0aGUgcmlnaHQgbnVtYmVyIG9mIGZyYW1lcy4KK1BBU1Mgc3VjY2Vzc2Z1bGx5 UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy93ZWJhdWRpby9kZWNvZGUtYXVkaW8tZGF0YS13ZWJtLW9wdXMtcmVzYW1wbGUuaHRtbCBiL0xh eW91dFRlc3RzL3dlYmF1ZGlvL2RlY29kZS1hdWRpby1kYXRhLXdlYm0tb3B1cy1yZXNhbXBsZS5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAuLjZhNWIzYzU5NzU1M2U5YTJmYTljMTk2ZDcxNTcwNjNiZWRmNGViZjMK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy93ZWJhdWRpby9kZWNvZGUtYXVkaW8tZGF0 YS13ZWJtLW9wdXMtcmVzYW1wbGUuaHRtbApAQCAtMCwwICsxLDM2IEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vcmVzb3VyY2VzL2pzLXRlc3QuanMi Pjwvc2NyaXB0PgorPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0icmVzb3VyY2Vz L2F1ZGlvLXRlc3RpbmcuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8c2NyaXB0Pgor ZGVzY3JpcHRpb24oIlRlc3QgdGhhdCBkZWNvZGluZyBhbiBvcHVzIHdlYm0gZmlsZSB3aXRoIHJl c2FtcGxpbmcgc3VjY2VlZHMiKTsKKword2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworCit2 YXIgY29udGV4dCA9IG5ldyB3aW5kb3cuQXVkaW9Db250ZXh0KHsgc2FtcGxlUmF0ZTogNDQxMDAg fSk7Cit2YXIgcmVxdWVzdCA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOworcmVxdWVzdC5vcGVuKCJH RVQiLCAncmVzb3VyY2VzL21lZGlhL29wdXMud2VibScsIHRydWUpOworcmVxdWVzdC5yZXNwb25z ZVR5cGUgPSAiYXJyYXlidWZmZXIiOworCityZXF1ZXN0Lm9ubG9hZCA9IGZ1bmN0aW9uKCkgewor ICAgIGNvbnRleHQuZGVjb2RlQXVkaW9EYXRhKHJlcXVlc3QucmVzcG9uc2UsIChidWZmZXIpID0+ IHsKKyAgICAgICAgdGVzdFBhc3NlZCgiU3VjY2Vzc2Z1bGx5IGRlY29kZWQgY29udGVudCIpOwor ICAgICAgICAvLyBGaWxlIGlzIGV4YWN0bHkgMS0wLjAwNjVzIGxvbmcgQCA0ODAwMEh6LCBzbyA0 NzY4OCBmcmFtZXMsIGFmdGVyIHJlc2FtcGxpbmcgaXQgc2hvdWxkIGJlIDQ3Njg4LzQ4MDAwKjQ0 MTAwID0gNDM4MTMuCisgICAgICAgIGlmIChidWZmZXIubGVuZ3RoID09PSA0MzgxMykKKyAgICAg ICAgICB0ZXN0UGFzc2VkKCJEZWNvZGluZyByZXR1cm5lZCB0aGUgcmlnaHQgbnVtYmVyIG9mIGZy YW1lcy4iKTsKKyAgICAgICAgZWxzZQorICAgICAgICAgIHRlc3RGYWlsZWQoIkRlY29kaW5nIHJl dHVybmVkIHRoZSB3cm9uZyBudW1iZXIgb2YgZnJhbWVzOiAiICsgYnVmZmVyLmxlbmd0aCk7Cisg ICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgfSwgKCkgPT4geworICAgICAgICB0ZXN0RmFp bGVkKCJGYWlsZWQgdG8gZGVjb2RlIGZpbGUiKTsKKyAgICAgICAgZmluaXNoSlNUZXN0KCk7Cisg ICAgICB9KTsKK30KK3JlcXVlc3Quc2VuZCgpOworCis8L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRt bD4K