205382 2019-12-18 01:49:40 -0800 [GStreamer][EME] Notify all elements waiting for CDM attachment 2019-12-19 05:25:07 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cturner cturner bugs-noreply calvaris cgarcia commit-queue eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sergio vjaquez oldest_to_newest 1599719 0 cturner 2019-12-18 01:49:40 -0800 [GStreamer][EME] Notify all elements waiting for CDM attachment 1599822 1 385978 cturner 2019-12-18 08:29:34 -0800 Created attachment 385978 Patch 1600216 2 385978 calvaris 2019-12-19 03:26:06 -0800 Comment on attachment 385978 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385978&action=review > Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:1794 > + auto cdmAttachmentLocker = holdLock(m_cdmAttachmentMutex); > + bool didCDMAttach = m_cdmAttachmentCondition.waitFor(m_cdmAttachmentMutex, 4_s, [this]() { > + return isCDMAttached(); > + }); > + cdmAttachmentLocker.unlockEarly(); I would prefer to take the boolean definition outside and open a nested scope to avoid unlocking early. I think it is less future error prone. > Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:768 > + else > + result = MediaPlayer::SupportsType::IsNotSupported; As a personal preference I would move this upfront and avoid the else. Anyway, this seems to be quite unrelated and I would recommend to land it in a another no-brainer bug. 1600224 3 386094 cturner 2019-12-19 04:29:59 -0800 Created attachment 386094 Patch 1600225 4 386095 cturner 2019-12-19 04:31:09 -0800 Created attachment 386095 Patch 1600228 5 386095 commit-queue 2019-12-19 04:35:20 -0800 Comment on attachment 386095 Patch Rejecting attachment 386095 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-01', 'validate-changelog', '--check-oops', '--non-interactive', 386095, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit ChangeLog entry in Source/WebCore/ChangeLog contains OOPS!. Full output: https://webkit-queues.webkit.org/results/13293302 1600230 6 386096 cturner 2019-12-19 04:39:31 -0800 Created attachment 386096 Patch 1600234 7 386096 commit-queue 2019-12-19 05:25:05 -0800 Comment on attachment 386096 Patch Clearing flags on attachment: 386096 Committed r253748: <https://trac.webkit.org/changeset/253748> 1600235 8 commit-queue 2019-12-19 05:25:07 -0800 All reviewed patches have been landed. Closing bug. 385978 2019-12-18 08:29:34 -0800 2019-12-19 04:29:53 -0800 Patch bug-205382-20191218162933.patch text/plain 10578 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlhZjk3MmNjNzQzYzkw ZTBiOTgzOGI5ZjNhYmUwNjljMzJiZTcwOC4uYjZjZmFkMDQyYWEzN2UxYzcwNjMzNjUwZWNlYzQw MWIxYjg4MmQwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU4IEBACisyMDE5LTEyLTE4ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtF TUVdIE5vdGlmeSBhbGwgZWxlbWVudHMgd2FpdGluZyBmb3IgQ0RNIGF0dGFjaG1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTM4MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gbXVsdGlwbGUg ZGVtdXhlcnMgYXJlIGluIGZsaWdodCBhc2tpbmcgZm9yIGEgQ0RNIGluc3RhbmNlLAorICAgICAg ICBvbmx5IG9uZSBvZiB0aGVtIHdhcyBnZXR0aW5nIHdva2VuIHVwIHdoZW4gYSBDRE0gd2FzIGF0 dGFjaGVkLAorICAgICAgICBsZWF2aW5nIHRoZSBvdGhlcihzKSBibG9ja2luZyB0aGVpciByZXNw ZWN0aXZlIHN0cmVhbWluZyB0aHJlYWRzCisgICAgICAgIGFuZCBsb2NraW5nIHRoZSBwaXBlbGlu ZS4gU3dpdGNoIGJhY2sgdG8gYSBjb25kaXRpb24gdmFyaWFibGUgZnJvbQorICAgICAgICBhIHNl bWFwaG9yZSB0byBmaXggdGhpcyBpc3N1ZS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5n IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcik6CisgICAgICAgIElu aXRpYWxpemUgdGhlIG5ldyBpc1BsYXllclNodXR0aW5nRG93biBwcmVkaWNhdGUgdG8gZmFsc2Uu CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIpOgorICAgICAgICBTZXQgdGhlIG5ldyBwcmVkaWNhdGUgZm9y IHBsYXllciBzaHV0ZG93biBhdCB0aGUgc3RhcnQgb2YKKyAgICAgICAgZGVzdHJ1Y3Rpb24sIHNv IHRoYXQgYmFja2dyb3VuZCB0aHJlYWRzIGNhbiBrbm93biB3aGVuIHRoZSBzaG91bGQKKyAgICAg ICAgYWJvcnQgdGhlaXIgb3BlcmF0aW9ucyBhcyBhIHJlc3VsdCBvZiBiZWluZyB1bmJsb2NrZWQg YnkgdGhlCisgICAgICAgIGRlc3RydWN0b3IuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZVN5bmNNZXNzYWdlKTogR28gYmFjaworICAgICAgICB0 byB1c2luZyBjb25kaXRpb24gdmFyaWFibGVzLCBzbyB3ZSBjYW4gdW5ibG9jayBtb3JlIHRoYW4g b25lCisgICAgICAgIHdhaXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6Y2RtSW5zdGFuY2VBdHRhY2hlZCk6CisgICAgICAgIEhlbHBlciBwcmVkaWNh dGUgdG8gbWFrZSBjbGVhciB0aGF0IHRoZSBwcmVzZW5jZSBvZiBhIHZhbGlkCisgICAgICAgIENE TUluc3RhbmNlIHBvaW50ZXIgaXMgYSBzaWduIHRoYXQgaXQgaGFzIGJlZW4gYXR0YWNoZWQuCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5oOiBBZGQKKyAgICAgICAgYW4gaXNQbGF5ZXJTaHV0dGluZ0Rvd24gbWV0aG9kIHVz aW5nIGFuIEF0b21pYzxib29sPi4gV2UgbmVlZCB0aGlzCisgICAgICAgIHRvIGF2b2lkIHJhY2lu ZyBzZXRfY29udGV4dCgpIG9uIGEgZGVjcnlwdG9yIGVsZW1lbnQgd2l0aCB0aGUKKyAgICAgICAg cGlwZWxpbmUgYmVpbmcgc2V0IHRvIE5VTEwuIEJlZm9yZSB3ZSB3ZXJlIHVzaW5nIHRoZSBub3Rp ZmllciBhcyBhCisgICAgICAgIHByb3h5IGZvciBwbGF5ZXIgc2h1dGRvd24sIHNpbmNlIGl0IGlz IGludmFsaWRhdGVkIGR1cmluZyBwbGF5ZXIKKyAgICAgICAgZGVzdHJ1Y3Rpb24uIFRoaXMgaXMg bm90IGEgbWFpbnRhaW5hYmxlIHNvbHV0aW9uLCBzaW5jZSBvdGhlcgorICAgICAgICBwcm9ncmFt bWVycyB3b3VsZCBmZWVsIGZyZWUgdG8gcmVvcmRlciB0aGUgcG9zaXRpb24gYXQgd2hpY2ggdGhl CisgICAgICAgIG5vdGlmaWVyIGlzIGludmFsaWRhdGVkLCBhbmQgdGhlbiBpbnRyb2R1Y2UgYSB2 ZXJ5IGhhcmQgdG8gZmluZAorICAgICAgICBidWcuIEJ5IGludHJvZHVjaW5nIHRoaXMgZmxhZyBh dCB0aGUgc3RhcnQgb2YgZGVzdHJ1Y3Rpb24sIHdlIHdpbGwKKyAgICAgICAgYWx3YXlzIGhhdmUg YSBrbm93biB3YXkgdG8gY2hlY2ssIGFmdGVyIGEgc3RyZWFtaW5nIHRocmVhZCBoYXMKKyAgICAg ICAgd29rZW4gdXAgYWdhaW4sIHdoZXRoZXIgd2Ugc2hvdWxkIGNhbGwgYW55IHBsYXllciBtZXRo b2RzLCBvcgorICAgICAgICByZXR1cm4gZWFybHkgZHVlIHRvIHNodXRkb3duIGluIHByb2dyZXNz LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjppc1BsYXll clNodXR0aW5nRG93bgorICAgICAgICBjb25zdCk6IFByZWRpY2F0ZSBmb3IgcGxheWVyIGluIHRo ZSBwcm9jZXNzIG9mIHNodXRkb3duLiBUaGlzCisgICAgICAgIHNob3VsZCBiZSB1c2VkIGJ5IGJh Y2tncm91bmQgdGhyZWFkcywgd2hpY2ggdXBvbiB3YWtldXAsIG1heSBuZWVkCisgICAgICAgIHRv IGJlIGF3YXJlIG9mIHdoZXRoZXIgdGhleSB3aWxsIGJlIGluIGEgcmFjZSB3aXRoIHRoZSBwaXBl bGluZQorICAgICAgICBnb2luZyB0byBOVUxMLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjppc0NETUF0dGFjaGVkIGNvbnN0KToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1T RS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0U6 OnN1cHBvcnRzVHlwZSk6IFJlZmFjdG9yCisgICAgICAgIGEgbmVzdGVkIHRlcm5hcnkgb3BlcmF0 b3IsIHdoaWNoIGlzIGEgbmlnaHRtYXJlIHRvIHF1aWNrbHkgcmVhZAorICAgICAgICBkdXJpbmcg bWFpbnRlbmFuY2UuIEFsc28gY2xhcmlmeSB0aGUgY29kZWMgc3RyaW5nIHdoZW4gZGVidWcKKyAg ICAgICAgcHJpbnRpbmcgYWJvdXQgaXQgbm90IGJlaW5nIHN1cHBvcnRlZCwgc2luY2Ugc2VlaW5n IG9ubHkKKyAgICAgICAgIklzTm90U3VwcG9ydGVkIiBidXJpZWQgaW5zaWRlIGEgR1N0cmVhbWVy IHRyYWNlIGxvZyBkb2VzIG5vdCB0ZWxsCisgICAgICAgIHlvdSBhYm91dCB3aGF0IGlzIG5vdCBz dXBwb3J0ZWQuCisKIDIwMTktMTItMTcgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgQWRkIHJlbW90ZSBtZWRpYSBwbGF5ZXIgbWV0aG9kcyBmb3IgcHJl cGFyZVRvUGxheSwgcHJlbG9hZCwgcHJpdmF0ZSBicm93c2luZyBtb2RlLCBwcmVzZXJ2ZXMgcGl0 Y2gsIGFuZCBmYWlsZWQgdG8gbG9hZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmNwcAppbmRleCA1M2Q1NmY4ZTk1MDgzNDI4ODM3Y2VjMThhNDEwYWM1ODQx YjBlMDI2Li45NGI4Y2ZlNWJiZDQxYzdmODdhNWQ1ZWVhYjc5MzRkNjM3ZjdkODhhIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcApAQCAtMzY5LDEx ICszNjksMTMgQEAgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXIoTWVkaWFQbGF5ZXIqIHBsYXllcikKICNpZiBVU0UoR0xJQikKICAgICBtX3Jl YWR5VGltZXJIYW5kbGVyLnNldFByaW9yaXR5KEdfUFJJT1JJVFlfREVGQVVMVF9JRExFKTsKICNl bmRpZgorICAgIG1faXNQbGF5ZXJTaHV0dGluZ0Rvd24uc3RvcmUoZmFsc2UpOwogfQogCiBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIoKQog ewogICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgIkRpc3Bvc2luZyBwbGF5ZXIiKTsK KyAgICBtX2lzUGxheWVyU2h1dHRpbmdEb3duLnN0b3JlKHRydWUpOwogCiAjaWYgRU5BQkxFKFZJ REVPX1RSQUNLKQogICAgIGZvciAoYXV0byYgdHJhY2sgOiBtX2F1ZGlvVHJhY2tzLnZhbHVlcygp KQpAQCAtNDQzLDcgKzQ0NSwxMCBAQCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXIoKQogICAgIGNhbmNlbFJlcGFpbnQodHJ1ZSk7CiAKICNp ZiBFTkFCTEUoRU5DUllQVEVEX01FRElBKQotICAgIG1fY2RtQXR0YWNobWVudFNlbWFwaG9yZS5z aWduYWwoKTsKKyAgICB7CisgICAgICAgIExvY2tIb2xkZXIgbG9jayhtX2NkbUF0dGFjaG1lbnRN dXRleCk7CisgICAgICAgIG1fY2RtQXR0YWNobWVudENvbmRpdGlvbi5ub3RpZnlBbGwoKTsKKyAg ICB9CiAjZW5kaWYKIAogICAgIC8vIFRoZSBjaGFuZ2UgdG8gR1NUX1NUQVRFX05VTEwgc3RhdGUg aXMgYWx3YXlzIHN5bmNocm9ub3VzLiBTbyBhZnRlciB0aGlzIGdldHMgZXhlY3V0ZWQgd2UgZG9u J3QgbmVlZCB0byB3b3JyeQpAQCAtMTc4MSw5ICsxNzg2LDE0IEBAIGJvb2wgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyOjpoYW5kbGVTeW5jTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQog ICAgICAgICBpbml0aWFsaXphdGlvbkRhdGFFbmNvdW50ZXJlZChXVEZNb3ZlKGluaXREYXRhKSk7 CiAKICAgICAgICAgR1NUX0lORk9fT0JKRUNUKHBpcGVsaW5lKCksICJ3YWl0aW5nIGZvciBhIENE TSBpbnN0YW5jZSIpOwotICAgICAgICBpZiAobV9jZG1BdHRhY2htZW50U2VtYXBob3JlLndhaXRG b3IoNF9zKQotICAgICAgICAgICAgJiYgbV9ub3RpZmllci0+aXNWYWxpZCgpIC8vIENoZWNrIHRo ZSBwbGF5ZXIgaXMgbm90IGJlaW5nIGRlc3Ryb3llZC4KLSAgICAgICAgICAgICYmICFtX2NkbUlu c3RhbmNlLT5rZXlTeXN0ZW0oKS5pc0VtcHR5KCkpIHsKKworICAgICAgICBhdXRvIGNkbUF0dGFj aG1lbnRMb2NrZXIgPSBob2xkTG9jayhtX2NkbUF0dGFjaG1lbnRNdXRleCk7CisgICAgICAgIGJv b2wgZGlkQ0RNQXR0YWNoID0gbV9jZG1BdHRhY2htZW50Q29uZGl0aW9uLndhaXRGb3IobV9jZG1B dHRhY2htZW50TXV0ZXgsIDRfcywgW3RoaXNdKCkgeworICAgICAgICAgICAgcmV0dXJuIGlzQ0RN QXR0YWNoZWQoKTsKKyAgICAgICAgfSk7CisgICAgICAgIGNkbUF0dGFjaG1lbnRMb2NrZXIudW5s b2NrRWFybHkoKTsKKworICAgICAgICBpZiAoZGlkQ0RNQXR0YWNoICYmICFpc1BsYXllclNodXR0 aW5nRG93bigpICYmICFtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKS5pc0VtcHR5KCkpIHsKICAg ICAgICAgICAgIGNvbnN0IGNoYXIqIHByZWZlcnJlZEtleVN5c3RlbVV1aWQgPSBHU3RyZWFtZXJF TUVVdGlsaXRpZXM6OmtleVN5c3RlbVRvVXVpZChtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKSk7 CiAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIndvcmtpbmcgd2l0aCBr ZXkgc3lzdGVtICVzLCBjb250aW51aW5nIHdpdGgga2V5IHN5c3RlbSAlcyBvbiAlcyIsIG1fY2Rt SW5zdGFuY2UtPmtleVN5c3RlbSgpLnV0ZjgoKS5kYXRhKCksIHByZWZlcnJlZEtleVN5c3RlbVV1 aWQsIEdTVF9NRVNTQUdFX1NSQ19OQU1FKG1lc3NhZ2UpKTsKIApAQCAtMzYxMSw3ICszNjIxLDkg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNlQXR0YWNoZWQo Q0RNSW5zdGFuY2UmIGluc3RhbmNlKQogCiAgICAgR1NUX0RFQlVHX09CSkVDVChtX3BpcGVsaW5l LmdldCgpLCAiQ0RNIHByb3h5IGluc3RhbmNlICVwIGRpc3BhdGNoZWQgYXMgY29udGV4dCIsIG1f Y2RtSW5zdGFuY2UtPnByb3h5Q0RNKCkuZ2V0KCkpOwogCi0gICAgbV9jZG1BdHRhY2htZW50U2Vt YXBob3JlLnNpZ25hbCgpOworICAgIExvY2tIb2xkZXIgbG9jayhtX2NkbUF0dGFjaG1lbnRNdXRl eCk7CisgICAgLy8gV2UgbXVzdCBub3RpZnkgYWxsIHdhaXRlcnMsIHNpbmNlIHNldmVyYWwgZGVt dXhlcnMgY2FuIGJlIHNpbXVsdGFuZW91c2x5IHdhaXRpbmcgZm9yIGEgQ0RNLgorICAgIG1fY2Rt QXR0YWNobWVudENvbmRpdGlvbi5ub3RpZnlBbGwoKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNlRGV0YWNoZWQoQ0RNSW5zdGFuY2UmIGluc3RhbmNl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IDg1 MTY1ZDFiZjEyOWNlY2UxYTEyNmQxYzMwNGQzZmM5NjJlNzI1MzguLmZkMDQ3NTQ3OWM3NDhlNDQ4 MjRhZmJkYTBlYzIxY2ViODMwOWI5ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmgKQEAgLTM0LDExICszNCwxMSBAQAogI2luY2x1ZGUgPGdsaWIuaD4K ICNpbmNsdWRlIDxnc3QvZ3N0Lmg+CiAjaW5jbHVkZSA8Z3N0L3BidXRpbHMvaW5zdGFsbC1wbHVn aW5zLmg+CisjaW5jbHVkZSA8d3RmL0F0b21pY3MuaD4KICNpbmNsdWRlIDx3dGYvQ29uZGl0aW9u Lmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgog I2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+Ci0jaW5jbHVkZSA8d3RmL3RocmVhZHMvQmluYXJ5U2Vt YXBob3JlLmg+CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAjaW5jbHVkZSAiVHJhY2tQcml2 YXRlQmFzZUdTdHJlYW1lci5oIgpAQCAtMzY5LDcgKzM2OSw4IEBAIHByb3RlY3RlZDoKICAgICBJ bWFnZU9yaWVudGF0aW9uIG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbjsKIAogI2lmIEVOQUJMRShF TkNSWVBURURfTUVESUEpCi0gICAgQmluYXJ5U2VtYXBob3JlIG1fY2RtQXR0YWNobWVudFNlbWFw aG9yZTsKKyAgICBMb2NrIG1fY2RtQXR0YWNobWVudE11dGV4OworICAgIENvbmRpdGlvbiBtX2Nk bUF0dGFjaG1lbnRDb25kaXRpb247CiAgICAgUmVmUHRyPGNvbnN0IENETUluc3RhbmNlPiBtX2Nk bUluc3RhbmNlOwogCiAgICAgTG9jayBtX3Byb3RlY3Rpb25NdXRleDsgLy8gR3VhcmRzIGFjY2Vz cyB0byBtX2hhbmRsZWRQcm90ZWN0aW9uRXZlbnRzLgpAQCAtMzgxLDYgKzM4Miw3IEBAIHByb3Rl Y3RlZDoKICAgICBPcHRpb25hbDxHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0RlY29k ZXJQbGF0Zm9ybTsKIAogcHJpdmF0ZToKKyAgICBib29sIGlzUGxheWVyU2h1dHRpbmdEb3duKCkg Y29uc3QgeyByZXR1cm4gbV9pc1BsYXllclNodXR0aW5nRG93bi5sb2FkKCk7IH0KICAgICBNZWRp YVRpbWUgbWF4VGltZUxvYWRlZCgpIGNvbnN0OwogICAgIEdzdEVsZW1lbnQqIHBpcGVsaW5lKCkg Y29uc3QgeyByZXR1cm4gbV9waXBlbGluZS5nZXQoKTsgfQogICAgIHZvaWQgc2V0VmlkZW9Tb3Vy Y2VPcmllbnRhdGlvbihJbWFnZU9yaWVudGF0aW9uKTsKQEAgLTQ0NSwxMSArNDQ3LDEzIEBAIHBy aXZhdGU6CiAgICAgdm9pZCBjbGVhclRyYWNrcygpOwogCiAjaWYgRU5BQkxFKEVOQ1JZUFRFRF9N RURJQSkKKyAgICBib29sIGlzQ0RNQXR0YWNoZWQoKSBjb25zdCB7IHJldHVybiBtX2NkbUluc3Rh bmNlOyB9CiAgICAgdm9pZCBhdHRlbXB0VG9EZWNyeXB0V2l0aExvY2FsSW5zdGFuY2UoKTsKICAg ICB2b2lkIGluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKEluaXREYXRhJiYpOwogICAgIHZv aWQgc2V0V2FpdGluZ0ZvcktleShib29sKTsKICNlbmRpZgogCisgICAgQXRvbWljPGJvb2w+IG1f aXNQbGF5ZXJTaHV0dGluZ0Rvd247CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIEdSZWZQ dHI8R3N0RWxlbWVudD4gbV90ZXh0QXBwU2luazsKICAgICBHUmVmUHRyPEdzdFBhZD4gbV90ZXh0 QXBwU2lua1BhZDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyTVNFLmNwcAppbmRleCA2YjZkOWUwNGFjZDQwNTE4OTRlMjEwNjVkNGE1NmZk ZDI1Y2NhMzI2Li42OTdhOThlMzdhOTA0YjA1MmYyYjFjMTY4MjYzMDg4YWI3NDYyOWZiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJN U0UuY3BwCkBAIC03NTUsMTYgKzc1NSwyMyBAQCBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRTo6c3VwcG9ydHNUeXBlKGNvbnN0IE1lZAogICAg ICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KIAotICAgIEdTVF9ERUJVRygiQ2hlY2tpbmcgbWlt ZS10eXBlIFwiJXNcIiIsIHBhcmFtZXRlcnMudHlwZS5yYXcoKS51dGY4KCkuZGF0YSgpKTsKICAg ICBhdXRvJiBnc3RSZWdpc3RyeVNjYW5uZXIgPSBHU3RyZWFtZXJSZWdpc3RyeVNjYW5uZXJNU0U6 OnNpbmdsZXRvbigpOwotICAgIC8vIFNwZWMgc2F5cyB3ZSBzaG91bGQgbm90IHJldHVybiAicHJv YmFibHkiIGlmIHRoZSBjb2RlY3Mgc3RyaW5nIGlzIGVtcHR5LgogICAgIGlmIChnc3RSZWdpc3Ry eVNjYW5uZXIuaXNDb250YWluZXJUeXBlU3VwcG9ydGVkKGNvbnRhaW5lclR5cGUpKSB7CiAgICAg ICAgIFZlY3RvcjxTdHJpbmc+IGNvZGVjcyA9IHBhcmFtZXRlcnMudHlwZS5jb2RlY3MoKTsKLSAg ICAgICAgcmVzdWx0ID0gY29kZWNzLmlzRW1wdHkoKSA/IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5 cGU6Ok1heUJlU3VwcG9ydGVkIDogKGdzdFJlZ2lzdHJ5U2Nhbm5lci5hcmVBbGxDb2RlY3NTdXBw b3J0ZWQoY29kZWNzKSA/IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGU6OklzU3VwcG9ydGVkIDog TWVkaWFQbGF5ZXI6OlN1cHBvcnRzVHlwZTo6SXNOb3RTdXBwb3J0ZWQpOworICAgICAgICBHU1Rf REVCVUcoIkNvbnRhaW5lciAnJXMnIGlzIHN1cHBvcnRlZCIsIGNvbnRhaW5lclR5cGUudXRmOCgp LmRhdGEoKSk7CisgICAgICAgIGlmIChjb2RlY3MuaXNFbXB0eSgpKSB7CisgICAgICAgICAgICAv LyBTcGVjIHNheXMgd2Ugc2hvdWxkIG5vdCByZXR1cm4gInByb2JhYmx5IiBpZiB0aGUgY29kZWNz IHN0cmluZyBpcyBlbXB0eS4KKyAgICAgICAgICAgIHJlc3VsdCA9IE1lZGlhUGxheWVyOjpTdXBw b3J0c1R5cGU6Ok1heUJlU3VwcG9ydGVkOworICAgICAgICB9IGVsc2UgaWYgKGdzdFJlZ2lzdHJ5 U2Nhbm5lci5hcmVBbGxDb2RlY3NTdXBwb3J0ZWQoY29kZWNzKSkKKyAgICAgICAgICAgIHJlc3Vs dCA9IE1lZGlhUGxheWVyOjpTdXBwb3J0c1R5cGU6OklzU3VwcG9ydGVkOworICAgICAgICBlbHNl CisgICAgICAgICAgICByZXN1bHQgPSBNZWRpYVBsYXllcjo6U3VwcG9ydHNUeXBlOjpJc05vdFN1 cHBvcnRlZDsKKyAgICB9IGVsc2UgeworICAgICAgICBHU1RfV0FSTklORygiQ29udGFpbmVyICcl cycgaXMgTk9UIHN1cHBvcnRlZCIsIGNvbnRhaW5lclR5cGUudXRmOCgpLmRhdGEoKSk7CiAgICAg fQogCiAgICAgYXV0byBmaW5hbFJlc3VsdCA9IGV4dGVuZGVkU3VwcG9ydHNUeXBlKHBhcmFtZXRl cnMsIHJlc3VsdCk7Ci0gICAgR1NUX0RFQlVHKCJTdXBwb3J0ZWQ6ICVzIiwgY29udmVydEVudW1l cmF0aW9uVG9TdHJpbmcoZmluYWxSZXN1bHQpLnV0ZjgoKS5kYXRhKCkpOworICAgIEdTVF9ERUJV RygiJyVzJyBzdXBwb3J0ZWQ/ICVzIiwgcGFyYW1ldGVycy50eXBlLnJhdygpLnV0ZjgoKS5kYXRh KCksIGNvbnZlcnRFbnVtZXJhdGlvblRvU3RyaW5nKGZpbmFsUmVzdWx0KS51dGY4KCkuZGF0YSgp KTsKICAgICByZXR1cm4gZmluYWxSZXN1bHQ7CiB9CiAK 386094 2019-12-19 04:29:59 -0800 2019-12-19 04:31:03 -0800 Patch bug-205382-20191219122957.patch text/plain 8049 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlhZjk3MmNjNzQzYzkw ZTBiOTgzOGI5ZjNhYmUwNjljMzJiZTcwOC4uOGZkNTVlOTEyM2FjZjU3MjNkNzAwNTU4ZWVmNjNk Nzc2ZmIyZDZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDE5LTEyLTE4ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtF TUVdIE5vdGlmeSBhbGwgZWxlbWVudHMgd2FpdGluZyBmb3IgQ0RNIGF0dGFjaG1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTM4MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gbXVsdGlwbGUg ZGVtdXhlcnMgYXJlIGluIGZsaWdodCBhc2tpbmcgZm9yIGEgQ0RNIGluc3RhbmNlLAorICAgICAg ICBvbmx5IG9uZSBvZiB0aGVtIHdhcyBnZXR0aW5nIHdva2VuIHVwIHdoZW4gYSBDRE0gd2FzIGF0 dGFjaGVkLAorICAgICAgICBsZWF2aW5nIHRoZSBvdGhlcihzKSBibG9ja2luZyB0aGVpciByZXNw ZWN0aXZlIHN0cmVhbWluZyB0aHJlYWRzCisgICAgICAgIGFuZCBsb2NraW5nIHRoZSBwaXBlbGlu ZS4gU3dpdGNoIGJhY2sgdG8gYSBjb25kaXRpb24gdmFyaWFibGUgZnJvbQorICAgICAgICBhIHNl bWFwaG9yZSB0byBmaXggdGhpcyBpc3N1ZS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5n IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcik6CisgICAgICAgIElu aXRpYWxpemUgdGhlIG5ldyBpc1BsYXllclNodXR0aW5nRG93biBwcmVkaWNhdGUgdG8gZmFsc2Uu CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIpOgorICAgICAgICBTZXQgdGhlIG5ldyBwcmVkaWNhdGUgZm9y IHBsYXllciBzaHV0ZG93biBhdCB0aGUgc3RhcnQgb2YKKyAgICAgICAgZGVzdHJ1Y3Rpb24sIHNv IHRoYXQgYmFja2dyb3VuZCB0aHJlYWRzIGNhbiBrbm93biB3aGVuIHRoZSBzaG91bGQKKyAgICAg ICAgYWJvcnQgdGhlaXIgb3BlcmF0aW9ucyBhcyBhIHJlc3VsdCBvZiBiZWluZyB1bmJsb2NrZWQg YnkgdGhlCisgICAgICAgIGRlc3RydWN0b3IuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZVN5bmNNZXNzYWdlKTogR28gYmFjaworICAgICAgICB0 byB1c2luZyBjb25kaXRpb24gdmFyaWFibGVzLCBzbyB3ZSBjYW4gdW5ibG9jayBtb3JlIHRoYW4g b25lCisgICAgICAgIHdhaXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6Y2RtSW5zdGFuY2VBdHRhY2hlZCk6CisgICAgICAgIEhlbHBlciBwcmVkaWNh dGUgdG8gbWFrZSBjbGVhciB0aGF0IHRoZSBwcmVzZW5jZSBvZiBhIHZhbGlkCisgICAgICAgIENE TUluc3RhbmNlIHBvaW50ZXIgaXMgYSBzaWduIHRoYXQgaXQgaGFzIGJlZW4gYXR0YWNoZWQuCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5oOiBBZGQKKyAgICAgICAgYW4gaXNQbGF5ZXJTaHV0dGluZ0Rvd24gbWV0aG9kIHVz aW5nIGFuIEF0b21pYzxib29sPi4gV2UgbmVlZCB0aGlzCisgICAgICAgIHRvIGF2b2lkIHJhY2lu ZyBzZXRfY29udGV4dCgpIG9uIGEgZGVjcnlwdG9yIGVsZW1lbnQgd2l0aCB0aGUKKyAgICAgICAg cGlwZWxpbmUgYmVpbmcgc2V0IHRvIE5VTEwuIEJlZm9yZSB3ZSB3ZXJlIHVzaW5nIHRoZSBub3Rp ZmllciBhcyBhCisgICAgICAgIHByb3h5IGZvciBwbGF5ZXIgc2h1dGRvd24sIHNpbmNlIGl0IGlz IGludmFsaWRhdGVkIGR1cmluZyBwbGF5ZXIKKyAgICAgICAgZGVzdHJ1Y3Rpb24uIFRoaXMgaXMg bm90IGEgbWFpbnRhaW5hYmxlIHNvbHV0aW9uLCBzaW5jZSBvdGhlcgorICAgICAgICBwcm9ncmFt bWVycyB3b3VsZCBmZWVsIGZyZWUgdG8gcmVvcmRlciB0aGUgcG9zaXRpb24gYXQgd2hpY2ggdGhl CisgICAgICAgIG5vdGlmaWVyIGlzIGludmFsaWRhdGVkLCBhbmQgdGhlbiBpbnRyb2R1Y2UgYSB2 ZXJ5IGhhcmQgdG8gZmluZAorICAgICAgICBidWcuIEJ5IGludHJvZHVjaW5nIHRoaXMgZmxhZyBh dCB0aGUgc3RhcnQgb2YgZGVzdHJ1Y3Rpb24sIHdlIHdpbGwKKyAgICAgICAgYWx3YXlzIGhhdmUg YSBrbm93biB3YXkgdG8gY2hlY2ssIGFmdGVyIGEgc3RyZWFtaW5nIHRocmVhZCBoYXMKKyAgICAg ICAgd29rZW4gdXAgYWdhaW4sIHdoZXRoZXIgd2Ugc2hvdWxkIGNhbGwgYW55IHBsYXllciBtZXRo b2RzLCBvcgorICAgICAgICByZXR1cm4gZWFybHkgZHVlIHRvIHNodXRkb3duIGluIHByb2dyZXNz LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjppc1BsYXll clNodXR0aW5nRG93bgorICAgICAgICBjb25zdCk6IFByZWRpY2F0ZSBmb3IgcGxheWVyIGluIHRo ZSBwcm9jZXNzIG9mIHNodXRkb3duLiBUaGlzCisgICAgICAgIHNob3VsZCBiZSB1c2VkIGJ5IGJh Y2tncm91bmQgdGhyZWFkcywgd2hpY2ggdXBvbiB3YWtldXAsIG1heSBuZWVkCisgICAgICAgIHRv IGJlIGF3YXJlIG9mIHdoZXRoZXIgdGhleSB3aWxsIGJlIGluIGEgcmFjZSB3aXRoIHRoZSBwaXBl bGluZQorICAgICAgICBnb2luZyB0byBOVUxMLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjppc0NETUF0dGFjaGVkIGNvbnN0KToKKwogMjAxOS0xMi0xNyAg RXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgcmVt b3RlIG1lZGlhIHBsYXllciBtZXRob2RzIGZvciBwcmVwYXJlVG9QbGF5LCBwcmVsb2FkLCBwcml2 YXRlIGJyb3dzaW5nIG1vZGUsIHByZXNlcnZlcyBwaXRjaCwgYW5kIGZhaWxlZCB0byBsb2FkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IDUz ZDU2ZjhlOTUwODM0Mjg4MzdjZWMxOGE0MTBhYzU4NDFiMGUwMjYuLjk4MDA3OGJmZGVhNDJjYmQy M2U3NWJhNTQ5YTE2Nzk0NWJlMWE1MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0zNjksMTEgKzM2OSwxMyBAQCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcihNZWRpYVBsYXllciog cGxheWVyKQogI2lmIFVTRShHTElCKQogICAgIG1fcmVhZHlUaW1lckhhbmRsZXIuc2V0UHJpb3Jp dHkoR19QUklPUklUWV9ERUZBVUxUX0lETEUpOwogI2VuZGlmCisgICAgbV9pc1BsYXllclNodXR0 aW5nRG93bi5zdG9yZShmYWxzZSk7CiB9CiAKIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigpCiB7CiAgICAgR1NUX0RFQlVHX09CSkVDVChw aXBlbGluZSgpLCAiRGlzcG9zaW5nIHBsYXllciIpOworICAgIG1faXNQbGF5ZXJTaHV0dGluZ0Rv d24uc3RvcmUodHJ1ZSk7CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgZm9yIChhdXRv JiB0cmFjayA6IG1fYXVkaW9UcmFja3MudmFsdWVzKCkpCkBAIC00NDMsNyArNDQ1LDEwIEBAIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigp CiAgICAgY2FuY2VsUmVwYWludCh0cnVlKTsKIAogI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUEp Ci0gICAgbV9jZG1BdHRhY2htZW50U2VtYXBob3JlLnNpZ25hbCgpOworICAgIHsKKyAgICAgICAg TG9ja0hvbGRlciBsb2NrKG1fY2RtQXR0YWNobWVudE11dGV4KTsKKyAgICAgICAgbV9jZG1BdHRh Y2htZW50Q29uZGl0aW9uLm5vdGlmeUFsbCgpOworICAgIH0KICNlbmRpZgogCiAgICAgLy8gVGhl IGNoYW5nZSB0byBHU1RfU1RBVEVfTlVMTCBzdGF0ZSBpcyBhbHdheXMgc3luY2hyb25vdXMuIFNv IGFmdGVyIHRoaXMgZ2V0cyBleGVjdXRlZCB3ZSBkb24ndCBuZWVkIHRvIHdvcnJ5CkBAIC0xNzgx LDkgKzE3ODYsMTYgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZVN5 bmNNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiAgICAgICAgIGluaXRpYWxpemF0aW9uRGF0 YUVuY291bnRlcmVkKFdURk1vdmUoaW5pdERhdGEpKTsKIAogICAgICAgICBHU1RfSU5GT19PQkpF Q1QocGlwZWxpbmUoKSwgIndhaXRpbmcgZm9yIGEgQ0RNIGluc3RhbmNlIik7Ci0gICAgICAgIGlm IChtX2NkbUF0dGFjaG1lbnRTZW1hcGhvcmUud2FpdEZvcig0X3MpCi0gICAgICAgICAgICAmJiBt X25vdGlmaWVyLT5pc1ZhbGlkKCkgLy8gQ2hlY2sgdGhlIHBsYXllciBpcyBub3QgYmVpbmcgZGVz dHJveWVkLgotICAgICAgICAgICAgJiYgIW1fY2RtSW5zdGFuY2UtPmtleVN5c3RlbSgpLmlzRW1w dHkoKSkgeworCisgICAgICAgIGJvb2wgZGlkQ0RNQXR0YWNoID0gZmFsc2U7CisgICAgICAgIHsK KyAgICAgICAgICAgIGF1dG8gY2RtQXR0YWNobWVudExvY2tlciA9IGhvbGRMb2NrKG1fY2RtQXR0 YWNobWVudE11dGV4KTsKKyAgICAgICAgICAgIGRpZENETUF0dGFjaCA9IG1fY2RtQXR0YWNobWVu dENvbmRpdGlvbi53YWl0Rm9yKG1fY2RtQXR0YWNobWVudE11dGV4LCA0X3MsIFt0aGlzXSgpIHsK KyAgICAgICAgICAgICAgICByZXR1cm4gaXNDRE1BdHRhY2hlZCgpOworICAgICAgICAgICAgfSk7 CisgICAgICAgIH0KKworICAgICAgICBpZiAoZGlkQ0RNQXR0YWNoICYmICFpc1BsYXllclNodXR0 aW5nRG93bigpICYmICFtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKS5pc0VtcHR5KCkpIHsKICAg ICAgICAgICAgIGNvbnN0IGNoYXIqIHByZWZlcnJlZEtleVN5c3RlbVV1aWQgPSBHU3RyZWFtZXJF TUVVdGlsaXRpZXM6OmtleVN5c3RlbVRvVXVpZChtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKSk7 CiAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIndvcmtpbmcgd2l0aCBr ZXkgc3lzdGVtICVzLCBjb250aW51aW5nIHdpdGgga2V5IHN5c3RlbSAlcyBvbiAlcyIsIG1fY2Rt SW5zdGFuY2UtPmtleVN5c3RlbSgpLnV0ZjgoKS5kYXRhKCksIHByZWZlcnJlZEtleVN5c3RlbVV1 aWQsIEdTVF9NRVNTQUdFX1NSQ19OQU1FKG1lc3NhZ2UpKTsKIApAQCAtMzYxMSw3ICszNjIzLDkg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNlQXR0YWNoZWQo Q0RNSW5zdGFuY2UmIGluc3RhbmNlKQogCiAgICAgR1NUX0RFQlVHX09CSkVDVChtX3BpcGVsaW5l LmdldCgpLCAiQ0RNIHByb3h5IGluc3RhbmNlICVwIGRpc3BhdGNoZWQgYXMgY29udGV4dCIsIG1f Y2RtSW5zdGFuY2UtPnByb3h5Q0RNKCkuZ2V0KCkpOwogCi0gICAgbV9jZG1BdHRhY2htZW50U2Vt YXBob3JlLnNpZ25hbCgpOworICAgIExvY2tIb2xkZXIgbG9jayhtX2NkbUF0dGFjaG1lbnRNdXRl eCk7CisgICAgLy8gV2UgbXVzdCBub3RpZnkgYWxsIHdhaXRlcnMsIHNpbmNlIHNldmVyYWwgZGVt dXhlcnMgY2FuIGJlIHNpbXVsdGFuZW91c2x5IHdhaXRpbmcgZm9yIGEgQ0RNLgorICAgIG1fY2Rt QXR0YWNobWVudENvbmRpdGlvbi5ub3RpZnlBbGwoKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNlRGV0YWNoZWQoQ0RNSW5zdGFuY2UmIGluc3RhbmNl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IDg1 MTY1ZDFiZjEyOWNlY2UxYTEyNmQxYzMwNGQzZmM5NjJlNzI1MzguLmZkMDQ3NTQ3OWM3NDhlNDQ4 MjRhZmJkYTBlYzIxY2ViODMwOWI5ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmgKQEAgLTM0LDExICszNCwxMSBAQAogI2luY2x1ZGUgPGdsaWIuaD4K ICNpbmNsdWRlIDxnc3QvZ3N0Lmg+CiAjaW5jbHVkZSA8Z3N0L3BidXRpbHMvaW5zdGFsbC1wbHVn aW5zLmg+CisjaW5jbHVkZSA8d3RmL0F0b21pY3MuaD4KICNpbmNsdWRlIDx3dGYvQ29uZGl0aW9u Lmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgog I2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+Ci0jaW5jbHVkZSA8d3RmL3RocmVhZHMvQmluYXJ5U2Vt YXBob3JlLmg+CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAjaW5jbHVkZSAiVHJhY2tQcml2 YXRlQmFzZUdTdHJlYW1lci5oIgpAQCAtMzY5LDcgKzM2OSw4IEBAIHByb3RlY3RlZDoKICAgICBJ bWFnZU9yaWVudGF0aW9uIG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbjsKIAogI2lmIEVOQUJMRShF TkNSWVBURURfTUVESUEpCi0gICAgQmluYXJ5U2VtYXBob3JlIG1fY2RtQXR0YWNobWVudFNlbWFw aG9yZTsKKyAgICBMb2NrIG1fY2RtQXR0YWNobWVudE11dGV4OworICAgIENvbmRpdGlvbiBtX2Nk bUF0dGFjaG1lbnRDb25kaXRpb247CiAgICAgUmVmUHRyPGNvbnN0IENETUluc3RhbmNlPiBtX2Nk bUluc3RhbmNlOwogCiAgICAgTG9jayBtX3Byb3RlY3Rpb25NdXRleDsgLy8gR3VhcmRzIGFjY2Vz cyB0byBtX2hhbmRsZWRQcm90ZWN0aW9uRXZlbnRzLgpAQCAtMzgxLDYgKzM4Miw3IEBAIHByb3Rl Y3RlZDoKICAgICBPcHRpb25hbDxHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0RlY29k ZXJQbGF0Zm9ybTsKIAogcHJpdmF0ZToKKyAgICBib29sIGlzUGxheWVyU2h1dHRpbmdEb3duKCkg Y29uc3QgeyByZXR1cm4gbV9pc1BsYXllclNodXR0aW5nRG93bi5sb2FkKCk7IH0KICAgICBNZWRp YVRpbWUgbWF4VGltZUxvYWRlZCgpIGNvbnN0OwogICAgIEdzdEVsZW1lbnQqIHBpcGVsaW5lKCkg Y29uc3QgeyByZXR1cm4gbV9waXBlbGluZS5nZXQoKTsgfQogICAgIHZvaWQgc2V0VmlkZW9Tb3Vy Y2VPcmllbnRhdGlvbihJbWFnZU9yaWVudGF0aW9uKTsKQEAgLTQ0NSwxMSArNDQ3LDEzIEBAIHBy aXZhdGU6CiAgICAgdm9pZCBjbGVhclRyYWNrcygpOwogCiAjaWYgRU5BQkxFKEVOQ1JZUFRFRF9N RURJQSkKKyAgICBib29sIGlzQ0RNQXR0YWNoZWQoKSBjb25zdCB7IHJldHVybiBtX2NkbUluc3Rh bmNlOyB9CiAgICAgdm9pZCBhdHRlbXB0VG9EZWNyeXB0V2l0aExvY2FsSW5zdGFuY2UoKTsKICAg ICB2b2lkIGluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKEluaXREYXRhJiYpOwogICAgIHZv aWQgc2V0V2FpdGluZ0ZvcktleShib29sKTsKICNlbmRpZgogCisgICAgQXRvbWljPGJvb2w+IG1f aXNQbGF5ZXJTaHV0dGluZ0Rvd247CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIEdSZWZQ dHI8R3N0RWxlbWVudD4gbV90ZXh0QXBwU2luazsKICAgICBHUmVmUHRyPEdzdFBhZD4gbV90ZXh0 QXBwU2lua1BhZDsK 386095 2019-12-19 04:31:09 -0800 2019-12-19 04:39:25 -0800 Patch bug-205382-20191219123107.patch text/plain 8049 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlhZjk3MmNjNzQzYzkw ZTBiOTgzOGI5ZjNhYmUwNjljMzJiZTcwOC4uOGZkNTVlOTEyM2FjZjU3MjNkNzAwNTU4ZWVmNjNk Nzc2ZmIyZDZiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDE5LTEyLTE4ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtF TUVdIE5vdGlmeSBhbGwgZWxlbWVudHMgd2FpdGluZyBmb3IgQ0RNIGF0dGFjaG1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTM4MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gbXVsdGlwbGUg ZGVtdXhlcnMgYXJlIGluIGZsaWdodCBhc2tpbmcgZm9yIGEgQ0RNIGluc3RhbmNlLAorICAgICAg ICBvbmx5IG9uZSBvZiB0aGVtIHdhcyBnZXR0aW5nIHdva2VuIHVwIHdoZW4gYSBDRE0gd2FzIGF0 dGFjaGVkLAorICAgICAgICBsZWF2aW5nIHRoZSBvdGhlcihzKSBibG9ja2luZyB0aGVpciByZXNw ZWN0aXZlIHN0cmVhbWluZyB0aHJlYWRzCisgICAgICAgIGFuZCBsb2NraW5nIHRoZSBwaXBlbGlu ZS4gU3dpdGNoIGJhY2sgdG8gYSBjb25kaXRpb24gdmFyaWFibGUgZnJvbQorICAgICAgICBhIHNl bWFwaG9yZSB0byBmaXggdGhpcyBpc3N1ZS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5n IHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcik6CisgICAgICAgIElu aXRpYWxpemUgdGhlIG5ldyBpc1BsYXllclNodXR0aW5nRG93biBwcmVkaWNhdGUgdG8gZmFsc2Uu CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6On5NZWRpYVBs YXllclByaXZhdGVHU3RyZWFtZXIpOgorICAgICAgICBTZXQgdGhlIG5ldyBwcmVkaWNhdGUgZm9y IHBsYXllciBzaHV0ZG93biBhdCB0aGUgc3RhcnQgb2YKKyAgICAgICAgZGVzdHJ1Y3Rpb24sIHNv IHRoYXQgYmFja2dyb3VuZCB0aHJlYWRzIGNhbiBrbm93biB3aGVuIHRoZSBzaG91bGQKKyAgICAg ICAgYWJvcnQgdGhlaXIgb3BlcmF0aW9ucyBhcyBhIHJlc3VsdCBvZiBiZWluZyB1bmJsb2NrZWQg YnkgdGhlCisgICAgICAgIGRlc3RydWN0b3IuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZVN5bmNNZXNzYWdlKTogR28gYmFjaworICAgICAgICB0 byB1c2luZyBjb25kaXRpb24gdmFyaWFibGVzLCBzbyB3ZSBjYW4gdW5ibG9jayBtb3JlIHRoYW4g b25lCisgICAgICAgIHdhaXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcjo6Y2RtSW5zdGFuY2VBdHRhY2hlZCk6CisgICAgICAgIEhlbHBlciBwcmVkaWNh dGUgdG8gbWFrZSBjbGVhciB0aGF0IHRoZSBwcmVzZW5jZSBvZiBhIHZhbGlkCisgICAgICAgIENE TUluc3RhbmNlIHBvaW50ZXIgaXMgYSBzaWduIHRoYXQgaXQgaGFzIGJlZW4gYXR0YWNoZWQuCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lci5oOiBBZGQKKyAgICAgICAgYW4gaXNQbGF5ZXJTaHV0dGluZ0Rvd24gbWV0aG9kIHVz aW5nIGFuIEF0b21pYzxib29sPi4gV2UgbmVlZCB0aGlzCisgICAgICAgIHRvIGF2b2lkIHJhY2lu ZyBzZXRfY29udGV4dCgpIG9uIGEgZGVjcnlwdG9yIGVsZW1lbnQgd2l0aCB0aGUKKyAgICAgICAg cGlwZWxpbmUgYmVpbmcgc2V0IHRvIE5VTEwuIEJlZm9yZSB3ZSB3ZXJlIHVzaW5nIHRoZSBub3Rp ZmllciBhcyBhCisgICAgICAgIHByb3h5IGZvciBwbGF5ZXIgc2h1dGRvd24sIHNpbmNlIGl0IGlz IGludmFsaWRhdGVkIGR1cmluZyBwbGF5ZXIKKyAgICAgICAgZGVzdHJ1Y3Rpb24uIFRoaXMgaXMg bm90IGEgbWFpbnRhaW5hYmxlIHNvbHV0aW9uLCBzaW5jZSBvdGhlcgorICAgICAgICBwcm9ncmFt bWVycyB3b3VsZCBmZWVsIGZyZWUgdG8gcmVvcmRlciB0aGUgcG9zaXRpb24gYXQgd2hpY2ggdGhl CisgICAgICAgIG5vdGlmaWVyIGlzIGludmFsaWRhdGVkLCBhbmQgdGhlbiBpbnRyb2R1Y2UgYSB2 ZXJ5IGhhcmQgdG8gZmluZAorICAgICAgICBidWcuIEJ5IGludHJvZHVjaW5nIHRoaXMgZmxhZyBh dCB0aGUgc3RhcnQgb2YgZGVzdHJ1Y3Rpb24sIHdlIHdpbGwKKyAgICAgICAgYWx3YXlzIGhhdmUg YSBrbm93biB3YXkgdG8gY2hlY2ssIGFmdGVyIGEgc3RyZWFtaW5nIHRocmVhZCBoYXMKKyAgICAg ICAgd29rZW4gdXAgYWdhaW4sIHdoZXRoZXIgd2Ugc2hvdWxkIGNhbGwgYW55IHBsYXllciBtZXRo b2RzLCBvcgorICAgICAgICByZXR1cm4gZWFybHkgZHVlIHRvIHNodXRkb3duIGluIHByb2dyZXNz LgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjppc1BsYXll clNodXR0aW5nRG93bgorICAgICAgICBjb25zdCk6IFByZWRpY2F0ZSBmb3IgcGxheWVyIGluIHRo ZSBwcm9jZXNzIG9mIHNodXRkb3duLiBUaGlzCisgICAgICAgIHNob3VsZCBiZSB1c2VkIGJ5IGJh Y2tncm91bmQgdGhyZWFkcywgd2hpY2ggdXBvbiB3YWtldXAsIG1heSBuZWVkCisgICAgICAgIHRv IGJlIGF3YXJlIG9mIHdoZXRoZXIgdGhleSB3aWxsIGJlIGluIGEgcmFjZSB3aXRoIHRoZSBwaXBl bGluZQorICAgICAgICBnb2luZyB0byBOVUxMLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyOjppc0NETUF0dGFjaGVkIGNvbnN0KToKKwogMjAxOS0xMi0xNyAg RXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgcmVt b3RlIG1lZGlhIHBsYXllciBtZXRob2RzIGZvciBwcmVwYXJlVG9QbGF5LCBwcmVsb2FkLCBwcml2 YXRlIGJyb3dzaW5nIG1vZGUsIHByZXNlcnZlcyBwaXRjaCwgYW5kIGZhaWxlZCB0byBsb2FkCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCmluZGV4IDUz ZDU2ZjhlOTUwODM0Mjg4MzdjZWMxOGE0MTBhYzU4NDFiMGUwMjYuLjk4MDA3OGJmZGVhNDJjYmQy M2U3NWJhNTQ5YTE2Nzk0NWJlMWE1MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0zNjksMTEgKzM2OSwxMyBAQCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcihNZWRpYVBsYXllciog cGxheWVyKQogI2lmIFVTRShHTElCKQogICAgIG1fcmVhZHlUaW1lckhhbmRsZXIuc2V0UHJpb3Jp dHkoR19QUklPUklUWV9ERUZBVUxUX0lETEUpOwogI2VuZGlmCisgICAgbV9pc1BsYXllclNodXR0 aW5nRG93bi5zdG9yZShmYWxzZSk7CiB9CiAKIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6 fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigpCiB7CiAgICAgR1NUX0RFQlVHX09CSkVDVChw aXBlbGluZSgpLCAiRGlzcG9zaW5nIHBsYXllciIpOworICAgIG1faXNQbGF5ZXJTaHV0dGluZ0Rv d24uc3RvcmUodHJ1ZSk7CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAgZm9yIChhdXRv JiB0cmFjayA6IG1fYXVkaW9UcmFja3MudmFsdWVzKCkpCkBAIC00NDMsNyArNDQ1LDEwIEBAIE1l ZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigp CiAgICAgY2FuY2VsUmVwYWludCh0cnVlKTsKIAogI2lmIEVOQUJMRShFTkNSWVBURURfTUVESUEp Ci0gICAgbV9jZG1BdHRhY2htZW50U2VtYXBob3JlLnNpZ25hbCgpOworICAgIHsKKyAgICAgICAg TG9ja0hvbGRlciBsb2NrKG1fY2RtQXR0YWNobWVudE11dGV4KTsKKyAgICAgICAgbV9jZG1BdHRh Y2htZW50Q29uZGl0aW9uLm5vdGlmeUFsbCgpOworICAgIH0KICNlbmRpZgogCiAgICAgLy8gVGhl IGNoYW5nZSB0byBHU1RfU1RBVEVfTlVMTCBzdGF0ZSBpcyBhbHdheXMgc3luY2hyb25vdXMuIFNv IGFmdGVyIHRoaXMgZ2V0cyBleGVjdXRlZCB3ZSBkb24ndCBuZWVkIHRvIHdvcnJ5CkBAIC0xNzgx LDkgKzE3ODYsMTYgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZVN5 bmNNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiAgICAgICAgIGluaXRpYWxpemF0aW9uRGF0 YUVuY291bnRlcmVkKFdURk1vdmUoaW5pdERhdGEpKTsKIAogICAgICAgICBHU1RfSU5GT19PQkpF Q1QocGlwZWxpbmUoKSwgIndhaXRpbmcgZm9yIGEgQ0RNIGluc3RhbmNlIik7Ci0gICAgICAgIGlm IChtX2NkbUF0dGFjaG1lbnRTZW1hcGhvcmUud2FpdEZvcig0X3MpCi0gICAgICAgICAgICAmJiBt X25vdGlmaWVyLT5pc1ZhbGlkKCkgLy8gQ2hlY2sgdGhlIHBsYXllciBpcyBub3QgYmVpbmcgZGVz dHJveWVkLgotICAgICAgICAgICAgJiYgIW1fY2RtSW5zdGFuY2UtPmtleVN5c3RlbSgpLmlzRW1w dHkoKSkgeworCisgICAgICAgIGJvb2wgZGlkQ0RNQXR0YWNoID0gZmFsc2U7CisgICAgICAgIHsK KyAgICAgICAgICAgIGF1dG8gY2RtQXR0YWNobWVudExvY2tlciA9IGhvbGRMb2NrKG1fY2RtQXR0 YWNobWVudE11dGV4KTsKKyAgICAgICAgICAgIGRpZENETUF0dGFjaCA9IG1fY2RtQXR0YWNobWVu dENvbmRpdGlvbi53YWl0Rm9yKG1fY2RtQXR0YWNobWVudE11dGV4LCA0X3MsIFt0aGlzXSgpIHsK KyAgICAgICAgICAgICAgICByZXR1cm4gaXNDRE1BdHRhY2hlZCgpOworICAgICAgICAgICAgfSk7 CisgICAgICAgIH0KKworICAgICAgICBpZiAoZGlkQ0RNQXR0YWNoICYmICFpc1BsYXllclNodXR0 aW5nRG93bigpICYmICFtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKS5pc0VtcHR5KCkpIHsKICAg ICAgICAgICAgIGNvbnN0IGNoYXIqIHByZWZlcnJlZEtleVN5c3RlbVV1aWQgPSBHU3RyZWFtZXJF TUVVdGlsaXRpZXM6OmtleVN5c3RlbVRvVXVpZChtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKSk7 CiAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIndvcmtpbmcgd2l0aCBr ZXkgc3lzdGVtICVzLCBjb250aW51aW5nIHdpdGgga2V5IHN5c3RlbSAlcyBvbiAlcyIsIG1fY2Rt SW5zdGFuY2UtPmtleVN5c3RlbSgpLnV0ZjgoKS5kYXRhKCksIHByZWZlcnJlZEtleVN5c3RlbVV1 aWQsIEdTVF9NRVNTQUdFX1NSQ19OQU1FKG1lc3NhZ2UpKTsKIApAQCAtMzYxMSw3ICszNjIzLDkg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNlQXR0YWNoZWQo Q0RNSW5zdGFuY2UmIGluc3RhbmNlKQogCiAgICAgR1NUX0RFQlVHX09CSkVDVChtX3BpcGVsaW5l LmdldCgpLCAiQ0RNIHByb3h5IGluc3RhbmNlICVwIGRpc3BhdGNoZWQgYXMgY29udGV4dCIsIG1f Y2RtSW5zdGFuY2UtPnByb3h5Q0RNKCkuZ2V0KCkpOwogCi0gICAgbV9jZG1BdHRhY2htZW50U2Vt YXBob3JlLnNpZ25hbCgpOworICAgIExvY2tIb2xkZXIgbG9jayhtX2NkbUF0dGFjaG1lbnRNdXRl eCk7CisgICAgLy8gV2UgbXVzdCBub3RpZnkgYWxsIHdhaXRlcnMsIHNpbmNlIHNldmVyYWwgZGVt dXhlcnMgY2FuIGJlIHNpbXVsdGFuZW91c2x5IHdhaXRpbmcgZm9yIGEgQ0RNLgorICAgIG1fY2Rt QXR0YWNobWVudENvbmRpdGlvbi5ub3RpZnlBbGwoKTsKIH0KIAogdm9pZCBNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNlRGV0YWNoZWQoQ0RNSW5zdGFuY2UmIGluc3RhbmNl KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oCmluZGV4IDg1 MTY1ZDFiZjEyOWNlY2UxYTEyNmQxYzMwNGQzZmM5NjJlNzI1MzguLmZkMDQ3NTQ3OWM3NDhlNDQ4 MjRhZmJkYTBlYzIxY2ViODMwOWI5ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyLmgKQEAgLTM0LDExICszNCwxMSBAQAogI2luY2x1ZGUgPGdsaWIuaD4K ICNpbmNsdWRlIDxnc3QvZ3N0Lmg+CiAjaW5jbHVkZSA8Z3N0L3BidXRpbHMvaW5zdGFsbC1wbHVn aW5zLmg+CisjaW5jbHVkZSA8d3RmL0F0b21pY3MuaD4KICNpbmNsdWRlIDx3dGYvQ29uZGl0aW9u Lmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvUnVuTG9vcC5oPgog I2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+Ci0jaW5jbHVkZSA8d3RmL3RocmVhZHMvQmluYXJ5U2Vt YXBob3JlLmg+CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAjaW5jbHVkZSAiVHJhY2tQcml2 YXRlQmFzZUdTdHJlYW1lci5oIgpAQCAtMzY5LDcgKzM2OSw4IEBAIHByb3RlY3RlZDoKICAgICBJ bWFnZU9yaWVudGF0aW9uIG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbjsKIAogI2lmIEVOQUJMRShF TkNSWVBURURfTUVESUEpCi0gICAgQmluYXJ5U2VtYXBob3JlIG1fY2RtQXR0YWNobWVudFNlbWFw aG9yZTsKKyAgICBMb2NrIG1fY2RtQXR0YWNobWVudE11dGV4OworICAgIENvbmRpdGlvbiBtX2Nk bUF0dGFjaG1lbnRDb25kaXRpb247CiAgICAgUmVmUHRyPGNvbnN0IENETUluc3RhbmNlPiBtX2Nk bUluc3RhbmNlOwogCiAgICAgTG9jayBtX3Byb3RlY3Rpb25NdXRleDsgLy8gR3VhcmRzIGFjY2Vz cyB0byBtX2hhbmRsZWRQcm90ZWN0aW9uRXZlbnRzLgpAQCAtMzgxLDYgKzM4Miw3IEBAIHByb3Rl Y3RlZDoKICAgICBPcHRpb25hbDxHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybT4gbV92aWRlb0RlY29k ZXJQbGF0Zm9ybTsKIAogcHJpdmF0ZToKKyAgICBib29sIGlzUGxheWVyU2h1dHRpbmdEb3duKCkg Y29uc3QgeyByZXR1cm4gbV9pc1BsYXllclNodXR0aW5nRG93bi5sb2FkKCk7IH0KICAgICBNZWRp YVRpbWUgbWF4VGltZUxvYWRlZCgpIGNvbnN0OwogICAgIEdzdEVsZW1lbnQqIHBpcGVsaW5lKCkg Y29uc3QgeyByZXR1cm4gbV9waXBlbGluZS5nZXQoKTsgfQogICAgIHZvaWQgc2V0VmlkZW9Tb3Vy Y2VPcmllbnRhdGlvbihJbWFnZU9yaWVudGF0aW9uKTsKQEAgLTQ0NSwxMSArNDQ3LDEzIEBAIHBy aXZhdGU6CiAgICAgdm9pZCBjbGVhclRyYWNrcygpOwogCiAjaWYgRU5BQkxFKEVOQ1JZUFRFRF9N RURJQSkKKyAgICBib29sIGlzQ0RNQXR0YWNoZWQoKSBjb25zdCB7IHJldHVybiBtX2NkbUluc3Rh bmNlOyB9CiAgICAgdm9pZCBhdHRlbXB0VG9EZWNyeXB0V2l0aExvY2FsSW5zdGFuY2UoKTsKICAg ICB2b2lkIGluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKEluaXREYXRhJiYpOwogICAgIHZv aWQgc2V0V2FpdGluZ0ZvcktleShib29sKTsKICNlbmRpZgogCisgICAgQXRvbWljPGJvb2w+IG1f aXNQbGF5ZXJTaHV0dGluZ0Rvd247CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQogICAgIEdSZWZQ dHI8R3N0RWxlbWVudD4gbV90ZXh0QXBwU2luazsKICAgICBHUmVmUHRyPEdzdFBhZD4gbV90ZXh0 QXBwU2lua1BhZDsK 386096 2019-12-19 04:39:31 -0800 2019-12-19 05:25:05 -0800 Patch bug-205382-20191219123929.patch text/plain 8058 cturner U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNjU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDlhZjk3MmNjNzQzYzkw ZTBiOTgzOGI5ZjNhYmUwNjljMzJiZTcwOC4uODc4ODZjODg2YWM1ZmY1MTBjOWY1OGQxMDQwMzFm MzVjYmFlY2Y5NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDUxIEBACisyMDE5LTEyLTE4ICBDaGFy bGllIFR1cm5lciAgPGN0dXJuZXJAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1N0cmVhbWVyXVtF TUVdIE5vdGlmeSBhbGwgZWxlbWVudHMgd2FpdGluZyBmb3IgQ0RNIGF0dGFjaG1lbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNTM4MgorCisgICAg ICAgIFJldmlld2VkIGJ5IFhhYmllciBSb2RyaWd1ZXotQ2FsdmFyLgorCisgICAgICAgIFdoZW4g bXVsdGlwbGUgZGVtdXhlcnMgYXJlIGluIGZsaWdodCBhc2tpbmcgZm9yIGEgQ0RNIGluc3RhbmNl LAorICAgICAgICBvbmx5IG9uZSBvZiB0aGVtIHdhcyBnZXR0aW5nIHdva2VuIHVwIHdoZW4gYSBD RE0gd2FzIGF0dGFjaGVkLAorICAgICAgICBsZWF2aW5nIHRoZSBvdGhlcihzKSBibG9ja2luZyB0 aGVpciByZXNwZWN0aXZlIHN0cmVhbWluZyB0aHJlYWRzCisgICAgICAgIGFuZCBsb2NraW5nIHRo ZSBwaXBlbGluZS4gU3dpdGNoIGJhY2sgdG8gYSBjb25kaXRpb24gdmFyaWFibGUgZnJvbQorICAg ICAgICBhIHNlbWFwaG9yZSB0byBmaXggdGhpcyBpc3N1ZS4KKworICAgICAgICBDb3ZlcmVkIGJ5 IGV4aXN0aW5nIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcik6Cisg ICAgICAgIEluaXRpYWxpemUgdGhlIG5ldyBpc1BsYXllclNodXR0aW5nRG93biBwcmVkaWNhdGUg dG8gZmFsc2UuCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 On5NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIpOgorICAgICAgICBTZXQgdGhlIG5ldyBwcmVk aWNhdGUgZm9yIHBsYXllciBzaHV0ZG93biBhdCB0aGUgc3RhcnQgb2YKKyAgICAgICAgZGVzdHJ1 Y3Rpb24sIHNvIHRoYXQgYmFja2dyb3VuZCB0aHJlYWRzIGNhbiBrbm93biB3aGVuIHRoZSBzaG91 bGQKKyAgICAgICAgYWJvcnQgdGhlaXIgb3BlcmF0aW9ucyBhcyBhIHJlc3VsdCBvZiBiZWluZyB1 bmJsb2NrZWQgYnkgdGhlCisgICAgICAgIGRlc3RydWN0b3IuCisgICAgICAgIChXZWJDb3JlOjpN ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmhhbmRsZVN5bmNNZXNzYWdlKTogR28gYmFjawor ICAgICAgICB0byB1c2luZyBjb25kaXRpb24gdmFyaWFibGVzLCBzbyB3ZSBjYW4gdW5ibG9jayBt b3JlIHRoYW4gb25lCisgICAgICAgIHdhaXRlci4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lcjo6Y2RtSW5zdGFuY2VBdHRhY2hlZCk6CisgICAgICAgIEhlbHBl ciBwcmVkaWNhdGUgdG8gbWFrZSBjbGVhciB0aGF0IHRoZSBwcmVzZW5jZSBvZiBhIHZhbGlkCisg ICAgICAgIENETUluc3RhbmNlIHBvaW50ZXIgaXMgYSBzaWduIHRoYXQgaXQgaGFzIGJlZW4gYXR0 YWNoZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lci5oOiBBZGQKKyAgICAgICAgYW4gaXNQbGF5ZXJTaHV0dGluZ0Rvd24g bWV0aG9kIHVzaW5nIGFuIEF0b21pYzxib29sPi4gV2UgbmVlZCB0aGlzCisgICAgICAgIHRvIGF2 b2lkIHJhY2luZyBzZXRfY29udGV4dCgpIG9uIGEgZGVjcnlwdG9yIGVsZW1lbnQgd2l0aCB0aGUK KyAgICAgICAgcGlwZWxpbmUgYmVpbmcgc2V0IHRvIE5VTEwuIEJlZm9yZSB3ZSB3ZXJlIHVzaW5n IHRoZSBub3RpZmllciBhcyBhCisgICAgICAgIHByb3h5IGZvciBwbGF5ZXIgc2h1dGRvd24sIHNp bmNlIGl0IGlzIGludmFsaWRhdGVkIGR1cmluZyBwbGF5ZXIKKyAgICAgICAgZGVzdHJ1Y3Rpb24u IFRoaXMgaXMgbm90IGEgbWFpbnRhaW5hYmxlIHNvbHV0aW9uLCBzaW5jZSBvdGhlcgorICAgICAg ICBwcm9ncmFtbWVycyB3b3VsZCBmZWVsIGZyZWUgdG8gcmVvcmRlciB0aGUgcG9zaXRpb24gYXQg d2hpY2ggdGhlCisgICAgICAgIG5vdGlmaWVyIGlzIGludmFsaWRhdGVkLCBhbmQgdGhlbiBpbnRy b2R1Y2UgYSB2ZXJ5IGhhcmQgdG8gZmluZAorICAgICAgICBidWcuIEJ5IGludHJvZHVjaW5nIHRo aXMgZmxhZyBhdCB0aGUgc3RhcnQgb2YgZGVzdHJ1Y3Rpb24sIHdlIHdpbGwKKyAgICAgICAgYWx3 YXlzIGhhdmUgYSBrbm93biB3YXkgdG8gY2hlY2ssIGFmdGVyIGEgc3RyZWFtaW5nIHRocmVhZCBo YXMKKyAgICAgICAgd29rZW4gdXAgYWdhaW4sIHdoZXRoZXIgd2Ugc2hvdWxkIGNhbGwgYW55IHBs YXllciBtZXRob2RzLCBvcgorICAgICAgICByZXR1cm4gZWFybHkgZHVlIHRvIHNodXRkb3duIGlu IHByb2dyZXNzLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVy Ojppc1BsYXllclNodXR0aW5nRG93bgorICAgICAgICBjb25zdCk6IFByZWRpY2F0ZSBmb3IgcGxh eWVyIGluIHRoZSBwcm9jZXNzIG9mIHNodXRkb3duLiBUaGlzCisgICAgICAgIHNob3VsZCBiZSB1 c2VkIGJ5IGJhY2tncm91bmQgdGhyZWFkcywgd2hpY2ggdXBvbiB3YWtldXAsIG1heSBuZWVkCisg ICAgICAgIHRvIGJlIGF3YXJlIG9mIHdoZXRoZXIgdGhleSB3aWxsIGJlIGluIGEgcmFjZSB3aXRo IHRoZSBwaXBlbGluZQorICAgICAgICBnb2luZyB0byBOVUxMLgorICAgICAgICAoV2ViQ29yZTo6 TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjppc0NETUF0dGFjaGVkIGNvbnN0KToKKwogMjAx OS0xMi0xNyAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAg ICBBZGQgcmVtb3RlIG1lZGlhIHBsYXllciBtZXRob2RzIGZvciBwcmVwYXJlVG9QbGF5LCBwcmVs b2FkLCBwcml2YXRlIGJyb3dzaW5nIG1vZGUsIHByZXNlcnZlcyBwaXRjaCwgYW5kIGZhaWxlZCB0 byBsb2FkCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3Bw CmluZGV4IDUzZDU2ZjhlOTUwODM0Mjg4MzdjZWMxOGE0MTBhYzU4NDFiMGUwMjYuLjk4MDA3OGJm ZGVhNDJjYmQyM2U3NWJhNTQ5YTE2Nzk0NWJlMWE1MjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9N ZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0zNjksMTEgKzM2OSwxMyBAQCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcihNZWRp YVBsYXllciogcGxheWVyKQogI2lmIFVTRShHTElCKQogICAgIG1fcmVhZHlUaW1lckhhbmRsZXIu c2V0UHJpb3JpdHkoR19QUklPUklUWV9ERUZBVUxUX0lETEUpOwogI2VuZGlmCisgICAgbV9pc1Bs YXllclNodXR0aW5nRG93bi5zdG9yZShmYWxzZSk7CiB9CiAKIE1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcigpCiB7CiAgICAgR1NUX0RFQlVH X09CSkVDVChwaXBlbGluZSgpLCAiRGlzcG9zaW5nIHBsYXllciIpOworICAgIG1faXNQbGF5ZXJT aHV0dGluZ0Rvd24uc3RvcmUodHJ1ZSk7CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAgICAg Zm9yIChhdXRvJiB0cmFjayA6IG1fYXVkaW9UcmFja3MudmFsdWVzKCkpCkBAIC00NDMsNyArNDQ1 LDEwIEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0ZUdT dHJlYW1lcigpCiAgICAgY2FuY2VsUmVwYWludCh0cnVlKTsKIAogI2lmIEVOQUJMRShFTkNSWVBU RURfTUVESUEpCi0gICAgbV9jZG1BdHRhY2htZW50U2VtYXBob3JlLnNpZ25hbCgpOworICAgIHsK KyAgICAgICAgTG9ja0hvbGRlciBsb2NrKG1fY2RtQXR0YWNobWVudE11dGV4KTsKKyAgICAgICAg bV9jZG1BdHRhY2htZW50Q29uZGl0aW9uLm5vdGlmeUFsbCgpOworICAgIH0KICNlbmRpZgogCiAg ICAgLy8gVGhlIGNoYW5nZSB0byBHU1RfU1RBVEVfTlVMTCBzdGF0ZSBpcyBhbHdheXMgc3luY2hy b25vdXMuIFNvIGFmdGVyIHRoaXMgZ2V0cyBleGVjdXRlZCB3ZSBkb24ndCBuZWVkIHRvIHdvcnJ5 CkBAIC0xNzgxLDkgKzE3ODYsMTYgQEAgYm9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6 OmhhbmRsZVN5bmNNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiAgICAgICAgIGluaXRpYWxp emF0aW9uRGF0YUVuY291bnRlcmVkKFdURk1vdmUoaW5pdERhdGEpKTsKIAogICAgICAgICBHU1Rf SU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIndhaXRpbmcgZm9yIGEgQ0RNIGluc3RhbmNlIik7Ci0g ICAgICAgIGlmIChtX2NkbUF0dGFjaG1lbnRTZW1hcGhvcmUud2FpdEZvcig0X3MpCi0gICAgICAg ICAgICAmJiBtX25vdGlmaWVyLT5pc1ZhbGlkKCkgLy8gQ2hlY2sgdGhlIHBsYXllciBpcyBub3Qg YmVpbmcgZGVzdHJveWVkLgotICAgICAgICAgICAgJiYgIW1fY2RtSW5zdGFuY2UtPmtleVN5c3Rl bSgpLmlzRW1wdHkoKSkgeworCisgICAgICAgIGJvb2wgZGlkQ0RNQXR0YWNoID0gZmFsc2U7Cisg ICAgICAgIHsKKyAgICAgICAgICAgIGF1dG8gY2RtQXR0YWNobWVudExvY2tlciA9IGhvbGRMb2Nr KG1fY2RtQXR0YWNobWVudE11dGV4KTsKKyAgICAgICAgICAgIGRpZENETUF0dGFjaCA9IG1fY2Rt QXR0YWNobWVudENvbmRpdGlvbi53YWl0Rm9yKG1fY2RtQXR0YWNobWVudE11dGV4LCA0X3MsIFt0 aGlzXSgpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gaXNDRE1BdHRhY2hlZCgpOworICAgICAg ICAgICAgfSk7CisgICAgICAgIH0KKworICAgICAgICBpZiAoZGlkQ0RNQXR0YWNoICYmICFpc1Bs YXllclNodXR0aW5nRG93bigpICYmICFtX2NkbUluc3RhbmNlLT5rZXlTeXN0ZW0oKS5pc0VtcHR5 KCkpIHsKICAgICAgICAgICAgIGNvbnN0IGNoYXIqIHByZWZlcnJlZEtleVN5c3RlbVV1aWQgPSBH U3RyZWFtZXJFTUVVdGlsaXRpZXM6OmtleVN5c3RlbVRvVXVpZChtX2NkbUluc3RhbmNlLT5rZXlT eXN0ZW0oKSk7CiAgICAgICAgICAgICBHU1RfSU5GT19PQkpFQ1QocGlwZWxpbmUoKSwgIndvcmtp bmcgd2l0aCBrZXkgc3lzdGVtICVzLCBjb250aW51aW5nIHdpdGgga2V5IHN5c3RlbSAlcyBvbiAl cyIsIG1fY2RtSW5zdGFuY2UtPmtleVN5c3RlbSgpLnV0ZjgoKS5kYXRhKCksIHByZWZlcnJlZEtl eVN5c3RlbVV1aWQsIEdTVF9NRVNTQUdFX1NSQ19OQU1FKG1lc3NhZ2UpKTsKIApAQCAtMzYxMSw3 ICszNjIzLDkgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNl QXR0YWNoZWQoQ0RNSW5zdGFuY2UmIGluc3RhbmNlKQogCiAgICAgR1NUX0RFQlVHX09CSkVDVCht X3BpcGVsaW5lLmdldCgpLCAiQ0RNIHByb3h5IGluc3RhbmNlICVwIGRpc3BhdGNoZWQgYXMgY29u dGV4dCIsIG1fY2RtSW5zdGFuY2UtPnByb3h5Q0RNKCkuZ2V0KCkpOwogCi0gICAgbV9jZG1BdHRh Y2htZW50U2VtYXBob3JlLnNpZ25hbCgpOworICAgIExvY2tIb2xkZXIgbG9jayhtX2NkbUF0dGFj aG1lbnRNdXRleCk7CisgICAgLy8gV2UgbXVzdCBub3RpZnkgYWxsIHdhaXRlcnMsIHNpbmNlIHNl dmVyYWwgZGVtdXhlcnMgY2FuIGJlIHNpbXVsdGFuZW91c2x5IHdhaXRpbmcgZm9yIGEgQ0RNLgor ICAgIG1fY2RtQXR0YWNobWVudENvbmRpdGlvbi5ub3RpZnlBbGwoKTsKIH0KIAogdm9pZCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmNkbUluc3RhbmNlRGV0YWNoZWQoQ0RNSW5zdGFuY2Um IGluc3RhbmNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5o CmluZGV4IDg1MTY1ZDFiZjEyOWNlY2UxYTEyNmQxYzMwNGQzZmM5NjJlNzI1MzguLmZkMDQ3NTQ3 OWM3NDhlNDQ4MjRhZmJkYTBlYzIxY2ViODMwOWI5ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgKQEAgLTM0LDExICszNCwxMSBAQAogI2luY2x1ZGUg PGdsaWIuaD4KICNpbmNsdWRlIDxnc3QvZ3N0Lmg+CiAjaW5jbHVkZSA8Z3N0L3BidXRpbHMvaW5z dGFsbC1wbHVnaW5zLmg+CisjaW5jbHVkZSA8d3RmL0F0b21pY3MuaD4KICNpbmNsdWRlIDx3dGYv Q29uZGl0aW9uLmg+CiAjaW5jbHVkZSA8d3RmL0ZvcndhcmQuaD4KICNpbmNsdWRlIDx3dGYvUnVu TG9vcC5oPgogI2luY2x1ZGUgPHd0Zi9XZWFrUHRyLmg+Ci0jaW5jbHVkZSA8d3RmL3RocmVhZHMv QmluYXJ5U2VtYXBob3JlLmg+CiAKICNpZiBFTkFCTEUoVklERU9fVFJBQ0spCiAjaW5jbHVkZSAi VHJhY2tQcml2YXRlQmFzZUdTdHJlYW1lci5oIgpAQCAtMzY5LDcgKzM2OSw4IEBAIHByb3RlY3Rl ZDoKICAgICBJbWFnZU9yaWVudGF0aW9uIG1fdmlkZW9Tb3VyY2VPcmllbnRhdGlvbjsKIAogI2lm IEVOQUJMRShFTkNSWVBURURfTUVESUEpCi0gICAgQmluYXJ5U2VtYXBob3JlIG1fY2RtQXR0YWNo bWVudFNlbWFwaG9yZTsKKyAgICBMb2NrIG1fY2RtQXR0YWNobWVudE11dGV4OworICAgIENvbmRp dGlvbiBtX2NkbUF0dGFjaG1lbnRDb25kaXRpb247CiAgICAgUmVmUHRyPGNvbnN0IENETUluc3Rh bmNlPiBtX2NkbUluc3RhbmNlOwogCiAgICAgTG9jayBtX3Byb3RlY3Rpb25NdXRleDsgLy8gR3Vh cmRzIGFjY2VzcyB0byBtX2hhbmRsZWRQcm90ZWN0aW9uRXZlbnRzLgpAQCAtMzgxLDYgKzM4Miw3 IEBAIHByb3RlY3RlZDoKICAgICBPcHRpb25hbDxHc3RWaWRlb0RlY29kZXJQbGF0Zm9ybT4gbV92 aWRlb0RlY29kZXJQbGF0Zm9ybTsKIAogcHJpdmF0ZToKKyAgICBib29sIGlzUGxheWVyU2h1dHRp bmdEb3duKCkgY29uc3QgeyByZXR1cm4gbV9pc1BsYXllclNodXR0aW5nRG93bi5sb2FkKCk7IH0K ICAgICBNZWRpYVRpbWUgbWF4VGltZUxvYWRlZCgpIGNvbnN0OwogICAgIEdzdEVsZW1lbnQqIHBp cGVsaW5lKCkgY29uc3QgeyByZXR1cm4gbV9waXBlbGluZS5nZXQoKTsgfQogICAgIHZvaWQgc2V0 VmlkZW9Tb3VyY2VPcmllbnRhdGlvbihJbWFnZU9yaWVudGF0aW9uKTsKQEAgLTQ0NSwxMSArNDQ3 LDEzIEBAIHByaXZhdGU6CiAgICAgdm9pZCBjbGVhclRyYWNrcygpOwogCiAjaWYgRU5BQkxFKEVO Q1JZUFRFRF9NRURJQSkKKyAgICBib29sIGlzQ0RNQXR0YWNoZWQoKSBjb25zdCB7IHJldHVybiBt X2NkbUluc3RhbmNlOyB9CiAgICAgdm9pZCBhdHRlbXB0VG9EZWNyeXB0V2l0aExvY2FsSW5zdGFu Y2UoKTsKICAgICB2b2lkIGluaXRpYWxpemF0aW9uRGF0YUVuY291bnRlcmVkKEluaXREYXRhJiYp OwogICAgIHZvaWQgc2V0V2FpdGluZ0ZvcktleShib29sKTsKICNlbmRpZgogCisgICAgQXRvbWlj PGJvb2w+IG1faXNQbGF5ZXJTaHV0dGluZ0Rvd247CiAjaWYgRU5BQkxFKFZJREVPX1RSQUNLKQog ICAgIEdSZWZQdHI8R3N0RWxlbWVudD4gbV90ZXh0QXBwU2luazsKICAgICBHUmVmUHRyPEdzdFBh ZD4gbV90ZXh0QXBwU2lua1BhZDsK