196774 2019-04-10 10:19:02 -0700 Regression(r240562) Audio sometimes keeps playing in previous process after a process-swap 2019-05-10 15:31:26 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=197799 InRadar P2 Normal --- 196784 193716 1 cdumez cdumez achristensen beidson ggaren koivisto ryanhaddad webkit-bug-importer oldest_to_newest 1525998 0 cdumez 2019-04-10 10:19:02 -0700 Audio sometimes keeps playing in previous process after a process-swap since r240562. 1525999 1 cdumez 2019-04-10 10:19:39 -0700 <rdar://problem/49460572> 1526006 2 367136 cdumez 2019-04-10 10:32:00 -0700 Created attachment 367136 Patch 1526020 3 367141 cdumez 2019-04-10 11:06:17 -0700 Created attachment 367141 Patch 1526068 4 367141 achristensen 2019-04-10 12:54:05 -0700 Comment on attachment 367141 Patch This looks good. I lament the lack of tests. 1526069 5 cdumez 2019-04-10 12:55:05 -0700 (In reply to Alex Christensen from comment #4) > Comment on attachment 367141 [details] > Patch > > This looks good. I lament the lack of tests. Yes, I wasn't able to find a way to API test this. 1526072 6 367141 cdumez 2019-04-10 12:56:48 -0700 Comment on attachment 367141 Patch Clearing flags on attachment: 367141 Committed r244144: <https://trac.webkit.org/changeset/244144> 1526073 7 cdumez 2019-04-10 12:56:50 -0700 All reviewed patches have been landed. Closing bug. 1526128 8 ryanhaddad 2019-04-10 14:28:01 -0700 (In reply to Chris Dumez from comment #5) > (In reply to Alex Christensen from comment #4) > > Comment on attachment 367141 [details] > > Patch > > > > This looks good. I lament the lack of tests. > > Yes, I wasn't able to find a way to API test this. It did manage to break one though, as shown by EWS: https://ews-build.webkit.org/#/builders/3/builds/385 1526129 9 cdumez 2019-04-10 14:28:57 -0700 (In reply to Ryan Haddad from comment #8) > (In reply to Chris Dumez from comment #5) > > (In reply to Alex Christensen from comment #4) > > > Comment on attachment 367141 [details] > > > Patch > > > > > > This looks good. I lament the lack of tests. > > > > Yes, I wasn't able to find a way to API test this. > It did manage to break one though, as shown by EWS: > https://ews-build.webkit.org/#/builders/3/builds/385 Will look now. 1526130 10 cdumez 2019-04-10 14:30:02 -0700 (In reply to Chris Dumez from comment #9) > (In reply to Ryan Haddad from comment #8) > > (In reply to Chris Dumez from comment #5) > > > (In reply to Alex Christensen from comment #4) > > > > Comment on attachment 367141 [details] > > > > Patch > > > > > > > > This looks good. I lament the lack of tests. > > > > > > Yes, I wasn't able to find a way to API test this. > > It did manage to break one though, as shown by EWS: > > https://ews-build.webkit.org/#/builders/3/builds/385 > > Will look now. Looks like that API test is flaky. 1526215 11 367141 cdumez 2019-04-10 16:51:28 -0700 Comment on attachment 367141 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=367141&action=review > Source/WebKit/UIProcess/SuspendedPageProxy.cpp:172 > + m_process->processPool().removeSuspendedPage(*this); // Will destroy |this|. I introduced an unintentional behavior change here by destroying the SuspendedPageProxy instead of closing it. Fixing via https://bugs.webkit.org/show_bug.cgi?id=196784 > Source/WebKit/UIProcess/WebPageProxy.cpp:-7091 > - m_process->processPool().closeFailedSuspendedPagesForPage(*this); Note that this was closing the SuspendedPage, ... > Source/WebKit/UIProcess/WebProcessPool.cpp:-2409 > - suspendedPage->close(); ... here, not destroying it. 1526360 12 cdumez 2019-04-11 06:31:39 -0700 Follow up fix landed in https://trac.webkit.org/changeset/244186 367136 2019-04-10 10:32:00 -0700 2019-04-10 11:06:15 -0700 Patch bug-196774-20190410103158.patch text/plain 9699 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRmNDBkNGViMDU1ZTE0YjI0 MjgxMGVlNmQ0NzNhZjE1YzhjMzhiZDAuLjI0OTgxZjlmZjUyNjVlMzFiNGJmMGYyMGU0ODc2Njg5 NjFhMGE4MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTktMDQtMTAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKHIyNDA1NjIpIEF1 ZGlvIHNvbWV0aW1lcyBrZWVwcyBwbGF5aW5nIGluIHByZXZpb3VzIHByb2Nlc3MgYWZ0ZXIgYSBw cm9jZXNzLXN3YXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5Njc3NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDk0NjA1NzI+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcjI0MDU2MiBhZGRlZCBsb2dp YyB0byBwcmV2ZW50IGZsYXNoaW5nIG9uIG5hdmlnYXRpb24uIFdoZW4gd2UgcmVjZWl2ZSB0aGUg RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAKKyAgICAgICAgSVBDIGZyb20gdGhlIHBy ZXZpb3VzIHByb2Nlc3MsIHdlIHdvdWxkIGRlbGF5IGNsb3NpbmcgdGhlIFdlYlBhZ2UgaW4gdGhh dCBwcm9jZXNzIHVudGlsIEVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUKKyAgICAgICAg SVBDIGlzIHJlY2VpdmVkIGZyb20gdGhlIG5ldyBwcm9jZXNzLiBUaGUgaXNzdWUgaXMgdGhhdCB0 aGlzIHdhcyByYWN5IGFzIHdlIHdvdWxkIHJlY2VpdmUgdGhlIEVudGVyQWNjZWxlcmF0ZWRDb21w b3NpdGluZ01vZGUKKyAgICAgICAgSVBDIGZyb20gdGhlIG5ldyBwcm9jZXNzICpiZWZvcmUqIHJl Y2VpdmluZyB0aGUgRGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAgSVBDIGZyb20gdGhl IHByZXZpb3VzIHByb2Nlc3MsIHdoaWNoIHdoaWNoCisgICAgICAgIGNhc2Ugd2Ugd291bGQgZmFp bCB0byBjbG9zZSB0aGUgV2ViUGFnZSBhbmQgYXVkaW8gY291bGQga2VlcCBwbGF5aW5nLgorCisg ICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB0aGUgV2ViUGFnZVByb3h5IGtlZXBzIHRyYWNr IG9mIGl0cyBsYXN0IHN1c3BlbmRlZCBwYWdlIGFuZCBub3RpZmllcyBpdCB3aGVuZXZlciBpdCBy ZWNlaXZlcyB0aGUKKyAgICAgICAgRW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSBJUEMu IElmIHRoZSBzdXNwZW5kZWQgcGFnZSBhbHJlYWR5IHJlY2VpdmVkIHRoZSBEaWRGYWlsVG9TdXNw ZW5kQWZ0ZXJQcm9jZXNzU3dhcCBJUEMsIGl0CisgICAgICAgIHdpbGwgY2xvc2UgdGhlIHBhZ2Uu IE90aGVyd2lzZSwgaXQgd2lsbCBzZXQgYSBib29sZWFuIGRhdGEgbWVtYmVyIGluZGljYXRpbmcg dGhhdCB3ZSBzaG91bGQgbm90IGRlbGF5IHBhZ2UgY2xvc2luZyB3aGVuCisgICAgICAgIHRoZSBE aWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCBpcyBldmVudHVhbGx5IHJlY2VpdmVkLgor CisgICAgICAgICogVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlN1c3BlbmRlZFBhZ2VQcm94eTo6U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAgICAg KFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5OjpwYWdlRW50ZXJlZEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdNb2RlKToKKyAgICAgICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5OjpkaWRQcm9j ZXNzUmVxdWVzdFRvU3VzcGVuZCk6CisgICAgICAgICogVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQ cm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5oOgorCiAyMDE5LTA0LTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgZHJvcCBTdXNwZW5kZWRQYWdlUHJveHkgZGF0YSBtZW1iZXIg dGhhdCBpcyB1bnVzZWQgYWZ0ZXIgcjI0NDA3NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IGMxMTg5MjM5MGI5YjRhZmI4MTQ0NTgwMzc3 MmY4OWEyYWUzYjkzMzQuLmZkNjUwYThiZGRjNzhlMDRiZGQ3Nzk3YWI1NjJmMzRjNDc5NmJmZGYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApA QCAtODIsNiArODIsNyBAQCBTdXNwZW5kZWRQYWdlUHJveHk6OlN1c3BlbmRlZFBhZ2VQcm94eShX ZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JgogICAgIDogbV9wYWdlKHBh Z2UpCiAgICAgLCBtX3Byb2Nlc3MoV1RGTW92ZShwcm9jZXNzKSkKICAgICAsIG1fbWFpbkZyYW1l SUQobWFpbkZyYW1lSUQpCisgICAgLCBtX3Nob3VsZERlbGF5Q2xvc2luZ09uRmFpbHVyZShtX3Bh Z2UuZHJhd2luZ0FyZWEoKSAmJiBtX3BhZ2UuZHJhd2luZ0FyZWEoKS0+dHlwZSgpID09IERyYXdp bmdBcmVhVHlwZVRpbGVkQ29yZUFuaW1hdGlvbikKICAgICAsIG1fc3VzcGVuc2lvblRpbWVvdXRU aW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZTdXNwZW5kZWRQYWdlUHJveHk6OnN1c3BlbnNp b25UaW1lZE91dCkKICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQogICAgICwgbV9zdXNwZW5zaW9u VG9rZW4obV9wcm9jZXNzLT50aHJvdHRsZXIoKS5iYWNrZ3JvdW5kQWN0aXZpdHlUb2tlbigpKQpA QCAtMTYwLDYgKzE2MSwxNiBAQCB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6Y2xvc2UoKQogICAg IG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJ RCgpKTsKIH0KIAordm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OnBhZ2VFbnRlcmVkQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ01vZGUoKQoreworICAgIG1fc2hvdWxkRGVsYXlDbG9zaW5nT25GYWlsdXJl ID0gZmFsc2U7CisKKyAgICBpZiAobV9zdXNwZW5zaW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRl OjpGYWlsZWRUb1N1c3BlbmQpIHsKKyAgICAgICAgLy8gV2UgbmVlZGVkIHRoZSBmYWlsZWQgc3Vz cGVuZGVkIHBhZ2UgdG8gc3RheSBhbGl2ZSB0byBhdm9pZCBmbGFzaGluZy4gTm93IHdlIGNhbiBn ZXQgcmlkIG9mIGl0LgorICAgICAgICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkucmVtb3ZlU3Vz cGVuZGVkUGFnZSgqdGhpcyk7IC8vIFdpbGwgZGVzdHJveSB8dGhpc3wuCisgICAgfQorfQorCiB2 b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJvY2Vzc1JlcXVlc3RUb1N1c3BlbmQoU3VzcGVu c2lvblN0YXRlIG5ld1N1c3BlbnNpb25TdGF0ZSkKIHsKICAgICBMT0coUHJvY2Vzc1N3YXBwaW5n LCAiU3VzcGVuZGVkUGFnZVByb3h5ICVzIGZyb20gcHJvY2VzcyAlaSBmaW5pc2hlZCB0cmFuc2l0 aW9uIHRvIHN1c3BlbmRlZCIsIGxvZ2dpbmdTdHJpbmcoKSwgbV9wcm9jZXNzLT5wcm9jZXNzSWRl bnRpZmllcigpKTsKQEAgLTE3NywxMyArMTg4LDcgQEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6 OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKFN1c3BlbnNpb25TdGF0ZSBuZXdTdXNwZW5zaW8K IAogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdl UHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIAotICAgIGJv b2wgc2hvdWxkRGVsYXlDbG9zaW5nT25GYWlsdXJlID0gZmFsc2U7Ci0jaWYgUExBVEZPUk0oTUFD KQotICAgIC8vIFdpdGggd2ViIHByb2Nlc3Mgc2lkZSB0aWxlcywgd2UgbmVlZCB0byBrZWVwIHRo ZSBzdXNwZW5kZWQgcGFnZSBhcm91bmQgb24gZmFpbHVyZSB0byBhdm9pZCBmbGFzaGluZy4KLSAg ICAvLyBJdCBpcyByZW1vdmVkIGJ5IFdlYlBhZ2VQcm94eTo6ZW50ZXJBY2NlbGVyYXRlZENvbXBv c2l0aW5nTW9kZSB3aGVuIHRoZSB0YXJnZXQgcGFnZSBpcyByZWFkeS4KLSAgICBzaG91bGREZWxh eUNsb3NpbmdPbkZhaWx1cmUgPSBtX3BhZ2UuZHJhd2luZ0FyZWEoKSAmJiBtX3BhZ2UuZHJhd2lu Z0FyZWEoKS0+dHlwZSgpID09IERyYXdpbmdBcmVhVHlwZVRpbGVkQ29yZUFuaW1hdGlvbjsKLSNl bmRpZgotICAgIGlmIChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OkZhaWxl ZFRvU3VzcGVuZCAmJiAhc2hvdWxkRGVsYXlDbG9zaW5nT25GYWlsdXJlKQorICAgIGlmIChtX3N1 c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OkZhaWxlZFRvU3VzcGVuZCAmJiAhbV9z aG91bGREZWxheUNsb3NpbmdPbkZhaWx1cmUpCiAgICAgICAgIGNsb3NlKCk7CiAKICAgICBpZiAo bV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcikKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3Vz cGVuZGVkUGFnZVByb3h5LmgKaW5kZXggOTI3ZmE3ZGE5YjIwMTNmZGI3YzllNTdmZDFiYTc4MWEy N2E5OWIwYy4uOGRhMmZhMjE2ZDE5OGFjMDM2NjE2ZmYyNjU3M2E2OWYyZjdjMDU5OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmgKQEAgLTUzLDYgKzUz LDggQEAgcHVibGljOgogICAgIHZvaWQgdW5zdXNwZW5kKCk7CiAgICAgdm9pZCBjbG9zZSgpOwog CisgICAgdm9pZCBwYWdlRW50ZXJlZEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CisKICNp ZiAhTE9HX0RJU0FCTEVECiAgICAgY29uc3QgY2hhciogbG9nZ2luZ1N0cmluZygpIGNvbnN0Owog I2VuZGlmCkBAIC03MCw2ICs3Miw3IEBAIHByaXZhdGU6CiAgICAgUmVmPFdlYlByb2Nlc3NQcm94 eT4gbV9wcm9jZXNzOwogICAgIHVpbnQ2NF90IG1fbWFpbkZyYW1lSUQ7CiAgICAgYm9vbCBtX2lz Q2xvc2VkIHsgZmFsc2UgfTsKKyAgICBib29sIG1fc2hvdWxkRGVsYXlDbG9zaW5nT25GYWlsdXJl IHsgZmFsc2UgfTsKIAogICAgIFN1c3BlbnNpb25TdGF0ZSBtX3N1c3BlbnNpb25TdGF0ZSB7IFN1 c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGluZyB9OwogICAgIENvbXBsZXRpb25IYW5kbGVyPHZvaWQo U3VzcGVuZGVkUGFnZVByb3h5Kik+IG1fcmVhZHlUb1Vuc3VzcGVuZEhhbmRsZXI7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCA1MzBmZDgyYmJiYmRhODI2MTAx MzMwMWYyYmU5ZjQ2ZmYzMWJhMjg0Li4wZjMzN2IxOTExZmNkYjIwMWNiNjg4MWZmODkxODcxNzY4 YjAyNmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTcz OCw2ICs3MzgsOCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bGF1bmNoUHJvY2Vzcyhjb25zdCBSZWdp c3RyYWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21haW4pCiAKIGJvb2wgV2ViUGFnZVByb3h5Ojpz dXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwg T3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFtZUlELCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xp ZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQpCiB7CisgICAgbV9sYXN0U3VzcGVuZGVk UGFnZSA9IG51bGxwdHI7CisKICAgICBpZiAoIW1haW5GcmFtZUlEKQogICAgICAgICByZXR1cm4g ZmFsc2U7CiAKQEAgLTc4MCw2ICs3ODIsNyBAQCBib29sIFdlYlBhZ2VQcm94eTo6c3VzcGVuZEN1 cnJlbnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmlnYXRpb24mIG5hdmlnYXRpb24sIE9wdAogICAg IGlmIChmcm9tSXRlbSAmJiBtX3ByZWZlcmVuY2VzLT51c2VzUGFnZUNhY2hlKCkpCiAgICAgICAg IGZyb21JdGVtLT5zZXRTdXNwZW5kZWRQYWdlKHN1c3BlbmRlZFBhZ2UuZ2V0KCkpOwogCisgICAg bV9sYXN0U3VzcGVuZGVkUGFnZSA9IG1ha2VXZWFrUHRyKCpzdXNwZW5kZWRQYWdlKTsKICAgICBt X3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuYWRkU3VzcGVuZGVkUGFnZShXVEZNb3ZlKHN1c3BlbmRl ZFBhZ2UpKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KQEAgLTY3NzEsNiArNjc3NCw3IEBAIHZvaWQg V2ViUGFnZVByb3h5OjpyZXNldFN0YXRlKFJlc2V0U3RhdGVSZWFzb24gcmVzZXRTdGF0ZVJlYXNv bikKICAgICBtX21haW5GcmFtZSA9IG51bGxwdHI7CiAgICAgbV9mb2N1c2VkRnJhbWUgPSBudWxs cHRyOwogICAgIG1fZnJhbWVTZXRMYXJnZXN0RnJhbWUgPSBudWxscHRyOworICAgIG1fbGFzdFN1 c3BlbmRlZFBhZ2UgPSBudWxscHRyOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgbV9zY3Jv bGxpbmdQZXJmb3JtYW5jZURhdGEgPSBudWxscHRyOwpAQCAtNzA4Nyw4ICs3MDkxLDkgQEAgdm9p ZCBXZWJQYWdlUHJveHk6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5 ZXJUcmVlQ29udGV4dCYgbGF5ZXIKICAgICBBU1NFUlQobV9kcmF3aW5nQXJlYS0+dHlwZSgpID09 IERyYXdpbmdBcmVhVHlwZVRpbGVkQ29yZUFuaW1hdGlvbik7CiAjZW5kaWYKICAgICBwYWdlQ2xp ZW50KCkuZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZShsYXllclRyZWVDb250ZXh0KTsK LSAgICAvLyBXZSBuZWVkZWQgdGhlIGZhaWxlZCBzdXNwZW5kZWQgcGFnZSB0byBzdGF5IGFsaXZl IHRvIGF2b2lkIGZsYXNoaW5nLiBOb3cgd2UgY2FuIGdldCByaWQgb2YgaXQuCi0gICAgbV9wcm9j ZXNzLT5wcm9jZXNzUG9vbCgpLmNsb3NlRmFpbGVkU3VzcGVuZGVkUGFnZXNGb3JQYWdlKCp0aGlz KTsKKworICAgIGlmIChtX2xhc3RTdXNwZW5kZWRQYWdlKQorICAgICAgICBtX2xhc3RTdXNwZW5k ZWRQYWdlLT5wYWdlRW50ZXJlZEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdNb2RlKCk7CiB9CiAKIHZv aWQgV2ViUGFnZVByb3h5OjpleGl0QWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAppbmRleCA0MWE0MzIyNWExMzhjMjkwNzg4NTNi OTcwMDUzNzVkYjg1MTE2ZTNmLi4yM2U4MjRmNGUwYTkwY2RmOThmNDQwZTE3MjYxMGJjYTIwNTBl MzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApAQCAtMjQ2OCw2ICsy NDY4LDcgQEAgV0VCUEFHRVBST1hZX0xPQURPUFRJTUlaRVJfQURESVRJT05TXzIKICAgICBib29s IG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2FuZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAK ICAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9uYWxQYWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQ YWdlOworICAgIFdlYWtQdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBtX2xhc3RTdXNwZW5kZWRQYWdl OwogCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAgICAgc3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1h Z2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1hZ2VDb250cm9sbGVyOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDI5YjRiNWFlNTE4MTY2Yzg4ZTgwMGQ5 OTZjZDhkNGViNDM0OTJkNGEuLjJhNjA0NjkyN2E2ZjZmOTFlZThjNjRkZWFkZjk3NzdmNmEyYjJj YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTI0 MDIsMTQgKzI0MDIsNiBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpyZW1vdmVBbGxTdXNwZW5kZWRQ YWdlc0ZvclBhZ2UoV2ViUGFnZVByb3h5JiBwYWdlLCBXZWJQcm9jZQogICAgIH0pOwogfQogCi12 b2lkIFdlYlByb2Nlc3NQb29sOjpjbG9zZUZhaWxlZFN1c3BlbmRlZFBhZ2VzRm9yUGFnZShXZWJQ YWdlUHJveHkmIHBhZ2UpCi17Ci0gICAgZm9yIChhdXRvJiBzdXNwZW5kZWRQYWdlIDogbV9zdXNw ZW5kZWRQYWdlcykgewotICAgICAgICBpZiAoJnN1c3BlbmRlZFBhZ2UtPnBhZ2UoKSA9PSAmcGFn ZSAmJiBzdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1c3BlbmQoKSkKLSAgICAgICAgICAgIHN1c3Bl bmRlZFBhZ2UtPmNsb3NlKCk7Ci0gICAgfQotfQotCiBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVk UGFnZVByb3h5PiBXZWJQcm9jZXNzUG9vbDo6dGFrZVN1c3BlbmRlZFBhZ2UoU3VzcGVuZGVkUGFn ZVByb3h5JiBzdXNwZW5kZWRQYWdlKQogewogICAgIHJldHVybiBtX3N1c3BlbmRlZFBhZ2VzLnRh a2VGaXJzdChbJnN1c3BlbmRlZFBhZ2VdKGF1dG8mIGl0ZW0pIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9XZWJQcm9jZXNzUG9vbC5oCmluZGV4IDQ3ODM0ZTdmMWY5YTllMWNkZTVhYjIwNGJjMDI4 NGI1MTNmODQ4ZDkuLjNiYjFmNzU4NmQ2MzRlMzJiMDIxMDI2YjlhNDQ2YWZhMzAwZTdjOGYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKKysrIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaApAQCAtNDcxLDcgKzQ3MSw2 IEBAIHB1YmxpYzoKICAgICAvLyBTdXNwZW5kZWRQYWdlUHJveHkgbWFuYWdlbWVudC4KICAgICB2 b2lkIGFkZFN1c3BlbmRlZFBhZ2Uoc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4m Jik7CiAgICAgdm9pZCByZW1vdmVBbGxTdXNwZW5kZWRQYWdlc0ZvclBhZ2UoV2ViUGFnZVByb3h5 JiwgV2ViUHJvY2Vzc1Byb3h5KiA9IG51bGxwdHIpOwotICAgIHZvaWQgY2xvc2VGYWlsZWRTdXNw ZW5kZWRQYWdlc0ZvclBhZ2UoV2ViUGFnZVByb3h5Jik7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFN1 c3BlbmRlZFBhZ2VQcm94eT4gdGFrZVN1c3BlbmRlZFBhZ2UoU3VzcGVuZGVkUGFnZVByb3h5Jik7 CiAgICAgdm9pZCByZW1vdmVTdXNwZW5kZWRQYWdlKFN1c3BlbmRlZFBhZ2VQcm94eSYpOwogICAg IGJvb2wgaGFzU3VzcGVuZGVkUGFnZUZvcihXZWJQcm9jZXNzUHJveHkmLCBXZWJQYWdlUHJveHkm KSBjb25zdDsK 367141 2019-04-10 11:06:17 -0700 2019-04-10 12:56:48 -0700 Patch bug-196774-20190410110616.patch text/plain 9726 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ0MTMyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRmNDBkNGViMDU1ZTE0YjI0 MjgxMGVlNmQ0NzNhZjE1YzhjMzhiZDAuLjI0OTgxZjlmZjUyNjVlMzFiNGJmMGYyMGU0ODc2Njg5 NjFhMGE4MTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMTktMDQtMTAgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKHIyNDA1NjIpIEF1 ZGlvIHNvbWV0aW1lcyBrZWVwcyBwbGF5aW5nIGluIHByZXZpb3VzIHByb2Nlc3MgYWZ0ZXIgYSBw cm9jZXNzLXN3YXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE5Njc3NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDk0NjA1NzI+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgcjI0MDU2MiBhZGRlZCBsb2dp YyB0byBwcmV2ZW50IGZsYXNoaW5nIG9uIG5hdmlnYXRpb24uIFdoZW4gd2UgcmVjZWl2ZSB0aGUg RGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAKKyAgICAgICAgSVBDIGZyb20gdGhlIHBy ZXZpb3VzIHByb2Nlc3MsIHdlIHdvdWxkIGRlbGF5IGNsb3NpbmcgdGhlIFdlYlBhZ2UgaW4gdGhh dCBwcm9jZXNzIHVudGlsIEVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUKKyAgICAgICAg SVBDIGlzIHJlY2VpdmVkIGZyb20gdGhlIG5ldyBwcm9jZXNzLiBUaGUgaXNzdWUgaXMgdGhhdCB0 aGlzIHdhcyByYWN5IGFzIHdlIHdvdWxkIHJlY2VpdmUgdGhlIEVudGVyQWNjZWxlcmF0ZWRDb21w b3NpdGluZ01vZGUKKyAgICAgICAgSVBDIGZyb20gdGhlIG5ldyBwcm9jZXNzICpiZWZvcmUqIHJl Y2VpdmluZyB0aGUgRGlkRmFpbFRvU3VzcGVuZEFmdGVyUHJvY2Vzc1N3YXAgSVBDIGZyb20gdGhl IHByZXZpb3VzIHByb2Nlc3MsIHdoaWNoIHdoaWNoCisgICAgICAgIGNhc2Ugd2Ugd291bGQgZmFp bCB0byBjbG9zZSB0aGUgV2ViUGFnZSBhbmQgYXVkaW8gY291bGQga2VlcCBwbGF5aW5nLgorCisg ICAgICAgIFRvIGFkZHJlc3MgdGhlIGlzc3VlLCB0aGUgV2ViUGFnZVByb3h5IGtlZXBzIHRyYWNr IG9mIGl0cyBsYXN0IHN1c3BlbmRlZCBwYWdlIGFuZCBub3RpZmllcyBpdCB3aGVuZXZlciBpdCBy ZWNlaXZlcyB0aGUKKyAgICAgICAgRW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSBJUEMu IElmIHRoZSBzdXNwZW5kZWQgcGFnZSBhbHJlYWR5IHJlY2VpdmVkIHRoZSBEaWRGYWlsVG9TdXNw ZW5kQWZ0ZXJQcm9jZXNzU3dhcCBJUEMsIGl0CisgICAgICAgIHdpbGwgY2xvc2UgdGhlIHBhZ2Uu IE90aGVyd2lzZSwgaXQgd2lsbCBzZXQgYSBib29sZWFuIGRhdGEgbWVtYmVyIGluZGljYXRpbmcg dGhhdCB3ZSBzaG91bGQgbm90IGRlbGF5IHBhZ2UgY2xvc2luZyB3aGVuCisgICAgICAgIHRoZSBE aWRGYWlsVG9TdXNwZW5kQWZ0ZXJQcm9jZXNzU3dhcCBpcyBldmVudHVhbGx5IHJlY2VpdmVkLgor CisgICAgICAgICogVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OlN1c3BlbmRlZFBhZ2VQcm94eTo6U3VzcGVuZGVkUGFnZVByb3h5KToKKyAgICAgICAg KFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5OjpwYWdlRW50ZXJlZEFjY2VsZXJhdGVkQ29tcG9z aXRpbmdNb2RlKToKKyAgICAgICAgKFdlYktpdDo6U3VzcGVuZGVkUGFnZVByb3h5OjpkaWRQcm9j ZXNzUmVxdWVzdFRvU3VzcGVuZCk6CisgICAgICAgICogVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQ cm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGUpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmVudGVyQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01v ZGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoKKyAgICAgICAgKiBVSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5oOgorCiAyMDE5LTA0LTEwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAK ICAgICAgICAgVW5yZXZpZXdlZCwgZHJvcCBTdXNwZW5kZWRQYWdlUHJveHkgZGF0YSBtZW1iZXIg dGhhdCBpcyB1bnVzZWQgYWZ0ZXIgcjI0NDA3NS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9TdXNwZW5kZWRQYWdlUHJveHkuY3BwCmluZGV4IGMxMTg5MjM5MGI5YjRhZmI4MTQ0NTgwMzc3 MmY4OWEyYWUzYjkzMzQuLjhkNDk0ODA4ZmZkMjM5YmNlODEyM2I0ZWY1ZmNkYjdjYjVjNmQ3MWMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5j cHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmNwcApA QCAtODIsNiArODIsOSBAQCBTdXNwZW5kZWRQYWdlUHJveHk6OlN1c3BlbmRlZFBhZ2VQcm94eShX ZWJQYWdlUHJveHkmIHBhZ2UsIFJlZjxXZWJQcm9jZXNzUHJveHk+JgogICAgIDogbV9wYWdlKHBh Z2UpCiAgICAgLCBtX3Byb2Nlc3MoV1RGTW92ZShwcm9jZXNzKSkKICAgICAsIG1fbWFpbkZyYW1l SUQobWFpbkZyYW1lSUQpCisjaWYgUExBVEZPUk0oTUFDKQorICAgICwgbV9zaG91bGREZWxheUNs b3NpbmdPbkZhaWx1cmUobV9wYWdlLmRyYXdpbmdBcmVhKCkgJiYgbV9wYWdlLmRyYXdpbmdBcmVh KCktPnR5cGUoKSA9PSBEcmF3aW5nQXJlYVR5cGVUaWxlZENvcmVBbmltYXRpb24pCisjZW5kaWYK ICAgICAsIG1fc3VzcGVuc2lvblRpbWVvdXRUaW1lcihSdW5Mb29wOjptYWluKCksIHRoaXMsICZT dXNwZW5kZWRQYWdlUHJveHk6OnN1c3BlbnNpb25UaW1lZE91dCkKICNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQogICAgICwgbV9zdXNwZW5zaW9uVG9rZW4obV9wcm9jZXNzLT50aHJvdHRsZXIoKS5i YWNrZ3JvdW5kQWN0aXZpdHlUb2tlbigpKQpAQCAtMTYwLDYgKzE2MywxNiBAQCB2b2lkIFN1c3Bl bmRlZFBhZ2VQcm94eTo6Y2xvc2UoKQogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZTo6Q2xvc2UoKSwgbV9wYWdlLnBhZ2VJRCgpKTsKIH0KIAordm9pZCBTdXNwZW5kZWRQYWdl UHJveHk6OnBhZ2VFbnRlcmVkQWNjZWxlcmF0ZWRDb21wb3NpdGluZ01vZGUoKQoreworICAgIG1f c2hvdWxkRGVsYXlDbG9zaW5nT25GYWlsdXJlID0gZmFsc2U7CisKKyAgICBpZiAobV9zdXNwZW5z aW9uU3RhdGUgPT0gU3VzcGVuc2lvblN0YXRlOjpGYWlsZWRUb1N1c3BlbmQpIHsKKyAgICAgICAg Ly8gV2UgbmVlZGVkIHRoZSBmYWlsZWQgc3VzcGVuZGVkIHBhZ2UgdG8gc3RheSBhbGl2ZSB0byBh dm9pZCBmbGFzaGluZy4gTm93IHdlIGNhbiBnZXQgcmlkIG9mIGl0LgorICAgICAgICBtX3Byb2Nl c3MtPnByb2Nlc3NQb29sKCkucmVtb3ZlU3VzcGVuZGVkUGFnZSgqdGhpcyk7IC8vIFdpbGwgZGVz dHJveSB8dGhpc3wuCisgICAgfQorfQorCiB2b2lkIFN1c3BlbmRlZFBhZ2VQcm94eTo6ZGlkUHJv Y2Vzc1JlcXVlc3RUb1N1c3BlbmQoU3VzcGVuc2lvblN0YXRlIG5ld1N1c3BlbnNpb25TdGF0ZSkK IHsKICAgICBMT0coUHJvY2Vzc1N3YXBwaW5nLCAiU3VzcGVuZGVkUGFnZVByb3h5ICVzIGZyb20g cHJvY2VzcyAlaSBmaW5pc2hlZCB0cmFuc2l0aW9uIHRvIHN1c3BlbmRlZCIsIGxvZ2dpbmdTdHJp bmcoKSwgbV9wcm9jZXNzLT5wcm9jZXNzSWRlbnRpZmllcigpKTsKQEAgLTE3NywxMyArMTkwLDcg QEAgdm9pZCBTdXNwZW5kZWRQYWdlUHJveHk6OmRpZFByb2Nlc3NSZXF1ZXN0VG9TdXNwZW5kKFN1 c3BlbnNpb25TdGF0ZSBuZXdTdXNwZW5zaW8KIAogICAgIG1fcHJvY2Vzcy0+cmVtb3ZlTWVzc2Fn ZVJlY2VpdmVyKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwg bV9wYWdlLnBhZ2VJRCgpKTsKIAotICAgIGJvb2wgc2hvdWxkRGVsYXlDbG9zaW5nT25GYWlsdXJl ID0gZmFsc2U7Ci0jaWYgUExBVEZPUk0oTUFDKQotICAgIC8vIFdpdGggd2ViIHByb2Nlc3Mgc2lk ZSB0aWxlcywgd2UgbmVlZCB0byBrZWVwIHRoZSBzdXNwZW5kZWQgcGFnZSBhcm91bmQgb24gZmFp bHVyZSB0byBhdm9pZCBmbGFzaGluZy4KLSAgICAvLyBJdCBpcyByZW1vdmVkIGJ5IFdlYlBhZ2VQ cm94eTo6ZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0aW5nTW9kZSB3aGVuIHRoZSB0YXJnZXQgcGFn ZSBpcyByZWFkeS4KLSAgICBzaG91bGREZWxheUNsb3NpbmdPbkZhaWx1cmUgPSBtX3BhZ2UuZHJh d2luZ0FyZWEoKSAmJiBtX3BhZ2UuZHJhd2luZ0FyZWEoKS0+dHlwZSgpID09IERyYXdpbmdBcmVh VHlwZVRpbGVkQ29yZUFuaW1hdGlvbjsKLSNlbmRpZgotICAgIGlmIChtX3N1c3BlbnNpb25TdGF0 ZSA9PSBTdXNwZW5zaW9uU3RhdGU6OkZhaWxlZFRvU3VzcGVuZCAmJiAhc2hvdWxkRGVsYXlDbG9z aW5nT25GYWlsdXJlKQorICAgIGlmIChtX3N1c3BlbnNpb25TdGF0ZSA9PSBTdXNwZW5zaW9uU3Rh dGU6OkZhaWxlZFRvU3VzcGVuZCAmJiAhbV9zaG91bGREZWxheUNsb3NpbmdPbkZhaWx1cmUpCiAg ICAgICAgIGNsb3NlKCk7CiAKICAgICBpZiAobV9yZWFkeVRvVW5zdXNwZW5kSGFuZGxlcikKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1N1c3BlbmRlZFBhZ2VQcm94eS5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVuZGVkUGFnZVByb3h5LmgKaW5kZXggOTI3ZmE3 ZGE5YjIwMTNmZGI3YzllNTdmZDFiYTc4MWEyN2E5OWIwYy4uOGRhMmZhMjE2ZDE5OGFjMDM2NjE2 ZmYyNjU3M2E2OWYyZjdjMDU5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv U3VzcGVuZGVkUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvU3VzcGVu ZGVkUGFnZVByb3h5LmgKQEAgLTUzLDYgKzUzLDggQEAgcHVibGljOgogICAgIHZvaWQgdW5zdXNw ZW5kKCk7CiAgICAgdm9pZCBjbG9zZSgpOwogCisgICAgdm9pZCBwYWdlRW50ZXJlZEFjY2VsZXJh dGVkQ29tcG9zaXRpbmdNb2RlKCk7CisKICNpZiAhTE9HX0RJU0FCTEVECiAgICAgY29uc3QgY2hh ciogbG9nZ2luZ1N0cmluZygpIGNvbnN0OwogI2VuZGlmCkBAIC03MCw2ICs3Miw3IEBAIHByaXZh dGU6CiAgICAgUmVmPFdlYlByb2Nlc3NQcm94eT4gbV9wcm9jZXNzOwogICAgIHVpbnQ2NF90IG1f bWFpbkZyYW1lSUQ7CiAgICAgYm9vbCBtX2lzQ2xvc2VkIHsgZmFsc2UgfTsKKyAgICBib29sIG1f c2hvdWxkRGVsYXlDbG9zaW5nT25GYWlsdXJlIHsgZmFsc2UgfTsKIAogICAgIFN1c3BlbnNpb25T dGF0ZSBtX3N1c3BlbnNpb25TdGF0ZSB7IFN1c3BlbnNpb25TdGF0ZTo6U3VzcGVuZGluZyB9Owog ICAgIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoU3VzcGVuZGVkUGFnZVByb3h5Kik+IG1fcmVhZHlU b1Vuc3VzcGVuZEhhbmRsZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cAppbmRleCA1MzBmZDgyYmJiYmRhODI2MTAxMzMwMWYyYmU5ZjQ2ZmYzMWJhMjg0Li4wZjMzN2Ix OTExZmNkYjIwMWNiNjg4MWZmODkxODcxNzY4YjAyNmIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAKQEAgLTczOCw2ICs3MzgsOCBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6bGF1bmNoUHJvY2Vzcyhjb25zdCBSZWdpc3RyYWJsZURvbWFpbiYgcmVnaXN0cmFibGVEb21h aW4pCiAKIGJvb2wgV2ViUGFnZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBvc3NpYmxlKEFQ STo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgT3B0aW9uYWw8dWludDY0X3Q+IG1haW5GcmFtZUlE LCBQcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50IHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGll bnQpCiB7CisgICAgbV9sYXN0U3VzcGVuZGVkUGFnZSA9IG51bGxwdHI7CisKICAgICBpZiAoIW1h aW5GcmFtZUlEKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKQEAgLTc4MCw2ICs3ODIsNyBAQCBi b29sIFdlYlBhZ2VQcm94eTo6c3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZShBUEk6Ok5hdmln YXRpb24mIG5hdmlnYXRpb24sIE9wdAogICAgIGlmIChmcm9tSXRlbSAmJiBtX3ByZWZlcmVuY2Vz LT51c2VzUGFnZUNhY2hlKCkpCiAgICAgICAgIGZyb21JdGVtLT5zZXRTdXNwZW5kZWRQYWdlKHN1 c3BlbmRlZFBhZ2UuZ2V0KCkpOwogCisgICAgbV9sYXN0U3VzcGVuZGVkUGFnZSA9IG1ha2VXZWFr UHRyKCpzdXNwZW5kZWRQYWdlKTsKICAgICBtX3Byb2Nlc3MtPnByb2Nlc3NQb29sKCkuYWRkU3Vz cGVuZGVkUGFnZShXVEZNb3ZlKHN1c3BlbmRlZFBhZ2UpKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0K QEAgLTY3NzEsNiArNjc3NCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpyZXNldFN0YXRlKFJlc2V0 U3RhdGVSZWFzb24gcmVzZXRTdGF0ZVJlYXNvbikKICAgICBtX21haW5GcmFtZSA9IG51bGxwdHI7 CiAgICAgbV9mb2N1c2VkRnJhbWUgPSBudWxscHRyOwogICAgIG1fZnJhbWVTZXRMYXJnZXN0RnJh bWUgPSBudWxscHRyOworICAgIG1fbGFzdFN1c3BlbmRlZFBhZ2UgPSBudWxscHRyOwogCiAjaWYg UExBVEZPUk0oQ09DT0EpCiAgICAgbV9zY3JvbGxpbmdQZXJmb3JtYW5jZURhdGEgPSBudWxscHRy OwpAQCAtNzA4Nyw4ICs3MDkxLDkgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmVudGVyQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ01vZGUoY29uc3QgTGF5ZXJUcmVlQ29udGV4dCYgbGF5ZXIKICAgICBBU1NF UlQobV9kcmF3aW5nQXJlYS0+dHlwZSgpID09IERyYXdpbmdBcmVhVHlwZVRpbGVkQ29yZUFuaW1h dGlvbik7CiAjZW5kaWYKICAgICBwYWdlQ2xpZW50KCkuZW50ZXJBY2NlbGVyYXRlZENvbXBvc2l0 aW5nTW9kZShsYXllclRyZWVDb250ZXh0KTsKLSAgICAvLyBXZSBuZWVkZWQgdGhlIGZhaWxlZCBz dXNwZW5kZWQgcGFnZSB0byBzdGF5IGFsaXZlIHRvIGF2b2lkIGZsYXNoaW5nLiBOb3cgd2UgY2Fu IGdldCByaWQgb2YgaXQuCi0gICAgbV9wcm9jZXNzLT5wcm9jZXNzUG9vbCgpLmNsb3NlRmFpbGVk U3VzcGVuZGVkUGFnZXNGb3JQYWdlKCp0aGlzKTsKKworICAgIGlmIChtX2xhc3RTdXNwZW5kZWRQ YWdlKQorICAgICAgICBtX2xhc3RTdXNwZW5kZWRQYWdlLT5wYWdlRW50ZXJlZEFjY2VsZXJhdGVk Q29tcG9zaXRpbmdNb2RlKCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpleGl0QWNjZWxlcmF0 ZWRDb21wb3NpdGluZ01vZGUoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaApp bmRleCA0MWE0MzIyNWExMzhjMjkwNzg4NTNiOTcwMDUzNzVkYjg1MTE2ZTNmLi4yM2U4MjRmNGUw YTkwY2RmOThmNDQwZTE3MjYxMGJjYTIwNTBlMzE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaApAQCAtMjQ2OCw2ICsyNDY4LDcgQEAgV0VCUEFHRVBST1hZX0xPQURPUFRJ TUlaRVJfQURESVRJT05TXzIKICAgICBib29sIG1fbWF5SGF2ZVVuaXZlcnNhbEZpbGVSZWFkU2Fu ZGJveEV4dGVuc2lvbiB7IGZhbHNlIH07CiAKICAgICBzdGQ6OnVuaXF1ZV9wdHI8UHJvdmlzaW9u YWxQYWdlUHJveHk+IG1fcHJvdmlzaW9uYWxQYWdlOworICAgIFdlYWtQdHI8U3VzcGVuZGVkUGFn ZVByb3h5PiBtX2xhc3RTdXNwZW5kZWRQYWdlOwogCiAjaWYgSEFWRShQRU5DSUxLSVQpCiAgICAg c3RkOjp1bmlxdWVfcHRyPEVkaXRhYmxlSW1hZ2VDb250cm9sbGVyPiBtX2VkaXRhYmxlSW1hZ2VD b250cm9sbGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmlu ZGV4IDI5YjRiNWFlNTE4MTY2Yzg4ZTgwMGQ5OTZjZDhkNGViNDM0OTJkNGEuLjJhNjA0NjkyN2E2 ZjZmOTFlZThjNjRkZWFkZjk3NzdmNmEyYjJjYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTI0MDIsMTQgKzI0MDIsNiBAQCB2b2lkIFdlYlByb2Nl c3NQb29sOjpyZW1vdmVBbGxTdXNwZW5kZWRQYWdlc0ZvclBhZ2UoV2ViUGFnZVByb3h5JiBwYWdl LCBXZWJQcm9jZQogICAgIH0pOwogfQogCi12b2lkIFdlYlByb2Nlc3NQb29sOjpjbG9zZUZhaWxl ZFN1c3BlbmRlZFBhZ2VzRm9yUGFnZShXZWJQYWdlUHJveHkmIHBhZ2UpCi17Ci0gICAgZm9yIChh dXRvJiBzdXNwZW5kZWRQYWdlIDogbV9zdXNwZW5kZWRQYWdlcykgewotICAgICAgICBpZiAoJnN1 c3BlbmRlZFBhZ2UtPnBhZ2UoKSA9PSAmcGFnZSAmJiBzdXNwZW5kZWRQYWdlLT5mYWlsZWRUb1N1 c3BlbmQoKSkKLSAgICAgICAgICAgIHN1c3BlbmRlZFBhZ2UtPmNsb3NlKCk7Ci0gICAgfQotfQot CiBzdGQ6OnVuaXF1ZV9wdHI8U3VzcGVuZGVkUGFnZVByb3h5PiBXZWJQcm9jZXNzUG9vbDo6dGFr ZVN1c3BlbmRlZFBhZ2UoU3VzcGVuZGVkUGFnZVByb3h5JiBzdXNwZW5kZWRQYWdlKQogewogICAg IHJldHVybiBtX3N1c3BlbmRlZFBhZ2VzLnRha2VGaXJzdChbJnN1c3BlbmRlZFBhZ2VdKGF1dG8m IGl0ZW0pIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCmluZGV4IDQ3 ODM0ZTdmMWY5YTllMWNkZTVhYjIwNGJjMDI4NGI1MTNmODQ4ZDkuLjNiYjFmNzU4NmQ2MzRlMzJi MDIxMDI2YjlhNDQ2YWZhMzAwZTdjOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuaApAQCAtNDcxLDcgKzQ3MSw2IEBAIHB1YmxpYzoKICAgICAvLyBTdXNwZW5kZWRQ YWdlUHJveHkgbWFuYWdlbWVudC4KICAgICB2b2lkIGFkZFN1c3BlbmRlZFBhZ2Uoc3RkOjp1bmlx dWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4mJik7CiAgICAgdm9pZCByZW1vdmVBbGxTdXNwZW5k ZWRQYWdlc0ZvclBhZ2UoV2ViUGFnZVByb3h5JiwgV2ViUHJvY2Vzc1Byb3h5KiA9IG51bGxwdHIp OwotICAgIHZvaWQgY2xvc2VGYWlsZWRTdXNwZW5kZWRQYWdlc0ZvclBhZ2UoV2ViUGFnZVByb3h5 Jik7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFN1c3BlbmRlZFBhZ2VQcm94eT4gdGFrZVN1c3BlbmRl ZFBhZ2UoU3VzcGVuZGVkUGFnZVByb3h5Jik7CiAgICAgdm9pZCByZW1vdmVTdXNwZW5kZWRQYWdl KFN1c3BlbmRlZFBhZ2VQcm94eSYpOwogICAgIGJvb2wgaGFzU3VzcGVuZGVkUGFnZUZvcihXZWJQ cm9jZXNzUHJveHkmLCBXZWJQYWdlUHJveHkmKSBjb25zdDsK