138614 2014-11-11 10:39:27 -0800 [iOS] cleanup wireless route monitoring 2014-11-13 18:49:40 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson calvaris commit-queue esprehn+autocc glenn gyuyoung.kim jer.noble philipj sergio oldest_to_newest 1047884 0 eric.carlson 2014-11-11 10:39:27 -0800 Cleanup. 1047885 1 eric.carlson 2014-11-11 10:39:57 -0800 <rdar://problem/18930328> 1047886 2 eric.carlson 2014-11-11 10:40:33 -0800 <rdar://problem/18940875> 1047888 3 241358 eric.carlson 2014-11-11 10:55:45 -0800 Created attachment 241358 Proposed patch. 1047891 4 commit-queue 2014-11-11 10:58:23 -0800 Attachment 241358 did not pass style-queue: ERROR: Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:263: Use 'WTF::move()' instead of 'std::move()'. [runtime/wtf_move] [4] ERROR: Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:264: Use 'WTF::move()' instead of 'std::move()'. [runtime/wtf_move] [4] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 1047895 5 241358 jer.noble 2014-11-11 11:01:35 -0800 Comment on attachment 241358 Proposed patch. View in context: https://bugs.webkit.org/attachment.cgi?id=241358&action=review r=me, with nits. > Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:239 > + LOG(Media, "WebMediaSessionHelper::initWithCallback"); Maybe: "-[WebMediaSessionHelper initWithCallback]"? > Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:266 > - (void)dealloc > { > + LOG(Media, "WebMediaSessionHelper::initWithCallback"); Really? ;) > Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:270 > + auto volumeView = std::move(_volumeView); > + auto routingController = std::move(_airPlayPresenceRoutingController); I think we're supposed to use WTF::move() now. > Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm:273 > + LOG(Media, "WebMediaSessionHelper::initWithCallback - dipatched to MainThread"); initWithCallback -> dealloc 1047900 6 241362 eric.carlson 2014-11-11 11:08:50 -0800 Created attachment 241362 Patch for landing. 1047972 7 241362 commit-queue 2014-11-11 14:03:16 -0800 Comment on attachment 241362 Patch for landing. Clearing flags on attachment: 241362 Committed r175976: <http://trac.webkit.org/changeset/175976> 241358 2014-11-11 10:55:45 -0800 2014-11-11 11:01:35 -0800 Proposed patch. patch_3.txt text/plain 9448 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTk1OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE0LTExLTExICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIGNsZWFudXAg d2lyZWxlc3Mgcm91dGUgbW9uaXRvcmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBodG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwOgorICAgICAgICAo V2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6Y2xlYXJNZWRpYVBsYXllcik6IEFkZCBsb2dnaW5n LgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6cmVtb3ZlRXZlbnRMaXN0ZW5l cik6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6SFRNTE1lZGlhRWxlbWVudDo6Y3JlYXRlTWVk aWFQbGF5ZXIpOiBEaXR0by4KKworICAgICAgICAqIHBsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNl c3Npb25NYW5hZ2VySU9TLm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdl cmlPUzo6cmVzZXRSZXN0cmljdGlvbnMpOiBBZGQgbG9nZ2luZy4KKyAgICAgICAgKFdlYkNvcmU6 Ok1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6OmNvbmZpZ3VyZVdpcmVMZXNzVGFyZ2V0TW9uaXRvcmlu Zyk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFTZXNzaW9uTWFuYWdlcmlPUzo6dXBk YXRlTm93UGxheWluZ0luZm8pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVs cGVyIGluaXRXaXRoQ2FsbGJhY2s6XSk6IERpdHRvLgorICAgICAgICAoLVtXZWJNZWRpYVNlc3Np b25IZWxwZXIgZGVhbGxvY10pOiBBbHdheXMgZGVhbGxvY2F0ZSB2b2x1bWUgdmlldyBhbmQgcm91 dGluZyBjb250cm9sbGVyCisgICAgICAgICAgICBvbiB0aGUgbWFpbiB0aHJlYWQuCisgICAgICAg ICgtW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBjbGVhckNhbGxiYWNrXSk6IEFkZCBsb2dnaW5nLgor ICAgICAgICAoLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgaGFzV2lyZWxlc3NUYXJnZXRzQXZhaWxh YmxlXSk6IERpdHRvLgorICAgICAgICAoLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgc3RhcnRNb25p dG9yaW5nQWlyUGxheVJvdXRlc10pOiBBbHdheXMgY2FsbCByb3V0aW5nIGNvbnRyb2xsZXIgb24K KyAgICAgICAgICAgIHRoZSBtYWluIHRocmVhZC4KKyAgICAgICAgKC1bV2ViTWVkaWFTZXNzaW9u SGVscGVyIHN0b3BNb25pdG9yaW5nQWlyUGxheVJvdXRlc10pOiBEaXR0by4KKyAgICAgICAgKC1b V2ViTWVkaWFTZXNzaW9uSGVscGVyIGludGVycnVwdGlvbjpdKTogQWRkIGxvZ2dpbmcuCisgICAg ICAgICgtW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBhcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91 bmQ6XSk6IERpdHRvLgorICAgICAgICAoLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgYXBwbGljYXRp b25EaWRCZWNvbWVBY3RpdmU6XSk6IERpdHRvLgorICAgICAgICAoLVtXZWJNZWRpYVNlc3Npb25I ZWxwZXIgYXBwbGljYXRpb25XaWxsUmVzaWduQWN0aXZlOl0pOiBEaXR0by4KKyAgICAgICAgKC1b V2ViTWVkaWFTZXNzaW9uSGVscGVyIHdpcmVsZXNzUm91dGVzQXZhaWxhYmxlRGlkQ2hhbmdlOl0p OiBEaXR0by4KKwogMjAxNC0xMS0xMSAgR3l1eW91bmcgS2ltICA8Z3l1eW91bmcua2ltQHNhbXN1 bmcuY29tPgogCiAgICAgICAgIFVzZSBzdGQ6OnVuaXF1ZV9wdHI8PnxzdGQ6Om1ha2VfdW5pcXVl X3B0ciBpbiBSZW5kZXJUaGVtZUVmbDo6VGhlbWVQYXJ0Q2FjaGVFbnRyeTo6Y3JlYXRlKCkKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gMTc1 Nzc3KQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtNDY1MSw2ICs0NjU3LDggQEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50Ojp1c2Vy Q2FuY2VsbGVkTG9hZAogCiB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OmNsZWFyTWVkaWFQbGF5ZXIo aW50IGZsYWdzKQogeworICAgIExPRyhNZWRpYSwgIkhUTUxNZWRpYUVsZW1lbnQ6OmNsZWFyTWVk aWFQbGF5ZXIoJXApIC0gZmxhZ3MgPSAleCIsIHRoaXMsICh1bnNpZ25lZClmbGFncyk7CisKICNp ZiBVU0UoUExBVEZPUk1fVEVYVF9UUkFDS19NRU5VKQogICAgIGlmIChwbGF0Zm9ybVRleHRUcmFj a01lbnUoKSkgewogICAgICAgICBtX3BsYXRmb3JtTWVudS0+c2V0Q2xpZW50KDApOwpAQCAtNDg1 NSw2ICs0ODYzLDcgQEAgYm9vbCBIVE1MTWVkaWFFbGVtZW50OjpyZW1vdmVFdmVudExpc3Rlbgog ICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBib29sIGRpZFJlbW92ZUxhc3RBdmFpbGFiaWxp dHlDaGFuZ2VkTGlzdGVuZXIgPSAhaGFzRXZlbnRMaXN0ZW5lcnMoZXZlbnROYW1lcygpLndlYmtp dHBsYXliYWNrdGFyZ2V0YXZhaWxhYmlsaXR5Y2hhbmdlZEV2ZW50KTsKKyAgICBMT0coTWVkaWEs ICJIVE1MTWVkaWFFbGVtZW50OjpyZW1vdmVFdmVudExpc3RlbmVyKCVwKSAtIHJlbW92ZWQgbGFz dCBsaXN0ZW5lciA9ICVzIiwgdGhpcywgYm9vbFN0cmluZyhkaWRSZW1vdmVMYXN0QXZhaWxhYmls aXR5Q2hhbmdlZExpc3RlbmVyKSk7CiAgICAgaWYgKGRpZFJlbW92ZUxhc3RBdmFpbGFiaWxpdHlD aGFuZ2VkTGlzdGVuZXIpCiAgICAgICAgIG1fbWVkaWFTZXNzaW9uLT5zZXRIYXNQbGF5YmFja1Rh cmdldEF2YWlsYWJpbGl0eUxpc3RlbmVycygqdGhpcywgZmFsc2UpOwogCkBAIC01MzU3LDYgKzUz NjYsOCBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6Om1hcmtDYXB0aW9uQW5kU3ViCiAKIHZvaWQg SFRNTE1lZGlhRWxlbWVudDo6Y3JlYXRlTWVkaWFQbGF5ZXIoKQogeworICAgIExPRyhNZWRpYSwg IkhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlhUGxheWVyKCVwKSIsIHRoaXMpOworCiAjaWYg RU5BQkxFKFdFQl9BVURJTykKICAgICBpZiAobV9hdWRpb1NvdXJjZU5vZGUpCiAgICAgICAgIG1f YXVkaW9Tb3VyY2VOb2RlLT5sb2NrKCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9h dWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9uTWFuYWdlcklPUy5tbQkocmV2 aXNpb24gMTc1Nzc3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlh U2Vzc2lvbk1hbmFnZXJJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTEyNiw2ICsxMzIsOCBAQCBN ZWRpYVNlc3Npb25NYW5hZ2VyaU9TOjp+TWVkaWFTZXNzaW9uTWFuCiAKIHZvaWQgTWVkaWFTZXNz aW9uTWFuYWdlcmlPUzo6cmVzZXRSZXN0cmljdGlvbnMoKQogeworICAgIExPRyhNZWRpYSwgIk1l ZGlhU2Vzc2lvbk1hbmFnZXJpT1M6OnJlc2V0UmVzdHJpY3Rpb25zIik7CisKICAgICBNZWRpYVNl c3Npb25NYW5hZ2VyOjpyZXNldFJlc3RyaWN0aW9ucygpOwogCiAgICAgc3RhdGljIHdrRGV2aWNl Q2xhc3MgZGV2aWNlQ2xhc3MgPSBpb3NEZXZpY2VDbGFzcygpOwpAQCAtMTY2LDYgKzE3NCw4IEBA IHZvaWQgTWVkaWFTZXNzaW9uTWFuYWdlcmlPUzo6Y29uZmlndXJlV2kKICAgICAgICAgfQogICAg IH0KIAorICAgIExPRyhNZWRpYSwgIk1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6OmNvbmZpZ3VyZVdp cmVMZXNzVGFyZ2V0TW9uaXRvcmluZyAtIHJlcXVpcmVzTW9uaXRvcmluZyA9ICVzIiwgcmVxdWly ZXNNb25pdG9yaW5nID8gInRydWUiIDogImZhbHNlIik7CisKICAgICBpZiAocmVxdWlyZXNNb25p dG9yaW5nKQogICAgICAgICBbbV9vYmpjT2JzZXJ2ZXIgc3RhcnRNb25pdG9yaW5nQWlyUGxheVJv dXRlc107CiAgICAgZWxzZQpAQCAtMTg3LDYgKzE5Nyw4IEBAIHZvaWQgTWVkaWFTZXNzaW9uTWFu YWdlcmlPUzo6c2Vzc2lvbldpbGwKICAgICAKIHZvaWQgTWVkaWFTZXNzaW9uTWFuYWdlcmlPUzo6 dXBkYXRlTm93UGxheWluZ0luZm8oKQogeworICAgIExPRyhNZWRpYSwgIk1lZGlhU2Vzc2lvbk1h bmFnZXJpT1M6OnVwZGF0ZU5vd1BsYXlpbmdJbmZvIik7CisKICAgICBNUE5vd1BsYXlpbmdJbmZv Q2VudGVyICpub3dQbGF5aW5nID0gKE1QTm93UGxheWluZ0luZm9DZW50ZXIgKilbZ2V0TVBOb3dQ bGF5aW5nSW5mb0NlbnRlckNsYXNzKCkgZGVmYXVsdENlbnRlcl07CiAgICAgY29uc3QgTWVkaWFT ZXNzaW9uKiBjdXJyZW50U2Vzc2lvbiA9IHRoaXMtPmN1cnJlbnRTZXNzaW9uKCk7CiAgICAgCkBA IC0yMjQsNiArMjM2LDggQEAgYm9vbCBNZWRpYVNlc3Npb25NYW5hZ2VyaU9TOjpzZXNzaW9uQ2Fu TAogCiAtIChpZClpbml0V2l0aENhbGxiYWNrOihNZWRpYVNlc3Npb25NYW5hZ2VyaU9TKiljYWxs YmFjawogeworICAgIExPRyhNZWRpYSwgIldlYk1lZGlhU2Vzc2lvbkhlbHBlcjo6aW5pdFdpdGhD YWxsYmFjayIpOworCiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJl dHVybiBuaWw7CiAgICAgCkBAIC0yNDksMTcgKzI2MywzOCBAQCAtIChpZClpbml0V2l0aENhbGxi YWNrOihNZWRpYVNlc3Npb25NYW5hCiAKIC0gKHZvaWQpZGVhbGxvYwogeworICAgIExPRyhNZWRp YSwgIldlYk1lZGlhU2Vzc2lvbkhlbHBlcjo6aW5pdFdpdGhDYWxsYmFjayIpOworCisgICAgaWYg KCFpc01haW5UaHJlYWQoKSkgeworICAgICAgICBhdXRvIHZvbHVtZVZpZXcgPSBzdGQ6Om1vdmUo X3ZvbHVtZVZpZXcpOworICAgICAgICBhdXRvIHJvdXRpbmdDb250cm9sbGVyID0gc3RkOjptb3Zl KF9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlcik7CisKKyAgICAgICAgY2FsbE9uTWFp blRocmVhZChbdm9sdW1lVmlldywgcm91dGluZ0NvbnRyb2xsZXJdICgpIG11dGFibGUgeworICAg ICAgICAgICAgTE9HKE1lZGlhLCAiV2ViTWVkaWFTZXNzaW9uSGVscGVyOjppbml0V2l0aENhbGxi YWNrIC0gZGlwYXRjaGVkIHRvIE1haW5UaHJlYWQiKTsKKworICAgICAgICAgICAgdm9sdW1lVmll dy5jbGVhcigpOworCisgICAgICAgICAgICBpZiAoIXJvdXRpbmdDb250cm9sbGVyKQorICAgICAg ICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgW3JvdXRpbmdDb250cm9sbGVyIHNldERp c2NvdmVyeU1vZGU6TVBSb3V0ZURpc2NvdmVyeU1vZGVEaXNhYmxlZF07CisgICAgICAgICAgICBy b3V0aW5nQ29udHJvbGxlci5jbGVhcigpOworICAgICAgICB9KTsKKyAgICB9CisKICAgICBbW05T Tm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVyOnNlbGZdOwog ICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KIAogLSAodm9pZCljbGVhckNhbGxiYWNrCiB7CisgICAg TE9HKE1lZGlhLCAiV2ViTWVkaWFTZXNzaW9uSGVscGVyOjpjbGVhckNhbGxiYWNrIik7CiAgICAg X2NhbGxiYWNrID0gbmlsOwogfQogCiAtIChCT09MKWhhc1dpcmVsZXNzVGFyZ2V0c0F2YWlsYWJs ZQogeworICAgIExPRyhNZWRpYSwgIldlYk1lZGlhU2Vzc2lvbkhlbHBlcjo6aGFzV2lyZWxlc3NU YXJnZXRzQXZhaWxhYmxlIik7CiAgICAgcmV0dXJuIFtfdm9sdW1lVmlldyBhcmVXaXJlbGVzc1Jv dXRlc0F2YWlsYWJsZV07CiB9CiAKQEAgLTI2OCw4ICszMDMsMTggQEAgLSAodm9pZClzdGFydE1v bml0b3JpbmdBaXJQbGF5Um91dGVzCiAgICAgaWYgKF9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29u dHJvbGxlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgX2FpclBsYXlQcmVzZW5jZVJvdXRpbmdD b250cm9sbGVyID0gYWRvcHROUyhbW2dldE1QQVZSb3V0aW5nQ29udHJvbGxlckNsYXNzKCkgYWxs b2NdIGluaXRXaXRoTmFtZTpAIldlYkNvcmUgLSBIVE1MIG1lZGlhIGVsZW1lbnQgY2hlY2tpbmcg Zm9yIEFpclBsYXkgcm91dGUgcHJlc2VuY2UiXSk7Ci0gICAgW19haXJQbGF5UHJlc2VuY2VSb3V0 aW5nQ29udHJvbGxlciBzZXREaXNjb3ZlcnlNb2RlOk1QUm91dGVEaXNjb3ZlcnlNb2RlUHJlc2Vu Y2VdOworICAgIExPRyhNZWRpYSwgIldlYk1lZGlhU2Vzc2lvbkhlbHBlcjo6c3RhcnRNb25pdG9y aW5nQWlyUGxheVJvdXRlcyIpOworCisgICAgUmV0YWluUHRyPFdlYk1lZGlhU2Vzc2lvbkhlbHBl cj4gc3Ryb25nU2VsZiA9IHNlbGY7CisgICAgY2FsbE9uTWFpblRocmVhZChbc3Ryb25nU2VsZl0g KCkgeworICAgICAgICBMT0coTWVkaWEsICJXZWJNZWRpYVNlc3Npb25IZWxwZXI6OnN0YXJ0TW9u aXRvcmluZ0FpclBsYXlSb3V0ZXMgLSBkaXBhdGNoZWQgdG8gTWFpblRocmVhZCIpOworCisgICAg ICAgIGlmIChzdHJvbmdTZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIpCisg ICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgc3Ryb25nU2VsZi0+X2FpclBsYXlQcmVzZW5j ZVJvdXRpbmdDb250cm9sbGVyID0gYWRvcHROUyhbW2dldE1QQVZSb3V0aW5nQ29udHJvbGxlckNs YXNzKCkgYWxsb2NdIGluaXRXaXRoTmFtZTpAIldlYkNvcmUgLSBIVE1MIG1lZGlhIGVsZW1lbnQg Y2hlY2tpbmcgZm9yIEFpclBsYXkgcm91dGUgcHJlc2VuY2UiXSk7CisgICAgICAgIFtzdHJvbmdT ZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpN UFJvdXRlRGlzY292ZXJ5TW9kZVByZXNlbmNlXTsKKyAgICB9KTsKIH0KIAogLSAodm9pZClzdG9w TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXMKQEAgLTI3Nyw4ICszMjIsMTggQEAgLSAodm9pZClzdG9w TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXMKICAgICBpZiAoIV9haXJQbGF5UHJlc2VuY2VSb3V0aW5n Q29udHJvbGxlcikKICAgICAgICAgcmV0dXJuOwogCi0gICAgW19haXJQbGF5UHJlc2VuY2VSb3V0 aW5nQ29udHJvbGxlciBzZXREaXNjb3ZlcnlNb2RlOk1QUm91dGVEaXNjb3ZlcnlNb2RlRGlzYWJs ZWRdOwotICAgIF9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlciA9IG5pbDsKKyAgICBM T0coTWVkaWEsICJXZWJNZWRpYVNlc3Npb25IZWxwZXI6OnN0b3BNb25pdG9yaW5nQWlyUGxheVJv dXRlcyIpOworCisgICAgUmV0YWluUHRyPFdlYk1lZGlhU2Vzc2lvbkhlbHBlcj4gc3Ryb25nU2Vs ZiA9IHNlbGY7CisgICAgY2FsbE9uTWFpblRocmVhZChbc3Ryb25nU2VsZl0gKCkgeworICAgICAg ICBMT0coTWVkaWEsICJXZWJNZWRpYVNlc3Npb25IZWxwZXI6OnN0b3BNb25pdG9yaW5nQWlyUGxh eVJvdXRlcyAtIGRpcGF0Y2hlZCB0byBNYWluVGhyZWFkIik7CisKKyAgICAgICAgaWYgKCFzdHJv bmdTZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIpCisgICAgICAgICAgICBy ZXR1cm47CisKKyAgICAgICAgW3N0cm9uZ1NlbGYtPl9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29u dHJvbGxlciBzZXREaXNjb3ZlcnlNb2RlOk1QUm91dGVEaXNjb3ZlcnlNb2RlRGlzYWJsZWRdOwor ICAgICAgICBzdHJvbmdTZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIgPSBu aWw7CisgICAgfSk7CiB9CiAKIC0gKHZvaWQpaW50ZXJydXB0aW9uOihOU05vdGlmaWNhdGlvbiAq KW5vdGlmaWNhdGlvbgpAQCAtMjg5LDYgKzM0NCw4IEBAIC0gKHZvaWQpaW50ZXJydXB0aW9uOihO U05vdGlmaWNhdGlvbiAqKW4KICAgICBOU1VJbnRlZ2VyIHR5cGUgPSBbW1tub3RpZmljYXRpb24g dXNlckluZm9dIG9iamVjdEZvcktleTpBVkF1ZGlvU2Vzc2lvbkludGVycnVwdGlvblR5cGVLZXld IHVuc2lnbmVkSW50ZWdlclZhbHVlXTsKICAgICBNZWRpYVNlc3Npb246OkVuZEludGVycnVwdGlv bkZsYWdzIGZsYWdzID0gTWVkaWFTZXNzaW9uOjpOb0ZsYWdzOwogCisgICAgTE9HKE1lZGlhLCAi V2ViTWVkaWFTZXNzaW9uSGVscGVyOjppbnRlcnJ1cHRpb24gLSB0eXBlID0gJWkiLCAoaW50KXR5 cGUpOworCiAgICAgaWYgKHR5cGUgPT0gQVZBdWRpb1Nlc3Npb25JbnRlcnJ1cHRpb25UeXBlRW5k ZWQgJiYgW1tbbm90aWZpY2F0aW9uIHVzZXJJbmZvXSBvYmplY3RGb3JLZXk6QVZBdWRpb1Nlc3Np b25JbnRlcnJ1cHRpb25PcHRpb25LZXldIHVuc2lnbmVkSW50ZWdlclZhbHVlXSA9PSBBVkF1ZGlv U2Vzc2lvbkludGVycnVwdGlvbk9wdGlvblNob3VsZFJlc3VtZSkKICAgICAgICAgZmxhZ3MgPSBN ZWRpYVNlc3Npb246Ok1heVJlc3VtZVBsYXlpbmc7CiAKQEAgLTMxMSw2ICszNjgsOCBAQCAtICh2 b2lkKWFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZDooCiAgICAgaWYgKCFfY2FsbGJhY2sp CiAgICAgICAgIHJldHVybjsKIAorICAgIExPRyhNZWRpYSwgIldlYk1lZGlhU2Vzc2lvbkhlbHBl cjo6YXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kIik7CisKICAgICBXZWJUaHJlYWRSdW4o XnsKICAgICAgICAgaWYgKCFfY2FsbGJhY2spCiAgICAgICAgICAgICByZXR1cm47CkBAIC0zMjYs NiArMzg1LDggQEAgLSAodm9pZClhcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZTooTlNObwogICAg IGlmICghX2NhbGxiYWNrKQogICAgICAgICByZXR1cm47CiAKKyAgICBMT0coTWVkaWEsICJXZWJN ZWRpYVNlc3Npb25IZWxwZXI6OmFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlIik7CisKICAgICBX ZWJUaHJlYWRSdW4oXnsKICAgICAgICAgaWYgKCFfY2FsbGJhY2spCiAgICAgICAgICAgICByZXR1 cm47CkBAIC0zNDAsNyArNDAxLDkgQEAgLSAodm9pZClhcHBsaWNhdGlvbldpbGxSZXNpZ25BY3Rp dmU6KE5TTgogCiAgICAgaWYgKCFfY2FsbGJhY2spCiAgICAgICAgIHJldHVybjsKLSAgICAKKwor ICAgIExPRyhNZWRpYSwgIldlYk1lZGlhU2Vzc2lvbkhlbHBlcjo6YXBwbGljYXRpb25XaWxsUmVz aWduQWN0aXZlIik7CisKICAgICBXZWJUaHJlYWRSdW4oXnsKICAgICAgICAgaWYgKCFfY2FsbGJh Y2spCiAgICAgICAgICAgICByZXR1cm47CkBAIC0zNTYsNiArNDE5LDggQEAgLSAodm9pZCl3aXJl bGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZQogICAgIGlmICghX2NhbGxiYWNrKQogICAgICAg ICByZXR1cm47CiAKKyAgICBMT0coTWVkaWEsICJXZWJNZWRpYVNlc3Npb25IZWxwZXI6OndpcmVs ZXNzUm91dGVzQXZhaWxhYmxlRGlkQ2hhbmdlIik7CisKICAgICBXZWJUaHJlYWRSdW4oXnsKICAg ICAgICAgaWYgKCFfY2FsbGJhY2spCiAgICAgICAgICAgICByZXR1cm47Cg== 241362 2014-11-11 11:08:50 -0800 2014-11-11 14:03:16 -0800 Patch for landing. patch_4.txt text/plain 9453 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NTk1OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDMzIEBACisyMDE0LTExLTExICBFcmljIENh cmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIGNsZWFudXAg d2lyZWxlc3Mgcm91dGUgbW9uaXRvcmluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTM4NjE0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgSmVyIE5vYmxl LgorCisgICAgICAgICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNsZWFyTWVkaWFQbGF5ZXIpOiBBZGQgbG9nZ2luZy4KKyAg ICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OnJlbW92ZUV2ZW50TGlzdGVuZXIpOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlhUGxh eWVyKTogRGl0dG8uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9hdWRpby9pb3MvTWVkaWFTZXNzaW9u TWFuYWdlcklPUy5tbToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6 OnJlc2V0UmVzdHJpY3Rpb25zKTogQWRkIGxvZ2dpbmcuCisgICAgICAgIChXZWJDb3JlOjpNZWRp YVNlc3Npb25NYW5hZ2VyaU9TOjpjb25maWd1cmVXaXJlTGVzc1RhcmdldE1vbml0b3JpbmcpOiBE aXR0by4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6OnVwZGF0ZU5v d1BsYXlpbmdJbmZvKTogRGl0dG8uCisgICAgICAgICgtW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBp bml0V2l0aENhbGxiYWNrOl0pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVs cGVyIGRlYWxsb2NdKTogQWx3YXlzIGRlYWxsb2NhdGUgdm9sdW1lIHZpZXcgYW5kIHJvdXRpbmcg Y29udHJvbGxlcgorICAgICAgICAgICAgb24gdGhlIG1haW4gdGhyZWFkLgorICAgICAgICAoLVtX ZWJNZWRpYVNlc3Npb25IZWxwZXIgY2xlYXJDYWxsYmFja10pOiBBZGQgbG9nZ2luZy4KKyAgICAg ICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIGhhc1dpcmVsZXNzVGFyZ2V0c0F2YWlsYWJsZV0p OiBEaXR0by4KKyAgICAgICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIHN0YXJ0TW9uaXRvcmlu Z0FpclBsYXlSb3V0ZXNdKTogQWx3YXlzIGNhbGwgcm91dGluZyBjb250cm9sbGVyIG9uCisgICAg ICAgICAgICB0aGUgbWFpbiB0aHJlYWQuCisgICAgICAgICgtW1dlYk1lZGlhU2Vzc2lvbkhlbHBl ciBzdG9wTW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNdKTogRGl0dG8uCisgICAgICAgICgtW1dlYk1l ZGlhU2Vzc2lvbkhlbHBlciBpbnRlcnJ1cHRpb246XSk6IEFkZCBsb2dnaW5nLgorICAgICAgICAo LVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kOl0p OiBEaXR0by4KKyAgICAgICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIGFwcGxpY2F0aW9uRGlk QmVjb21lQWN0aXZlOl0pOiBEaXR0by4KKyAgICAgICAgKC1bV2ViTWVkaWFTZXNzaW9uSGVscGVy IGFwcGxpY2F0aW9uV2lsbFJlc2lnbkFjdGl2ZTpdKTogRGl0dG8uCisgICAgICAgICgtW1dlYk1l ZGlhU2Vzc2lvbkhlbHBlciB3aXJlbGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZTpdKTogRGl0 dG8uCisKIDIwMTQtMTEtMTEgIEd5dXlvdW5nIEtpbSAgPGd5dXlvdW5nLmtpbUBzYW1zdW5nLmNv bT4KIAogICAgICAgICBVc2Ugc3RkOjp1bmlxdWVfcHRyPD58c3RkOjptYWtlX3VuaXF1ZV9wdHIg aW4gUmVuZGVyVGhlbWVFZmw6OlRoZW1lUGFydENhY2hlRW50cnk6OmNyZWF0ZSgpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHJldmlzaW9uIDE3NTc3NykK KysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTQ2NTEsNiArNDY1MSw4IEBAIHZvaWQgSFRNTE1lZGlhRWxlbWVudDo6dXNlckNhbmNl bGxlZExvYWQKIAogdm9pZCBIVE1MTWVkaWFFbGVtZW50OjpjbGVhck1lZGlhUGxheWVyKGludCBm bGFncykKIHsKKyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50OjpjbGVhck1lZGlhUGxh eWVyKCVwKSAtIGZsYWdzID0gJXgiLCB0aGlzLCAodW5zaWduZWQpZmxhZ3MpOworCiAjaWYgVVNF KFBMQVRGT1JNX1RFWFRfVFJBQ0tfTUVOVSkKICAgICBpZiAocGxhdGZvcm1UZXh0VHJhY2tNZW51 KCkpIHsKICAgICAgICAgbV9wbGF0Zm9ybU1lbnUtPnNldENsaWVudCgwKTsKQEAgLTQ4NTUsNiAr NDg1Nyw3IEBAIGJvb2wgSFRNTE1lZGlhRWxlbWVudDo6cmVtb3ZlRXZlbnRMaXN0ZW4KICAgICAg ICAgcmV0dXJuIGZhbHNlOwogCiAgICAgYm9vbCBkaWRSZW1vdmVMYXN0QXZhaWxhYmlsaXR5Q2hh bmdlZExpc3RlbmVyID0gIWhhc0V2ZW50TGlzdGVuZXJzKGV2ZW50TmFtZXMoKS53ZWJraXRwbGF5 YmFja3RhcmdldGF2YWlsYWJpbGl0eWNoYW5nZWRFdmVudCk7CisgICAgTE9HKE1lZGlhLCAiSFRN TE1lZGlhRWxlbWVudDo6cmVtb3ZlRXZlbnRMaXN0ZW5lciglcCkgLSByZW1vdmVkIGxhc3QgbGlz dGVuZXIgPSAlcyIsIHRoaXMsIGJvb2xTdHJpbmcoZGlkUmVtb3ZlTGFzdEF2YWlsYWJpbGl0eUNo YW5nZWRMaXN0ZW5lcikpOwogICAgIGlmIChkaWRSZW1vdmVMYXN0QXZhaWxhYmlsaXR5Q2hhbmdl ZExpc3RlbmVyKQogICAgICAgICBtX21lZGlhU2Vzc2lvbi0+c2V0SGFzUGxheWJhY2tUYXJnZXRB dmFpbGFiaWxpdHlMaXN0ZW5lcnMoKnRoaXMsIGZhbHNlKTsKIApAQCAtNTM1Nyw2ICs1MzYwLDgg QEAgdm9pZCBIVE1MTWVkaWFFbGVtZW50OjptYXJrQ2FwdGlvbkFuZFN1YgogCiB2b2lkIEhUTUxN ZWRpYUVsZW1lbnQ6OmNyZWF0ZU1lZGlhUGxheWVyKCkKIHsKKyAgICBMT0coTWVkaWEsICJIVE1M TWVkaWFFbGVtZW50OjpjcmVhdGVNZWRpYVBsYXllciglcCkiLCB0aGlzKTsKKwogI2lmIEVOQUJM RShXRUJfQVVESU8pCiAgICAgaWYgKG1fYXVkaW9Tb3VyY2VOb2RlKQogICAgICAgICBtX2F1ZGlv U291cmNlTm9kZS0+bG9jaygpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYXVkaW8v aW9zL01lZGlhU2Vzc2lvbk1hbmFnZXJJT1MubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vYXVkaW8vaW9zL01lZGlhU2Vzc2lvbk1hbmFnZXJJT1MubW0JKHJldmlzaW9u IDE3NTc3NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2F1ZGlvL2lvcy9NZWRpYVNlc3Np b25NYW5hZ2VySU9TLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMjYsNiArMTI2LDggQEAgTWVkaWFT ZXNzaW9uTWFuYWdlcmlPUzo6fk1lZGlhU2Vzc2lvbk1hbgogCiB2b2lkIE1lZGlhU2Vzc2lvbk1h bmFnZXJpT1M6OnJlc2V0UmVzdHJpY3Rpb25zKCkKIHsKKyAgICBMT0coTWVkaWEsICJNZWRpYVNl c3Npb25NYW5hZ2VyaU9TOjpyZXNldFJlc3RyaWN0aW9ucyIpOworCiAgICAgTWVkaWFTZXNzaW9u TWFuYWdlcjo6cmVzZXRSZXN0cmljdGlvbnMoKTsKIAogICAgIHN0YXRpYyB3a0RldmljZUNsYXNz IGRldmljZUNsYXNzID0gaW9zRGV2aWNlQ2xhc3MoKTsKQEAgLTE2Niw2ICsxNjgsOCBAQCB2b2lk IE1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6OmNvbmZpZ3VyZVdpCiAgICAgICAgIH0KICAgICB9CiAK KyAgICBMT0coTWVkaWEsICJNZWRpYVNlc3Npb25NYW5hZ2VyaU9TOjpjb25maWd1cmVXaXJlTGVz c1RhcmdldE1vbml0b3JpbmcgLSByZXF1aXJlc01vbml0b3JpbmcgPSAlcyIsIHJlcXVpcmVzTW9u aXRvcmluZyA/ICJ0cnVlIiA6ICJmYWxzZSIpOworCiAgICAgaWYgKHJlcXVpcmVzTW9uaXRvcmlu ZykKICAgICAgICAgW21fb2JqY09ic2VydmVyIHN0YXJ0TW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNd OwogICAgIGVsc2UKQEAgLTE4Nyw2ICsxOTEsOCBAQCB2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJp T1M6OnNlc3Npb25XaWxsCiAgICAgCiB2b2lkIE1lZGlhU2Vzc2lvbk1hbmFnZXJpT1M6OnVwZGF0 ZU5vd1BsYXlpbmdJbmZvKCkKIHsKKyAgICBMT0coTWVkaWEsICJNZWRpYVNlc3Npb25NYW5hZ2Vy aU9TOjp1cGRhdGVOb3dQbGF5aW5nSW5mbyIpOworCiAgICAgTVBOb3dQbGF5aW5nSW5mb0NlbnRl ciAqbm93UGxheWluZyA9IChNUE5vd1BsYXlpbmdJbmZvQ2VudGVyICopW2dldE1QTm93UGxheWlu Z0luZm9DZW50ZXJDbGFzcygpIGRlZmF1bHRDZW50ZXJdOwogICAgIGNvbnN0IE1lZGlhU2Vzc2lv biogY3VycmVudFNlc3Npb24gPSB0aGlzLT5jdXJyZW50U2Vzc2lvbigpOwogICAgIApAQCAtMjI0 LDYgKzIzMCw4IEBAIGJvb2wgTWVkaWFTZXNzaW9uTWFuYWdlcmlPUzo6c2Vzc2lvbkNhbkwKIAog LSAoaWQpaW5pdFdpdGhDYWxsYmFjazooTWVkaWFTZXNzaW9uTWFuYWdlcmlPUyopY2FsbGJhY2sK IHsKKyAgICBMT0coTWVkaWEsICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBpbml0V2l0aENhbGxi YWNrXSIpOworCiAgICAgaWYgKCEoc2VsZiA9IFtzdXBlciBpbml0XSkpCiAgICAgICAgIHJldHVy biBuaWw7CiAgICAgCkBAIC0yNDksMTcgKzI1NywzOCBAQCAtIChpZClpbml0V2l0aENhbGxiYWNr OihNZWRpYVNlc3Npb25NYW5hCiAKIC0gKHZvaWQpZGVhbGxvYwogeworICAgIExPRyhNZWRpYSwg Ii1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIGRlYWxsb2NdIik7CisKKyAgICBpZiAoIWlzTWFpblRo cmVhZCgpKSB7CisgICAgICAgIGF1dG8gdm9sdW1lVmlldyA9IFdURjo6bW92ZShfdm9sdW1lVmll dyk7CisgICAgICAgIGF1dG8gcm91dGluZ0NvbnRyb2xsZXIgPSBXVEY6Om1vdmUoX2FpclBsYXlQ cmVzZW5jZVJvdXRpbmdDb250cm9sbGVyKTsKKworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFt2 b2x1bWVWaWV3LCByb3V0aW5nQ29udHJvbGxlcl0gKCkgbXV0YWJsZSB7CisgICAgICAgICAgICBM T0coTWVkaWEsICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBkZWFsbG9jXSAtIGRpcGF0Y2hlZCB0 byBNYWluVGhyZWFkIik7CisKKyAgICAgICAgICAgIHZvbHVtZVZpZXcuY2xlYXIoKTsKKworICAg ICAgICAgICAgaWYgKCFyb3V0aW5nQ29udHJvbGxlcikKKyAgICAgICAgICAgICAgICByZXR1cm47 CisKKyAgICAgICAgICAgIFtyb3V0aW5nQ29udHJvbGxlciBzZXREaXNjb3ZlcnlNb2RlOk1QUm91 dGVEaXNjb3ZlcnlNb2RlRGlzYWJsZWRdOworICAgICAgICAgICAgcm91dGluZ0NvbnRyb2xsZXIu Y2xlYXIoKTsKKyAgICAgICAgfSk7CisgICAgfQorCiAgICAgW1tOU05vdGlmaWNhdGlvbkNlbnRl ciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpzZWxmXTsKICAgICBbc3VwZXIgZGVhbGxv Y107CiB9CiAKIC0gKHZvaWQpY2xlYXJDYWxsYmFjawogeworICAgIExPRyhNZWRpYSwgIi1bV2Vi TWVkaWFTZXNzaW9uSGVscGVyIGNsZWFyQ2FsbGJhY2tdIik7CiAgICAgX2NhbGxiYWNrID0gbmls OwogfQogCiAtIChCT09MKWhhc1dpcmVsZXNzVGFyZ2V0c0F2YWlsYWJsZQogeworICAgIExPRyhN ZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIGhhc1dpcmVsZXNzVGFyZ2V0c0F2YWlsYWJs ZV0iKTsKICAgICByZXR1cm4gW192b2x1bWVWaWV3IGFyZVdpcmVsZXNzUm91dGVzQXZhaWxhYmxl XTsKIH0KIApAQCAtMjY4LDggKzI5NywxOCBAQCAtICh2b2lkKXN0YXJ0TW9uaXRvcmluZ0FpclBs YXlSb3V0ZXMKICAgICBpZiAoX2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyKQogICAg ICAgICByZXR1cm47CiAKLSAgICBfYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIgPSBh ZG9wdE5TKFtbZ2V0TVBBVlJvdXRpbmdDb250cm9sbGVyQ2xhc3MoKSBhbGxvY10gaW5pdFdpdGhO YW1lOkAiV2ViQ29yZSAtIEhUTUwgbWVkaWEgZWxlbWVudCBjaGVja2luZyBmb3IgQWlyUGxheSBy b3V0ZSBwcmVzZW5jZSJdKTsKLSAgICBbX2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVy IHNldERpc2NvdmVyeU1vZGU6TVBSb3V0ZURpc2NvdmVyeU1vZGVQcmVzZW5jZV07CisgICAgTE9H KE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgc3RhcnRNb25pdG9yaW5nQWlyUGxheVJv dXRlc10iKTsKKworICAgIFJldGFpblB0cjxXZWJNZWRpYVNlc3Npb25IZWxwZXI+IHN0cm9uZ1Nl bGYgPSBzZWxmOworICAgIGNhbGxPbk1haW5UaHJlYWQoW3N0cm9uZ1NlbGZdICgpIHsKKyAgICAg ICAgTE9HKE1lZGlhLCAiLVtXZWJNZWRpYVNlc3Npb25IZWxwZXIgc3RhcnRNb25pdG9yaW5nQWly UGxheVJvdXRlc10gLSBkaXBhdGNoZWQgdG8gTWFpblRocmVhZCIpOworCisgICAgICAgIGlmIChz dHJvbmdTZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIpCisgICAgICAgICAg ICByZXR1cm47CisKKyAgICAgICAgc3Ryb25nU2VsZi0+X2FpclBsYXlQcmVzZW5jZVJvdXRpbmdD b250cm9sbGVyID0gYWRvcHROUyhbW2dldE1QQVZSb3V0aW5nQ29udHJvbGxlckNsYXNzKCkgYWxs b2NdIGluaXRXaXRoTmFtZTpAIldlYkNvcmUgLSBIVE1MIG1lZGlhIGVsZW1lbnQgY2hlY2tpbmcg Zm9yIEFpclBsYXkgcm91dGUgcHJlc2VuY2UiXSk7CisgICAgICAgIFtzdHJvbmdTZWxmLT5fYWly UGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xsZXIgc2V0RGlzY292ZXJ5TW9kZTpNUFJvdXRlRGlz Y292ZXJ5TW9kZVByZXNlbmNlXTsKKyAgICB9KTsKIH0KIAogLSAodm9pZClzdG9wTW9uaXRvcmlu Z0FpclBsYXlSb3V0ZXMKQEAgLTI3Nyw4ICszMTYsMTggQEAgLSAodm9pZClzdG9wTW9uaXRvcmlu Z0FpclBsYXlSb3V0ZXMKICAgICBpZiAoIV9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxl cikKICAgICAgICAgcmV0dXJuOwogCi0gICAgW19haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJv bGxlciBzZXREaXNjb3ZlcnlNb2RlOk1QUm91dGVEaXNjb3ZlcnlNb2RlRGlzYWJsZWRdOwotICAg IF9haXJQbGF5UHJlc2VuY2VSb3V0aW5nQ29udHJvbGxlciA9IG5pbDsKKyAgICBMT0coTWVkaWEs ICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBzdG9wTW9uaXRvcmluZ0FpclBsYXlSb3V0ZXNdIik7 CisKKyAgICBSZXRhaW5QdHI8V2ViTWVkaWFTZXNzaW9uSGVscGVyPiBzdHJvbmdTZWxmID0gc2Vs ZjsKKyAgICBjYWxsT25NYWluVGhyZWFkKFtzdHJvbmdTZWxmXSAoKSB7CisgICAgICAgIExPRyhN ZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9uSGVscGVyIHN0b3BNb25pdG9yaW5nQWlyUGxheVJvdXRl c10gLSBkaXBhdGNoZWQgdG8gTWFpblRocmVhZCIpOworCisgICAgICAgIGlmICghc3Ryb25nU2Vs Zi0+X2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyKQorICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgIFtzdHJvbmdTZWxmLT5fYWlyUGxheVByZXNlbmNlUm91dGluZ0NvbnRyb2xs ZXIgc2V0RGlzY292ZXJ5TW9kZTpNUFJvdXRlRGlzY292ZXJ5TW9kZURpc2FibGVkXTsKKyAgICAg ICAgc3Ryb25nU2VsZi0+X2FpclBsYXlQcmVzZW5jZVJvdXRpbmdDb250cm9sbGVyID0gbmlsOwor ICAgIH0pOwogfQogCiAtICh2b2lkKWludGVycnVwdGlvbjooTlNOb3RpZmljYXRpb24gKilub3Rp ZmljYXRpb24KQEAgLTI4OSw2ICszMzgsOCBAQCAtICh2b2lkKWludGVycnVwdGlvbjooTlNOb3Rp ZmljYXRpb24gKiluCiAgICAgTlNVSW50ZWdlciB0eXBlID0gW1tbbm90aWZpY2F0aW9uIHVzZXJJ bmZvXSBvYmplY3RGb3JLZXk6QVZBdWRpb1Nlc3Npb25JbnRlcnJ1cHRpb25UeXBlS2V5XSB1bnNp Z25lZEludGVnZXJWYWx1ZV07CiAgICAgTWVkaWFTZXNzaW9uOjpFbmRJbnRlcnJ1cHRpb25GbGFn cyBmbGFncyA9IE1lZGlhU2Vzc2lvbjo6Tm9GbGFnczsKIAorICAgIExPRyhNZWRpYSwgIi1bV2Vi TWVkaWFTZXNzaW9uSGVscGVyIGludGVycnVwdGlvbl0gLSB0eXBlID0gJWkiLCAoaW50KXR5cGUp OworCiAgICAgaWYgKHR5cGUgPT0gQVZBdWRpb1Nlc3Npb25JbnRlcnJ1cHRpb25UeXBlRW5kZWQg JiYgW1tbbm90aWZpY2F0aW9uIHVzZXJJbmZvXSBvYmplY3RGb3JLZXk6QVZBdWRpb1Nlc3Npb25J bnRlcnJ1cHRpb25PcHRpb25LZXldIHVuc2lnbmVkSW50ZWdlclZhbHVlXSA9PSBBVkF1ZGlvU2Vz c2lvbkludGVycnVwdGlvbk9wdGlvblNob3VsZFJlc3VtZSkKICAgICAgICAgZmxhZ3MgPSBNZWRp YVNlc3Npb246Ok1heVJlc3VtZVBsYXlpbmc7CiAKQEAgLTMxMSw2ICszNjIsOCBAQCAtICh2b2lk KWFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZDooCiAgICAgaWYgKCFfY2FsbGJhY2spCiAg ICAgICAgIHJldHVybjsKIAorICAgIExPRyhNZWRpYSwgIi1bV2ViTWVkaWFTZXNzaW9uSGVscGVy IGFwcGxpY2F0aW9uV2lsbEVudGVyRm9yZWdyb3VuZF0iKTsKKwogICAgIFdlYlRocmVhZFJ1bihe ewogICAgICAgICBpZiAoIV9jYWxsYmFjaykKICAgICAgICAgICAgIHJldHVybjsKQEAgLTMyNiw2 ICszNzksOCBAQCAtICh2b2lkKWFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlOihOU05vCiAgICAg aWYgKCFfY2FsbGJhY2spCiAgICAgICAgIHJldHVybjsKIAorICAgIExPRyhNZWRpYSwgIi1bV2Vi TWVkaWFTZXNzaW9uSGVscGVyIGFwcGxpY2F0aW9uRGlkQmVjb21lQWN0aXZlXSIpOworCiAgICAg V2ViVGhyZWFkUnVuKF57CiAgICAgICAgIGlmICghX2NhbGxiYWNrKQogICAgICAgICAgICAgcmV0 dXJuOwpAQCAtMzQwLDcgKzM5NSw5IEBAIC0gKHZvaWQpYXBwbGljYXRpb25XaWxsUmVzaWduQWN0 aXZlOihOU04KIAogICAgIGlmICghX2NhbGxiYWNrKQogICAgICAgICByZXR1cm47Ci0gICAgCisK KyAgICBMT0coTWVkaWEsICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciBhcHBsaWNhdGlvbldpbGxS ZXNpZ25BY3RpdmVdIik7CisKICAgICBXZWJUaHJlYWRSdW4oXnsKICAgICAgICAgaWYgKCFfY2Fs bGJhY2spCiAgICAgICAgICAgICByZXR1cm47CkBAIC0zNTYsNiArNDEzLDggQEAgLSAodm9pZCl3 aXJlbGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZQogICAgIGlmICghX2NhbGxiYWNrKQogICAg ICAgICByZXR1cm47CiAKKyAgICBMT0coTWVkaWEsICItW1dlYk1lZGlhU2Vzc2lvbkhlbHBlciB3 aXJlbGVzc1JvdXRlc0F2YWlsYWJsZURpZENoYW5nZV0iKTsKKwogICAgIFdlYlRocmVhZFJ1bihe ewogICAgICAgICBpZiAoIV9jYWxsYmFjaykKICAgICAgICAgICAgIHJldHVybjsK