224717 2021-04-17 03:56:07 -0700 [Cleanup] Remove redundant BreakingContext::m_currentStyle 2021-04-24 15:07:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham changseok esprehn+autocc ews-watchlist glenn koivisto kondapallykalyan pdr simon.fraser webkit-bug-importer zalan oldest_to_newest 1751408 0 zalan 2021-04-17 03:56:07 -0700 ssia 1751409 1 426329 zalan 2021-04-17 03:57:29 -0700 Created attachment 426329 Patch 1751437 2 426338 zalan 2021-04-17 11:24:32 -0700 Created attachment 426338 Patch 1751463 3 ews-feeder 2021-04-17 14:13:30 -0700 Committed r276207 (236689@main): <https://commits.webkit.org/236689@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426338. 1753928 4 webkit-bug-importer 2021-04-24 15:07:21 -0700 <rdar://problem/77110094> 426329 2021-04-17 03:57:29 -0700 2021-04-17 11:24:30 -0700 Patch bug-224717-20210417035728.patch text/plain 10106 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggM2JiMjdjZjExMmZlMzQz OGYzYmQ4MzdjYTA2YzM3MjkxYzRiNWJkZi4uMmY2ODk1MjI5OTkyMDA5NDBjODUwNzlmZWRlZmY0 MTY4NTJmYzI5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA0LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NsZWFudXBdIFJlbW92ZSBy ZWR1bmRhbnQgQnJlYWtpbmdDb250ZXh0OjptX2N1cnJlbnRTdHlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NzE3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRVdTIHRlc3RpbmcuCisKKyAgICAgICAg KiByZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkJy ZWFraW5nQ29udGV4dDo6QnJlYWtpbmdDb250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkJyZWFr aW5nQ29udGV4dDo6aW5pdGlhbGl6ZUZvckN1cnJlbnRPYmplY3QpOgorICAgICAgICAoV2ViQ29y ZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVCUik6CisgICAgICAgIChXZWJDb3JlOjpCcmVha2lu Z0NvbnRleHQ6OmhhbmRsZVRleHQpOgorICAgICAgICAoV2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0 Ojpjb21taXRBbmRVcGRhdGVMaW5lQnJlYWtJZk5lZWRlZCk6CisKIDIwMjEtMDQtMTYgIFphbGFu IEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBbQ2xlYW51cF0gTW9kZXJuaXpl IFRyYWlsaW5nT2JqZWN0cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xp bmUvQnJlYWtpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVh a2luZ0NvbnRleHQuaAppbmRleCAzZTc5YWI1NDMxMzc5MmJhNzI4ZDQwYTgxNjdhOWE5OWQ2Yjhm N2EzLi4xMTg4NDIzYWFiYmE1MjRiMTg0MjdkNzYxMjg3MzBkNDJhNDA1NzYyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaApAQCAtMTAxLDcg KzEwMSw2IEBAIHB1YmxpYzoKICAgICAgICAgLCBtX2Jsb2NrKGJsb2NrKQogICAgICAgICAsIG1f bGFzdE9iamVjdChtX2N1cnJlbnQucmVuZGVyZXIoKSkKICAgICAgICAgLCBtX25leHRPYmplY3Qo bnVsbHB0cikKLSAgICAgICAgLCBtX2N1cnJlbnRTdHlsZShudWxscHRyKQogICAgICAgICAsIG1f YmxvY2tTdHlsZShibG9jay5zdHlsZSgpKQogICAgICAgICAsIG1fbGluZUluZm8oaW5MaW5lSW5m bykKICAgICAgICAgLCBtX3JlbmRlclRleHRJbmZvKGluUmVuZGVyVGV4dEluZm8pCkBAIC0xODcs OCArMTg2LDYgQEAgcHJpdmF0ZToKICAgICBSZW5kZXJPYmplY3QqIG1fbGFzdE9iamVjdDsKICAg ICBSZW5kZXJPYmplY3QqIG1fbmV4dE9iamVjdDsKIAotICAgIGNvbnN0IFJlbmRlclN0eWxlKiBt X2N1cnJlbnRTdHlsZTsKLQogICAgIC8vIEZpcmVmb3ggYW5kIE9wZXJhIHdpbGwgYWxsb3cgYSB0 YWJsZSBjZWxsIHRvIGdyb3cgdG8gZml0IGFuIGltYWdlIGluc2lkZSBpdCB1bmRlcgogICAgIC8v IHZlcnkgc3BlY2lmaWMgY2lyY3Vtc3RhbmNlcyAoaW4gb3JkZXIgdG8gbWF0Y2ggY29tbW9uIFdp bklFIHJlbmRlcmluZ3MpLgogICAgIC8vIE5vdCBzdXBwb3J0aW5nIHRoZSBxdWlyayBoYXMgY2F1 c2VkIHVzIHRvIG1pcy1yZW5kZXIgc29tZSByZWFsIHNpdGVzLiAoU2VlIEJ1Z3ppbGxhIDEwNTE3 LikKQEAgLTIzOSwyMiArMjM2LDE5IEBAIHByaXZhdGU6CiBpbmxpbmUgdm9pZCBCcmVha2luZ0Nv bnRleHQ6OmluaXRpYWxpemVGb3JDdXJyZW50T2JqZWN0KCkKIHsKICAgICBtX2hhZFVuY29tbWl0 dGVkV2lkdGhCZWZvcmVDdXJyZW50ID0gISFtX3dpZHRoLnVuY29tbWl0dGVkV2lkdGgoKTsKKyAg ICBhdXRvJiByZW5kZXJlciA9ICptX2N1cnJlbnQucmVuZGVyZXIoKTsKIAotICAgIG1fY3VycmVu dFN0eWxlID0gJm1fY3VycmVudC5yZW5kZXJlcigpLT5zdHlsZSgpOyAvLyBGSVhNRTogU2hvdWxk IHRoaXMgYmUgJmxpbmVTdHlsZSgqbV9jdXJyZW50LnJlbmRlcmVyKCksIG1fbGluZUluZm8pOyA/ Ci0KLSAgICBBU1NFUlQobV9jdXJyZW50U3R5bGUpOwotCi0gICAgbV9uZXh0T2JqZWN0ID0gYmlk aU5leHRTa2lwcGluZ0VtcHR5SW5saW5lcyhtX2Jsb2NrLCBtX2N1cnJlbnQucmVuZGVyZXIoKSk7 Ci0gICAgaWYgKG1fbmV4dE9iamVjdCAmJiBtX25leHRPYmplY3QtPnBhcmVudCgpICYmICFtX25l eHRPYmplY3QtPnBhcmVudCgpLT5pc0Rlc2NlbmRhbnRPZihtX2N1cnJlbnQucmVuZGVyZXIoKS0+ cGFyZW50KCkpKQorICAgIG1fbmV4dE9iamVjdCA9IGJpZGlOZXh0U2tpcHBpbmdFbXB0eUlubGlu ZXMobV9ibG9jaywgJnJlbmRlcmVyKTsKKyAgICBpZiAobV9uZXh0T2JqZWN0ICYmIG1fbmV4dE9i amVjdC0+cGFyZW50KCkgJiYgIW1fbmV4dE9iamVjdC0+cGFyZW50KCktPmlzRGVzY2VuZGFudE9m KHJlbmRlcmVyLnBhcmVudCgpKSkKICAgICAgICAgbV9pbmNsdWRlRW5kV2lkdGggPSB0cnVlOwog Ci0gICAgbV9jdXJyV1MgPSBtX2N1cnJlbnQucmVuZGVyZXIoKS0+aXNSZXBsYWNlZCgpID8gbV9j dXJyZW50LnJlbmRlcmVyKCktPnBhcmVudCgpLT5zdHlsZSgpLndoaXRlU3BhY2UoKSA6IG1fY3Vy cmVudFN0eWxlLT53aGl0ZVNwYWNlKCk7CisgICAgbV9jdXJyV1MgPSByZW5kZXJlci5pc1JlcGxh Y2VkKCkgPyByZW5kZXJlci5wYXJlbnQoKS0+c3R5bGUoKS53aGl0ZVNwYWNlKCkgOiByZW5kZXJl ci5zdHlsZSgpLndoaXRlU3BhY2UoKTsKICAgICBtX2xhc3RXUyA9IG1fbGFzdE9iamVjdC0+aXNS ZXBsYWNlZCgpID8gbV9sYXN0T2JqZWN0LT5wYXJlbnQoKS0+c3R5bGUoKS53aGl0ZVNwYWNlKCkg OiBtX2xhc3RPYmplY3QtPnN0eWxlKCkud2hpdGVTcGFjZSgpOwogCiAgICAgbV9hdXRvV3JhcCA9 IFJlbmRlclN0eWxlOjphdXRvV3JhcChtX2N1cnJXUyk7CiAgICAgbV9hdXRvV3JhcFdhc0V2ZXJU cnVlT25MaW5lID0gbV9hdXRvV3JhcFdhc0V2ZXJUcnVlT25MaW5lIHx8IG1fYXV0b1dyYXA7CiAK LSAgICBtX3ByZXNlcnZlc05ld2xpbmUgPSBtX2N1cnJlbnQucmVuZGVyZXIoKS0+aXNTVkdJbmxp bmVUZXh0KCkgPyBmYWxzZSA6IFJlbmRlclN0eWxlOjpwcmVzZXJ2ZU5ld2xpbmUobV9jdXJyV1Mp OworICAgIG1fcHJlc2VydmVzTmV3bGluZSA9IHJlbmRlcmVyLmlzU1ZHSW5saW5lVGV4dCgpID8g ZmFsc2UgOiBSZW5kZXJTdHlsZTo6cHJlc2VydmVOZXdsaW5lKG1fY3VycldTKTsKIAogICAgIG1f Y29sbGFwc2VXaGl0ZVNwYWNlID0gUmVuZGVyU3R5bGU6OmNvbGxhcHNlV2hpdGVTcGFjZShtX2N1 cnJXUyk7CiB9CkBAIC0yNzYsNyArMjcwLDcgQEAgaW5saW5lIHZvaWQgQnJlYWtpbmdDb250ZXh0 OjppbmNyZW1lbnQoKQogaW5saW5lIHZvaWQgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVCUihDbGVh ciYgY2xlYXIpCiB7CiAgICAgaWYgKGZpdHNPbkxpbmVPckhhbmdzQXRFbmQoKSkgewotICAgICAg ICBSZW5kZXJPYmplY3QmIGJyID0gKm1fY3VycmVudC5yZW5kZXJlcigpOworICAgICAgICBhdXRv JiBiciA9ICptX2N1cnJlbnQucmVuZGVyZXIoKTsKICAgICAgICAgbV9saW5lQnJlYWsubW92ZVRv U3RhcnRPZihicik7CiAgICAgICAgIG1fbGluZUJyZWFrLmluY3JlbWVudCgpOwogCkBAIC0yOTMs NyArMjg3LDcgQEAgaW5saW5lIHZvaWQgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVCUihDbGVhciYg Y2xlYXIpCiAgICAgICAgIC8vIEEgPGJyPiB3aXRoIGNsZWFyYW5jZSBhbHdheXMgbmVlZHMgYSBs aW5lYm94IGluIGNhc2UgdGhlIGxpbmVzIGJlbG93IGl0IGdldCBkaXJ0aWVkIGxhdGVyIGFuZAog ICAgICAgICAvLyBuZWVkIHRvIGNoZWNrIGZvciBmbG9hdHMgdG8gY2xlYXIgLSBzbyBpZiB3ZSdy ZSBpZ25vcmluZyBzcGFjZXMsIHN0b3AgaWdub3JpbmcgdGhlbSBhbmQgYWRkIGEKICAgICAgICAg Ly8gcnVuIGZvciB0aGlzIG9iamVjdC4KLSAgICAgICAgaWYgKG1faWdub3JpbmdTcGFjZXMgJiYg bV9jdXJyZW50U3R5bGUtPmNsZWFyKCkgIT0gQ2xlYXI6Ok5vbmUpCisgICAgICAgIGlmIChtX2ln bm9yaW5nU3BhY2VzICYmIGJyLnN0eWxlKCkuY2xlYXIoKSAhPSBDbGVhcjo6Tm9uZSkKICAgICAg ICAgICAgIG1fbGluZVdoaXRlc3BhY2VDb2xsYXBzaW5nU3RhdGUuZW5zdXJlTGluZUJveEluc2lk ZUlnbm9yZWRTcGFjZXMoYnIpOwogICAgICAgICAvLyBJZiB3ZSB3ZXJlIHByZWNlZGVkIGJ5IGNv bGxhcHNpbmcgc3BhY2UgYW5kIGFyZSBpbiBhIHJpZ2h0LWFsaWduZWQgY29udGFpbmVyIHdlIG5l ZWQgdG8gZW5zdXJlIHRoZSBzcGFjZSBnZXRzCiAgICAgICAgIC8vIGNvbGxhcHNlZCBhd2F5IHNv IHRoYXQgaXQgZG9lc24ndCBwdXNoIHRoZSB0ZXh0IG91dCBmcm9tIHRoZSBjb250YWluZXIncyBy aWdodC1oYW5kIGVkZ2UuCkBAIC0zMDIsNyArMjk2LDcgQEAgaW5saW5lIHZvaWQgQnJlYWtpbmdD b250ZXh0OjpoYW5kbGVCUihDbGVhciYgY2xlYXIpCiAgICAgICAgICAgICBtX2xpbmVXaGl0ZXNw YWNlQ29sbGFwc2luZ1N0YXRlLnN0b3BJZ25vcmluZ1NwYWNlcyhJbmxpbmVJdGVyYXRvcigwLCBt X2N1cnJlbnQucmVuZGVyZXIoKSwgbV9jdXJyZW50Lm9mZnNldCgpKSk7CiAKICAgICAgICAgaWYg KCFtX2xpbmVJbmZvLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIGNsZWFyID0gbV9jdXJyZW50U3R5 bGUtPmNsZWFyKCk7CisgICAgICAgICAgICBjbGVhciA9IGJyLnN0eWxlKCkuY2xlYXIoKTsKICAg ICB9CiAgICAgbV9hdEVuZCA9IHRydWU7CiB9CkBAIC02OTgsMjEgKzY5MiwyMSBAQCBpbmxpbmUg Ym9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1l YXN1cmVtZW50cywgYm9vbAogICAgIGJvb2wgY2FuSGFuZ1N0b3BPckNvbW1hQXRMaW5lRW5kID0g c3R5bGUuaGFuZ2luZ1B1bmN0dWF0aW9uKCkuY29udGFpbnMoSGFuZ2luZ1B1bmN0dWF0aW9uOjpB bGxvd0VuZCk7CiAgICAgaW50IGVuZFB1bmN0dWF0aW9uSW5kZXggPSBjYW5IYW5nUHVuY3R1YXRp b25BdEVuZCAmJiBtX2NvbGxhcHNlV2hpdGVTcGFjZSA/IHJlbmRlcmVyLmxhc3RDaGFyYWN0ZXJJ bmRleFN0cmlwcGluZ1NwYWNlcygpIDogcmVuZGVyZXIudGV4dCgpLmxlbmd0aCgpIC0gMTsKICAg ICB1bnNpZ25lZCBsYXN0U3BhY2UgPSBtX2N1cnJlbnQub2Zmc2V0KCk7Ci0gICAgZmxvYXQgd29y ZFNwYWNpbmcgPSBtX2N1cnJlbnRTdHlsZS0+Zm9udENhc2NhZGUoKS53b3JkU3BhY2luZygpOwor ICAgIGZsb2F0IHdvcmRTcGFjaW5nID0gc3R5bGUuZm9udENhc2NhZGUoKS53b3JkU3BhY2luZygp OwogICAgIGZsb2F0IGxhc3RTcGFjZVdvcmRTcGFjaW5nID0gMDsKICAgICBmbG9hdCB3b3JkU3Bh Y2luZ0ZvcldvcmRNZWFzdXJlbWVudCA9IDA7CiAKICAgICBmbG9hdCB3cmFwV2lkdGhPZmZzZXQg PSBtX3dpZHRoLnVuY29tbWl0dGVkV2lkdGgoKSArIGlubGluZUxvZ2ljYWxXaWR0aChyZW5kZXJl ciwgIW1fYXBwbGllZFN0YXJ0V2lkdGgsIHRydWUpOwogICAgIGZsb2F0IHdyYXBXID0gd3JhcFdp ZHRoT2Zmc2V0OwogICAgIGZsb2F0IGNoYXJXaWR0aCA9IDA7Ci0gICAgYm9vbCBicmVha05CU1Ag PSBtX2F1dG9XcmFwICYmIG1fY3VycmVudFN0eWxlLT5uYnNwTW9kZSgpID09IE5CU1BNb2RlOjpT cGFjZTsKKyAgICBib29sIGJyZWFrTkJTUCA9IG1fYXV0b1dyYXAgJiYgc3R5bGUubmJzcE1vZGUo KSA9PSBOQlNQTW9kZTo6U3BhY2U7CiAgICAgLy8gQXV0by13cmFwcGluZyB0ZXh0IHNob3VsZCB3 cmFwIGluIHRoZSBtaWRkbGUgb2YgYSB3b3JkIG9ubHkgaWYgaXQgY291bGQgbm90IHdyYXAgYmVm b3JlIHRoZSB3b3JkLAogICAgIC8vIHdoaWNoIGlzIG9ubHkgcG9zc2libGUgaWYgdGhlIHdvcmQg aXMgdGhlIGZpcnN0IHRoaW5nIG9uIHRoZSBsaW5lLgotICAgIGJvb2wgYnJlYWtXb3JkcyA9IG1f Y3VycmVudFN0eWxlLT5icmVha1dvcmRzKCkgJiYgKChtX2F1dG9XcmFwICYmICghbV93aWR0aC5j b21taXR0ZWRXaWR0aCgpICYmICFtX3dpZHRoLmhhc0NvbW1pdHRlZFJlcGxhY2VkKCkpKSB8fCBt X2N1cnJXUyA9PSBXaGl0ZVNwYWNlOjpQcmUpOworICAgIGJvb2wgYnJlYWtXb3JkcyA9IHN0eWxl LmJyZWFrV29yZHMoKSAmJiAoKG1fYXV0b1dyYXAgJiYgKCFtX3dpZHRoLmNvbW1pdHRlZFdpZHRo KCkgJiYgIW1fd2lkdGguaGFzQ29tbWl0dGVkUmVwbGFjZWQoKSkpIHx8IG1fY3VycldTID09IFdo aXRlU3BhY2U6OlByZSk7CiAgICAgYm9vbCBtaWRXb3JkQnJlYWsgPSBmYWxzZTsKLSAgICBib29s IGJyZWFrQW55d2hlcmUgPSBtX2N1cnJlbnRTdHlsZS0+bGluZUJyZWFrKCkgPT0gTGluZUJyZWFr OjpBbnl3aGVyZSAmJiBtX2F1dG9XcmFwOwotICAgIGJvb2wgYnJlYWtBbGwgPSAobV9jdXJyZW50 U3R5bGUtPndvcmRCcmVhaygpID09IFdvcmRCcmVhazo6QnJlYWtBbGwgfHwgYnJlYWtBbnl3aGVy ZSkgJiYgbV9hdXRvV3JhcDsKLSAgICBib29sIGtlZXBBbGxXb3JkcyA9IG1fY3VycmVudFN0eWxl LT53b3JkQnJlYWsoKSA9PSBXb3JkQnJlYWs6OktlZXBBbGw7CisgICAgYm9vbCBicmVha0FueXdo ZXJlID0gc3R5bGUubGluZUJyZWFrKCkgPT0gTGluZUJyZWFrOjpBbnl3aGVyZSAmJiBtX2F1dG9X cmFwOworICAgIGJvb2wgYnJlYWtBbGwgPSAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFr OjpCcmVha0FsbCB8fCBicmVha0FueXdoZXJlKSAmJiBtX2F1dG9XcmFwOworICAgIGJvb2wga2Vl cEFsbFdvcmRzID0gc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpLZWVwQWxsOwogICAg IGZsb2F0IGh5cGhlbldpZHRoID0gMDsKICAgICBhdXRvIGl0ZXJhdG9yTW9kZSA9IG1hcExpbmVC cmVha1RvSXRlcmF0b3JNb2RlKG1fYmxvY2tTdHlsZS5saW5lQnJlYWsoKSk7CiAgICAgYm9vbCBj YW5Vc2VMaW5lQnJlYWtTaG9ydGN1dCA9IGl0ZXJhdG9yTW9kZSA9PSBMaW5lQnJlYWtJdGVyYXRv ck1vZGU6OkRlZmF1bHQ7CkBAIC04NTMsNyArODQ3LDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdD b250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJv b2wKICAgICAgICAgICAgICAgICAvLyBJZiB3ZSBicmVhayBvbmx5IGFmdGVyIHdoaXRlLXNwYWNl LCBjb25zaWRlciB0aGUgY3VycmVudCBjaGFyYWN0ZXIKICAgICAgICAgICAgICAgICAvLyBhcyBj YW5kaWRhdGUgd2lkdGggZm9yIHRoaXMgbGluZS4KICAgICAgICAgICAgICAgICBib29sIGxpbmVX YXNUb29XaWRlID0gZmFsc2U7Ci0gICAgICAgICAgICAgICAgaWYgKGZpdHNPbkxpbmVPckhhbmdz QXRFbmQoKSAmJiBtX2N1cnJlbnRDaGFyYWN0ZXJJc1dTICYmIG1fY3VycmVudFN0eWxlLT5icmVh a09ubHlBZnRlcldoaXRlU3BhY2UoKSAmJiAoIW1pZFdvcmRCcmVhayB8fCBtX2N1cnJXUyA9PSBX aGl0ZVNwYWNlOjpCcmVha1NwYWNlcykpIHsKKyAgICAgICAgICAgICAgICBpZiAoZml0c09uTGlu ZU9ySGFuZ3NBdEVuZCgpICYmIG1fY3VycmVudENoYXJhY3RlcklzV1MgJiYgc3R5bGUuYnJlYWtP bmx5QWZ0ZXJXaGl0ZVNwYWNlKCkgJiYgKCFtaWRXb3JkQnJlYWsgfHwgbV9jdXJyV1MgPT0gV2hp dGVTcGFjZTo6QnJlYWtTcGFjZXMpKSB7CiAgICAgICAgICAgICAgICAgICAgIGZsb2F0IGNoYXJX aWR0aCA9IHRleHRXaWR0aChyZW5kZXJlciwgbV9jdXJyZW50Lm9mZnNldCgpLCAxLCBmb250LCBt X3dpZHRoLmN1cnJlbnRXaWR0aCgpLCBpc0ZpeGVkUGl0Y2gsIG1fY29sbGFwc2VXaGl0ZVNwYWNl LCB3b3JkTWVhc3VyZW1lbnQuZmFsbGJhY2tGb250cywgdGV4dExheW91dCkgKyAoYXBwbHlXb3Jk U3BhY2luZyA/IHdvcmRTcGFjaW5nIDogMCk7CiAgICAgICAgICAgICAgICAgICAgIC8vIENoZWNr IGlmIGxpbmUgaXMgdG9vIGJpZyBldmVuIHdpdGhvdXQgdGhlIGV4dHJhIHNwYWNlCiAgICAgICAg ICAgICAgICAgICAgIC8vIGF0IHRoZSBlbmQgb2YgdGhlIGxpbmUuIElmIGl0IGlzIG5vdCwgZG8g bm90aGluZy4KQEAgLTk3MCw3ICs5NjQsNyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6 OmhhbmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAg ICAgICAgICAgICAgIGxhc3RTcGFjZSA9IG1fY3VycmVudC5vZmZzZXQoKTsKICAgICAgICAgICAg IH0KIAotICAgICAgICAgICAgaWYgKCFtX2lnbm9yaW5nU3BhY2VzICYmIG1fY3VycmVudFN0eWxl LT5jb2xsYXBzZVdoaXRlU3BhY2UoKSkgeworICAgICAgICAgICAgaWYgKCFtX2lnbm9yaW5nU3Bh Y2VzICYmIHN0eWxlLmNvbGxhcHNlV2hpdGVTcGFjZSgpKSB7CiAgICAgICAgICAgICAgICAgLy8g SWYgd2UgZW5jb3VudGVyIGEgbmV3bGluZSwgb3IgaWYgd2UgZW5jb3VudGVyIGEgc2Vjb25kIHNw YWNlLAogICAgICAgICAgICAgICAgIC8vIHdlIG5lZWQgdG8gYnJlYWsgdXAgdGhpcyBydW4gYW5k IGVudGVyIGEgbW9kZSB3aGVyZSB3ZSBzdGFydCBjb2xsYXBzaW5nIHNwYWNlcy4KICAgICAgICAg ICAgICAgICBpZiAobV9jdXJyZW50Q2hhcmFjdGVySXNTcGFjZSAmJiBwcmV2aW91c0NoYXJhY3Rl cklzU3BhY2UpIHsKQEAgLTEwMjQsMTMgKzEwMTgsMTMgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdD b250ZXh0OjpoYW5kbGVUZXh0KFdvcmRNZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJv b2wKICAgICAgICAgfQogCiAgICAgICAgIGlmICghbV9jdXJyZW50Q2hhcmFjdGVySXNXUyAmJiBw cmV2aW91c0NoYXJhY3RlcklzV1MpIHsKLSAgICAgICAgICAgIGlmIChtX2F1dG9XcmFwICYmIG1f Y3VycmVudFN0eWxlLT5icmVha09ubHlBZnRlcldoaXRlU3BhY2UoKSkKKyAgICAgICAgICAgIGlm IChtX2F1dG9XcmFwICYmIHN0eWxlLmJyZWFrT25seUFmdGVyV2hpdGVTcGFjZSgpKQogICAgICAg ICAgICAgICAgIG1fbGluZUJyZWFrLm1vdmVUbyhyZW5kZXJlciwgbV9jdXJyZW50Lm9mZnNldCgp LCBtX2N1cnJlbnQubmV4dEJyZWFrYWJsZVBvc2l0aW9uKCkpOwogICAgICAgICB9CiAKICAgICAg ICAgaWYgKG1fY29sbGFwc2VXaGl0ZVNwYWNlICYmIG1fY3VycmVudENoYXJhY3RlcklzU3BhY2Ug JiYgIW1faWdub3JpbmdTcGFjZXMpCiAgICAgICAgICAgICBtX3RyYWlsaW5nT2JqZWN0cy5zZXRU cmFpbGluZ1doaXRlc3BhY2UocmVuZGVyZXIpOwotICAgICAgICBlbHNlIGlmICghbV9jdXJyZW50 U3R5bGUtPmNvbGxhcHNlV2hpdGVTcGFjZSgpIHx8ICFtX2N1cnJlbnRDaGFyYWN0ZXJJc1NwYWNl KQorICAgICAgICBlbHNlIGlmICghc3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkgfHwgIW1fY3Vy cmVudENoYXJhY3RlcklzU3BhY2UpCiAgICAgICAgICAgICBtX3RyYWlsaW5nT2JqZWN0cy5jbGVh cigpOwogCiAgICAgICAgIG1fYXRTdGFydCA9IGZhbHNlOwpAQCAtMTE1MCw3ICsxMTQ0LDcgQEAg aW5saW5lIHZvaWQgQnJlYWtpbmdDb250ZXh0Ojpjb21taXRBbmRVcGRhdGVMaW5lQnJlYWtJZk5l ZWRlZCgpCiAKICAgICBpZiAoY2hlY2tGb3JCcmVhayAmJiAhbV93aWR0aC5maXRzT25MaW5lKG1f aWdub3JpbmdTcGFjZXMpICYmICFtX2hhbmdzQXRFbmQpIHsKICAgICAgICAgLy8gaWYgd2UgaGF2 ZSBmbG9hdHMsIHRyeSB0byBnZXQgYmVsb3cgdGhlbS4KLSAgICAgICAgaWYgKG1fY3VycmVudENo YXJhY3RlcklzU3BhY2UgJiYgIW1faWdub3JpbmdTcGFjZXMgJiYgbV9jdXJyZW50U3R5bGUtPmNv bGxhcHNlV2hpdGVTcGFjZSgpKQorICAgICAgICBpZiAobV9jdXJyZW50Q2hhcmFjdGVySXNTcGFj ZSAmJiAhbV9pZ25vcmluZ1NwYWNlcyAmJiBtX2NvbGxhcHNlV2hpdGVTcGFjZSkKICAgICAgICAg ICAgIG1fdHJhaWxpbmdPYmplY3RzLmNsZWFyKCk7CiAKICAgICAgICAgaWYgKG1fd2lkdGguY29t bWl0dGVkV2lkdGgoKSkgewo= 426338 2021-04-17 11:24:32 -0700 2021-04-17 14:13:31 -0700 Patch bug-224717-20210417112431.patch text/plain 10082 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2MjAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjYwMmIxMTA5NzJlZjJm ZTk0MTRlZjRiMGRmYzM0NGJkOGM2MTg0ZS4uNTM3OGY2MjUzY2Q1ODk0YzAyYmU4MGJhYzhlYTQz ZmQ4MjVjNzA1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIxLTA0LTE3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0NsZWFudXBdIFJlbW92ZSBy ZWR1bmRhbnQgQnJlYWtpbmdDb250ZXh0OjptX2N1cnJlbnRTdHlsZQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI0NzE3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiByZW5kZXJpbmcvbGluZS9CcmVha2lu Z0NvbnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkJyZWFraW5nQ29udGV4dDo6QnJlYWtpbmdD b250ZXh0KToKKyAgICAgICAgKFdlYkNvcmU6OkJyZWFraW5nQ29udGV4dDo6aW5pdGlhbGl6ZUZv ckN1cnJlbnRPYmplY3QpOgorICAgICAgICAoV2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0OjpoYW5k bGVCUik6CisgICAgICAgIChXZWJDb3JlOjpCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQpOgor ICAgICAgICAoV2ViQ29yZTo6QnJlYWtpbmdDb250ZXh0Ojpjb21taXRBbmRVcGRhdGVMaW5lQnJl YWtJZk5lZWRlZCk6CisKIDIwMjEtMDQtMTcgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNv bT4KIAogICAgICAgICBbQ2xlYW51cF0gTW9kZXJuaXplIFRyYWlsaW5nT2JqZWN0cwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL2xpbmUvQnJlYWtpbmdDb250ZXh0LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAppbmRleCAzZTc5 YWI1NDMxMzc5MmJhNzI4ZDQwYTgxNjdhOWE5OWQ2YjhmN2EzLi4xMTg4NDIzYWFiYmE1MjRiMTg0 MjdkNzYxMjg3MzBkNDJhNDA1NzYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvbGluZS9CcmVha2luZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv bGluZS9CcmVha2luZ0NvbnRleHQuaApAQCAtMTAxLDcgKzEwMSw2IEBAIHB1YmxpYzoKICAgICAg ICAgLCBtX2Jsb2NrKGJsb2NrKQogICAgICAgICAsIG1fbGFzdE9iamVjdChtX2N1cnJlbnQucmVu ZGVyZXIoKSkKICAgICAgICAgLCBtX25leHRPYmplY3QobnVsbHB0cikKLSAgICAgICAgLCBtX2N1 cnJlbnRTdHlsZShudWxscHRyKQogICAgICAgICAsIG1fYmxvY2tTdHlsZShibG9jay5zdHlsZSgp KQogICAgICAgICAsIG1fbGluZUluZm8oaW5MaW5lSW5mbykKICAgICAgICAgLCBtX3JlbmRlclRl eHRJbmZvKGluUmVuZGVyVGV4dEluZm8pCkBAIC0xODcsOCArMTg2LDYgQEAgcHJpdmF0ZToKICAg ICBSZW5kZXJPYmplY3QqIG1fbGFzdE9iamVjdDsKICAgICBSZW5kZXJPYmplY3QqIG1fbmV4dE9i amVjdDsKIAotICAgIGNvbnN0IFJlbmRlclN0eWxlKiBtX2N1cnJlbnRTdHlsZTsKLQogICAgIC8v IEZpcmVmb3ggYW5kIE9wZXJhIHdpbGwgYWxsb3cgYSB0YWJsZSBjZWxsIHRvIGdyb3cgdG8gZml0 IGFuIGltYWdlIGluc2lkZSBpdCB1bmRlcgogICAgIC8vIHZlcnkgc3BlY2lmaWMgY2lyY3Vtc3Rh bmNlcyAoaW4gb3JkZXIgdG8gbWF0Y2ggY29tbW9uIFdpbklFIHJlbmRlcmluZ3MpLgogICAgIC8v IE5vdCBzdXBwb3J0aW5nIHRoZSBxdWlyayBoYXMgY2F1c2VkIHVzIHRvIG1pcy1yZW5kZXIgc29t ZSByZWFsIHNpdGVzLiAoU2VlIEJ1Z3ppbGxhIDEwNTE3LikKQEAgLTIzOSwyMiArMjM2LDE5IEBA IHByaXZhdGU6CiBpbmxpbmUgdm9pZCBCcmVha2luZ0NvbnRleHQ6OmluaXRpYWxpemVGb3JDdXJy ZW50T2JqZWN0KCkKIHsKICAgICBtX2hhZFVuY29tbWl0dGVkV2lkdGhCZWZvcmVDdXJyZW50ID0g ISFtX3dpZHRoLnVuY29tbWl0dGVkV2lkdGgoKTsKKyAgICBhdXRvJiByZW5kZXJlciA9ICptX2N1 cnJlbnQucmVuZGVyZXIoKTsKIAotICAgIG1fY3VycmVudFN0eWxlID0gJm1fY3VycmVudC5yZW5k ZXJlcigpLT5zdHlsZSgpOyAvLyBGSVhNRTogU2hvdWxkIHRoaXMgYmUgJmxpbmVTdHlsZSgqbV9j dXJyZW50LnJlbmRlcmVyKCksIG1fbGluZUluZm8pOyA/Ci0KLSAgICBBU1NFUlQobV9jdXJyZW50 U3R5bGUpOwotCi0gICAgbV9uZXh0T2JqZWN0ID0gYmlkaU5leHRTa2lwcGluZ0VtcHR5SW5saW5l cyhtX2Jsb2NrLCBtX2N1cnJlbnQucmVuZGVyZXIoKSk7Ci0gICAgaWYgKG1fbmV4dE9iamVjdCAm JiBtX25leHRPYmplY3QtPnBhcmVudCgpICYmICFtX25leHRPYmplY3QtPnBhcmVudCgpLT5pc0Rl c2NlbmRhbnRPZihtX2N1cnJlbnQucmVuZGVyZXIoKS0+cGFyZW50KCkpKQorICAgIG1fbmV4dE9i amVjdCA9IGJpZGlOZXh0U2tpcHBpbmdFbXB0eUlubGluZXMobV9ibG9jaywgJnJlbmRlcmVyKTsK KyAgICBpZiAobV9uZXh0T2JqZWN0ICYmIG1fbmV4dE9iamVjdC0+cGFyZW50KCkgJiYgIW1fbmV4 dE9iamVjdC0+cGFyZW50KCktPmlzRGVzY2VuZGFudE9mKHJlbmRlcmVyLnBhcmVudCgpKSkKICAg ICAgICAgbV9pbmNsdWRlRW5kV2lkdGggPSB0cnVlOwogCi0gICAgbV9jdXJyV1MgPSBtX2N1cnJl bnQucmVuZGVyZXIoKS0+aXNSZXBsYWNlZCgpID8gbV9jdXJyZW50LnJlbmRlcmVyKCktPnBhcmVu dCgpLT5zdHlsZSgpLndoaXRlU3BhY2UoKSA6IG1fY3VycmVudFN0eWxlLT53aGl0ZVNwYWNlKCk7 CisgICAgbV9jdXJyV1MgPSByZW5kZXJlci5pc1JlcGxhY2VkKCkgPyByZW5kZXJlci5wYXJlbnQo KS0+c3R5bGUoKS53aGl0ZVNwYWNlKCkgOiByZW5kZXJlci5zdHlsZSgpLndoaXRlU3BhY2UoKTsK ICAgICBtX2xhc3RXUyA9IG1fbGFzdE9iamVjdC0+aXNSZXBsYWNlZCgpID8gbV9sYXN0T2JqZWN0 LT5wYXJlbnQoKS0+c3R5bGUoKS53aGl0ZVNwYWNlKCkgOiBtX2xhc3RPYmplY3QtPnN0eWxlKCku d2hpdGVTcGFjZSgpOwogCiAgICAgbV9hdXRvV3JhcCA9IFJlbmRlclN0eWxlOjphdXRvV3JhcCht X2N1cnJXUyk7CiAgICAgbV9hdXRvV3JhcFdhc0V2ZXJUcnVlT25MaW5lID0gbV9hdXRvV3JhcFdh c0V2ZXJUcnVlT25MaW5lIHx8IG1fYXV0b1dyYXA7CiAKLSAgICBtX3ByZXNlcnZlc05ld2xpbmUg PSBtX2N1cnJlbnQucmVuZGVyZXIoKS0+aXNTVkdJbmxpbmVUZXh0KCkgPyBmYWxzZSA6IFJlbmRl clN0eWxlOjpwcmVzZXJ2ZU5ld2xpbmUobV9jdXJyV1MpOworICAgIG1fcHJlc2VydmVzTmV3bGlu ZSA9IHJlbmRlcmVyLmlzU1ZHSW5saW5lVGV4dCgpID8gZmFsc2UgOiBSZW5kZXJTdHlsZTo6cHJl c2VydmVOZXdsaW5lKG1fY3VycldTKTsKIAogICAgIG1fY29sbGFwc2VXaGl0ZVNwYWNlID0gUmVu ZGVyU3R5bGU6OmNvbGxhcHNlV2hpdGVTcGFjZShtX2N1cnJXUyk7CiB9CkBAIC0yNzYsNyArMjcw LDcgQEAgaW5saW5lIHZvaWQgQnJlYWtpbmdDb250ZXh0OjppbmNyZW1lbnQoKQogaW5saW5lIHZv aWQgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVCUihDbGVhciYgY2xlYXIpCiB7CiAgICAgaWYgKGZp dHNPbkxpbmVPckhhbmdzQXRFbmQoKSkgewotICAgICAgICBSZW5kZXJPYmplY3QmIGJyID0gKm1f Y3VycmVudC5yZW5kZXJlcigpOworICAgICAgICBhdXRvJiBiciA9ICptX2N1cnJlbnQucmVuZGVy ZXIoKTsKICAgICAgICAgbV9saW5lQnJlYWsubW92ZVRvU3RhcnRPZihicik7CiAgICAgICAgIG1f bGluZUJyZWFrLmluY3JlbWVudCgpOwogCkBAIC0yOTMsNyArMjg3LDcgQEAgaW5saW5lIHZvaWQg QnJlYWtpbmdDb250ZXh0OjpoYW5kbGVCUihDbGVhciYgY2xlYXIpCiAgICAgICAgIC8vIEEgPGJy PiB3aXRoIGNsZWFyYW5jZSBhbHdheXMgbmVlZHMgYSBsaW5lYm94IGluIGNhc2UgdGhlIGxpbmVz IGJlbG93IGl0IGdldCBkaXJ0aWVkIGxhdGVyIGFuZAogICAgICAgICAvLyBuZWVkIHRvIGNoZWNr IGZvciBmbG9hdHMgdG8gY2xlYXIgLSBzbyBpZiB3ZSdyZSBpZ25vcmluZyBzcGFjZXMsIHN0b3Ag aWdub3JpbmcgdGhlbSBhbmQgYWRkIGEKICAgICAgICAgLy8gcnVuIGZvciB0aGlzIG9iamVjdC4K LSAgICAgICAgaWYgKG1faWdub3JpbmdTcGFjZXMgJiYgbV9jdXJyZW50U3R5bGUtPmNsZWFyKCkg IT0gQ2xlYXI6Ok5vbmUpCisgICAgICAgIGlmIChtX2lnbm9yaW5nU3BhY2VzICYmIGJyLnN0eWxl KCkuY2xlYXIoKSAhPSBDbGVhcjo6Tm9uZSkKICAgICAgICAgICAgIG1fbGluZVdoaXRlc3BhY2VD b2xsYXBzaW5nU3RhdGUuZW5zdXJlTGluZUJveEluc2lkZUlnbm9yZWRTcGFjZXMoYnIpOwogICAg ICAgICAvLyBJZiB3ZSB3ZXJlIHByZWNlZGVkIGJ5IGNvbGxhcHNpbmcgc3BhY2UgYW5kIGFyZSBp biBhIHJpZ2h0LWFsaWduZWQgY29udGFpbmVyIHdlIG5lZWQgdG8gZW5zdXJlIHRoZSBzcGFjZSBn ZXRzCiAgICAgICAgIC8vIGNvbGxhcHNlZCBhd2F5IHNvIHRoYXQgaXQgZG9lc24ndCBwdXNoIHRo ZSB0ZXh0IG91dCBmcm9tIHRoZSBjb250YWluZXIncyByaWdodC1oYW5kIGVkZ2UuCkBAIC0zMDIs NyArMjk2LDcgQEAgaW5saW5lIHZvaWQgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVCUihDbGVhciYg Y2xlYXIpCiAgICAgICAgICAgICBtX2xpbmVXaGl0ZXNwYWNlQ29sbGFwc2luZ1N0YXRlLnN0b3BJ Z25vcmluZ1NwYWNlcyhJbmxpbmVJdGVyYXRvcigwLCBtX2N1cnJlbnQucmVuZGVyZXIoKSwgbV9j dXJyZW50Lm9mZnNldCgpKSk7CiAKICAgICAgICAgaWYgKCFtX2xpbmVJbmZvLmlzRW1wdHkoKSkK LSAgICAgICAgICAgIGNsZWFyID0gbV9jdXJyZW50U3R5bGUtPmNsZWFyKCk7CisgICAgICAgICAg ICBjbGVhciA9IGJyLnN0eWxlKCkuY2xlYXIoKTsKICAgICB9CiAgICAgbV9hdEVuZCA9IHRydWU7 CiB9CkBAIC02OTgsMjEgKzY5MiwyMSBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6Omhh bmRsZVRleHQoV29yZE1lYXN1cmVtZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgIGJv b2wgY2FuSGFuZ1N0b3BPckNvbW1hQXRMaW5lRW5kID0gc3R5bGUuaGFuZ2luZ1B1bmN0dWF0aW9u KCkuY29udGFpbnMoSGFuZ2luZ1B1bmN0dWF0aW9uOjpBbGxvd0VuZCk7CiAgICAgaW50IGVuZFB1 bmN0dWF0aW9uSW5kZXggPSBjYW5IYW5nUHVuY3R1YXRpb25BdEVuZCAmJiBtX2NvbGxhcHNlV2hp dGVTcGFjZSA/IHJlbmRlcmVyLmxhc3RDaGFyYWN0ZXJJbmRleFN0cmlwcGluZ1NwYWNlcygpIDog cmVuZGVyZXIudGV4dCgpLmxlbmd0aCgpIC0gMTsKICAgICB1bnNpZ25lZCBsYXN0U3BhY2UgPSBt X2N1cnJlbnQub2Zmc2V0KCk7Ci0gICAgZmxvYXQgd29yZFNwYWNpbmcgPSBtX2N1cnJlbnRTdHls ZS0+Zm9udENhc2NhZGUoKS53b3JkU3BhY2luZygpOworICAgIGZsb2F0IHdvcmRTcGFjaW5nID0g c3R5bGUuZm9udENhc2NhZGUoKS53b3JkU3BhY2luZygpOwogICAgIGZsb2F0IGxhc3RTcGFjZVdv cmRTcGFjaW5nID0gMDsKICAgICBmbG9hdCB3b3JkU3BhY2luZ0ZvcldvcmRNZWFzdXJlbWVudCA9 IDA7CiAKICAgICBmbG9hdCB3cmFwV2lkdGhPZmZzZXQgPSBtX3dpZHRoLnVuY29tbWl0dGVkV2lk dGgoKSArIGlubGluZUxvZ2ljYWxXaWR0aChyZW5kZXJlciwgIW1fYXBwbGllZFN0YXJ0V2lkdGgs IHRydWUpOwogICAgIGZsb2F0IHdyYXBXID0gd3JhcFdpZHRoT2Zmc2V0OwogICAgIGZsb2F0IGNo YXJXaWR0aCA9IDA7Ci0gICAgYm9vbCBicmVha05CU1AgPSBtX2F1dG9XcmFwICYmIG1fY3VycmVu dFN0eWxlLT5uYnNwTW9kZSgpID09IE5CU1BNb2RlOjpTcGFjZTsKKyAgICBib29sIGJyZWFrTkJT UCA9IG1fYXV0b1dyYXAgJiYgc3R5bGUubmJzcE1vZGUoKSA9PSBOQlNQTW9kZTo6U3BhY2U7CiAg ICAgLy8gQXV0by13cmFwcGluZyB0ZXh0IHNob3VsZCB3cmFwIGluIHRoZSBtaWRkbGUgb2YgYSB3 b3JkIG9ubHkgaWYgaXQgY291bGQgbm90IHdyYXAgYmVmb3JlIHRoZSB3b3JkLAogICAgIC8vIHdo aWNoIGlzIG9ubHkgcG9zc2libGUgaWYgdGhlIHdvcmQgaXMgdGhlIGZpcnN0IHRoaW5nIG9uIHRo ZSBsaW5lLgotICAgIGJvb2wgYnJlYWtXb3JkcyA9IG1fY3VycmVudFN0eWxlLT5icmVha1dvcmRz KCkgJiYgKChtX2F1dG9XcmFwICYmICghbV93aWR0aC5jb21taXR0ZWRXaWR0aCgpICYmICFtX3dp ZHRoLmhhc0NvbW1pdHRlZFJlcGxhY2VkKCkpKSB8fCBtX2N1cnJXUyA9PSBXaGl0ZVNwYWNlOjpQ cmUpOworICAgIGJvb2wgYnJlYWtXb3JkcyA9IHN0eWxlLmJyZWFrV29yZHMoKSAmJiAoKG1fYXV0 b1dyYXAgJiYgKCFtX3dpZHRoLmNvbW1pdHRlZFdpZHRoKCkgJiYgIW1fd2lkdGguaGFzQ29tbWl0 dGVkUmVwbGFjZWQoKSkpIHx8IG1fY3VycldTID09IFdoaXRlU3BhY2U6OlByZSk7CiAgICAgYm9v bCBtaWRXb3JkQnJlYWsgPSBmYWxzZTsKLSAgICBib29sIGJyZWFrQW55d2hlcmUgPSBtX2N1cnJl bnRTdHlsZS0+bGluZUJyZWFrKCkgPT0gTGluZUJyZWFrOjpBbnl3aGVyZSAmJiBtX2F1dG9XcmFw OwotICAgIGJvb2wgYnJlYWtBbGwgPSAobV9jdXJyZW50U3R5bGUtPndvcmRCcmVhaygpID09IFdv cmRCcmVhazo6QnJlYWtBbGwgfHwgYnJlYWtBbnl3aGVyZSkgJiYgbV9hdXRvV3JhcDsKLSAgICBi b29sIGtlZXBBbGxXb3JkcyA9IG1fY3VycmVudFN0eWxlLT53b3JkQnJlYWsoKSA9PSBXb3JkQnJl YWs6OktlZXBBbGw7CisgICAgYm9vbCBicmVha0FueXdoZXJlID0gc3R5bGUubGluZUJyZWFrKCkg PT0gTGluZUJyZWFrOjpBbnl3aGVyZSAmJiBtX2F1dG9XcmFwOworICAgIGJvb2wgYnJlYWtBbGwg PSAoc3R5bGUud29yZEJyZWFrKCkgPT0gV29yZEJyZWFrOjpCcmVha0FsbCB8fCBicmVha0FueXdo ZXJlKSAmJiBtX2F1dG9XcmFwOworICAgIGJvb2wga2VlcEFsbFdvcmRzID0gc3R5bGUud29yZEJy ZWFrKCkgPT0gV29yZEJyZWFrOjpLZWVwQWxsOwogICAgIGZsb2F0IGh5cGhlbldpZHRoID0gMDsK ICAgICBhdXRvIGl0ZXJhdG9yTW9kZSA9IG1hcExpbmVCcmVha1RvSXRlcmF0b3JNb2RlKG1fYmxv Y2tTdHlsZS5saW5lQnJlYWsoKSk7CiAgICAgYm9vbCBjYW5Vc2VMaW5lQnJlYWtTaG9ydGN1dCA9 IGl0ZXJhdG9yTW9kZSA9PSBMaW5lQnJlYWtJdGVyYXRvck1vZGU6OkRlZmF1bHQ7CkBAIC04NTMs NyArODQ3LDcgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRN ZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgICAgICAgICAvLyBJ ZiB3ZSBicmVhayBvbmx5IGFmdGVyIHdoaXRlLXNwYWNlLCBjb25zaWRlciB0aGUgY3VycmVudCBj aGFyYWN0ZXIKICAgICAgICAgICAgICAgICAvLyBhcyBjYW5kaWRhdGUgd2lkdGggZm9yIHRoaXMg bGluZS4KICAgICAgICAgICAgICAgICBib29sIGxpbmVXYXNUb29XaWRlID0gZmFsc2U7Ci0gICAg ICAgICAgICAgICAgaWYgKGZpdHNPbkxpbmVPckhhbmdzQXRFbmQoKSAmJiBtX2N1cnJlbnRDaGFy YWN0ZXJJc1dTICYmIG1fY3VycmVudFN0eWxlLT5icmVha09ubHlBZnRlcldoaXRlU3BhY2UoKSAm JiAoIW1pZFdvcmRCcmVhayB8fCBtX2N1cnJXUyA9PSBXaGl0ZVNwYWNlOjpCcmVha1NwYWNlcykp IHsKKyAgICAgICAgICAgICAgICBpZiAoZml0c09uTGluZU9ySGFuZ3NBdEVuZCgpICYmIG1fY3Vy cmVudENoYXJhY3RlcklzV1MgJiYgc3R5bGUuYnJlYWtPbmx5QWZ0ZXJXaGl0ZVNwYWNlKCkgJiYg KCFtaWRXb3JkQnJlYWsgfHwgbV9jdXJyV1MgPT0gV2hpdGVTcGFjZTo6QnJlYWtTcGFjZXMpKSB7 CiAgICAgICAgICAgICAgICAgICAgIGZsb2F0IGNoYXJXaWR0aCA9IHRleHRXaWR0aChyZW5kZXJl ciwgbV9jdXJyZW50Lm9mZnNldCgpLCAxLCBmb250LCBtX3dpZHRoLmN1cnJlbnRXaWR0aCgpLCBp c0ZpeGVkUGl0Y2gsIG1fY29sbGFwc2VXaGl0ZVNwYWNlLCB3b3JkTWVhc3VyZW1lbnQuZmFsbGJh Y2tGb250cywgdGV4dExheW91dCkgKyAoYXBwbHlXb3JkU3BhY2luZyA/IHdvcmRTcGFjaW5nIDog MCk7CiAgICAgICAgICAgICAgICAgICAgIC8vIENoZWNrIGlmIGxpbmUgaXMgdG9vIGJpZyBldmVu IHdpdGhvdXQgdGhlIGV4dHJhIHNwYWNlCiAgICAgICAgICAgICAgICAgICAgIC8vIGF0IHRoZSBl bmQgb2YgdGhlIGxpbmUuIElmIGl0IGlzIG5vdCwgZG8gbm90aGluZy4KQEAgLTk3MCw3ICs5NjQs NyBAQCBpbmxpbmUgYm9vbCBCcmVha2luZ0NvbnRleHQ6OmhhbmRsZVRleHQoV29yZE1lYXN1cmVt ZW50cyYgd29yZE1lYXN1cmVtZW50cywgYm9vbAogICAgICAgICAgICAgICAgIGxhc3RTcGFjZSA9 IG1fY3VycmVudC5vZmZzZXQoKTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKCFt X2lnbm9yaW5nU3BhY2VzICYmIG1fY3VycmVudFN0eWxlLT5jb2xsYXBzZVdoaXRlU3BhY2UoKSkg eworICAgICAgICAgICAgaWYgKCFtX2lnbm9yaW5nU3BhY2VzICYmIHN0eWxlLmNvbGxhcHNlV2hp dGVTcGFjZSgpKSB7CiAgICAgICAgICAgICAgICAgLy8gSWYgd2UgZW5jb3VudGVyIGEgbmV3bGlu ZSwgb3IgaWYgd2UgZW5jb3VudGVyIGEgc2Vjb25kIHNwYWNlLAogICAgICAgICAgICAgICAgIC8v IHdlIG5lZWQgdG8gYnJlYWsgdXAgdGhpcyBydW4gYW5kIGVudGVyIGEgbW9kZSB3aGVyZSB3ZSBz dGFydCBjb2xsYXBzaW5nIHNwYWNlcy4KICAgICAgICAgICAgICAgICBpZiAobV9jdXJyZW50Q2hh cmFjdGVySXNTcGFjZSAmJiBwcmV2aW91c0NoYXJhY3RlcklzU3BhY2UpIHsKQEAgLTEwMjQsMTMg KzEwMTgsMTMgQEAgaW5saW5lIGJvb2wgQnJlYWtpbmdDb250ZXh0OjpoYW5kbGVUZXh0KFdvcmRN ZWFzdXJlbWVudHMmIHdvcmRNZWFzdXJlbWVudHMsIGJvb2wKICAgICAgICAgfQogCiAgICAgICAg IGlmICghbV9jdXJyZW50Q2hhcmFjdGVySXNXUyAmJiBwcmV2aW91c0NoYXJhY3RlcklzV1MpIHsK LSAgICAgICAgICAgIGlmIChtX2F1dG9XcmFwICYmIG1fY3VycmVudFN0eWxlLT5icmVha09ubHlB ZnRlcldoaXRlU3BhY2UoKSkKKyAgICAgICAgICAgIGlmIChtX2F1dG9XcmFwICYmIHN0eWxlLmJy ZWFrT25seUFmdGVyV2hpdGVTcGFjZSgpKQogICAgICAgICAgICAgICAgIG1fbGluZUJyZWFrLm1v dmVUbyhyZW5kZXJlciwgbV9jdXJyZW50Lm9mZnNldCgpLCBtX2N1cnJlbnQubmV4dEJyZWFrYWJs ZVBvc2l0aW9uKCkpOwogICAgICAgICB9CiAKICAgICAgICAgaWYgKG1fY29sbGFwc2VXaGl0ZVNw YWNlICYmIG1fY3VycmVudENoYXJhY3RlcklzU3BhY2UgJiYgIW1faWdub3JpbmdTcGFjZXMpCiAg ICAgICAgICAgICBtX3RyYWlsaW5nT2JqZWN0cy5zZXRUcmFpbGluZ1doaXRlc3BhY2UocmVuZGVy ZXIpOwotICAgICAgICBlbHNlIGlmICghbV9jdXJyZW50U3R5bGUtPmNvbGxhcHNlV2hpdGVTcGFj ZSgpIHx8ICFtX2N1cnJlbnRDaGFyYWN0ZXJJc1NwYWNlKQorICAgICAgICBlbHNlIGlmICghc3R5 bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCkgfHwgIW1fY3VycmVudENoYXJhY3RlcklzU3BhY2UpCiAg ICAgICAgICAgICBtX3RyYWlsaW5nT2JqZWN0cy5jbGVhcigpOwogCiAgICAgICAgIG1fYXRTdGFy dCA9IGZhbHNlOwpAQCAtMTE1MCw3ICsxMTQ0LDcgQEAgaW5saW5lIHZvaWQgQnJlYWtpbmdDb250 ZXh0Ojpjb21taXRBbmRVcGRhdGVMaW5lQnJlYWtJZk5lZWRlZCgpCiAKICAgICBpZiAoY2hlY2tG b3JCcmVhayAmJiAhbV93aWR0aC5maXRzT25MaW5lKG1faWdub3JpbmdTcGFjZXMpICYmICFtX2hh bmdzQXRFbmQpIHsKICAgICAgICAgLy8gaWYgd2UgaGF2ZSBmbG9hdHMsIHRyeSB0byBnZXQgYmVs b3cgdGhlbS4KLSAgICAgICAgaWYgKG1fY3VycmVudENoYXJhY3RlcklzU3BhY2UgJiYgIW1faWdu b3JpbmdTcGFjZXMgJiYgbV9jdXJyZW50U3R5bGUtPmNvbGxhcHNlV2hpdGVTcGFjZSgpKQorICAg ICAgICBpZiAobV9jdXJyZW50Q2hhcmFjdGVySXNTcGFjZSAmJiAhbV9pZ25vcmluZ1NwYWNlcyAm JiBtX2NvbGxhcHNlV2hpdGVTcGFjZSkKICAgICAgICAgICAgIG1fdHJhaWxpbmdPYmplY3RzLmNs ZWFyKCk7CiAKICAgICAgICAgaWYgKG1fd2lkdGguY29tbWl0dGVkV2lkdGgoKSkgewo=