203194 2019-10-21 07:50:25 -0700 [GStreamer] Several issues while trying to play a video on NextCloud 2020-05-12 07:21:26 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED DUPLICATE 210284 P2 Normal --- 1 svillar calvaris aboya berto bugs-noreply calvaris cgarcia commit-queue eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sergio vjaquez oldest_to_newest 1581847 0 svillar 2019-10-21 07:50:25 -0700 I'm experiencing several issues when trying to play a video hosted on a nextcloud installation: * the playback is choppy, it starts, then I got several cuts and finally it becomes stalled * the download bar grows a bit and then stops * the progress indicator behaviour is weird, as it moves faster than the download bar Note that the video plays fine if I download it. PS: the aforementioned video is hosted in a private installation, I can give further details privately. 1581849 1 pnormand 2019-10-21 07:54:06 -0700 Most likely an issue in the GStreamer webkithttpsrc element. 1589484 2 383346 calvaris 2019-11-12 03:37:33 -0800 Created attachment 383346 Patch 1589485 3 383346 pnormand 2019-11-12 03:45:03 -0800 Comment on attachment 383346 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383346&action=review > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp:468 > - && (GST_STATE(src) == GST_STATE_PLAYING) && priv->isDownloadSuspended) { > + && (GST_STATE(src) == GST_STATE_PLAYING || GST_STATE(src) == GST_STATE_PAUSED) && priv->isDownloadSuspended) { Could be simplified to GST_STATE(src) >= GST_STATE_PAUSED > Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.h:38 > +#define WEBKIT_WEB_SRC_CAST(obj) ((WebKitWebSrc*)(obj)) Odd indentation here :) 1589507 4 383351 calvaris 2019-11-12 07:03:14 -0800 Created attachment 383351 Patch for landing 1589508 5 383352 calvaris 2019-11-12 07:04:48 -0800 Created attachment 383352 Patch for landing 1589808 6 383352 commit-queue 2019-11-13 02:44:05 -0800 Comment on attachment 383352 Patch for landing Clearing flags on attachment: 383352 Committed r252398: <https://trac.webkit.org/changeset/252398> 1589809 7 commit-queue 2019-11-13 02:44:07 -0800 All reviewed patches have been landed. Closing bug. 1590248 8 calvaris 2019-11-14 07:42:47 -0800 I could reproduce this bug again. 1592324 9 pnormand 2019-11-21 02:59:21 -0800 *** Bug 204410 has been marked as a duplicate of this bug. *** 1599329 10 pnormand 2019-12-17 01:53:49 -0800 With current ToT here playback doesn't even start... The pipeline seems stuck in an ASYNC state change. 1599349 11 calvaris 2019-12-17 02:48:22 -0800 Have you tried patch for bug 205275 ? 1599350 12 pnormand 2019-12-17 02:51:55 -0800 (In reply to Xabier Rodríguez Calvar from comment #11) > Have you tried patch for bug 205275 ? Yes and the video plays now. I was just saying the original issue reported is now different from what I observe without patches. 1599356 13 calvaris 2019-12-17 03:09:21 -0800 (In reply to Philippe Normand from comment #12) > Yes and the video plays now. I was just saying the original issue reported > is now different from what I observe without patches. I observed several of this things while working on this bug that I tried to fix but as the patch was getting big, I thought I could push what I had and tackle the "low bandwidth pause" back here. 1651720 14 aboya 2020-05-12 07:21:26 -0700 The video is working fine after the WebKitWebSrc threading rework. *** This bug has been marked as a duplicate of bug 210284 *** 383346 2019-11-12 03:37:33 -0800 2019-11-12 07:03:11 -0800 Patch bug-203194-20191112123731.patch text/plain 11953 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ4NjdmNTM0MTI3ZTNk ODU0NjczYWMyYmI4NWI1Yzg1NmYzMzU4Zi4uODYxNGE5MDkwY2U0ODBkYzM5NDNhNmM4MjE1MWZi YWY0N2RkZWVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE5LTExLTEyICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU2V2ZXJhbCBpc3N1ZXMgd2hpbGUgdHJ5aW5nIHRvIHBsYXkgYSB2aWRlbyBvbiBO ZXh0Q2xvdWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMzE5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpcnN0IHByb2JsZW0gd2FzIHRoZSBsb2FkZXIgbm90IGJlaW5nIHJlc3RhcnRlZCBpbiBQQVVT RUQsIHNvCisgICAgICAgIHNvbWV0aW1lcyBwbGF5YmFjayBuZXZlciBzdGFydGVkIHNpbmNlIGJ1 ZmZlcmluZyBuZXZlciByZWFjaGVkCisgICAgICAgIDEwMCUuCisKKyAgICAgICAgVGhlbiwgYWZ0 ZXIgaW52ZXN0aWdhdGluZyBibG9ja3NpemVzIGFuZCBub3QgYmVpbmcgYSB2aWFibGUKKyAgICAg ICAgc29sdXRpb24sIHJlZHVjaW5nIHRoZSAyMDBfbXMgdG8gMTAwX21zIHdhaXQgZm9yIG5ldyBk YXRhIHdhcyB0aGUKKyAgICAgICAgdHJpY2sgdG8gYXZvaWQgY2hvcHB5bmVzcy4KKworICAgICAg ICBEdXJpbmcgaW52ZXN0aWdhdGlvbiBzZXZlcmFsIGlzc3VlcyB3ZXJlIGZpeGVkIGxpa2UgdHVy bmluZworICAgICAgICBHc3RRdWVyeSogaW50byBHUmVmUHRyIGZvciBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OmJ1ZmZlcmVkLAorICAgICAgICBtYWtpbmcgYmxvY2tzaXplIHVuc2lnbmVk IGluc3RlYWQgb2YgdWludDY0X3QgYXMgaXQgaXMgaW4KKyAgICAgICAgR1N0cmVhbWVyIGFuZCBj cmVhdGluZyBhbmQgdXNpbmcgV0VCS0lUX1dFQl9TUkNfQ0FTVCBzaW5jZSBtYW55CisgICAgICAg IHVzZXMgb2YgV0VCS0lUX1dFQl9TUkMgY2FzdCB3ZXJlIGFscmVhZHkgcHJvdGVjdGVkIGJ5Cisg ICAgICAgIFdFQktJVF9JU19XRUJfU1JDLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmJ1ZmZlcmVkIGNvbnN0KTogR1JlZlB0 cjxHc3RRdWVyeT4uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OmhhbmRsZU1lc3NhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjpzb3VyY2VTZXR1cCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmRpZFBhc3NDT1JTQWNjZXNzQ2hlY2sgY29uc3QpOgorICAgICAgICBV c2UgV0VCS0lUX1dFQl9TUkNfQ0FTVC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYktpdFdlYlNy Y0NyZWF0ZSk6IFJlZHVjZSB3YWl0IGZvciBkYXRhIGRvd24gdG8gMTAwX21zIGFuZAorICAgICAg ICByZXF1ZXN0IGRvd25sb2FkIHJlc3RhcnQgYWxzbyBpbiBQQVVTRUQuCisgICAgICAgIChDYWNo ZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUpOiBUdXJuCisg ICAgICAgIGJsb2Nrc2l6ZSB0byB1bnNpZ25lZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmg6IEFkZAorICAgICAgICBXRUJL SVRfV0VCX1NSQ19DQVNULgorCiAyMDE5LTExLTEwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIExpbmU6OlJ1bidzIGxpbmUgbGF5b3V0 IHNwZWNpZmljIGxvZ2ljIHRvIElubGluZUl0ZW1SdW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggYzI2MWRhZGM2NTg1ODUyNDdjODZlYWJl NTUwM2YwNGY2Y2FmMDFhZC4uZDIyYTRmZTJiMTEyYjM5NDhlNWQ2NWU2ODI0MjE4M2QyNmFlOTZh YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK QEAgLTExNDYsMTcgKzExNDYsMTUgQEAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtVGltZVJhbmdl cz4gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpidWZmZXJlZCgpIGNvbnMKICAgICBpZiAo IW1lZGlhRHVyYXRpb24gfHwgbWVkaWFEdXJhdGlvbi5pc1Bvc2l0aXZlSW5maW5pdGUoKSkKICAg ICAgICAgcmV0dXJuIHRpbWVSYW5nZXM7CiAKLSAgICBHc3RRdWVyeSogcXVlcnkgPSBnc3RfcXVl cnlfbmV3X2J1ZmZlcmluZyhHU1RfRk9STUFUX1BFUkNFTlQpOworICAgIEdSZWZQdHI8R3N0UXVl cnk+IHF1ZXJ5ID0gYWRvcHRHUmVmKGdzdF9xdWVyeV9uZXdfYnVmZmVyaW5nKEdTVF9GT1JNQVRf UEVSQ0VOVCkpOwogCi0gICAgaWYgKCFnc3RfZWxlbWVudF9xdWVyeShtX3BpcGVsaW5lLmdldCgp LCBxdWVyeSkpIHsKLSAgICAgICAgZ3N0X3F1ZXJ5X3VucmVmKHF1ZXJ5KTsKKyAgICBpZiAoIWdz dF9lbGVtZW50X3F1ZXJ5KG1fcGlwZWxpbmUuZ2V0KCksIHF1ZXJ5LmdldCgpKSkKICAgICAgICAg cmV0dXJuIHRpbWVSYW5nZXM7Ci0gICAgfQogCi0gICAgZ3VpbnQgbnVtQnVmZmVyaW5nUmFuZ2Vz ID0gZ3N0X3F1ZXJ5X2dldF9uX2J1ZmZlcmluZ19yYW5nZXMocXVlcnkpOworICAgIGd1aW50IG51 bUJ1ZmZlcmluZ1JhbmdlcyA9IGdzdF9xdWVyeV9nZXRfbl9idWZmZXJpbmdfcmFuZ2VzKHF1ZXJ5 LmdldCgpKTsKICAgICBmb3IgKGd1aW50IGluZGV4ID0gMDsgaW5kZXggPCBudW1CdWZmZXJpbmdS YW5nZXM7IGluZGV4KyspIHsKICAgICAgICAgZ2ludDY0IHJhbmdlU3RhcnQgPSAwLCByYW5nZVN0 b3AgPSAwOwotICAgICAgICBpZiAoZ3N0X3F1ZXJ5X3BhcnNlX250aF9idWZmZXJpbmdfcmFuZ2Uo cXVlcnksIGluZGV4LCAmcmFuZ2VTdGFydCwgJnJhbmdlU3RvcCkpIHsKKyAgICAgICAgaWYgKGdz dF9xdWVyeV9wYXJzZV9udGhfYnVmZmVyaW5nX3JhbmdlKHF1ZXJ5LmdldCgpLCBpbmRleCwgJnJh bmdlU3RhcnQsICZyYW5nZVN0b3ApKSB7CiAgICAgICAgICAgICB1aW50NjRfdCBzdGFydFRpbWUg PSBnc3RfdXRpbF91aW50NjRfc2NhbGVfaW50X3JvdW5kKHRvR3N0VW5zaWduZWQ2NFRpbWUobWVk aWFEdXJhdGlvbiksIHJhbmdlU3RhcnQsIEdTVF9GT1JNQVRfUEVSQ0VOVF9NQVgpOwogICAgICAg ICAgICAgdWludDY0X3Qgc3RvcFRpbWUgPSBnc3RfdXRpbF91aW50NjRfc2NhbGVfaW50X3JvdW5k KHRvR3N0VW5zaWduZWQ2NFRpbWUobWVkaWFEdXJhdGlvbiksIHJhbmdlU3RvcCwgR1NUX0ZPUk1B VF9QRVJDRU5UX01BWCk7CiAgICAgICAgICAgICB0aW1lUmFuZ2VzLT5hZGQoTWVkaWFUaW1lKHN0 YXJ0VGltZSwgR1NUX1NFQ09ORCksIE1lZGlhVGltZShzdG9wVGltZSwgR1NUX1NFQ09ORCkpOwpA QCAtMTE3MSw4ICsxMTY5LDYgQEAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtVGltZVJhbmdlcz4g TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpidWZmZXJlZCgpIGNvbnMKICAgICAgICAgICAg IHRpbWVSYW5nZXMtPmFkZChNZWRpYVRpbWU6Onplcm9UaW1lKCksIGxvYWRlZCk7CiAgICAgfQog Ci0gICAgZ3N0X3F1ZXJ5X3VucmVmKHF1ZXJ5KTsKLQogICAgIHJldHVybiB0aW1lUmFuZ2VzOwog fQogCkBAIC0xMzkzLDcgKzEzODksNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6aGFuZGxlTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQogICAgICAgICB9IGVsc2UgaWYg KGdzdF9zdHJ1Y3R1cmVfaGFzX25hbWUoc3RydWN0dXJlLCAiYWRhcHRpdmUtc3RyZWFtaW5nLXN0 YXRpc3RpY3MiKSkgewogICAgICAgICAgICAgaWYgKFdFQktJVF9JU19XRUJfU1JDKG1fc291cmNl LmdldCgpKSAmJiAhd2Via2l0R3N0Q2hlY2tWZXJzaW9uKDEsIDEyLCAwKSkgewogICAgICAgICAg ICAgICAgIGlmIChjb25zdCBjaGFyKiB1cmkgPSBnc3Rfc3RydWN0dXJlX2dldF9zdHJpbmcoc3Ry dWN0dXJlLCAidXJpIikpCi0gICAgICAgICAgICAgICAgICAgIG1faGFzVGFpbnRlZE9yaWdpbiA9 IHdlYktpdFNyY1dvdWxkVGFpbnRPcmlnaW4oV0VCS0lUX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkp LCBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKFVSTChVUkwoKSwgdXJpKSkpOworICAgICAgICAgICAg ICAgICAgICBtX2hhc1RhaW50ZWRPcmlnaW4gPSB3ZWJLaXRTcmNXb3VsZFRhaW50T3JpZ2luKFdF QktJVF9XRUJfU1JDX0NBU1QobV9zb3VyY2UuZ2V0KCkpLCBTZWN1cml0eU9yaWdpbjo6Y3JlYXRl KFVSTChVUkwoKSwgdXJpKSkpOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UKICAgICAg ICAgICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgIlVuaGFuZGxlZCBlbGVtZW50IG1l c3NhZ2U6ICUiIEdTVF9QVFJfRk9STUFULCBzdHJ1Y3R1cmUpOwpAQCAtMTg1NCw3ICsxODUwLDcg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNvdXJjZVNldHVwKEdzdEVsZW1l bnQqIHNvdXJjZUVsZW1lbnQpCiAgICAgbV9zb3VyY2UgPSBzb3VyY2VFbGVtZW50OwogCiAgICAg aWYgKFdFQktJVF9JU19XRUJfU1JDKG1fc291cmNlLmdldCgpKSkgewotICAgICAgICB3ZWJLaXRX ZWJTcmNTZXRNZWRpYVBsYXllcihXRUJLSVRfV0VCX1NSQyhtX3NvdXJjZS5nZXQoKSksIG1fcGxh eWVyKTsKKyAgICAgICAgd2ViS2l0V2ViU3JjU2V0TWVkaWFQbGF5ZXIoV0VCS0lUX1dFQl9TUkNf Q0FTVChtX3NvdXJjZS5nZXQoKSksIG1fcGxheWVyKTsKICAgICAgICAgZ19zaWduYWxfY29ubmVj dChHU1RfRUxFTUVOVF9QQVJFTlQobV9zb3VyY2UuZ2V0KCkpLCAiZWxlbWVudC1hZGRlZCIsIEdf Q0FMTEJBQ0sodXJpRGVjb2RlQmluRWxlbWVudEFkZGVkQ2FsbGJhY2spLCB0aGlzKTsKICNpZiBF TkFCTEUoTUVESUFfU1RSRUFNKQogICAgIH0gZWxzZSBpZiAoV0VCS0lUX0lTX01FRElBX1NUUkVB TV9TUkMoc291cmNlRWxlbWVudCkpIHsKQEAgLTI1MjIsNyArMjUxOCw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzaW11bGF0ZUF1ZGlvSW50ZXJydXB0aW9uKCkKIGJvb2wg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpkaWRQYXNzQ09SU0FjY2Vzc0NoZWNrKCkgY29u c3QKIHsKICAgICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkpKQotICAgICAg ICByZXR1cm4gd2ViS2l0U3JjUGFzc2VkQ09SU0FjY2Vzc0NoZWNrKFdFQktJVF9XRUJfU1JDKG1f c291cmNlLmdldCgpKSk7CisgICAgICAgIHJldHVybiB3ZWJLaXRTcmNQYXNzZWRDT1JTQWNjZXNz Q2hlY2soV0VCS0lUX1dFQl9TUkNfQ0FTVChtX3NvdXJjZS5nZXQoKSkpOwogICAgIHJldHVybiBm YWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApp bmRleCA5NjViNmUyNzZkMDE0NTc5MWUxZWM0N2MwMTE5MWYyODNkNGFiYzRlLi43MWVkZDYxN2M2 NDI0NGRjZDRkMjFiNzZlY2VjNDdkYzYzZTM4MmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcApAQCAtNjEsNyArNjEsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzZXRTb3VyY2VFbGVtZW50KFdlYktpdFdlYlNyYyogc3JjKSB7IG1fc3JjID0gR1NUX0VMRU1F TlRfQ0FTVChzcmMpOyB9CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBjaGVja1VwZGF0ZUJsb2Nrc2l6 ZSh1aW50NjRfdCBieXRlc1JlYWQpOworICAgIHZvaWQgY2hlY2tVcGRhdGVCbG9ja3NpemUodW5z aWduZWQgYnl0ZXNSZWFkKTsKIAogICAgIC8vIFBsYXRmb3JtTWVkaWFSZXNvdXJjZUNsaWVudCB2 aXJ0dWFsIG1ldGhvZHMuCiAgICAgdm9pZCByZXNwb25zZVJlY2VpdmVkKFBsYXRmb3JtTWVkaWFS ZXNvdXJjZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KFNob3VsZENvbnRpbnVlKT4mJikgb3ZlcnJpZGU7CkBAIC0xMzcsNyArMTM3LDcgQEAgc3RydWN0 IF9XZWJLaXRXZWJTcmNQcml2YXRlIHsKICAgICBib29sIGlzU2Vla2FibGU7CiAgICAgYm9vbCBp c1NlZWtpbmc7CiAgICAgYm9vbCB3YXNTZWVraW5nIHsgZmFsc2UgfTsKLSAgICB1aW50NjRfdCBt aW5pbXVtQmxvY2tzaXplOworICAgIHVuc2lnbmVkIG1pbmltdW1CbG9ja3NpemU7CiAgICAgTG9j ayBhZGFwdGVyTG9jazsKICAgICBDb25kaXRpb24gYWRhcHRlckNvbmRpdGlvbjsKICAgICB1aW50 NjRfdCBxdWV1ZVNpemUgeyAwIH07CkBAIC00MTIsMjAgKzQxMiwyMSBAQCBzdGF0aWMgR3N0Rmxv d1JldHVybiB3ZWJLaXRXZWJTcmNDcmVhdGUoR3N0UHVzaFNyYyogcHVzaFNyYywgR3N0QnVmZmVy KiogYnVmZmVyKQogICAgICAgICB1bnNpZ25lZCByZXRyaWVzID0gMDsKICAgICAgICAgc2l6ZV90 IGF2YWlsYWJsZSA9IGdzdF9hZGFwdGVyX2F2YWlsYWJsZV9mYXN0KHByaXYtPmFkYXB0ZXIuZ2V0 KCkpOwogICAgICAgICB3aGlsZSAoYXZhaWxhYmxlIDwgc2l6ZSAmJiAhaXNBZGFwdGVyRHJhaW5l ZCkgewotICAgICAgICAgICAgcHJpdi0+YWRhcHRlckNvbmRpdGlvbi53YWl0Rm9yKHByaXYtPmFk YXB0ZXJMb2NrLCAyMDBfbXMsIFsmXSB7CisgICAgICAgICAgICBwcml2LT5hZGFwdGVyQ29uZGl0 aW9uLndhaXRGb3IocHJpdi0+YWRhcHRlckxvY2ssIDEwMF9tcywgWyZdIHsKICAgICAgICAgICAg ICAgICByZXR1cm4gZ3N0X2FkYXB0ZXJfYXZhaWxhYmxlX2Zhc3QocHJpdi0+YWRhcHRlci5nZXQo KSkgPj0gc2l6ZTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgcmV0cmllcysrOwogICAg ICAgICAgICAgYXZhaWxhYmxlID0gZ3N0X2FkYXB0ZXJfYXZhaWxhYmxlX2Zhc3QocHJpdi0+YWRh cHRlci5nZXQoKSk7Ci0gICAgICAgICAgICBpZiAoYXZhaWxhYmxlICYmIGF2YWlsYWJsZSA8IHNp emUpCisgICAgICAgICAgICBpZiAoYXZhaWxhYmxlICYmIGF2YWlsYWJsZSA8IHNpemUpIHsKKyAg ICAgICAgICAgICAgICBHU1RfVFJBQ0VfT0JKRUNUKHNyYywgImRpZCBub3QgZ2V0IHRoZSAldSBi bG9ja3NpemUgYnl0ZXMsIGxldCdzIHB1c2ggdGhlICUiIEdfR1NJWkVfRk9STUFUICIgYnl0ZXMg d2UgZ290Iiwgc2l6ZSwgYXZhaWxhYmxlKTsKICAgICAgICAgICAgICAgICBzaXplID0gYXZhaWxh YmxlOwotICAgICAgICAgICAgZWxzZSBpZiAocmV0cmllcyA+IDMpCisgICAgICAgICAgICB9IGVs c2UgaWYgKHJldHJpZXMgPiAzKQogICAgICAgICAgICAgICAgIGlzQWRhcHRlckRyYWluZWQgPSB0 cnVlOwogICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKGlzQWRhcHRlckRyYWluZWQpIHsKLSAg ICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJBZGFwdGVyIHN0aWxsIGVtcHR5IGFmdGVyIDgw MCBtaWxsaS1zZWNvbmRzIG9mIHdhaXRpbmcsIGFzc3VtaW5nIEVPUyIpOworICAgICAgICBHU1Rf REVCVUdfT0JKRUNUKHNyYywgIkFkYXB0ZXIgc3RpbGwgZW1wdHkgYWZ0ZXIgNDAwIG1pbGxpLXNl Y29uZHMgb2Ygd2FpdGluZywgYXNzdW1pbmcgRU9TIik7CiAgICAgICAgIHJldHVybiBHU1RfRkxP V19FT1M7CiAgICAgfQogCkBAIC00NjQsNyArNDY1LDcgQEAgc3RhdGljIEdzdEZsb3dSZXR1cm4g d2ViS2l0V2ViU3JjQ3JlYXRlKEdzdFB1c2hTcmMqIHB1c2hTcmMsIEdzdEJ1ZmZlcioqIGJ1ZmZl cikKICAgICAgICAgICAgICAgICAmJiAocHJpdi0+c2l6ZSA+IFNNQUxMX01FRElBX1JFU09VUkNF X01BWF9TSVpFKSAmJiBwcml2LT5yZWFkUG9zaXRpb24KICAgICAgICAgICAgICAgICAmJiAocHJp di0+cmVhZFBvc2l0aW9uICE9IHByaXYtPnNpemUpCiAgICAgICAgICAgICAgICAgJiYgKHByaXYt PnF1ZXVlU2l6ZSA8IChwcml2LT5zaXplICogSElHSF9RVUVVRV9GQUNUT1JfVEhSRVNIT0xEICog TE9XX1FVRVVFX0ZBQ1RPUl9USFJFU0hPTEQpKQotICAgICAgICAgICAgICAgICYmIChHU1RfU1RB VEUoc3JjKSA9PSBHU1RfU1RBVEVfUExBWUlORykgJiYgcHJpdi0+aXNEb3dubG9hZFN1c3BlbmRl ZCkgeworICAgICAgICAgICAgICAgICYmIChHU1RfU1RBVEUoc3JjKSA9PSBHU1RfU1RBVEVfUExB WUlORyB8fCBHU1RfU1RBVEUoc3JjKSA9PSBHU1RfU1RBVEVfUEFVU0VEKSAmJiBwcml2LT5pc0Rv d25sb2FkU3VzcGVuZGVkKSB7CiAgICAgICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMs ICJbQnVmZmVyaW5nXSBBZGFwdGVyIHJ1bm5pbmcgb3V0IG9mIGRhdGEsIHJlc3RhcnRpbmcgZG93 bmxvYWQiKTsKICAgICAgICAgICAgICAgICBwcml2LT5pc0Rvd25sb2FkU3VzcGVuZGVkID0gZmFs c2U7CiAgICAgICAgICAgICAgICAgd2ViS2l0V2ViU3JjTWFrZVJlcXVlc3QoYmFzZVNyYywgZmFs c2UpOwpAQCAtOTIwLDE0ICs5MjEsMTQgQEAgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6 OkNhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50KFdlYktpdFdlYlNyYyogc3JjLAogCiBDYWNo ZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6fkNhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50 KCkgPSBkZWZhdWx0OwogCi12b2lkIENhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50OjpjaGVj a1VwZGF0ZUJsb2Nrc2l6ZSh1aW50NjRfdCBieXRlc1JlYWQpCit2b2lkIENhY2hlZFJlc291cmNl U3RyZWFtaW5nQ2xpZW50OjpjaGVja1VwZGF0ZUJsb2Nrc2l6ZSh1bnNpZ25lZCBieXRlc1JlYWQp CiB7CiAgICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyhtX3NyYy5nZXQoKSk7 CiAgICAgR3N0QmFzZVNyYyogYmFzZVNyYyA9IEdTVF9CQVNFX1NSQ19DQVNUKHNyYyk7CiAgICAg V2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9IHNyYy0+cHJpdjsKIAotICAgIHVpbnQ2NF90IGJs b2Nrc2l6ZSA9IGdzdF9iYXNlX3NyY19nZXRfYmxvY2tzaXplKGJhc2VTcmMpOwotICAgIEdTVF9M T0dfT0JKRUNUKHNyYywgIkNoZWNraW5nIHRvIHVwZGF0ZSBibG9ja3NpemUuIFJlYWQ6ICUiIFBS SXU2NCAiLCBjdXJyZW50IGJsb2Nrc2l6ZTogJSIgUFJJdTY0LCBieXRlc1JlYWQsIGJsb2Nrc2l6 ZSk7CisgICAgdW5zaWduZWQgYmxvY2tzaXplID0gZ3N0X2Jhc2Vfc3JjX2dldF9ibG9ja3NpemUo YmFzZVNyYyk7CisgICAgR1NUX0xPR19PQkpFQ1Qoc3JjLCAiQ2hlY2tpbmcgdG8gdXBkYXRlIGJs b2Nrc2l6ZS4gUmVhZDogJXUsIGN1cnJlbnQgYmxvY2tzaXplOiAldSIsIGJ5dGVzUmVhZCwgYmxv Y2tzaXplKTsKIAogICAgIGlmIChieXRlc1JlYWQgPj0gYmxvY2tzaXplICogc19ncm93QmxvY2tz aXplTGltaXQpIHsKICAgICAgICAgbV9yZWR1Y2VCbG9ja3NpemVDb3VudCA9IDA7CkBAIC05MzUs NyArOTM2LDcgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRh dGVCbG9ja3NpemUodWludDY0X3QgYnl0ZXNSZWFkKQogCiAgICAgICAgIGlmIChtX2luY3JlYXNl QmxvY2tzaXplQ291bnQgPj0gc19ncm93QmxvY2tzaXplQ291bnQpIHsKICAgICAgICAgICAgIGJs b2Nrc2l6ZSAqPSBzX2dyb3dCbG9ja3NpemVGYWN0b3I7Ci0gICAgICAgICAgICBHU1RfREVCVUdf T0JKRUNUKHNyYywgIkluY3JlYXNlZCBibG9ja3NpemUgdG8gJSIgUFJJdTY0LCBibG9ja3NpemUp OworICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJJbmNyZWFzZWQgYmxvY2tzaXpl IHRvICV1IiwgYmxvY2tzaXplKTsKICAgICAgICAgICAgIGdzdF9iYXNlX3NyY19zZXRfYmxvY2tz aXplKGJhc2VTcmMsIGJsb2Nrc2l6ZSk7CiAgICAgICAgICAgICBtX2luY3JlYXNlQmxvY2tzaXpl Q291bnQgPSAwOwogICAgICAgICB9CkBAIC05NDYsNyArOTQ3LDcgQEAgdm9pZCBDYWNoZWRSZXNv dXJjZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUodWludDY0X3QgYnl0ZXNS ZWFkKQogICAgICAgICBpZiAobV9yZWR1Y2VCbG9ja3NpemVDb3VudCA+PSBzX3JlZHVjZUJsb2Nr c2l6ZUNvdW50KSB7CiAgICAgICAgICAgICBibG9ja3NpemUgKj0gc19yZWR1Y2VCbG9ja3NpemVG YWN0b3I7CiAgICAgICAgICAgICBibG9ja3NpemUgPSBzdGQ6Om1heChibG9ja3NpemUsIHByaXYt Pm1pbmltdW1CbG9ja3NpemUpOwotICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJE ZWNyZWFzZWQgYmxvY2tzaXplIHRvICUiIFBSSXU2NCwgYmxvY2tzaXplKTsKKyAgICAgICAgICAg IEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiRGVjcmVhc2VkIGJsb2Nrc2l6ZSB0byAldSIsIGJsb2Nr c2l6ZSk7CiAgICAgICAgICAgICBnc3RfYmFzZV9zcmNfc2V0X2Jsb2Nrc2l6ZShiYXNlU3JjLCBi bG9ja3NpemUpOwogICAgICAgICAgICAgbV9yZWR1Y2VCbG9ja3NpemVDb3VudCA9IDA7CiAgICAg ICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaAppbmRleCBhYjg1 MTgzYzAwNjdiZTQ0MmFjZjUyMjQyYjhjY2M2Y2I4YzI2NDE0Li5kNTcxMWVlYTNiMmM5OTJjZGM2 NDgwODE0NGRlNzVmOWRlMjUyMWRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdT dHJlYW1lci5oCkBAIC0zNSw2ICszNSw3IEBAIEdfQkVHSU5fREVDTFMKICNkZWZpbmUgV0VCS0lU X1dFQl9TUkNfQ0xBU1Moa2xhc3MpICAgIChHX1RZUEVfQ0hFQ0tfQ0xBU1NfQ0FTVCAoKGtsYXNz KSwgV0VCS0lUX1RZUEVfV0VCX1NSQywgV2ViS2l0V2ViU3JjQ2xhc3MpKQogI2RlZmluZSBXRUJL SVRfSVNfV0VCX1NSQyhvYmopICAgICAgICAgKEdfVFlQRV9DSEVDS19JTlNUQU5DRV9UWVBFICgo b2JqKSwgV0VCS0lUX1RZUEVfV0VCX1NSQykpCiAjZGVmaW5lIFdFQktJVF9JU19XRUJfU1JDX0NM QVNTKGtsYXNzKSAoR19UWVBFX0NIRUNLX0NMQVNTX1RZUEUgKChrbGFzcyksIFdFQktJVF9UWVBF X1dFQl9TUkMpKQorI2RlZmluZSBXRUJLSVRfV0VCX1NSQ19DQVNUKG9iaikgICAgICAgICAgICgo V2ViS2l0V2ViU3JjKikob2JqKSkKIAogI2RlZmluZSBXRUJLSVRfV0VCX1NSQ19QTEFZRVJfQ09O VEVYVF9UWVBFX05BTUUgICJ3ZWJraXQubWVkaWEtcGxheWVyIgogCg== 383351 2019-11-12 07:03:14 -0800 2019-11-12 07:04:44 -0800 Patch for landing bug-203194-20191112160313.patch text/plain 11908 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ4NjdmNTM0MTI3ZTNk ODU0NjczYWMyYmI4NWI1Yzg1NmYzMzU4Zi4uODYxNGE5MDkwY2U0ODBkYzM5NDNhNmM4MjE1MWZi YWY0N2RkZWVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE5LTExLTEyICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU2V2ZXJhbCBpc3N1ZXMgd2hpbGUgdHJ5aW5nIHRvIHBsYXkgYSB2aWRlbyBvbiBO ZXh0Q2xvdWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMzE5NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEZpcnN0IHByb2JsZW0gd2FzIHRoZSBsb2FkZXIgbm90IGJlaW5nIHJlc3RhcnRlZCBpbiBQQVVT RUQsIHNvCisgICAgICAgIHNvbWV0aW1lcyBwbGF5YmFjayBuZXZlciBzdGFydGVkIHNpbmNlIGJ1 ZmZlcmluZyBuZXZlciByZWFjaGVkCisgICAgICAgIDEwMCUuCisKKyAgICAgICAgVGhlbiwgYWZ0 ZXIgaW52ZXN0aWdhdGluZyBibG9ja3NpemVzIGFuZCBub3QgYmVpbmcgYSB2aWFibGUKKyAgICAg ICAgc29sdXRpb24sIHJlZHVjaW5nIHRoZSAyMDBfbXMgdG8gMTAwX21zIHdhaXQgZm9yIG5ldyBk YXRhIHdhcyB0aGUKKyAgICAgICAgdHJpY2sgdG8gYXZvaWQgY2hvcHB5bmVzcy4KKworICAgICAg ICBEdXJpbmcgaW52ZXN0aWdhdGlvbiBzZXZlcmFsIGlzc3VlcyB3ZXJlIGZpeGVkIGxpa2UgdHVy bmluZworICAgICAgICBHc3RRdWVyeSogaW50byBHUmVmUHRyIGZvciBNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OmJ1ZmZlcmVkLAorICAgICAgICBtYWtpbmcgYmxvY2tzaXplIHVuc2lnbmVk IGluc3RlYWQgb2YgdWludDY0X3QgYXMgaXQgaXMgaW4KKyAgICAgICAgR1N0cmVhbWVyIGFuZCBj cmVhdGluZyBhbmQgdXNpbmcgV0VCS0lUX1dFQl9TUkNfQ0FTVCBzaW5jZSBtYW55CisgICAgICAg IHVzZXMgb2YgV0VCS0lUX1dFQl9TUkMgY2FzdCB3ZXJlIGFscmVhZHkgcHJvdGVjdGVkIGJ5Cisg ICAgICAgIFdFQktJVF9JU19XRUJfU1JDLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmJ1ZmZlcmVkIGNvbnN0KTogR1JlZlB0 cjxHc3RRdWVyeT4uCisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXI6OmhhbmRsZU1lc3NhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRl R1N0cmVhbWVyOjpzb3VyY2VTZXR1cCk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXI6OmRpZFBhc3NDT1JTQWNjZXNzQ2hlY2sgY29uc3QpOgorICAgICAgICBV c2UgV0VCS0lUX1dFQl9TUkNfQ0FTVC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9nc3Ry ZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHdlYktpdFdlYlNy Y0NyZWF0ZSk6IFJlZHVjZSB3YWl0IGZvciBkYXRhIGRvd24gdG8gMTAwX21zIGFuZAorICAgICAg ICByZXF1ZXN0IGRvd25sb2FkIHJlc3RhcnQgYWxzbyBpbiBQQVVTRUQuCisgICAgICAgIChDYWNo ZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUpOiBUdXJuCisg ICAgICAgIGJsb2Nrc2l6ZSB0byB1bnNpZ25lZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmg6IEFkZAorICAgICAgICBXRUJL SVRfV0VCX1NSQ19DQVNULgorCiAyMDE5LTExLTEwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBs ZS5jb20+CiAKICAgICAgICAgW0xGQ11bSUZDXSBNb3ZlIExpbmU6OlJ1bidzIGxpbmUgbGF5b3V0 IHNwZWNpZmljIGxvZ2ljIHRvIElubGluZUl0ZW1SdW4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFt ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlh UGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKaW5kZXggYzI2MWRhZGM2NTg1ODUyNDdjODZlYWJl NTUwM2YwNGY2Y2FmMDFhZC4uZDIyYTRmZTJiMTEyYjM5NDhlNWQ2NWU2ODI0MjE4M2QyNmFlOTZh YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAK QEAgLTExNDYsMTcgKzExNDYsMTUgQEAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtVGltZVJhbmdl cz4gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpidWZmZXJlZCgpIGNvbnMKICAgICBpZiAo IW1lZGlhRHVyYXRpb24gfHwgbWVkaWFEdXJhdGlvbi5pc1Bvc2l0aXZlSW5maW5pdGUoKSkKICAg ICAgICAgcmV0dXJuIHRpbWVSYW5nZXM7CiAKLSAgICBHc3RRdWVyeSogcXVlcnkgPSBnc3RfcXVl cnlfbmV3X2J1ZmZlcmluZyhHU1RfRk9STUFUX1BFUkNFTlQpOworICAgIEdSZWZQdHI8R3N0UXVl cnk+IHF1ZXJ5ID0gYWRvcHRHUmVmKGdzdF9xdWVyeV9uZXdfYnVmZmVyaW5nKEdTVF9GT1JNQVRf UEVSQ0VOVCkpOwogCi0gICAgaWYgKCFnc3RfZWxlbWVudF9xdWVyeShtX3BpcGVsaW5lLmdldCgp LCBxdWVyeSkpIHsKLSAgICAgICAgZ3N0X3F1ZXJ5X3VucmVmKHF1ZXJ5KTsKKyAgICBpZiAoIWdz dF9lbGVtZW50X3F1ZXJ5KG1fcGlwZWxpbmUuZ2V0KCksIHF1ZXJ5LmdldCgpKSkKICAgICAgICAg cmV0dXJuIHRpbWVSYW5nZXM7Ci0gICAgfQogCi0gICAgZ3VpbnQgbnVtQnVmZmVyaW5nUmFuZ2Vz ID0gZ3N0X3F1ZXJ5X2dldF9uX2J1ZmZlcmluZ19yYW5nZXMocXVlcnkpOworICAgIGd1aW50IG51 bUJ1ZmZlcmluZ1JhbmdlcyA9IGdzdF9xdWVyeV9nZXRfbl9idWZmZXJpbmdfcmFuZ2VzKHF1ZXJ5 LmdldCgpKTsKICAgICBmb3IgKGd1aW50IGluZGV4ID0gMDsgaW5kZXggPCBudW1CdWZmZXJpbmdS YW5nZXM7IGluZGV4KyspIHsKICAgICAgICAgZ2ludDY0IHJhbmdlU3RhcnQgPSAwLCByYW5nZVN0 b3AgPSAwOwotICAgICAgICBpZiAoZ3N0X3F1ZXJ5X3BhcnNlX250aF9idWZmZXJpbmdfcmFuZ2Uo cXVlcnksIGluZGV4LCAmcmFuZ2VTdGFydCwgJnJhbmdlU3RvcCkpIHsKKyAgICAgICAgaWYgKGdz dF9xdWVyeV9wYXJzZV9udGhfYnVmZmVyaW5nX3JhbmdlKHF1ZXJ5LmdldCgpLCBpbmRleCwgJnJh bmdlU3RhcnQsICZyYW5nZVN0b3ApKSB7CiAgICAgICAgICAgICB1aW50NjRfdCBzdGFydFRpbWUg PSBnc3RfdXRpbF91aW50NjRfc2NhbGVfaW50X3JvdW5kKHRvR3N0VW5zaWduZWQ2NFRpbWUobWVk aWFEdXJhdGlvbiksIHJhbmdlU3RhcnQsIEdTVF9GT1JNQVRfUEVSQ0VOVF9NQVgpOwogICAgICAg ICAgICAgdWludDY0X3Qgc3RvcFRpbWUgPSBnc3RfdXRpbF91aW50NjRfc2NhbGVfaW50X3JvdW5k KHRvR3N0VW5zaWduZWQ2NFRpbWUobWVkaWFEdXJhdGlvbiksIHJhbmdlU3RvcCwgR1NUX0ZPUk1B VF9QRVJDRU5UX01BWCk7CiAgICAgICAgICAgICB0aW1lUmFuZ2VzLT5hZGQoTWVkaWFUaW1lKHN0 YXJ0VGltZSwgR1NUX1NFQ09ORCksIE1lZGlhVGltZShzdG9wVGltZSwgR1NUX1NFQ09ORCkpOwpA QCAtMTE3MSw4ICsxMTY5LDYgQEAgc3RkOjp1bmlxdWVfcHRyPFBsYXRmb3JtVGltZVJhbmdlcz4g TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpidWZmZXJlZCgpIGNvbnMKICAgICAgICAgICAg IHRpbWVSYW5nZXMtPmFkZChNZWRpYVRpbWU6Onplcm9UaW1lKCksIGxvYWRlZCk7CiAgICAgfQog Ci0gICAgZ3N0X3F1ZXJ5X3VucmVmKHF1ZXJ5KTsKLQogICAgIHJldHVybiB0aW1lUmFuZ2VzOwog fQogCkBAIC0xMzkzLDcgKzEzODksNyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l cjo6aGFuZGxlTWVzc2FnZShHc3RNZXNzYWdlKiBtZXNzYWdlKQogICAgICAgICB9IGVsc2UgaWYg KGdzdF9zdHJ1Y3R1cmVfaGFzX25hbWUoc3RydWN0dXJlLCAiYWRhcHRpdmUtc3RyZWFtaW5nLXN0 YXRpc3RpY3MiKSkgewogICAgICAgICAgICAgaWYgKFdFQktJVF9JU19XRUJfU1JDKG1fc291cmNl LmdldCgpKSAmJiAhd2Via2l0R3N0Q2hlY2tWZXJzaW9uKDEsIDEyLCAwKSkgewogICAgICAgICAg ICAgICAgIGlmIChjb25zdCBjaGFyKiB1cmkgPSBnc3Rfc3RydWN0dXJlX2dldF9zdHJpbmcoc3Ry dWN0dXJlLCAidXJpIikpCi0gICAgICAgICAgICAgICAgICAgIG1faGFzVGFpbnRlZE9yaWdpbiA9 IHdlYktpdFNyY1dvdWxkVGFpbnRPcmlnaW4oV0VCS0lUX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkp LCBTZWN1cml0eU9yaWdpbjo6Y3JlYXRlKFVSTChVUkwoKSwgdXJpKSkpOworICAgICAgICAgICAg ICAgICAgICBtX2hhc1RhaW50ZWRPcmlnaW4gPSB3ZWJLaXRTcmNXb3VsZFRhaW50T3JpZ2luKFdF QktJVF9XRUJfU1JDX0NBU1QobV9zb3VyY2UuZ2V0KCkpLCBTZWN1cml0eU9yaWdpbjo6Y3JlYXRl KFVSTChVUkwoKSwgdXJpKSkpOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UKICAgICAg ICAgICAgIEdTVF9ERUJVR19PQkpFQ1QocGlwZWxpbmUoKSwgIlVuaGFuZGxlZCBlbGVtZW50IG1l c3NhZ2U6ICUiIEdTVF9QVFJfRk9STUFULCBzdHJ1Y3R1cmUpOwpAQCAtMTg1NCw3ICsxODUwLDcg QEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNvdXJjZVNldHVwKEdzdEVsZW1l bnQqIHNvdXJjZUVsZW1lbnQpCiAgICAgbV9zb3VyY2UgPSBzb3VyY2VFbGVtZW50OwogCiAgICAg aWYgKFdFQktJVF9JU19XRUJfU1JDKG1fc291cmNlLmdldCgpKSkgewotICAgICAgICB3ZWJLaXRX ZWJTcmNTZXRNZWRpYVBsYXllcihXRUJLSVRfV0VCX1NSQyhtX3NvdXJjZS5nZXQoKSksIG1fcGxh eWVyKTsKKyAgICAgICAgd2ViS2l0V2ViU3JjU2V0TWVkaWFQbGF5ZXIoV0VCS0lUX1dFQl9TUkNf Q0FTVChtX3NvdXJjZS5nZXQoKSksIG1fcGxheWVyKTsKICAgICAgICAgZ19zaWduYWxfY29ubmVj dChHU1RfRUxFTUVOVF9QQVJFTlQobV9zb3VyY2UuZ2V0KCkpLCAiZWxlbWVudC1hZGRlZCIsIEdf Q0FMTEJBQ0sodXJpRGVjb2RlQmluRWxlbWVudEFkZGVkQ2FsbGJhY2spLCB0aGlzKTsKICNpZiBF TkFCTEUoTUVESUFfU1RSRUFNKQogICAgIH0gZWxzZSBpZiAoV0VCS0lUX0lTX01FRElBX1NUUkVB TV9TUkMoc291cmNlRWxlbWVudCkpIHsKQEAgLTI1MjIsNyArMjUxOCw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzaW11bGF0ZUF1ZGlvSW50ZXJydXB0aW9uKCkKIGJvb2wg TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpkaWRQYXNzQ09SU0FjY2Vzc0NoZWNrKCkgY29u c3QKIHsKICAgICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkpKQotICAgICAg ICByZXR1cm4gd2ViS2l0U3JjUGFzc2VkQ09SU0FjY2Vzc0NoZWNrKFdFQktJVF9XRUJfU1JDKG1f c291cmNlLmdldCgpKSk7CisgICAgICAgIHJldHVybiB3ZWJLaXRTcmNQYXNzZWRDT1JTQWNjZXNz Q2hlY2soV0VCS0lUX1dFQl9TUkNfQ0FTVChtX3NvdXJjZS5nZXQoKSkpOwogICAgIHJldHVybiBm YWxzZTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApp bmRleCA5NjViNmUyNzZkMDE0NTc5MWUxZWM0N2MwMTE5MWYyODNkNGFiYzRlLi5iMGZlMzE5Mzc1 ZjI2YzE4ODZkNWE0OGRiMmVhOWRkODM3ZTE2ODQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0 V2ViU291cmNlR1N0cmVhbWVyLmNwcApAQCAtNjEsNyArNjEsNyBAQCBwdWJsaWM6CiAgICAgdm9p ZCBzZXRTb3VyY2VFbGVtZW50KFdlYktpdFdlYlNyYyogc3JjKSB7IG1fc3JjID0gR1NUX0VMRU1F TlRfQ0FTVChzcmMpOyB9CiAKIHByaXZhdGU6Ci0gICAgdm9pZCBjaGVja1VwZGF0ZUJsb2Nrc2l6 ZSh1aW50NjRfdCBieXRlc1JlYWQpOworICAgIHZvaWQgY2hlY2tVcGRhdGVCbG9ja3NpemUodW5z aWduZWQgYnl0ZXNSZWFkKTsKIAogICAgIC8vIFBsYXRmb3JtTWVkaWFSZXNvdXJjZUNsaWVudCB2 aXJ0dWFsIG1ldGhvZHMuCiAgICAgdm9pZCByZXNwb25zZVJlY2VpdmVkKFBsYXRmb3JtTWVkaWFS ZXNvdXJjZSYsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmLCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KFNob3VsZENvbnRpbnVlKT4mJikgb3ZlcnJpZGU7CkBAIC0xMzcsNyArMTM3LDcgQEAgc3RydWN0 IF9XZWJLaXRXZWJTcmNQcml2YXRlIHsKICAgICBib29sIGlzU2Vla2FibGU7CiAgICAgYm9vbCBp c1NlZWtpbmc7CiAgICAgYm9vbCB3YXNTZWVraW5nIHsgZmFsc2UgfTsKLSAgICB1aW50NjRfdCBt aW5pbXVtQmxvY2tzaXplOworICAgIHVuc2lnbmVkIG1pbmltdW1CbG9ja3NpemU7CiAgICAgTG9j ayBhZGFwdGVyTG9jazsKICAgICBDb25kaXRpb24gYWRhcHRlckNvbmRpdGlvbjsKICAgICB1aW50 NjRfdCBxdWV1ZVNpemUgeyAwIH07CkBAIC00MTIsMjAgKzQxMiwyMSBAQCBzdGF0aWMgR3N0Rmxv d1JldHVybiB3ZWJLaXRXZWJTcmNDcmVhdGUoR3N0UHVzaFNyYyogcHVzaFNyYywgR3N0QnVmZmVy KiogYnVmZmVyKQogICAgICAgICB1bnNpZ25lZCByZXRyaWVzID0gMDsKICAgICAgICAgc2l6ZV90 IGF2YWlsYWJsZSA9IGdzdF9hZGFwdGVyX2F2YWlsYWJsZV9mYXN0KHByaXYtPmFkYXB0ZXIuZ2V0 KCkpOwogICAgICAgICB3aGlsZSAoYXZhaWxhYmxlIDwgc2l6ZSAmJiAhaXNBZGFwdGVyRHJhaW5l ZCkgewotICAgICAgICAgICAgcHJpdi0+YWRhcHRlckNvbmRpdGlvbi53YWl0Rm9yKHByaXYtPmFk YXB0ZXJMb2NrLCAyMDBfbXMsIFsmXSB7CisgICAgICAgICAgICBwcml2LT5hZGFwdGVyQ29uZGl0 aW9uLndhaXRGb3IocHJpdi0+YWRhcHRlckxvY2ssIDEwMF9tcywgWyZdIHsKICAgICAgICAgICAg ICAgICByZXR1cm4gZ3N0X2FkYXB0ZXJfYXZhaWxhYmxlX2Zhc3QocHJpdi0+YWRhcHRlci5nZXQo KSkgPj0gc2l6ZTsKICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgcmV0cmllcysrOwogICAg ICAgICAgICAgYXZhaWxhYmxlID0gZ3N0X2FkYXB0ZXJfYXZhaWxhYmxlX2Zhc3QocHJpdi0+YWRh cHRlci5nZXQoKSk7Ci0gICAgICAgICAgICBpZiAoYXZhaWxhYmxlICYmIGF2YWlsYWJsZSA8IHNp emUpCisgICAgICAgICAgICBpZiAoYXZhaWxhYmxlICYmIGF2YWlsYWJsZSA8IHNpemUpIHsKKyAg ICAgICAgICAgICAgICBHU1RfVFJBQ0VfT0JKRUNUKHNyYywgImRpZCBub3QgZ2V0IHRoZSAldSBi bG9ja3NpemUgYnl0ZXMsIGxldCdzIHB1c2ggdGhlICUiIEdfR1NJWkVfRk9STUFUICIgYnl0ZXMg d2UgZ290Iiwgc2l6ZSwgYXZhaWxhYmxlKTsKICAgICAgICAgICAgICAgICBzaXplID0gYXZhaWxh YmxlOwotICAgICAgICAgICAgZWxzZSBpZiAocmV0cmllcyA+IDMpCisgICAgICAgICAgICB9IGVs c2UgaWYgKHJldHJpZXMgPiAzKQogICAgICAgICAgICAgICAgIGlzQWRhcHRlckRyYWluZWQgPSB0 cnVlOwogICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKGlzQWRhcHRlckRyYWluZWQpIHsKLSAg ICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJBZGFwdGVyIHN0aWxsIGVtcHR5IGFmdGVyIDgw MCBtaWxsaS1zZWNvbmRzIG9mIHdhaXRpbmcsIGFzc3VtaW5nIEVPUyIpOworICAgICAgICBHU1Rf REVCVUdfT0JKRUNUKHNyYywgIkFkYXB0ZXIgc3RpbGwgZW1wdHkgYWZ0ZXIgNDAwIG1pbGxpLXNl Y29uZHMgb2Ygd2FpdGluZywgYXNzdW1pbmcgRU9TIik7CiAgICAgICAgIHJldHVybiBHU1RfRkxP V19FT1M7CiAgICAgfQogCkBAIC00NjQsNyArNDY1LDcgQEAgc3RhdGljIEdzdEZsb3dSZXR1cm4g d2ViS2l0V2ViU3JjQ3JlYXRlKEdzdFB1c2hTcmMqIHB1c2hTcmMsIEdzdEJ1ZmZlcioqIGJ1ZmZl cikKICAgICAgICAgICAgICAgICAmJiAocHJpdi0+c2l6ZSA+IFNNQUxMX01FRElBX1JFU09VUkNF X01BWF9TSVpFKSAmJiBwcml2LT5yZWFkUG9zaXRpb24KICAgICAgICAgICAgICAgICAmJiAocHJp di0+cmVhZFBvc2l0aW9uICE9IHByaXYtPnNpemUpCiAgICAgICAgICAgICAgICAgJiYgKHByaXYt PnF1ZXVlU2l6ZSA8IChwcml2LT5zaXplICogSElHSF9RVUVVRV9GQUNUT1JfVEhSRVNIT0xEICog TE9XX1FVRVVFX0ZBQ1RPUl9USFJFU0hPTEQpKQotICAgICAgICAgICAgICAgICYmIChHU1RfU1RB VEUoc3JjKSA9PSBHU1RfU1RBVEVfUExBWUlORykgJiYgcHJpdi0+aXNEb3dubG9hZFN1c3BlbmRl ZCkgeworICAgICAgICAgICAgICAgICYmIEdTVF9TVEFURShzcmMpID49IEdTVF9TVEFURV9QQVVT RUQgJiYgcHJpdi0+aXNEb3dubG9hZFN1c3BlbmRlZCkgewogICAgICAgICAgICAgICAgIEdTVF9E RUJVR19PQkpFQ1Qoc3JjLCAiW0J1ZmZlcmluZ10gQWRhcHRlciBydW5uaW5nIG91dCBvZiBkYXRh LCByZXN0YXJ0aW5nIGRvd25sb2FkIik7CiAgICAgICAgICAgICAgICAgcHJpdi0+aXNEb3dubG9h ZFN1c3BlbmRlZCA9IGZhbHNlOwogICAgICAgICAgICAgICAgIHdlYktpdFdlYlNyY01ha2VSZXF1 ZXN0KGJhc2VTcmMsIGZhbHNlKTsKQEAgLTkyMCwxNCArOTIxLDE0IEBAIENhY2hlZFJlc291cmNl U3RyZWFtaW5nQ2xpZW50OjpDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudChXZWJLaXRXZWJT cmMqIHNyYywKIAogQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6On5DYWNoZWRSZXNvdXJj ZVN0cmVhbWluZ0NsaWVudCgpID0gZGVmYXVsdDsKIAotdm9pZCBDYWNoZWRSZXNvdXJjZVN0cmVh bWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUodWludDY0X3QgYnl0ZXNSZWFkKQordm9p ZCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUodW5z aWduZWQgYnl0ZXNSZWFkKQogewogICAgIFdlYktpdFdlYlNyYyogc3JjID0gV0VCS0lUX1dFQl9T UkMobV9zcmMuZ2V0KCkpOwogICAgIEdzdEJhc2VTcmMqIGJhc2VTcmMgPSBHU1RfQkFTRV9TUkNf Q0FTVChzcmMpOwogICAgIFdlYktpdFdlYlNyY1ByaXZhdGUqIHByaXYgPSBzcmMtPnByaXY7CiAK LSAgICB1aW50NjRfdCBibG9ja3NpemUgPSBnc3RfYmFzZV9zcmNfZ2V0X2Jsb2Nrc2l6ZShiYXNl U3JjKTsKLSAgICBHU1RfTE9HX09CSkVDVChzcmMsICJDaGVja2luZyB0byB1cGRhdGUgYmxvY2tz aXplLiBSZWFkOiAlIiBQUkl1NjQgIiwgY3VycmVudCBibG9ja3NpemU6ICUiIFBSSXU2NCwgYnl0 ZXNSZWFkLCBibG9ja3NpemUpOworICAgIHVuc2lnbmVkIGJsb2Nrc2l6ZSA9IGdzdF9iYXNlX3Ny Y19nZXRfYmxvY2tzaXplKGJhc2VTcmMpOworICAgIEdTVF9MT0dfT0JKRUNUKHNyYywgIkNoZWNr aW5nIHRvIHVwZGF0ZSBibG9ja3NpemUuIFJlYWQ6ICV1LCBjdXJyZW50IGJsb2Nrc2l6ZTogJXUi LCBieXRlc1JlYWQsIGJsb2Nrc2l6ZSk7CiAKICAgICBpZiAoYnl0ZXNSZWFkID49IGJsb2Nrc2l6 ZSAqIHNfZ3Jvd0Jsb2Nrc2l6ZUxpbWl0KSB7CiAgICAgICAgIG1fcmVkdWNlQmxvY2tzaXplQ291 bnQgPSAwOwpAQCAtOTM1LDcgKzkzNiw3IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdD bGllbnQ6OmNoZWNrVXBkYXRlQmxvY2tzaXplKHVpbnQ2NF90IGJ5dGVzUmVhZCkKIAogICAgICAg ICBpZiAobV9pbmNyZWFzZUJsb2Nrc2l6ZUNvdW50ID49IHNfZ3Jvd0Jsb2Nrc2l6ZUNvdW50KSB7 CiAgICAgICAgICAgICBibG9ja3NpemUgKj0gc19ncm93QmxvY2tzaXplRmFjdG9yOwotICAgICAg ICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJJbmNyZWFzZWQgYmxvY2tzaXplIHRvICUiIFBS SXU2NCwgYmxvY2tzaXplKTsKKyAgICAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiSW5j cmVhc2VkIGJsb2Nrc2l6ZSB0byAldSIsIGJsb2Nrc2l6ZSk7CiAgICAgICAgICAgICBnc3RfYmFz ZV9zcmNfc2V0X2Jsb2Nrc2l6ZShiYXNlU3JjLCBibG9ja3NpemUpOwogICAgICAgICAgICAgbV9p bmNyZWFzZUJsb2Nrc2l6ZUNvdW50ID0gMDsKICAgICAgICAgfQpAQCAtOTQ2LDcgKzk0Nyw3IEBA IHZvaWQgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmNoZWNrVXBkYXRlQmxvY2tzaXpl KHVpbnQ2NF90IGJ5dGVzUmVhZCkKICAgICAgICAgaWYgKG1fcmVkdWNlQmxvY2tzaXplQ291bnQg Pj0gc19yZWR1Y2VCbG9ja3NpemVDb3VudCkgewogICAgICAgICAgICAgYmxvY2tzaXplICo9IHNf cmVkdWNlQmxvY2tzaXplRmFjdG9yOwogICAgICAgICAgICAgYmxvY2tzaXplID0gc3RkOjptYXgo YmxvY2tzaXplLCBwcml2LT5taW5pbXVtQmxvY2tzaXplKTsKLSAgICAgICAgICAgIEdTVF9ERUJV R19PQkpFQ1Qoc3JjLCAiRGVjcmVhc2VkIGJsb2Nrc2l6ZSB0byAlIiBQUkl1NjQsIGJsb2Nrc2l6 ZSk7CisgICAgICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIkRlY3JlYXNlZCBibG9ja3Np emUgdG8gJXUiLCBibG9ja3NpemUpOwogICAgICAgICAgICAgZ3N0X2Jhc2Vfc3JjX3NldF9ibG9j a3NpemUoYmFzZVNyYywgYmxvY2tzaXplKTsKICAgICAgICAgICAgIG1fcmVkdWNlQmxvY2tzaXpl Q291bnQgPSAwOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmggYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVh bWVyLmgKaW5kZXggYWI4NTE4M2MwMDY3YmU0NDJhY2Y1MjI0MmI4Y2NjNmNiOGMyNjQxNC4uZjNk OThmYmVjOWI2NDIwNWJkZmI5ZTU0OTdhZTUwMjEzZTg0MTA4MSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJl YW1lci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9X ZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaApAQCAtMzUsNiArMzUsNyBAQCBHX0JFR0lOX0RFQ0xT CiAjZGVmaW5lIFdFQktJVF9XRUJfU1JDX0NMQVNTKGtsYXNzKSAgICAoR19UWVBFX0NIRUNLX0NM QVNTX0NBU1QgKChrbGFzcyksIFdFQktJVF9UWVBFX1dFQl9TUkMsIFdlYktpdFdlYlNyY0NsYXNz KSkKICNkZWZpbmUgV0VCS0lUX0lTX1dFQl9TUkMob2JqKSAgICAgICAgIChHX1RZUEVfQ0hFQ0tf SU5TVEFOQ0VfVFlQRSAoKG9iaiksIFdFQktJVF9UWVBFX1dFQl9TUkMpKQogI2RlZmluZSBXRUJL SVRfSVNfV0VCX1NSQ19DTEFTUyhrbGFzcykgKEdfVFlQRV9DSEVDS19DTEFTU19UWVBFICgoa2xh c3MpLCBXRUJLSVRfVFlQRV9XRUJfU1JDKSkKKyNkZWZpbmUgV0VCS0lUX1dFQl9TUkNfQ0FTVChv YmopICAgICAgICgoV2ViS2l0V2ViU3JjKikob2JqKSkKIAogI2RlZmluZSBXRUJLSVRfV0VCX1NS Q19QTEFZRVJfQ09OVEVYVF9UWVBFX05BTUUgICJ3ZWJraXQubWVkaWEtcGxheWVyIgogCg== 383352 2019-11-12 07:04:48 -0800 2019-11-13 02:44:05 -0800 Patch for landing bug-203194-20191112160447.patch text/plain 11910 calvaris U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ4NjdmNTM0MTI3ZTNk ODU0NjczYWMyYmI4NWI1Yzg1NmYzMzU4Zi4uZGJiYTI1MTM2YjNmYzc2ZGRmNDExMWEzMDY5NmM0 ODRiZTBhYjU3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM5IEBACisyMDE5LTExLTEyICBYYWJp ZXIgUm9kcmlndWV6IENhbHZhciAgPGNhbHZhcmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU2V2ZXJhbCBpc3N1ZXMgd2hpbGUgdHJ5aW5nIHRvIHBsYXkgYSB2aWRlbyBvbiBO ZXh0Q2xvdWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTIwMzE5NAorCisgICAgICAgIFJldmlld2VkIGJ5IFBoaWxpcHBlIE5vcm1hbmQuCisKKyAgICAg ICAgRmlyc3QgcHJvYmxlbSB3YXMgdGhlIGxvYWRlciBub3QgYmVpbmcgcmVzdGFydGVkIGluIFBB VVNFRCwgc28KKyAgICAgICAgc29tZXRpbWVzIHBsYXliYWNrIG5ldmVyIHN0YXJ0ZWQgc2luY2Ug YnVmZmVyaW5nIG5ldmVyIHJlYWNoZWQKKyAgICAgICAgMTAwJS4KKworICAgICAgICBUaGVuLCBh ZnRlciBpbnZlc3RpZ2F0aW5nIGJsb2Nrc2l6ZXMgYW5kIG5vdCBiZWluZyBhIHZpYWJsZQorICAg ICAgICBzb2x1dGlvbiwgcmVkdWNpbmcgdGhlIDIwMF9tcyB0byAxMDBfbXMgd2FpdCBmb3IgbmV3 IGRhdGEgd2FzIHRoZQorICAgICAgICB0cmljayB0byBhdm9pZCBjaG9wcHluZXNzLgorCisgICAg ICAgIER1cmluZyBpbnZlc3RpZ2F0aW9uIHNldmVyYWwgaXNzdWVzIHdlcmUgZml4ZWQgbGlrZSB0 dXJuaW5nCisgICAgICAgIEdzdFF1ZXJ5KiBpbnRvIEdSZWZQdHIgZm9yIE1lZGlhUGxheWVyUHJp dmF0ZUdTdHJlYW1lcjo6YnVmZmVyZWQsCisgICAgICAgIG1ha2luZyBibG9ja3NpemUgdW5zaWdu ZWQgaW5zdGVhZCBvZiB1aW50NjRfdCBhcyBpdCBpcyBpbgorICAgICAgICBHU3RyZWFtZXIgYW5k IGNyZWF0aW5nIGFuZCB1c2luZyBXRUJLSVRfV0VCX1NSQ19DQVNUIHNpbmNlIG1hbnkKKyAgICAg ICAgdXNlcyBvZiBXRUJLSVRfV0VCX1NSQyBjYXN0IHdlcmUgYWxyZWFkeSBwcm90ZWN0ZWQgYnkK KyAgICAgICAgV0VCS0lUX0lTX1dFQl9TUkMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6YnVmZmVyZWQgY29uc3QpOiBHUmVm UHRyPEdzdFF1ZXJ5Pi4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6aGFuZGxlTWVzc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZh dGVHU3RyZWFtZXI6OnNvdXJjZVNldHVwKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVy UHJpdmF0ZUdTdHJlYW1lcjo6ZGlkUGFzc0NPUlNBY2Nlc3NDaGVjayBjb25zdCk6CisgICAgICAg IFVzZSBXRUJLSVRfV0VCX1NSQ19DQVNULgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAod2ViS2l0V2Vi U3JjQ3JlYXRlKTogUmVkdWNlIHdhaXQgZm9yIGRhdGEgZG93biB0byAxMDBfbXMgYW5kCisgICAg ICAgIHJlcXVlc3QgZG93bmxvYWQgcmVzdGFydCBhbHNvIGluIFBBVVNFRC4KKyAgICAgICAgKENh Y2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50OjpjaGVja1VwZGF0ZUJsb2Nrc2l6ZSk6IFR1cm4K KyAgICAgICAgYmxvY2tzaXplIHRvIHVuc2lnbmVkLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaDogQWRkCisgICAgICAgIFdF QktJVF9XRUJfU1JDX0NBU1QuCisKIDIwMTktMTEtMTAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBbTEZDXVtJRkNdIE1vdmUgTGluZTo6UnVuJ3MgbGluZSBsYXlv dXQgc3BlY2lmaWMgbG9naWMgdG8gSW5saW5lSXRlbVJ1bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAppbmRleCBjMjYxZGFkYzY1ODU4NTI0N2M4NmVh YmU1NTAzZjA0ZjZjYWYwMWFkLi5kMjJhNGZlMmIxMTJiMzk0OGU1ZDY1ZTY4MjQyMTgzZDI2YWU5 NmFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFt ZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNw cApAQCAtMTE0NiwxNyArMTE0NiwxNSBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1UaW1lUmFu Z2VzPiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmJ1ZmZlcmVkKCkgY29ucwogICAgIGlm ICghbWVkaWFEdXJhdGlvbiB8fCBtZWRpYUR1cmF0aW9uLmlzUG9zaXRpdmVJbmZpbml0ZSgpKQog ICAgICAgICByZXR1cm4gdGltZVJhbmdlczsKIAotICAgIEdzdFF1ZXJ5KiBxdWVyeSA9IGdzdF9x dWVyeV9uZXdfYnVmZmVyaW5nKEdTVF9GT1JNQVRfUEVSQ0VOVCk7CisgICAgR1JlZlB0cjxHc3RR dWVyeT4gcXVlcnkgPSBhZG9wdEdSZWYoZ3N0X3F1ZXJ5X25ld19idWZmZXJpbmcoR1NUX0ZPUk1B VF9QRVJDRU5UKSk7CiAKLSAgICBpZiAoIWdzdF9lbGVtZW50X3F1ZXJ5KG1fcGlwZWxpbmUuZ2V0 KCksIHF1ZXJ5KSkgewotICAgICAgICBnc3RfcXVlcnlfdW5yZWYocXVlcnkpOworICAgIGlmICgh Z3N0X2VsZW1lbnRfcXVlcnkobV9waXBlbGluZS5nZXQoKSwgcXVlcnkuZ2V0KCkpKQogICAgICAg ICByZXR1cm4gdGltZVJhbmdlczsKLSAgICB9CiAKLSAgICBndWludCBudW1CdWZmZXJpbmdSYW5n ZXMgPSBnc3RfcXVlcnlfZ2V0X25fYnVmZmVyaW5nX3JhbmdlcyhxdWVyeSk7CisgICAgZ3VpbnQg bnVtQnVmZmVyaW5nUmFuZ2VzID0gZ3N0X3F1ZXJ5X2dldF9uX2J1ZmZlcmluZ19yYW5nZXMocXVl cnkuZ2V0KCkpOwogICAgIGZvciAoZ3VpbnQgaW5kZXggPSAwOyBpbmRleCA8IG51bUJ1ZmZlcmlu Z1JhbmdlczsgaW5kZXgrKykgewogICAgICAgICBnaW50NjQgcmFuZ2VTdGFydCA9IDAsIHJhbmdl U3RvcCA9IDA7Ci0gICAgICAgIGlmIChnc3RfcXVlcnlfcGFyc2VfbnRoX2J1ZmZlcmluZ19yYW5n ZShxdWVyeSwgaW5kZXgsICZyYW5nZVN0YXJ0LCAmcmFuZ2VTdG9wKSkgeworICAgICAgICBpZiAo Z3N0X3F1ZXJ5X3BhcnNlX250aF9idWZmZXJpbmdfcmFuZ2UocXVlcnkuZ2V0KCksIGluZGV4LCAm cmFuZ2VTdGFydCwgJnJhbmdlU3RvcCkpIHsKICAgICAgICAgICAgIHVpbnQ2NF90IHN0YXJ0VGlt ZSA9IGdzdF91dGlsX3VpbnQ2NF9zY2FsZV9pbnRfcm91bmQodG9Hc3RVbnNpZ25lZDY0VGltZSht ZWRpYUR1cmF0aW9uKSwgcmFuZ2VTdGFydCwgR1NUX0ZPUk1BVF9QRVJDRU5UX01BWCk7CiAgICAg ICAgICAgICB1aW50NjRfdCBzdG9wVGltZSA9IGdzdF91dGlsX3VpbnQ2NF9zY2FsZV9pbnRfcm91 bmQodG9Hc3RVbnNpZ25lZDY0VGltZShtZWRpYUR1cmF0aW9uKSwgcmFuZ2VTdG9wLCBHU1RfRk9S TUFUX1BFUkNFTlRfTUFYKTsKICAgICAgICAgICAgIHRpbWVSYW5nZXMtPmFkZChNZWRpYVRpbWUo c3RhcnRUaW1lLCBHU1RfU0VDT05EKSwgTWVkaWFUaW1lKHN0b3BUaW1lLCBHU1RfU0VDT05EKSk7 CkBAIC0xMTcxLDggKzExNjksNiBAQCBzdGQ6OnVuaXF1ZV9wdHI8UGxhdGZvcm1UaW1lUmFuZ2Vz PiBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmJ1ZmZlcmVkKCkgY29ucwogICAgICAgICAg ICAgdGltZVJhbmdlcy0+YWRkKE1lZGlhVGltZTo6emVyb1RpbWUoKSwgbG9hZGVkKTsKICAgICB9 CiAKLSAgICBnc3RfcXVlcnlfdW5yZWYocXVlcnkpOwotCiAgICAgcmV0dXJuIHRpbWVSYW5nZXM7 CiB9CiAKQEAgLTEzOTMsNyArMTM4OSw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVh bWVyOjpoYW5kbGVNZXNzYWdlKEdzdE1lc3NhZ2UqIG1lc3NhZ2UpCiAgICAgICAgIH0gZWxzZSBp ZiAoZ3N0X3N0cnVjdHVyZV9oYXNfbmFtZShzdHJ1Y3R1cmUsICJhZGFwdGl2ZS1zdHJlYW1pbmct c3RhdGlzdGljcyIpKSB7CiAgICAgICAgICAgICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMobV9zb3Vy Y2UuZ2V0KCkpICYmICF3ZWJraXRHc3RDaGVja1ZlcnNpb24oMSwgMTIsIDApKSB7CiAgICAgICAg ICAgICAgICAgaWYgKGNvbnN0IGNoYXIqIHVyaSA9IGdzdF9zdHJ1Y3R1cmVfZ2V0X3N0cmluZyhz dHJ1Y3R1cmUsICJ1cmkiKSkKLSAgICAgICAgICAgICAgICAgICAgbV9oYXNUYWludGVkT3JpZ2lu ID0gd2ViS2l0U3JjV291bGRUYWludE9yaWdpbihXRUJLSVRfV0VCX1NSQyhtX3NvdXJjZS5nZXQo KSksIFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUoVVJMKFVSTCgpLCB1cmkpKSk7CisgICAgICAgICAg ICAgICAgICAgIG1faGFzVGFpbnRlZE9yaWdpbiA9IHdlYktpdFNyY1dvdWxkVGFpbnRPcmlnaW4o V0VCS0lUX1dFQl9TUkNfQ0FTVChtX3NvdXJjZS5nZXQoKSksIFNlY3VyaXR5T3JpZ2luOjpjcmVh dGUoVVJMKFVSTCgpLCB1cmkpKSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZQogICAg ICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiVW5oYW5kbGVkIGVsZW1lbnQg bWVzc2FnZTogJSIgR1NUX1BUUl9GT1JNQVQsIHN0cnVjdHVyZSk7CkBAIC0xODU0LDcgKzE4NTAs NyBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6c291cmNlU2V0dXAoR3N0RWxl bWVudCogc291cmNlRWxlbWVudCkKICAgICBtX3NvdXJjZSA9IHNvdXJjZUVsZW1lbnQ7CiAKICAg ICBpZiAoV0VCS0lUX0lTX1dFQl9TUkMobV9zb3VyY2UuZ2V0KCkpKSB7Ci0gICAgICAgIHdlYktp dFdlYlNyY1NldE1lZGlhUGxheWVyKFdFQktJVF9XRUJfU1JDKG1fc291cmNlLmdldCgpKSwgbV9w bGF5ZXIpOworICAgICAgICB3ZWJLaXRXZWJTcmNTZXRNZWRpYVBsYXllcihXRUJLSVRfV0VCX1NS Q19DQVNUKG1fc291cmNlLmdldCgpKSwgbV9wbGF5ZXIpOwogICAgICAgICBnX3NpZ25hbF9jb25u ZWN0KEdTVF9FTEVNRU5UX1BBUkVOVChtX3NvdXJjZS5nZXQoKSksICJlbGVtZW50LWFkZGVkIiwg R19DQUxMQkFDSyh1cmlEZWNvZGVCaW5FbGVtZW50QWRkZWRDYWxsYmFjayksIHRoaXMpOwogI2lm IEVOQUJMRShNRURJQV9TVFJFQU0pCiAgICAgfSBlbHNlIGlmIChXRUJLSVRfSVNfTUVESUFfU1RS RUFNX1NSQyhzb3VyY2VFbGVtZW50KSkgewpAQCAtMjUyMiw3ICsyNTE4LDcgQEAgdm9pZCBNZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXI6OnNpbXVsYXRlQXVkaW9JbnRlcnJ1cHRpb24oKQogYm9v bCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmRpZFBhc3NDT1JTQWNjZXNzQ2hlY2soKSBj b25zdAogewogICAgIGlmIChXRUJLSVRfSVNfV0VCX1NSQyhtX3NvdXJjZS5nZXQoKSkpCi0gICAg ICAgIHJldHVybiB3ZWJLaXRTcmNQYXNzZWRDT1JTQWNjZXNzQ2hlY2soV0VCS0lUX1dFQl9TUkMo bV9zb3VyY2UuZ2V0KCkpKTsKKyAgICAgICAgcmV0dXJuIHdlYktpdFNyY1Bhc3NlZENPUlNBY2Nl c3NDaGVjayhXRUJLSVRfV0VCX1NSQ19DQVNUKG1fc291cmNlLmdldCgpKSk7CiAgICAgcmV0dXJu IGZhbHNlOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3Bw CmluZGV4IDk2NWI2ZTI3NmQwMTQ1NzkxZTFlYzQ3YzAxMTkxZjI4M2Q0YWJjNGUuLmIwZmUzMTkz NzVmMjZjMTg4NmQ1YTQ4ZGIyZWE5ZGQ4MzdlMTY4NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJL aXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwCkBAIC02MSw3ICs2MSw3IEBAIHB1YmxpYzoKICAgICB2 b2lkIHNldFNvdXJjZUVsZW1lbnQoV2ViS2l0V2ViU3JjKiBzcmMpIHsgbV9zcmMgPSBHU1RfRUxF TUVOVF9DQVNUKHNyYyk7IH0KIAogcHJpdmF0ZToKLSAgICB2b2lkIGNoZWNrVXBkYXRlQmxvY2tz aXplKHVpbnQ2NF90IGJ5dGVzUmVhZCk7CisgICAgdm9pZCBjaGVja1VwZGF0ZUJsb2Nrc2l6ZSh1 bnNpZ25lZCBieXRlc1JlYWQpOwogCiAgICAgLy8gUGxhdGZvcm1NZWRpYVJlc291cmNlQ2xpZW50 IHZpcnR1YWwgbWV0aG9kcy4KICAgICB2b2lkIHJlc3BvbnNlUmVjZWl2ZWQoUGxhdGZvcm1NZWRp YVJlc291cmNlJiwgY29uc3QgUmVzb3VyY2VSZXNwb25zZSYsIENvbXBsZXRpb25IYW5kbGVyPHZv aWQoU2hvdWxkQ29udGludWUpPiYmKSBvdmVycmlkZTsKQEAgLTEzNyw3ICsxMzcsNyBAQCBzdHJ1 Y3QgX1dlYktpdFdlYlNyY1ByaXZhdGUgewogICAgIGJvb2wgaXNTZWVrYWJsZTsKICAgICBib29s IGlzU2Vla2luZzsKICAgICBib29sIHdhc1NlZWtpbmcgeyBmYWxzZSB9OwotICAgIHVpbnQ2NF90 IG1pbmltdW1CbG9ja3NpemU7CisgICAgdW5zaWduZWQgbWluaW11bUJsb2Nrc2l6ZTsKICAgICBM b2NrIGFkYXB0ZXJMb2NrOwogICAgIENvbmRpdGlvbiBhZGFwdGVyQ29uZGl0aW9uOwogICAgIHVp bnQ2NF90IHF1ZXVlU2l6ZSB7IDAgfTsKQEAgLTQxMiwyMCArNDEyLDIxIEBAIHN0YXRpYyBHc3RG bG93UmV0dXJuIHdlYktpdFdlYlNyY0NyZWF0ZShHc3RQdXNoU3JjKiBwdXNoU3JjLCBHc3RCdWZm ZXIqKiBidWZmZXIpCiAgICAgICAgIHVuc2lnbmVkIHJldHJpZXMgPSAwOwogICAgICAgICBzaXpl X3QgYXZhaWxhYmxlID0gZ3N0X2FkYXB0ZXJfYXZhaWxhYmxlX2Zhc3QocHJpdi0+YWRhcHRlci5n ZXQoKSk7CiAgICAgICAgIHdoaWxlIChhdmFpbGFibGUgPCBzaXplICYmICFpc0FkYXB0ZXJEcmFp bmVkKSB7Ci0gICAgICAgICAgICBwcml2LT5hZGFwdGVyQ29uZGl0aW9uLndhaXRGb3IocHJpdi0+ YWRhcHRlckxvY2ssIDIwMF9tcywgWyZdIHsKKyAgICAgICAgICAgIHByaXYtPmFkYXB0ZXJDb25k aXRpb24ud2FpdEZvcihwcml2LT5hZGFwdGVyTG9jaywgMTAwX21zLCBbJl0gewogICAgICAgICAg ICAgICAgIHJldHVybiBnc3RfYWRhcHRlcl9hdmFpbGFibGVfZmFzdChwcml2LT5hZGFwdGVyLmdl dCgpKSA+PSBzaXplOwogICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICByZXRyaWVzKys7CiAg ICAgICAgICAgICBhdmFpbGFibGUgPSBnc3RfYWRhcHRlcl9hdmFpbGFibGVfZmFzdChwcml2LT5h ZGFwdGVyLmdldCgpKTsKLSAgICAgICAgICAgIGlmIChhdmFpbGFibGUgJiYgYXZhaWxhYmxlIDwg c2l6ZSkKKyAgICAgICAgICAgIGlmIChhdmFpbGFibGUgJiYgYXZhaWxhYmxlIDwgc2l6ZSkgewor ICAgICAgICAgICAgICAgIEdTVF9UUkFDRV9PQkpFQ1Qoc3JjLCAiZGlkIG5vdCBnZXQgdGhlICV1 IGJsb2Nrc2l6ZSBieXRlcywgbGV0J3MgcHVzaCB0aGUgJSIgR19HU0laRV9GT1JNQVQgIiBieXRl cyB3ZSBnb3QiLCBzaXplLCBhdmFpbGFibGUpOwogICAgICAgICAgICAgICAgIHNpemUgPSBhdmFp bGFibGU7Ci0gICAgICAgICAgICBlbHNlIGlmIChyZXRyaWVzID4gMykKKyAgICAgICAgICAgIH0g ZWxzZSBpZiAocmV0cmllcyA+IDMpCiAgICAgICAgICAgICAgICAgaXNBZGFwdGVyRHJhaW5lZCA9 IHRydWU7CiAgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAoaXNBZGFwdGVyRHJhaW5lZCkgewot ICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIkFkYXB0ZXIgc3RpbGwgZW1wdHkgYWZ0ZXIg ODAwIG1pbGxpLXNlY29uZHMgb2Ygd2FpdGluZywgYXNzdW1pbmcgRU9TIik7CisgICAgICAgIEdT VF9ERUJVR19PQkpFQ1Qoc3JjLCAiQWRhcHRlciBzdGlsbCBlbXB0eSBhZnRlciA0MDAgbWlsbGkt c2Vjb25kcyBvZiB3YWl0aW5nLCBhc3N1bWluZyBFT1MiKTsKICAgICAgICAgcmV0dXJuIEdTVF9G TE9XX0VPUzsKICAgICB9CiAKQEAgLTQ2NCw3ICs0NjUsNyBAQCBzdGF0aWMgR3N0Rmxvd1JldHVy biB3ZWJLaXRXZWJTcmNDcmVhdGUoR3N0UHVzaFNyYyogcHVzaFNyYywgR3N0QnVmZmVyKiogYnVm ZmVyKQogICAgICAgICAgICAgICAgICYmIChwcml2LT5zaXplID4gU01BTExfTUVESUFfUkVTT1VS Q0VfTUFYX1NJWkUpICYmIHByaXYtPnJlYWRQb3NpdGlvbgogICAgICAgICAgICAgICAgICYmIChw cml2LT5yZWFkUG9zaXRpb24gIT0gcHJpdi0+c2l6ZSkKICAgICAgICAgICAgICAgICAmJiAocHJp di0+cXVldWVTaXplIDwgKHByaXYtPnNpemUgKiBISUdIX1FVRVVFX0ZBQ1RPUl9USFJFU0hPTEQg KiBMT1dfUVVFVUVfRkFDVE9SX1RIUkVTSE9MRCkpCi0gICAgICAgICAgICAgICAgJiYgKEdTVF9T VEFURShzcmMpID09IEdTVF9TVEFURV9QTEFZSU5HKSAmJiBwcml2LT5pc0Rvd25sb2FkU3VzcGVu ZGVkKSB7CisgICAgICAgICAgICAgICAgJiYgR1NUX1NUQVRFKHNyYykgPj0gR1NUX1NUQVRFX1BB VVNFRCAmJiBwcml2LT5pc0Rvd25sb2FkU3VzcGVuZGVkKSB7CiAgICAgICAgICAgICAgICAgR1NU X0RFQlVHX09CSkVDVChzcmMsICJbQnVmZmVyaW5nXSBBZGFwdGVyIHJ1bm5pbmcgb3V0IG9mIGRh dGEsIHJlc3RhcnRpbmcgZG93bmxvYWQiKTsKICAgICAgICAgICAgICAgICBwcml2LT5pc0Rvd25s b2FkU3VzcGVuZGVkID0gZmFsc2U7CiAgICAgICAgICAgICAgICAgd2ViS2l0V2ViU3JjTWFrZVJl cXVlc3QoYmFzZVNyYywgZmFsc2UpOwpAQCAtOTIwLDE0ICs5MjEsMTQgQEAgQ2FjaGVkUmVzb3Vy Y2VTdHJlYW1pbmdDbGllbnQ6OkNhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50KFdlYktpdFdl YlNyYyogc3JjLAogCiBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6fkNhY2hlZFJlc291 cmNlU3RyZWFtaW5nQ2xpZW50KCkgPSBkZWZhdWx0OwogCi12b2lkIENhY2hlZFJlc291cmNlU3Ry ZWFtaW5nQ2xpZW50OjpjaGVja1VwZGF0ZUJsb2Nrc2l6ZSh1aW50NjRfdCBieXRlc1JlYWQpCit2 b2lkIENhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50OjpjaGVja1VwZGF0ZUJsb2Nrc2l6ZSh1 bnNpZ25lZCBieXRlc1JlYWQpCiB7CiAgICAgV2ViS2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VC X1NSQyhtX3NyYy5nZXQoKSk7CiAgICAgR3N0QmFzZVNyYyogYmFzZVNyYyA9IEdTVF9CQVNFX1NS Q19DQVNUKHNyYyk7CiAgICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9IHNyYy0+cHJpdjsK IAotICAgIHVpbnQ2NF90IGJsb2Nrc2l6ZSA9IGdzdF9iYXNlX3NyY19nZXRfYmxvY2tzaXplKGJh c2VTcmMpOwotICAgIEdTVF9MT0dfT0JKRUNUKHNyYywgIkNoZWNraW5nIHRvIHVwZGF0ZSBibG9j a3NpemUuIFJlYWQ6ICUiIFBSSXU2NCAiLCBjdXJyZW50IGJsb2Nrc2l6ZTogJSIgUFJJdTY0LCBi eXRlc1JlYWQsIGJsb2Nrc2l6ZSk7CisgICAgdW5zaWduZWQgYmxvY2tzaXplID0gZ3N0X2Jhc2Vf c3JjX2dldF9ibG9ja3NpemUoYmFzZVNyYyk7CisgICAgR1NUX0xPR19PQkpFQ1Qoc3JjLCAiQ2hl Y2tpbmcgdG8gdXBkYXRlIGJsb2Nrc2l6ZS4gUmVhZDogJXUsIGN1cnJlbnQgYmxvY2tzaXplOiAl dSIsIGJ5dGVzUmVhZCwgYmxvY2tzaXplKTsKIAogICAgIGlmIChieXRlc1JlYWQgPj0gYmxvY2tz aXplICogc19ncm93QmxvY2tzaXplTGltaXQpIHsKICAgICAgICAgbV9yZWR1Y2VCbG9ja3NpemVD b3VudCA9IDA7CkBAIC05MzUsNyArOTM2LDcgQEAgdm9pZCBDYWNoZWRSZXNvdXJjZVN0cmVhbWlu Z0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3NpemUodWludDY0X3QgYnl0ZXNSZWFkKQogCiAgICAg ICAgIGlmIChtX2luY3JlYXNlQmxvY2tzaXplQ291bnQgPj0gc19ncm93QmxvY2tzaXplQ291bnQp IHsKICAgICAgICAgICAgIGJsb2Nrc2l6ZSAqPSBzX2dyb3dCbG9ja3NpemVGYWN0b3I7Ci0gICAg ICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIkluY3JlYXNlZCBibG9ja3NpemUgdG8gJSIg UFJJdTY0LCBibG9ja3NpemUpOworICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMsICJJ bmNyZWFzZWQgYmxvY2tzaXplIHRvICV1IiwgYmxvY2tzaXplKTsKICAgICAgICAgICAgIGdzdF9i YXNlX3NyY19zZXRfYmxvY2tzaXplKGJhc2VTcmMsIGJsb2Nrc2l6ZSk7CiAgICAgICAgICAgICBt X2luY3JlYXNlQmxvY2tzaXplQ291bnQgPSAwOwogICAgICAgICB9CkBAIC05NDYsNyArOTQ3LDcg QEAgdm9pZCBDYWNoZWRSZXNvdXJjZVN0cmVhbWluZ0NsaWVudDo6Y2hlY2tVcGRhdGVCbG9ja3Np emUodWludDY0X3QgYnl0ZXNSZWFkKQogICAgICAgICBpZiAobV9yZWR1Y2VCbG9ja3NpemVDb3Vu dCA+PSBzX3JlZHVjZUJsb2Nrc2l6ZUNvdW50KSB7CiAgICAgICAgICAgICBibG9ja3NpemUgKj0g c19yZWR1Y2VCbG9ja3NpemVGYWN0b3I7CiAgICAgICAgICAgICBibG9ja3NpemUgPSBzdGQ6Om1h eChibG9ja3NpemUsIHByaXYtPm1pbmltdW1CbG9ja3NpemUpOwotICAgICAgICAgICAgR1NUX0RF QlVHX09CSkVDVChzcmMsICJEZWNyZWFzZWQgYmxvY2tzaXplIHRvICUiIFBSSXU2NCwgYmxvY2tz aXplKTsKKyAgICAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiRGVjcmVhc2VkIGJsb2Nr c2l6ZSB0byAldSIsIGJsb2Nrc2l6ZSk7CiAgICAgICAgICAgICBnc3RfYmFzZV9zcmNfc2V0X2Js b2Nrc2l6ZShiYXNlU3JjLCBibG9ja3NpemUpOwogICAgICAgICAgICAgbV9yZWR1Y2VCbG9ja3Np emVDb3VudCA9IDA7CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuaCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3Ry ZWFtZXIuaAppbmRleCBhYjg1MTgzYzAwNjdiZTQ0MmFjZjUyMjQyYjhjY2M2Y2I4YzI2NDE0Li5m M2Q5OGZiZWM5YjY0MjA1YmRmYjllNTQ5N2FlNTAyMTNlODQxMDgxIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0 cmVhbWVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5oCkBAIC0zNSw2ICszNSw3IEBAIEdfQkVHSU5fREVD TFMKICNkZWZpbmUgV0VCS0lUX1dFQl9TUkNfQ0xBU1Moa2xhc3MpICAgIChHX1RZUEVfQ0hFQ0tf Q0xBU1NfQ0FTVCAoKGtsYXNzKSwgV0VCS0lUX1RZUEVfV0VCX1NSQywgV2ViS2l0V2ViU3JjQ2xh c3MpKQogI2RlZmluZSBXRUJLSVRfSVNfV0VCX1NSQyhvYmopICAgICAgICAgKEdfVFlQRV9DSEVD S19JTlNUQU5DRV9UWVBFICgob2JqKSwgV0VCS0lUX1RZUEVfV0VCX1NSQykpCiAjZGVmaW5lIFdF QktJVF9JU19XRUJfU1JDX0NMQVNTKGtsYXNzKSAoR19UWVBFX0NIRUNLX0NMQVNTX1RZUEUgKChr bGFzcyksIFdFQktJVF9UWVBFX1dFQl9TUkMpKQorI2RlZmluZSBXRUJLSVRfV0VCX1NSQ19DQVNU KG9iaikgICAgICAgKChXZWJLaXRXZWJTcmMqKShvYmopKQogCiAjZGVmaW5lIFdFQktJVF9XRUJf U1JDX1BMQVlFUl9DT05URVhUX1RZUEVfTkFNRSAgIndlYmtpdC5tZWRpYS1wbGF5ZXIiCiAK