209827 2020-03-31 12:41:39 -0700 CRASH in MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer(), uncaught ObjC exception 2020-04-01 14:15:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jer.noble jer.noble calvaris darin eric.carlson ews-watchlist glenn mkwst peng.liu6 philipj sergio webkit-bug-importer oldest_to_newest 1636185 0 jer.noble 2020-03-31 12:41:39 -0700 CRASH in MediaPlayerPrivateMediaSourceAVFObjC::addAudioRenderer(), uncaught ObjC exception 1636186 1 jer.noble 2020-03-31 12:42:07 -0700 <rdar://problem/61113080> 1636187 2 webkit-bug-importer 2020-03-31 12:42:20 -0700 <rdar://problem/61120016> 1636188 3 395081 jer.noble 2020-03-31 12:46:55 -0700 Created attachment 395081 Patch 1636189 4 395081 darin 2020-03-31 12:51:50 -0700 Comment on attachment 395081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395081&action=review > Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:903 > + ASSERT_NOT_REACHED(); I don’t really like using assertions like this. As a project we intend to use assertions for things that must *never* happen, not for things that *normally* don’t happen. The other cases in this patch seem to be truly "should never happen" cases, although I might be wrong about that. 1636196 5 395081 jer.noble 2020-03-31 12:57:45 -0700 Comment on attachment 395081 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395081&action=review >> Source/WebCore/platform/graphics/avfoundation/objc/SourceBufferPrivateAVFObjC.mm:903 >> + ASSERT_NOT_REACHED(); > > I don’t really like using assertions like this. As a project we intend to use assertions for things that must *never* happen, not for things that *normally* don’t happen. > > The other cases in this patch seem to be truly "should never happen" cases, although I might be wrong about that. My goal here is to catch this case in layout tests; this scenario could easily cause layout test flakiness in a totally un-diagnosable way. If we upgrade a bot to a new OS and this ASSERTion starts getting hit and generates crashlogs, we can immediately trace the cause to a particular OS revision. But maybe we can achieve this some other way, like through a WKTR or DRT only console log that would show up in the test .diff? 1636211 6 darin 2020-03-31 13:15:51 -0700 (In reply to Jer Noble from comment #5) > My goal here is to catch this case in layout tests Got it! > But maybe we can achieve this some other way, like through a WKTR or DRT only console log that would show up in the test .diff? Yes, I think there is quite a bit of logging that shows up in regression test results. Let's check on that. 1636341 7 395117 jer.noble 2020-03-31 18:03:29 -0700 Created attachment 395117 Patch for landing 1636592 8 395191 jer.noble 2020-04-01 11:57:25 -0700 Created attachment 395191 Patch for landing 1636654 9 ews-feeder 2020-04-01 14:15:23 -0700 Committed r259363: <https://trac.webkit.org/changeset/259363> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395191. 395081 2020-03-31 12:46:55 -0700 2020-03-31 18:03:28 -0700 Patch bug-209827-20200331124655.patch text/plain 5958 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ0OGZiNmRiOWRhNDZi NjZkYmYwODExMjEzMGY3NTdiZmZiOTUxOS4uMDBkM2Q4Mzc5NjJjMmZhNzI4MWVkNTQ4NTI4Yjc0 YTk4NmZiMjQ1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTAzLTMxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIENSQVNIIGluIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6YWRkQXVkaW9SZW5kZXJlcigpLCB1bmNhdWdo dCBPYmpDIGV4Y2VwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjA5ODI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MTExMzA4MD4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtW0FWU2FtcGxlQnVm ZmVyQXVkaW9SZW5kZXJlciBpbml0XSBjYW4sIGluIGV4Y2VwdGlvbmFsIGNvbmRpdGlvbnMsIHJl dHVybiBuaWwuIFBhc3NpbmcgYQorICAgICAgICBuaWwgb2JqZWN0LCBvciBhbm90aGVyIG9iamVj dCB0aGF0IEFWU2FtcGxlQnVmZmVyUmVuZGVyU3luY2hyb25pemVyIGNvbnNpZGVycyAiaW52YWxp ZCIsIGludG8KKyAgICAgICAgLVtBVlNhbXBsZUJ1ZmZlclJlbmRlclN5bmNocm9uaXplciBhZGRS ZW5kZXJlcjpdIHdpbGwgdGhyb3cgYW4gZXhjZXB0aW9uLiBQcm90ZWN0IGFnYWluc3QgdGhpcwor ICAgICAgICBzY2VuYXJpbyBpbiB0d28gd2F5czoKKworICAgICAgICAtIENoZWNrIHRoZSByZXR1 cm4gdmFsdWUgb2YgLVtBVlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXIgaW5pdF0sIGFuZCBpZiBu aWwsIGxvZyBhbiBlcnJvciwKKyAgICAgICAgICBhc3NlcnQsIGFuZCBzZXQgdGhlIG5ldHdvcmsg c3RhdGUgdG8gIkRlY29kZUVycm9yIi4KKyAgICAgICAgLSBXcmFwIGNhbGxzIHRvIC1hZGRSZW5k ZXJlcjogaW4gQHRyeS9AY2F0Y2ggYmxvY2tzLCB3aGljaCBpZiBjYXVnaHQsIGxvZyBhbiBlcnJv ciwgYXNzZXJ0LAorICAgICAgICAgIGFuZCBzZXQgdGhlIG5ldHdvcmsgc3RhdGUgdG8gIkRlY29k ZUVycm9yIi4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6ZW5zdXJlTGF5ZXIpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZl clByaXZhdGVBVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVyUHJpdmF0 ZUFWRk9iakM6OnRyYWNrRGlkQ2hhbmdlRW5hYmxlZCk6CisKIDIwMjAtMDMtMjQgIEplciBOb2Js ZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjU4MzE0KTog TGVhayBpbiBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OnVwZGF0ZUxhc3RQ aXhlbEJ1ZmZlcigpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMu bW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9N ZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0KaW5kZXggY2E5YmJiZTlkNWM3 NTZjM2UzMWJhZTk4NDU5MzQyNTliZmVmMDhlYi4uODJmZDQzZjczYTNhMGQ5M2Q2Mjk1N2M2YWE5 YWFjMTJmM2M2MzliZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpD Lm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9v YmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQpAQCAtNzYyLDYgKzc2 Miw3IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjplbnN1cmVM YXllcigpCiAgICAgICAgIHJldHVybjsKIAogICAgIG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVy ID0gYWRvcHROUyhbUEFMOjphbGxvY0FWU2FtcGxlQnVmZmVyRGlzcGxheUxheWVySW5zdGFuY2Uo KSBpbml0XSk7CisgICAgQVNTRVJUKG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyKTsKICNpZm5k ZWYgTkRFQlVHCiAgICAgW21fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyIHNldE5hbWU6QCJNZWRp YVBsYXllclByaXZhdGVNZWRpYVNvdXJjZSBBVlNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciJdOwog I2VuZGlmCkBAIC03ODUsNyArNzg2LDE2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFT b3VyY2VBVkZPYmpDOjplbnN1cmVMYXllcigpCiAgICAgaWYgKFttX3NhbXBsZUJ1ZmZlckRpc3Bs YXlMYXllciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHNldFByZXZlbnRzRGlzcGxheVNs ZWVwRHVyaW5nVmlkZW9QbGF5YmFjazopXSkKICAgICAgICAgbV9zYW1wbGVCdWZmZXJEaXNwbGF5 TGF5ZXIuZ2V0KCkucHJldmVudHNEaXNwbGF5U2xlZXBEdXJpbmdWaWRlb1BsYXliYWNrID0gTk87 CiAKLSAgICBbbV9zeW5jaHJvbml6ZXIgYWRkUmVuZGVyZXI6bV9zYW1wbGVCdWZmZXJEaXNwbGF5 TGF5ZXIuZ2V0KCldOworICAgIEB0cnkgeworICAgICAgICBbbV9zeW5jaHJvbml6ZXIgYWRkUmVu ZGVyZXI6bV9zYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIuZ2V0KCldOworICAgIH0gQGNhdGNoKE5T RXhjZXB0aW9uICpleGNlcHRpb24pIHsKKyAgICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJRVIs ICItW0FWU2FtcGxlQnVmZmVyUmVuZGVyU3luY2hyb25pemVyIGFkZFJlbmRlcmVyOl0gdGhyZXcg YW4gZXhjZXB0aW9uOiAiLCBbW2V4Y2VwdGlvbiBuYW1lXSBVVEY4U3RyaW5nXSwgIiwgcmVhc29u IDogIiwgW1tleGNlcHRpb24gcmVhc29uXSBVVEY4U3RyaW5nXSk7CisgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOworCisgICAgICAgIHNldE5ldHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6TmV0 d29ya1N0YXRlOjpEZWNvZGVFcnJvcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBp ZiAobV9tZWRpYVNvdXJjZVByaXZhdGUpCiAgICAgICAgIG1fbWVkaWFTb3VyY2VQcml2YXRlLT5z ZXRWaWRlb0xheWVyKG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyLmdldCgpKTsKICAgICBtX3Zp ZGVvTGF5ZXJNYW5hZ2VyLT5zZXRWaWRlb0xheWVyKG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVy LmdldCgpLCBzbmFwcGVkSW50UmVjdChtX3BsYXllci0+cGxheWVyQ29udGVudEJveFJlY3QoKSku c2l6ZSgpKTsKQEAgLTExNTMsNiArMTE2MywxMSBAQCBBTExPV19ORVdfQVBJX1dJVEhPVVRfR1VB UkRTX0JFR0lOCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6YWRk QXVkaW9SZW5kZXJlcihBVlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXIqIGF1ZGlvUmVuZGVyZXIp CiBBTExPV19ORVdfQVBJX1dJVEhPVVRfR1VBUkRTX0VORAogeworICAgIGlmICghYXVkaW9SZW5k ZXJlcikgeworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKwogICAgIGlmICghbV9zYW1wbGVCdWZmZXJBdWRpb1JlbmRlcmVyTWFwLmFkZCgoX19i cmlkZ2UgQ0ZUeXBlUmVmKWF1ZGlvUmVuZGVyZXIsIEF1ZGlvUmVuZGVyZXJQcm9wZXJ0aWVzKCkp LmlzTmV3RW50cnkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTE2MCw3ICsxMTc1LDE1IEBAIEFM TE9XX05FV19BUElfV0lUSE9VVF9HVUFSRFNfRU5ECiAgICAgW2F1ZGlvUmVuZGVyZXIgc2V0Vm9s dW1lOm1fcGxheWVyLT52b2x1bWUoKV07CiAgICAgW2F1ZGlvUmVuZGVyZXIgc2V0QXVkaW9UaW1l UGl0Y2hBbGdvcml0aG06KG1fcGxheWVyLT5wcmVzZXJ2ZXNQaXRjaCgpID8gQVZBdWRpb1RpbWVQ aXRjaEFsZ29yaXRobVNwZWN0cmFsIDogQVZBdWRpb1RpbWVQaXRjaEFsZ29yaXRobVZhcmlzcGVl ZCldOwogCi0gICAgW21fc3luY2hyb25pemVyIGFkZFJlbmRlcmVyOmF1ZGlvUmVuZGVyZXJdOwor ICAgIEB0cnkgeworICAgICAgICBbbV9zeW5jaHJvbml6ZXIgYWRkUmVuZGVyZXI6YXVkaW9SZW5k ZXJlcl07CisgICAgfSBAY2F0Y2goTlNFeGNlcHRpb24gKmV4Y2VwdGlvbikgeworICAgICAgICBF UlJPUl9MT0coTE9HSURFTlRJRklFUiwgIi1bQVZTYW1wbGVCdWZmZXJSZW5kZXJTeW5jaHJvbml6 ZXIgYWRkUmVuZGVyZXI6XSB0aHJldyBhbiBleGNlcHRpb246ICIsIFtbZXhjZXB0aW9uIG5hbWVd IFVURjhTdHJpbmddLCAiLCByZWFzb24gOiAiLCBbW2V4Y2VwdGlvbiByZWFzb25dIFVURjhTdHJp bmddKTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisKKyAgICAgICAgc2V0TmV0d29y a1N0YXRlKE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGU6OkRlY29kZUVycm9yKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KICAgICBtX3BsYXllci0+cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0gYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZG T2JqQy5tbQppbmRleCBiMmYxZGI2MjBhNTUyOTcyOTlhZGJlZWQzN2EzNTI4ZDExZmEzNTM2Li44 MjVmYmY0MjU0ZDA2MjJmMjhlNDdlMTg2YjRlN2IyMDZmMDAxNTVlIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZm ZXJQcml2YXRlQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGlj cy9hdmZvdW5kYXRpb24vb2JqYy9Tb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQy5tbQpAQCAtODk3 LDYgKzg5NywxNCBAQCB2b2lkIFNvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDOjp0cmFja0RpZENo YW5nZUVuYWJsZWQoQXVkaW9UcmFja1ByaXZhdGVNZWRpYVNvdQogICAgICAgICBBTExPV19ORVdf QVBJX1dJVEhPVVRfR1VBUkRTX0VORAogICAgICAgICBpZiAoIW1fYXVkaW9SZW5kZXJlcnMuY29u dGFpbnModHJhY2tJRCkpIHsKICAgICAgICAgICAgIHJlbmRlcmVyID0gYWRvcHROUyhbUEFMOjph bGxvY0FWU2FtcGxlQnVmZmVyQXVkaW9SZW5kZXJlckluc3RhbmNlKCkgaW5pdF0pOworCisgICAg ICAgICAgICBpZiAoIXJlbmRlcmVyKSB7CisgICAgICAgICAgICAgICAgRVJST1JfTE9HKExPR0lE RU5USUZJRVIsICItW0FWU2FtcGxlQnVmZmVyQXVkaW9SZW5kZXJlciBpbml0XSByZXR1cm5lZCBu aWwhIGJhaWxpbmchIik7CisgICAgICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7Cisg ICAgICAgICAgICAgICAgbV9tZWRpYVNvdXJjZS0+cGxheWVyKCktPnNldE5ldHdvcmtTdGF0ZShN ZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpEZWNvZGVFcnJvcik7CisgICAgICAgICAgICAgICAg cmV0dXJuOworICAgICAgICAgICAgfQorCiAgICAgICAgICAgICBhdXRvIHdlYWtUaGlzID0gbWFr ZVdlYWtQdHIoKnRoaXMpOwogICAgICAgICAgICAgW3JlbmRlcmVyIHJlcXVlc3RNZWRpYURhdGFX aGVuUmVhZHlPblF1ZXVlOmRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCkgdXNpbmdCbG9jazpeewog ICAgICAgICAgICAgICAgIGlmICh3ZWFrVGhpcykK 395117 2020-03-31 18:03:29 -0700 2020-04-01 11:57:23 -0700 Patch for landing bug-209827-20200331180329.patch text/plain 10859 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ0OGZiNmRiOWRhNDZi NjZkYmYwODExMjEzMGY3NTdiZmZiOTUxOS4uNWQ2MTcwMzViZjRkN2RkZTQxYmU0YmM3ZTU1MWJm ZmQ4YWUyODI4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIwLTAzLTMxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIENSQVNIIGluIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6YWRkQXVkaW9SZW5kZXJlcigpLCB1bmNhdWdo dCBPYmpDIGV4Y2VwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjA5ODI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MTExMzA4MD4KKworICAg ICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgLVtBVlNhbXBsZUJ1ZmZl ckF1ZGlvUmVuZGVyZXIgaW5pdF0gY2FuLCBpbiBleGNlcHRpb25hbCBjb25kaXRpb25zLCByZXR1 cm4gbmlsLiBQYXNzaW5nIGEKKyAgICAgICAgbmlsIG9iamVjdCwgb3IgYW5vdGhlciBvYmplY3Qg dGhhdCBBVlNhbXBsZUJ1ZmZlclJlbmRlclN5bmNocm9uaXplciBjb25zaWRlcnMgImludmFsaWQi LCBpbnRvCisgICAgICAgIC1bQVZTYW1wbGVCdWZmZXJSZW5kZXJTeW5jaHJvbml6ZXIgYWRkUmVu ZGVyZXI6XSB3aWxsIHRocm93IGFuIGV4Y2VwdGlvbi4gUHJvdGVjdCBhZ2FpbnN0IHRoaXMKKyAg ICAgICAgc2NlbmFyaW8gaW4gdHdvIHdheXM6CisKKyAgICAgICAgLSBDaGVjayB0aGUgcmV0dXJu IHZhbHVlIG9mIC1bQVZTYW1wbGVCdWZmZXJBdWRpb1JlbmRlcmVyIGluaXRdLCBhbmQgaWYgbmls LCBsb2cgYW4gZXJyb3IsCisgICAgICAgICAgbG9nIHRvIGNvbnNvbGUsIGFuZCBzZXQgdGhlIG5l dHdvcmsgc3RhdGUgdG8gIkRlY29kZUVycm9yIi4KKyAgICAgICAgLSBXcmFwIGNhbGxzIHRvIC1h ZGRSZW5kZXJlcjogaW4gQHRyeS9AY2F0Y2ggYmxvY2tzLCB3aGljaCBpZiBjYXVnaHQsIGxvZyBh biBlcnJvciwgbG9nIHRvIGNvbnNvbGUsCisgICAgICAgICAgYW5kIHNldCB0aGUgbmV0d29yayBz dGF0ZSB0byAiRGVjb2RlRXJyb3IiLgorCisgICAgICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9N ZWRpYVNvdXJjZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVNvdXJjZTo6ZmFpbGVkVG9D cmVhdGVSZW5kZXJlcik6CisgICAgICAgICogTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJj ZS5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhU291cmNlUHJpdmF0ZUNsaWVu dC5oOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1l ZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6ZW5zdXJlTGF5ZXIpOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU291cmNlUHJpdmF0 ZUFWRk9iakMuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFT b3VyY2VQcml2YXRlQVZGT2JqQzo6ZmFpbGVkVG9DcmVhdGVBdWRpb1JlbmRlcmVyKToKKyAgICAg ICAgKFdlYkNvcmU6Ok1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OmZhaWxlZFRvQ3JlYXRlVmlk ZW9SZW5kZXJlcik6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpTb3Vy Y2VCdWZmZXJQcml2YXRlQVZGT2JqQzo6dHJhY2tEaWRDaGFuZ2VFbmFibGVkKToKKwogMjAyMC0w My0yNCAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNT SU9OKHIyNTgzMTQpOiBMZWFrIGluIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2Jq Qzo6dXBkYXRlTGFzdFBpeGVsQnVmZmVyKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHAKaW5kZXggNGU0MTkzYmFiOTJjYjUyZmJiMDBj MGZhNmU4ZWMzMmQ0ODI1NDliZS4uYTg2M2JlMTRhNmJkNDU3N2M4ZTI4NTg2MTNiNzIzNzM5YjI2 OGZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRp YVNvdXJjZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRp YVNvdXJjZS5jcHAKQEAgLTEwOTQsNiArMTA5NCwxMiBAQCBXVEZMb2dDaGFubmVsJiBNZWRpYVNv dXJjZTo6bG9nQ2hhbm5lbCgpIGNvbnN0CiB9CiAjZW5kaWYKIAordm9pZCBNZWRpYVNvdXJjZTo6 ZmFpbGVkVG9DcmVhdGVSZW5kZXJlcihSZW5kZXJlclR5cGUgdHlwZSkKK3sKKyAgICBpZiAoYXV0 byBjb250ZXh0ID0gc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpKQorICAgICAgICBjb250ZXh0LT5h ZGRDb25zb2xlTWVzc2FnZShNZXNzYWdlU291cmNlOjpKUywgTWVzc2FnZUxldmVsOjpFcnJvciwg bWFrZVN0cmluZygiTWVkaWFTb3VyY2UgIiwgdHlwZSA9PSBSZW5kZXJlclR5cGU6OlZpZGVvID8g InZpZGVvIiA6ICJhdWRpbyIsICIgcmVuZGVyZXIgY3JlYXRpb24gZmFpbGVkLiIpKTsKK30KKwog fQogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3Vy Y2UvTWVkaWFTb3VyY2UuaCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVk aWFTb3VyY2UuaAppbmRleCA0MjViZjk3ZTgzOWQ3NTY3NDE2NjY3NGFjN2QwMGQ1MTIwNzI2MmQ0 Li5lYjJiMDE1YzYyNjYzNzZhZjM4ZTU5ZjQ0OGFjM2U2ZTZjZjQ2MWFiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlLmgKKysrIGIvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5oCkBAIC0xMjQsNiAr MTI0LDggQEAgcHVibGljOgogICAgIHZvaWQgc2V0TG9nSWRlbnRpZmllcihjb25zdCB2b2lkKikg ZmluYWw7CiAjZW5kaWYKIAorICAgIHZvaWQgZmFpbGVkVG9DcmVhdGVSZW5kZXJlcihSZW5kZXJl clR5cGUpIGZpbmFsOworCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IE1lZGlhU291cmNlKFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQmKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvTWVkaWFTb3VyY2VQcml2YXRlQ2xpZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9NZWRpYVNvdXJjZVByaXZhdGVDbGllbnQuaAppbmRleCAxOTQxMzgy ZWEyZTMyNmRkNmE2N2VhZjVjNDA0OTJhMTc3ZmUyYjQ0Li5hNWVkMjc1ZDY5NTE5ZmM0MWNjNDRj OGIyOTkzOTQ4MGUzZWUzNGJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9NZWRpYVNvdXJjZVByaXZhdGVDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9NZWRpYVNvdXJjZVByaXZhdGVDbGllbnQuaApAQCAtMzAsNiArMzAs NyBAQAogCiAjaW5jbHVkZSAiUGxhdGZvcm1UaW1lUmFuZ2VzLmgiCiAjaW5jbHVkZSA8d3RmL0xv Z2dlci5oPgorCiAjaW5jbHVkZSA8d3RmL1JlZkNvdW50ZWQuaD4KIAogbmFtZXNwYWNlIFdlYkNv cmUgewpAQCAtNTAsNiArNTEsOSBAQCBwdWJsaWM6CiAjaWYgIVJFTEVBU0VfTE9HX0RJU0FCTEVE CiAgICAgdmlydHVhbCB2b2lkIHNldExvZ0lkZW50aWZpZXIoY29uc3Qgdm9pZCopID0gMDsKICNl bmRpZgorCisgICAgZW51bSBjbGFzcyBSZW5kZXJlclR5cGUgeyBBdWRpbywgVmlkZW8gfTsKKyAg ICB2aXJ0dWFsIHZvaWQgZmFpbGVkVG9DcmVhdGVSZW5kZXJlcihSZW5kZXJlclR5cGUpID0gMDsK IH07CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2 Zm91bmRhdGlvbi9vYmpjL01lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbSBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQppbmRleCBjYTliYmJlOWQ1Yzc1NmMz ZTMxYmFlOTg0NTkzNDI1OWJmZWYwOGViLi41MmRhODU3ODVlNTg5ODY3NWZkOTI4MzcwMzA0NGU1 MThkYTA0MGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9h dmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMv TWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tCkBAIC03NjYsNiArNzY2LDE0 IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDOjplbnN1cmVMYXll cigpCiAgICAgW21fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyIHNldE5hbWU6QCJNZWRpYVBsYXll clByaXZhdGVNZWRpYVNvdXJjZSBBVlNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciJdOwogI2VuZGlm CiAKKyAgICBpZiAoIW1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyKSB7CisgICAgICAgIEVSUk9S X0xPRyhMT0dJREVOVElGSUVSLCAiRmFpbGVkIHRvIGNyZWF0ZSBBVlNhbXBsZUJ1ZmZlckRpc3Bs YXlMYXllciIpOworICAgICAgICBpZiAobV9tZWRpYVNvdXJjZVByaXZhdGUpCisgICAgICAgICAg ICBtX21lZGlhU291cmNlUHJpdmF0ZS0+ZmFpbGVkVG9DcmVhdGVWaWRlb1JlbmRlcmVyKCk7Cisg ICAgICAgIHNldE5ldHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpEZWNvZGVF cnJvcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICNpZiBIQVZFKEFWU0FNUExFQlVGRkVS VklERU9PVVRQVVQpCiAgICAgQVNTRVJUKCFtX3ZpZGVvT3V0cHV0KTsKICAgICBpZiAoaXNWaWRl b091dHB1dEF2YWlsYWJsZSgpKSB7CkBAIC03NzUsMTcgKzc4MywxOSBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6ZW5zdXJlTGF5ZXIoKQogICAgIH0KICNlbmRp ZgogCi0gICAgQVNTRVJUKG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyKTsKLSAgICBpZiAoIW1f c2FtcGxlQnVmZmVyRGlzcGxheUxheWVyKSB7Ci0gICAgICAgIEVSUk9SX0xPRyhMT0dJREVOVElG SUVSLCAiRmFpbGVkIHRvIGNyZWF0ZSBBVlNhbXBsZUJ1ZmZlckRpc3BsYXlMYXllciIpOworICAg IGlmIChbbV9zYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3RvcihzZXRQcmV2ZW50c0Rpc3BsYXlTbGVlcER1cmluZ1ZpZGVvUGxheWJhY2s6KV0pCisgICAg ICAgIG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyLmdldCgpLnByZXZlbnRzRGlzcGxheVNsZWVw RHVyaW5nVmlkZW9QbGF5YmFjayA9IE5POworCisgICAgQHRyeSB7CisgICAgICAgIFttX3N5bmNo cm9uaXplciBhZGRSZW5kZXJlcjptX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKV07Cisg ICAgfSBAY2F0Y2goTlNFeGNlcHRpb24gKmV4Y2VwdGlvbikgeworICAgICAgICBFUlJPUl9MT0co TE9HSURFTlRJRklFUiwgIi1bQVZTYW1wbGVCdWZmZXJSZW5kZXJTeW5jaHJvbml6ZXIgYWRkUmVu ZGVyZXI6XSB0aHJldyBhbiBleGNlcHRpb246ICIsIFtbZXhjZXB0aW9uIG5hbWVdIFVURjhTdHJp bmddLCAiLCByZWFzb24gOiAiLCBbW2V4Y2VwdGlvbiByZWFzb25dIFVURjhTdHJpbmddKTsKKyAg ICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisKICAgICAgICAgc2V0TmV0d29ya1N0YXRlKE1l ZGlhUGxheWVyOjpOZXR3b3JrU3RhdGU6OkRlY29kZUVycm9yKTsKICAgICAgICAgcmV0dXJuOwog ICAgIH0KIAotICAgIGlmIChbbV9zYW1wbGVCdWZmZXJEaXNwbGF5TGF5ZXIgcmVzcG9uZHNUb1Nl bGVjdG9yOkBzZWxlY3RvcihzZXRQcmV2ZW50c0Rpc3BsYXlTbGVlcER1cmluZ1ZpZGVvUGxheWJh Y2s6KV0pCi0gICAgICAgIG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyLmdldCgpLnByZXZlbnRz RGlzcGxheVNsZWVwRHVyaW5nVmlkZW9QbGF5YmFjayA9IE5POwotCi0gICAgW21fc3luY2hyb25p emVyIGFkZFJlbmRlcmVyOm1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyLmdldCgpXTsKICAgICBp ZiAobV9tZWRpYVNvdXJjZVByaXZhdGUpCiAgICAgICAgIG1fbWVkaWFTb3VyY2VQcml2YXRlLT5z ZXRWaWRlb0xheWVyKG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyLmdldCgpKTsKICAgICBtX3Zp ZGVvTGF5ZXJNYW5hZ2VyLT5zZXRWaWRlb0xheWVyKG1fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVy LmdldCgpLCBzbmFwcGVkSW50UmVjdChtX3BsYXllci0+cGxheWVyQ29udGVudEJveFJlY3QoKSku c2l6ZSgpKTsKQEAgLTExNTMsNiArMTE2MywxMSBAQCBBTExPV19ORVdfQVBJX1dJVEhPVVRfR1VB UkRTX0JFR0lOCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6YWRk QXVkaW9SZW5kZXJlcihBVlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXIqIGF1ZGlvUmVuZGVyZXIp CiBBTExPV19ORVdfQVBJX1dJVEhPVVRfR1VBUkRTX0VORAogeworICAgIGlmICghYXVkaW9SZW5k ZXJlcikgeworICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKKyAgICAgICAgcmV0dXJuOwor ICAgIH0KKwogICAgIGlmICghbV9zYW1wbGVCdWZmZXJBdWRpb1JlbmRlcmVyTWFwLmFkZCgoX19i cmlkZ2UgQ0ZUeXBlUmVmKWF1ZGlvUmVuZGVyZXIsIEF1ZGlvUmVuZGVyZXJQcm9wZXJ0aWVzKCkp LmlzTmV3RW50cnkpCiAgICAgICAgIHJldHVybjsKIApAQCAtMTE2MCw3ICsxMTc1LDE1IEBAIEFM TE9XX05FV19BUElfV0lUSE9VVF9HVUFSRFNfRU5ECiAgICAgW2F1ZGlvUmVuZGVyZXIgc2V0Vm9s dW1lOm1fcGxheWVyLT52b2x1bWUoKV07CiAgICAgW2F1ZGlvUmVuZGVyZXIgc2V0QXVkaW9UaW1l UGl0Y2hBbGdvcml0aG06KG1fcGxheWVyLT5wcmVzZXJ2ZXNQaXRjaCgpID8gQVZBdWRpb1RpbWVQ aXRjaEFsZ29yaXRobVNwZWN0cmFsIDogQVZBdWRpb1RpbWVQaXRjaEFsZ29yaXRobVZhcmlzcGVl ZCldOwogCi0gICAgW21fc3luY2hyb25pemVyIGFkZFJlbmRlcmVyOmF1ZGlvUmVuZGVyZXJdOwor ICAgIEB0cnkgeworICAgICAgICBbbV9zeW5jaHJvbml6ZXIgYWRkUmVuZGVyZXI6YXVkaW9SZW5k ZXJlcl07CisgICAgfSBAY2F0Y2goTlNFeGNlcHRpb24gKmV4Y2VwdGlvbikgeworICAgICAgICBF UlJPUl9MT0coTE9HSURFTlRJRklFUiwgIi1bQVZTYW1wbGVCdWZmZXJSZW5kZXJTeW5jaHJvbml6 ZXIgYWRkUmVuZGVyZXI6XSB0aHJldyBhbiBleGNlcHRpb246ICIsIFtbZXhjZXB0aW9uIG5hbWVd IFVURjhTdHJpbmddLCAiLCByZWFzb24gOiAiLCBbW2V4Y2VwdGlvbiByZWFzb25dIFVURjhTdHJp bmddKTsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CisKKyAgICAgICAgc2V0TmV0d29y a1N0YXRlKE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGU6OkRlY29kZUVycm9yKTsKKyAgICAgICAg cmV0dXJuOworICAgIH0KICAgICBtX3BsYXllci0+cmVuZGVyaW5nTW9kZUNoYW5nZWQoKTsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQy5oIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTb3VyY2VQcml2YXRlQVZGT2Jq Qy5oCmluZGV4IGU0MjFjZWZiMDJlNTlkYzQ0ZDc0ZmZjYTZjODFhMjM1NjNhMTVjYjQuLjVhZWY5 ZWQ4Y2Q3OWU0MmE0OWQzN2NmNmUwZThhMmQwNjEzMDIwZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU291cmNlUHJp dmF0ZUFWRk9iakMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZv dW5kYXRpb24vb2JqYy9NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDLmgKQEAgLTExMCw2ICsxMTAs OSBAQCBwdWJsaWM6CiAgICAgY29uc3Qgdm9pZCogbmV4dFNvdXJjZUJ1ZmZlckxvZ0lkZW50aWZp ZXIoKSB7IHJldHVybiBjaGlsZExvZ0lkZW50aWZpZXIobV9sb2dJZGVudGlmaWVyLCArK21fbmV4 dFNvdXJjZUJ1ZmZlcklEKTsgfQogI2VuZGlmCiAKKyAgICB2b2lkIGZhaWxlZFRvQ3JlYXRlVmlk ZW9SZW5kZXJlcigpOworICAgIHZvaWQgZmFpbGVkVG9DcmVhdGVBdWRpb1JlbmRlcmVyKCk7CisK IHByaXZhdGU6CiAgICAgTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQyhNZWRpYVBsYXllclByaXZh dGVNZWRpYVNvdXJjZUFWRk9iakMqLCBNZWRpYVNvdXJjZVByaXZhdGVDbGllbnQqKTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29i amMvTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU291cmNlUHJpdmF0ZUFWRk9iakMubW0K aW5kZXggMGU3YWUwNTNkOWRjZjMyYWM4ZTFiN2I5ZmZkZTUxOTA1NmQyNzI2ZC4uYzg2NzhkZWJm NDc4ZTg1MDBlMGU2OTIyZTE0NWE5NTUyOTMxOGVjYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTb3VyY2VQcml2YXRl QVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5k YXRpb24vb2JqYy9NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDLm1tCkBAIC0zMjUsNiArMzI1LDE2 IEBAIFdURkxvZ0NoYW5uZWwmIE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OmxvZ0NoYW5uZWwo KSBjb25zdAogfQogI2VuZGlmCiAKK3ZvaWQgTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6ZmFp bGVkVG9DcmVhdGVBdWRpb1JlbmRlcmVyKCkKK3sKKyAgICBtX2NsaWVudC0+ZmFpbGVkVG9DcmVh dGVSZW5kZXJlcihNZWRpYVNvdXJjZVByaXZhdGVDbGllbnQ6OlJlbmRlcmVyVHlwZTo6QXVkaW8p OworfQorCit2b2lkIE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OmZhaWxlZFRvQ3JlYXRlVmlk ZW9SZW5kZXJlcigpCit7CisgICAgbV9jbGllbnQtPmZhaWxlZFRvQ3JlYXRlUmVuZGVyZXIoTWVk aWFTb3VyY2VQcml2YXRlQ2xpZW50OjpSZW5kZXJlclR5cGU6OlZpZGVvKTsKK30KKwogfQogCiAj ZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NPVVJDRSkgJiYgVVNFKEFWRk9VTkRBVElPTikKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpj L1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0K aW5kZXggYjJmMWRiNjIwYTU1Mjk3Mjk5YWRiZWVkMzdhMzUyOGQxMWZhMzUzNi4uY2I2ZTE0ZmM2 YWFhN2NjMDA0MTFmMjUxMTRkZDQwODNkYTc3MWE0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0 ZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3Vu ZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0KQEAgLTg5Nyw2ICs4OTcs MTUgQEAgdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRlQVZGT2JqQzo6dHJhY2tEaWRDaGFuZ2VFbmFi bGVkKEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTb3UKICAgICAgICAgQUxMT1dfTkVXX0FQSV9XSVRI T1VUX0dVQVJEU19FTkQKICAgICAgICAgaWYgKCFtX2F1ZGlvUmVuZGVyZXJzLmNvbnRhaW5zKHRy YWNrSUQpKSB7CiAgICAgICAgICAgICByZW5kZXJlciA9IGFkb3B0TlMoW1BBTDo6YWxsb2NBVlNh bXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXJJbnN0YW5jZSgpIGluaXRdKTsKKworICAgICAgICAgICAg aWYgKCFyZW5kZXJlcikgeworICAgICAgICAgICAgICAgIEVSUk9SX0xPRyhMT0dJREVOVElGSUVS LCAiLVtBVlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXIgaW5pdF0gcmV0dXJuZWQgbmlsISBiYWls aW5nISIpOworICAgICAgICAgICAgICAgIGlmIChtX21lZGlhU291cmNlKQorICAgICAgICAgICAg ICAgICAgICBtX21lZGlhU291cmNlLT5mYWlsZWRUb0NyZWF0ZUF1ZGlvUmVuZGVyZXIoKTsKKyAg ICAgICAgICAgICAgICBtX21lZGlhU291cmNlLT5wbGF5ZXIoKS0+c2V0TmV0d29ya1N0YXRlKE1l ZGlhUGxheWVyOjpOZXR3b3JrU3RhdGU6OkRlY29kZUVycm9yKTsKKyAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICB9CisKICAgICAgICAgICAgIGF1dG8gd2Vha1RoaXMgPSBtYWtl V2Vha1B0cigqdGhpcyk7CiAgICAgICAgICAgICBbcmVuZGVyZXIgcmVxdWVzdE1lZGlhRGF0YVdo ZW5SZWFkeU9uUXVldWU6ZGlzcGF0Y2hfZ2V0X21haW5fcXVldWUoKSB1c2luZ0Jsb2NrOl57CiAg ICAgICAgICAgICAgICAgaWYgKHdlYWtUaGlzKQo= 395191 2020-04-01 11:57:25 -0700 2020-04-01 14:15:24 -0700 Patch for landing bug-209827-20200401115724.patch text/plain 10813 jer.noble U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5MjA2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTUxZDkxNzVlM2FhYTBm ZGE2YjUxZWRmMDhmNWM1Mjk3ZWQ1OGJiYi4uMzMyNjU0N2U0YjU3MjVkMjMwNDZjNjBmYTYzOWZh OTBhMzU4Y2FhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDIwLTAzLTMxICBKZXIg Tm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgorCisgICAgICAgIENSQVNIIGluIE1lZGlhUGxh eWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQzo6YWRkQXVkaW9SZW5kZXJlcigpLCB1bmNhdWdo dCBPYmpDIGV4Y2VwdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjA5ODI3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MTExMzA4MD4KKworICAg ICAgICBSZXZpZXdlZCBieSBFcmljIENhcmxzb24uCisKKyAgICAgICAgLVtBVlNhbXBsZUJ1ZmZl ckF1ZGlvUmVuZGVyZXIgaW5pdF0gY2FuLCBpbiBleGNlcHRpb25hbCBjb25kaXRpb25zLCByZXR1 cm4gbmlsLiBQYXNzaW5nIGEKKyAgICAgICAgbmlsIG9iamVjdCwgb3IgYW5vdGhlciBvYmplY3Qg dGhhdCBBVlNhbXBsZUJ1ZmZlclJlbmRlclN5bmNocm9uaXplciBjb25zaWRlcnMgImludmFsaWQi LCBpbnRvCisgICAgICAgIC1bQVZTYW1wbGVCdWZmZXJSZW5kZXJTeW5jaHJvbml6ZXIgYWRkUmVu ZGVyZXI6XSB3aWxsIHRocm93IGFuIGV4Y2VwdGlvbi4gUHJvdGVjdCBhZ2FpbnN0IHRoaXMKKyAg ICAgICAgc2NlbmFyaW8gaW4gdHdvIHdheXM6CisKKyAgICAgICAgLSBDaGVjayB0aGUgcmV0dXJu IHZhbHVlIG9mIC1bQVZTYW1wbGVCdWZmZXJBdWRpb1JlbmRlcmVyIGluaXRdLCBhbmQgaWYgbmls LCBsb2cgYW4gZXJyb3IsCisgICAgICAgICAgbG9nIHRvIGNvbnNvbGUsIGFuZCBzZXQgdGhlIG5l dHdvcmsgc3RhdGUgdG8gIkRlY29kZUVycm9yIi4KKyAgICAgICAgLSBXcmFwIGNhbGxzIHRvIC1h ZGRSZW5kZXJlcjogaW4gQHRyeS9AY2F0Y2ggYmxvY2tzLCB3aGljaCBpZiBjYXVnaHQsIGxvZyBh biBlcnJvciwgYXNzZXJ0LAorICAgICAgICAgIGFuZCBzZXQgdGhlIG5ldHdvcmsgc3RhdGUgdG8g IkRlY29kZUVycm9yIi4KKworICAgICAgICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3Vy Y2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTb3VyY2U6OmZhaWxlZFRvQ3JlYXRlUmVu ZGVyZXIpOgorICAgICAgICAqIE1vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVNvdXJjZVByaXZhdGVDbGllbnQuaDoKKyAg ICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclBy aXZhdGVNZWRpYVNvdXJjZUFWRk9iakMubW06CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXll clByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmVuc3VyZUxheWVyKToKKyAgICAgICAgKiBwbGF0 Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpD Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFT b3VyY2VQcml2YXRlQVZGT2JqQy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU291cmNlUHJp dmF0ZUFWRk9iakM6OmZhaWxlZFRvQ3JlYXRlQXVkaW9SZW5kZXJlcik6CisgICAgICAgIChXZWJD b3JlOjpNZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDOjpmYWlsZWRUb0NyZWF0ZVZpZGVvUmVuZGVy ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJj ZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1tOgorICAgICAgICAoV2ViQ29yZTo6U291cmNlQnVmZmVy UHJpdmF0ZUFWRk9iakM6OnRyYWNrRGlkQ2hhbmdlRW5hYmxlZCk6CisKIDIwMjAtMDMtMzEgIEpl ciBOb2JsZSAgPGplci5ub2JsZUBhcHBsZS5jb20+CiAKICAgICAgICAgRG9uJ3QgdXNlIHJhdyBw b2ludGVycyBpbiBTaGFkb3dSb290LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9tZWRpYXNvdXJjZS9NZWRpYVNvdXJjZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21l ZGlhc291cmNlL01lZGlhU291cmNlLmNwcAppbmRleCA0ZTQxOTNiYWI5MmNiNTJmYmIwMGMwZmE2 ZThlYzMyZDQ4MjU0OWJlLi5hODYzYmUxNGE2YmQ0NTc3YzhlMjg1ODYxM2I3MjM3MzliMjY4ZmUx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291 cmNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291 cmNlLmNwcApAQCAtMTA5NCw2ICsxMDk0LDEyIEBAIFdURkxvZ0NoYW5uZWwmIE1lZGlhU291cmNl Ojpsb2dDaGFubmVsKCkgY29uc3QKIH0KICNlbmRpZgogCit2b2lkIE1lZGlhU291cmNlOjpmYWls ZWRUb0NyZWF0ZVJlbmRlcmVyKFJlbmRlcmVyVHlwZSB0eXBlKQoreworICAgIGlmIChhdXRvIGNv bnRleHQgPSBzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpCisgICAgICAgIGNvbnRleHQtPmFkZENv bnNvbGVNZXNzYWdlKE1lc3NhZ2VTb3VyY2U6OkpTLCBNZXNzYWdlTGV2ZWw6OkVycm9yLCBtYWtl U3RyaW5nKCJNZWRpYVNvdXJjZSAiLCB0eXBlID09IFJlbmRlcmVyVHlwZTo6VmlkZW8gPyAidmlk ZW8iIDogImF1ZGlvIiwgIiByZW5kZXJlciBjcmVhdGlvbiBmYWlsZWQuIikpOworfQorCiB9CiAK ICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9N ZWRpYVNvdXJjZS5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tZWRpYXNvdXJjZS9NZWRpYVNv dXJjZS5oCmluZGV4IDQyNWJmOTdlODM5ZDc1Njc0MTY2Njc0YWM3ZDAwZDUxMjA3MjYyZDQuLmVi MmIwMTVjNjI2NjM3NmFmMzhlNTlmNDQ4YWMzZTZlNmNmNDYxYWIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvbWVkaWFzb3VyY2UvTWVkaWFTb3VyY2UuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9Nb2R1bGVzL21lZGlhc291cmNlL01lZGlhU291cmNlLmgKQEAgLTEyNCw2ICsxMjQs OCBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRMb2dJZGVudGlmaWVyKGNvbnN0IHZvaWQqKSBmaW5h bDsKICNlbmRpZgogCisgICAgdm9pZCBmYWlsZWRUb0NyZWF0ZVJlbmRlcmVyKFJlbmRlcmVyVHlw ZSkgZmluYWw7CisKIHByaXZhdGU6CiAgICAgZXhwbGljaXQgTWVkaWFTb3VyY2UoU2NyaXB0RXhl Y3V0aW9uQ29udGV4dCYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9NZWRpYVNvdXJjZVByaXZhdGVDbGllbnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhU291cmNlUHJpdmF0ZUNsaWVudC5oCmluZGV4IDE5NDEzODJlYTJl MzI2ZGQ2YTY3ZWFmNWM0MDQ5MmExNzdmZTJiNDQuLjNmZTJhZDRlODUxNWIyMjliZmVjOTA1Y2Ew MDg5MjQ1YWY5ODA0MDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL01lZGlhU291cmNlUHJpdmF0ZUNsaWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL01lZGlhU291cmNlUHJpdmF0ZUNsaWVudC5oCkBAIC01MCw2ICs1MCw5IEBA IHB1YmxpYzoKICNpZiAhUkVMRUFTRV9MT0dfRElTQUJMRUQKICAgICB2aXJ0dWFsIHZvaWQgc2V0 TG9nSWRlbnRpZmllcihjb25zdCB2b2lkKikgPSAwOwogI2VuZGlmCisKKyAgICBlbnVtIGNsYXNz IFJlbmRlcmVyVHlwZSB7IEF1ZGlvLCBWaWRlbyB9OworICAgIHZpcnR1YWwgdm9pZCBmYWlsZWRU b0NyZWF0ZVJlbmRlcmVyKFJlbmRlcmVyVHlwZSkgPSAwOwogfTsKIAogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQ bGF5ZXJQcml2YXRlTWVkaWFTb3VyY2VBVkZPYmpDLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFQbGF5ZXJQcml2YXRlTWVkaWFTb3Vy Y2VBVkZPYmpDLm1tCmluZGV4IGNhOWJiYmU5ZDVjNzU2YzNlMzFiYWU5ODQ1OTM0MjU5YmZlZjA4 ZWIuLmI4MjQwM2Q3ZDgyN2U3NzIxYmE5ZjkyNWIzYWMyMjI1MjkwZGZiYTIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh UGxheWVyUHJpdmF0ZU1lZGlhU291cmNlQVZGT2JqQy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRpYVBsYXllclByaXZhdGVNZWRp YVNvdXJjZUFWRk9iakMubW0KQEAgLTc2Niw2ICs3NjYsMTQgQEAgdm9pZCBNZWRpYVBsYXllclBy aXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmVuc3VyZUxheWVyKCkKICAgICBbbV9zYW1wbGVCdWZm ZXJEaXNwbGF5TGF5ZXIgc2V0TmFtZTpAIk1lZGlhUGxheWVyUHJpdmF0ZU1lZGlhU291cmNlIEFW U2FtcGxlQnVmZmVyRGlzcGxheUxheWVyIl07CiAjZW5kaWYKIAorICAgIGlmICghbV9zYW1wbGVC dWZmZXJEaXNwbGF5TGF5ZXIpIHsKKyAgICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJRVIsICJG YWlsZWQgdG8gY3JlYXRlIEFWU2FtcGxlQnVmZmVyRGlzcGxheUxheWVyIik7CisgICAgICAgIGlm IChtX21lZGlhU291cmNlUHJpdmF0ZSkKKyAgICAgICAgICAgIG1fbWVkaWFTb3VyY2VQcml2YXRl LT5mYWlsZWRUb0NyZWF0ZVJlbmRlcmVyKE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OlJlbmRl cmVyVHlwZTo6VmlkZW8pOworICAgICAgICBzZXROZXR3b3JrU3RhdGUoTWVkaWFQbGF5ZXI6Ok5l dHdvcmtTdGF0ZTo6RGVjb2RlRXJyb3IpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAjaWYg SEFWRShBVlNBTVBMRUJVRkZFUlZJREVPT1VUUFVUKQogICAgIEFTU0VSVCghbV92aWRlb091dHB1 dCk7CiAgICAgaWYgKGlzVmlkZW9PdXRwdXRBdmFpbGFibGUoKSkgewpAQCAtNzc1LDE3ICs3ODMs MTkgQEAgdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFWRk9iakM6OmVuc3VyZUxh eWVyKCkKICAgICB9CiAjZW5kaWYKIAotICAgIEFTU0VSVChtX3NhbXBsZUJ1ZmZlckRpc3BsYXlM YXllcik7Ci0gICAgaWYgKCFtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllcikgewotICAgICAgICBF UlJPUl9MT0coTE9HSURFTlRJRklFUiwgIkZhaWxlZCB0byBjcmVhdGUgQVZTYW1wbGVCdWZmZXJE aXNwbGF5TGF5ZXIiKTsKKyAgICBpZiAoW21fc2FtcGxlQnVmZmVyRGlzcGxheUxheWVyIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0UHJldmVudHNEaXNwbGF5U2xlZXBEdXJpbmdWaWRl b1BsYXliYWNrOildKQorICAgICAgICBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKS5w cmV2ZW50c0Rpc3BsYXlTbGVlcER1cmluZ1ZpZGVvUGxheWJhY2sgPSBOTzsKKworICAgIEB0cnkg eworICAgICAgICBbbV9zeW5jaHJvbml6ZXIgYWRkUmVuZGVyZXI6bV9zYW1wbGVCdWZmZXJEaXNw bGF5TGF5ZXIuZ2V0KCldOworICAgIH0gQGNhdGNoKE5TRXhjZXB0aW9uICpleGNlcHRpb24pIHsK KyAgICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJRVIsICItW0FWU2FtcGxlQnVmZmVyUmVuZGVy U3luY2hyb25pemVyIGFkZFJlbmRlcmVyOl0gdGhyZXcgYW4gZXhjZXB0aW9uOiAiLCBbW2V4Y2Vw dGlvbiBuYW1lXSBVVEY4U3RyaW5nXSwgIiwgcmVhc29uIDogIiwgW1tleGNlcHRpb24gcmVhc29u XSBVVEY4U3RyaW5nXSk7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworCiAgICAgICAg IHNldE5ldHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpEZWNvZGVFcnJvcik7 CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoW21fc2FtcGxlQnVmZmVyRGlzcGxh eUxheWVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Ioc2V0UHJldmVudHNEaXNwbGF5U2xl ZXBEdXJpbmdWaWRlb1BsYXliYWNrOildKQotICAgICAgICBtX3NhbXBsZUJ1ZmZlckRpc3BsYXlM YXllci5nZXQoKS5wcmV2ZW50c0Rpc3BsYXlTbGVlcER1cmluZ1ZpZGVvUGxheWJhY2sgPSBOTzsK LQotICAgIFttX3N5bmNocm9uaXplciBhZGRSZW5kZXJlcjptX3NhbXBsZUJ1ZmZlckRpc3BsYXlM YXllci5nZXQoKV07CiAgICAgaWYgKG1fbWVkaWFTb3VyY2VQcml2YXRlKQogICAgICAgICBtX21l ZGlhU291cmNlUHJpdmF0ZS0+c2V0VmlkZW9MYXllcihtX3NhbXBsZUJ1ZmZlckRpc3BsYXlMYXll ci5nZXQoKSk7CiAgICAgbV92aWRlb0xheWVyTWFuYWdlci0+c2V0VmlkZW9MYXllcihtX3NhbXBs ZUJ1ZmZlckRpc3BsYXlMYXllci5nZXQoKSwgc25hcHBlZEludFJlY3QobV9wbGF5ZXItPnBsYXll ckNvbnRlbnRCb3hSZWN0KCkpLnNpemUoKSk7CkBAIC0xMTUzLDYgKzExNjMsMTEgQEAgQUxMT1df TkVXX0FQSV9XSVRIT1VUX0dVQVJEU19CRUdJTgogdm9pZCBNZWRpYVBsYXllclByaXZhdGVNZWRp YVNvdXJjZUFWRk9iakM6OmFkZEF1ZGlvUmVuZGVyZXIoQVZTYW1wbGVCdWZmZXJBdWRpb1JlbmRl cmVyKiBhdWRpb1JlbmRlcmVyKQogQUxMT1dfTkVXX0FQSV9XSVRIT1VUX0dVQVJEU19FTkQKIHsK KyAgICBpZiAoIWF1ZGlvUmVuZGVyZXIpIHsKKyAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBpZiAoIW1fc2FtcGxlQnVmZmVyQXVkaW9S ZW5kZXJlck1hcC5hZGQoKF9fYnJpZGdlIENGVHlwZVJlZilhdWRpb1JlbmRlcmVyLCBBdWRpb1Jl bmRlcmVyUHJvcGVydGllcygpKS5pc05ld0VudHJ5KQogICAgICAgICByZXR1cm47CiAKQEAgLTEx NjAsNyArMTE3NSwxNSBAQCBBTExPV19ORVdfQVBJX1dJVEhPVVRfR1VBUkRTX0VORAogICAgIFth dWRpb1JlbmRlcmVyIHNldFZvbHVtZTptX3BsYXllci0+dm9sdW1lKCldOwogICAgIFthdWRpb1Jl bmRlcmVyIHNldEF1ZGlvVGltZVBpdGNoQWxnb3JpdGhtOihtX3BsYXllci0+cHJlc2VydmVzUGl0 Y2goKSA/IEFWQXVkaW9UaW1lUGl0Y2hBbGdvcml0aG1TcGVjdHJhbCA6IEFWQXVkaW9UaW1lUGl0 Y2hBbGdvcml0aG1WYXJpc3BlZWQpXTsKIAotICAgIFttX3N5bmNocm9uaXplciBhZGRSZW5kZXJl cjphdWRpb1JlbmRlcmVyXTsKKyAgICBAdHJ5IHsKKyAgICAgICAgW21fc3luY2hyb25pemVyIGFk ZFJlbmRlcmVyOmF1ZGlvUmVuZGVyZXJdOworICAgIH0gQGNhdGNoKE5TRXhjZXB0aW9uICpleGNl cHRpb24pIHsKKyAgICAgICAgRVJST1JfTE9HKExPR0lERU5USUZJRVIsICItW0FWU2FtcGxlQnVm ZmVyUmVuZGVyU3luY2hyb25pemVyIGFkZFJlbmRlcmVyOl0gdGhyZXcgYW4gZXhjZXB0aW9uOiAi LCBbW2V4Y2VwdGlvbiBuYW1lXSBVVEY4U3RyaW5nXSwgIiwgcmVhc29uIDogIiwgW1tleGNlcHRp b24gcmVhc29uXSBVVEY4U3RyaW5nXSk7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwor CisgICAgICAgIHNldE5ldHdvcmtTdGF0ZShNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlOjpEZWNv ZGVFcnJvcik7CisgICAgICAgIHJldHVybjsKKyAgICB9CiAgICAgbV9wbGF5ZXItPnJlbmRlcmlu Z01vZGVDaGFuZ2VkKCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlhU291cmNlUHJpdmF0ZUFWRk9iakMuaCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL01lZGlh U291cmNlUHJpdmF0ZUFWRk9iakMuaAppbmRleCBlNDIxY2VmYjAyZTU5ZGM0NGQ3NGZmY2E2Yzgx YTIzNTYzYTE1Y2I0Li5lMWU0YWE3ODY5NWYwMDQ4ZjBjZmNjODI0MTZhMjA5NDhmNmRhY2U2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24v b2JqYy9NZWRpYVNvdXJjZVByaXZhdGVBVkZPYmpDLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTb3VyY2VQcml2YXRlQVZGT2Jq Qy5oCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgRU5BQkxFKE1FRElBX1NPVVJDRSkgJiYgVVNFKEFW Rk9VTkRBVElPTikKIAogI2luY2x1ZGUgIk1lZGlhU291cmNlUHJpdmF0ZS5oIgorI2luY2x1ZGUg Ik1lZGlhU291cmNlUHJpdmF0ZUNsaWVudC5oIgogI2luY2x1ZGUgPHd0Zi9EZXF1ZS5oPgogI2lu Y2x1ZGUgPHd0Zi9Mb2dnZXJIZWxwZXIuaD4KICNpbmNsdWRlIDx3dGYvUmVmUHRyLmg+CkBAIC0x MTAsNiArMTExLDkgQEAgcHVibGljOgogICAgIGNvbnN0IHZvaWQqIG5leHRTb3VyY2VCdWZmZXJM b2dJZGVudGlmaWVyKCkgeyByZXR1cm4gY2hpbGRMb2dJZGVudGlmaWVyKG1fbG9nSWRlbnRpZmll ciwgKyttX25leHRTb3VyY2VCdWZmZXJJRCk7IH0KICNlbmRpZgogCisgICAgdXNpbmcgUmVuZGVy ZXJUeXBlID0gTWVkaWFTb3VyY2VQcml2YXRlQ2xpZW50OjpSZW5kZXJlclR5cGU7CisgICAgdm9p ZCBmYWlsZWRUb0NyZWF0ZVJlbmRlcmVyKFJlbmRlcmVyVHlwZSk7CisKIHByaXZhdGU6CiAgICAg TWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQyhNZWRpYVBsYXllclByaXZhdGVNZWRpYVNvdXJjZUFW Rk9iakMqLCBNZWRpYVNvdXJjZVByaXZhdGVDbGllbnQqKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTb3VyY2VQ cml2YXRlQVZGT2JqQy5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91 bmRhdGlvbi9vYmpjL01lZGlhU291cmNlUHJpdmF0ZUFWRk9iakMubW0KaW5kZXggMGU3YWUwNTNk OWRjZjMyYWM4ZTFiN2I5ZmZkZTUxOTA1NmQyNzI2ZC4uZWFjNDQ0Y2I2NmYwZGE2NjU2ZTVkYWU1 MDgwODYxY2I1NjViZWI4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvYXZmb3VuZGF0aW9uL29iamMvTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQy5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9NZWRp YVNvdXJjZVByaXZhdGVBVkZPYmpDLm1tCkBAIC0zMjUsNiArMzI1LDExIEBAIFdURkxvZ0NoYW5u ZWwmIE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OmxvZ0NoYW5uZWwoKSBjb25zdAogfQogI2Vu ZGlmCiAKK3ZvaWQgTWVkaWFTb3VyY2VQcml2YXRlQVZGT2JqQzo6ZmFpbGVkVG9DcmVhdGVSZW5k ZXJlcihSZW5kZXJlclR5cGUgdHlwZSkKK3sKKyAgICBtX2NsaWVudC0+ZmFpbGVkVG9DcmVhdGVS ZW5kZXJlcih0eXBlKTsKK30KKwogfQogCiAjZW5kaWYgLy8gRU5BQkxFKE1FRElBX1NPVVJDRSkg JiYgVVNFKEFWRk9VTkRBVElPTikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1NvdXJjZUJ1ZmZlclByaXZhdGVBVkZPYmpDLm1t IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291 cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0KaW5kZXggYjJmMWRiNjIwYTU1Mjk3Mjk5YWRiZWVk MzdhMzUyOGQxMWZhMzUzNi4uNDkwOWZkZGE5Y2M4Zjg3YWFhYzgzNWRkMTg4ZmFlY2E1YzYwNjUz NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0 aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0ZUFWRk9iakMubW0KKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvU291cmNlQnVmZmVyUHJpdmF0 ZUFWRk9iakMubW0KQEAgLTg5Nyw2ICs4OTcsMTUgQEAgdm9pZCBTb3VyY2VCdWZmZXJQcml2YXRl QVZGT2JqQzo6dHJhY2tEaWRDaGFuZ2VFbmFibGVkKEF1ZGlvVHJhY2tQcml2YXRlTWVkaWFTb3UK ICAgICAgICAgQUxMT1dfTkVXX0FQSV9XSVRIT1VUX0dVQVJEU19FTkQKICAgICAgICAgaWYgKCFt X2F1ZGlvUmVuZGVyZXJzLmNvbnRhaW5zKHRyYWNrSUQpKSB7CiAgICAgICAgICAgICByZW5kZXJl ciA9IGFkb3B0TlMoW1BBTDo6YWxsb2NBVlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVyZXJJbnN0YW5j ZSgpIGluaXRdKTsKKworICAgICAgICAgICAgaWYgKCFyZW5kZXJlcikgeworICAgICAgICAgICAg ICAgIEVSUk9SX0xPRyhMT0dJREVOVElGSUVSLCAiLVtBVlNhbXBsZUJ1ZmZlckF1ZGlvUmVuZGVy ZXIgaW5pdF0gcmV0dXJuZWQgbmlsISBiYWlsaW5nISIpOworICAgICAgICAgICAgICAgIGlmICht X21lZGlhU291cmNlKQorICAgICAgICAgICAgICAgICAgICBtX21lZGlhU291cmNlLT5mYWlsZWRU b0NyZWF0ZVJlbmRlcmVyKE1lZGlhU291cmNlUHJpdmF0ZUFWRk9iakM6OlJlbmRlcmVyVHlwZTo6 QXVkaW8pOworICAgICAgICAgICAgICAgIG1fbWVkaWFTb3VyY2UtPnBsYXllcigpLT5zZXROZXR3 b3JrU3RhdGUoTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZTo6RGVjb2RlRXJyb3IpOworICAgICAg ICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAgICAgYXV0byB3ZWFr VGhpcyA9IG1ha2VXZWFrUHRyKCp0aGlzKTsKICAgICAgICAgICAgIFtyZW5kZXJlciByZXF1ZXN0 TWVkaWFEYXRhV2hlblJlYWR5T25RdWV1ZTpkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpIHVzaW5n QmxvY2s6XnsKICAgICAgICAgICAgICAgICBpZiAod2Vha1RoaXMpCg==