216260 2020-09-07 21:05:53 -0700 [LFC][IFC] LineBuilder::rebuildLine should just re-initialize the current line 2020-09-09 09:06:22 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1686472 0 zalan 2020-09-07 21:05:53 -0700 instead of the special clearContent(). 1686473 1 408208 zalan 2020-09-07 21:12:03 -0700 Created attachment 408208 Patch 1686648 2 408248 zalan 2020-09-08 11:46:14 -0700 Created attachment 408248 Patch 1686987 3 ews-feeder 2020-09-09 09:05:55 -0700 Committed r266783: <https://trac.webkit.org/changeset/266783> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408248. 1686988 4 webkit-bug-importer 2020-09-09 09:06:22 -0700 <rdar://problem/68576273> 408208 2020-09-07 21:12:03 -0700 2020-09-08 11:46:12 -0700 Patch bug-216260-20200907211202.patch text/plain 9586 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NjkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjZmZjFhZDRkYWFlMDFj MDc2ZTZlYmNkYjA5ZDA1NmQ2M2FlZjYxMC4uYzVlZWNiOTcyNWZhMTMwZTNhNDk3YTVhNmQ4NDBi ZjNkNGMzMjU5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA5LTA3ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQnVp bGRlcjo6cmVidWlsZExpbmUgc2hvdWxkIGNhbGwgTGluZTo6Y2xvc2Uvb3BlbgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MjYwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm93IHRoYXQgTGluZUJ1aWxk ZXIgaGFzIHRoZSBMaW5lLCB3ZSBjb3VsZCBqdXN0IGNhbGwgY2xvc2Uvb3BlbiB3aGVuIHRoZSBj b250ZW50IHJlcXVpcmVzIGEgcmUtYnVpbGQuCisKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9y bWF0dGluZy9JbmxpbmVMaW5lLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZTo6 b3Blbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Om1vdmVMb2dpY2FsTGVmdCk6 CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6Om1vdmVMb2dpY2FsUmlnaHQpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpjbGVhckNvbnRlbnQpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaDogTGluZSBzaG91bGQg cmVhbGx5IHN0YXJ0IHdpdGggImNsb3NlZCIgc3RhdGUuCisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6Omhvcml6b250YWxDb25zdHJhaW50IGNvbnN0KTogVGhlIGxpbmUgbG9naWNhbCB3 aWR0aCBpcyBhY3R1YWxseSB0aGUgaG9yaXpvbnRhbCBjb25zdHJhaW50LgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lOjphdmFpbGFibGVXaWR0aCBjb25zdCk6CisgICAgICAgIChXZWJD b3JlOjpMYXlvdXQ6OkxpbmU6OmxpbmVMb2dpY2FsV2lkdGggY29uc3QpOiBEZWxldGVkLgorICAg ICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQp OgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlRmxvYXRzQW5k SW5saW5lQ29udGVudCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpy ZWJ1aWxkTGluZSk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJ1aWxkZXIuaDoKKwogMjAyMC0wOS0wNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtMRkNdW0lGQ10gUmVtb3ZlIHJlZHVuZGFudCBGb3JtYXR0aW5nQ29udGV4 dDo6UXVpcmtzOjpsaW5lRGVzY2VudE5lZWRzQ29sbGFwc2luZwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCA5YmY5 MjRlYTkyMTNkYzUyZGZiMTMxMWJlNmYzMDA3NGE5MGUxNTczLi4wNDQ1ZmJjYjQzN2NjMjBjY2I3 MDc1OTIwOWNlN2NjOWEwNjAyZjEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv aW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcApAQCAtNTcsMTUgKzU3LDExIEBAIExp bmU6On5MaW5lKCkKIAogdm9pZCBMaW5lOjpvcGVuKElubGluZUxheW91dFVuaXQgYXZhaWxhYmxl V2lkdGgpCiB7Ci0gICAgbV9saW5lTG9naWNhbFdpZHRoID0gYXZhaWxhYmxlV2lkdGg7Ci0gICAg Y2xlYXJDb250ZW50KCk7CisgICAgQVNTRVJUKG1faXNDbG9zZWQpOwogI2lmIEFTU0VSVF9FTkFC TEVECiAgICAgbV9pc0Nsb3NlZCA9IGZhbHNlOwogI2VuZGlmCi19Ci0KLXZvaWQgTGluZTo6Y2xl YXJDb250ZW50KCkKLXsKKyAgICBtX2hvcml6b250YWxDb25zdHJhaW50ID0gYXZhaWxhYmxlV2lk dGg7CiAgICAgbV9jb250ZW50TG9naWNhbFdpZHRoID0geyB9OwogICAgIG1faXNWaXN1YWxseUVt cHR5ID0gdHJ1ZTsKICAgICBtX3J1bnMuY2xlYXIoKTsKQEAgLTIxMSwxMyArMjA3LDEzIEBAIHZv aWQgTGluZTo6bW92ZUxvZ2ljYWxMZWZ0KElubGluZUxheW91dFVuaXQgZGVsdGEpCiAgICAgICAg IHJldHVybjsKICAgICBBU1NFUlQoZGVsdGEgPiAwKTsKICAgICBtX2xpbmVMb2dpY2FsTGVmdCAr PSBkZWx0YTsKLSAgICBtX2xpbmVMb2dpY2FsV2lkdGggLT0gZGVsdGE7CisgICAgbV9ob3Jpem9u dGFsQ29uc3RyYWludCAtPSBkZWx0YTsKIH0KIAogdm9pZCBMaW5lOjptb3ZlTG9naWNhbFJpZ2h0 KElubGluZUxheW91dFVuaXQgZGVsdGEpCiB7CiAgICAgQVNTRVJUKGRlbHRhID4gMCk7Ci0gICAg bV9saW5lTG9naWNhbFdpZHRoIC09IGRlbHRhOworICAgIG1faG9yaXpvbnRhbENvbnN0cmFpbnQg LT0gZGVsdGE7CiB9CiAKIHZvaWQgTGluZTo6YXBwZW5kKGNvbnN0IElubGluZUl0ZW0mIGlubGlu ZUl0ZW0sIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCmluZGV4IGE0NDUyZTE0 ODM1MzU4YjMzODE1OGZmODA0NmExOWRlMDY3MGRjODAuLjNmZmM1MmE0MGEyMmVkMWNiZGU1OGFi MzJiOTQwMTgwMTY4NzgwZDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5s aW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTQ0LDcgKzQ0LDYgQEAgcHVibGljOgogCiAg ICAgdm9pZCBvcGVuKElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoKTsKICAg ICB2b2lkIGNsb3NlKGJvb2wgaXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50KTsKLSAgICB2b2lk IGNsZWFyQ29udGVudCgpOwogCiAgICAgdm9pZCBzZXRIYXNJbnRydXNpdmVGbG9hdChib29sIGhh c0ludHJ1c2l2ZUZsb2F0KSB7IG1faGFzSW50cnVzaXZlRmxvYXQgPSBoYXNJbnRydXNpdmVGbG9h dDsgfQogICAgIGJvb2wgaGFzSW50cnVzaXZlRmxvYXQoKSBjb25zdCB7IHJldHVybiBtX2hhc0lu dHJ1c2l2ZUZsb2F0OyB9CkBAIC01NCw5ICs1Myw5IEBAIHB1YmxpYzoKIAogICAgIGJvb2wgaXNW aXN1YWxseUVtcHR5KCkgY29uc3QgeyByZXR1cm4gbV9pc1Zpc3VhbGx5RW1wdHk7IH0KIAotICAg IElubGluZUxheW91dFVuaXQgbGluZUxvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fbGlu ZUxvZ2ljYWxXaWR0aDsgfQorICAgIElubGluZUxheW91dFVuaXQgaG9yaXpvbnRhbENvbnN0cmFp bnQoKSBjb25zdCB7IHJldHVybiBtX2hvcml6b250YWxDb25zdHJhaW50OyB9CiAgICAgSW5saW5l TGF5b3V0VW5pdCBjb250ZW50TG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gbV9jb250ZW50 TG9naWNhbFdpZHRoOyB9Ci0gICAgSW5saW5lTGF5b3V0VW5pdCBhdmFpbGFibGVXaWR0aCgpIGNv bnN0IHsgcmV0dXJuIGxpbmVMb2dpY2FsV2lkdGgoKSAtIGNvbnRlbnRMb2dpY2FsV2lkdGgoKTsg fQorICAgIElubGluZUxheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgoKSBjb25zdCB7IHJldHVybiBo b3Jpem9udGFsQ29uc3RyYWludCgpIC0gY29udGVudExvZ2ljYWxXaWR0aCgpOyB9CiAKICAgICBJ bmxpbmVMYXlvdXRVbml0IHRyaW1tYWJsZVRyYWlsaW5nV2lkdGgoKSBjb25zdCB7IHJldHVybiBt X3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC53aWR0aCgpOyB9CiAgICAgYm9vbCBpc1RyYWlsaW5n UnVuRnVsbHlUcmltbWFibGUoKSBjb25zdCB7IHJldHVybiBtX3RyaW1tYWJsZVRyYWlsaW5nQ29u dGVudC5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKTsgfQpAQCAtMTc5LDE0ICsxNzgsMTQg QEAgcHJpdmF0ZToKICAgICBSdW5MaXN0IG1fcnVuczsKICAgICBUcmltbWFibGVUcmFpbGluZ0Nv bnRlbnQgbV90cmltbWFibGVUcmFpbGluZ0NvbnRlbnQ7CiAgICAgSW5saW5lTGF5b3V0VW5pdCBt X2xpbmVMb2dpY2FsTGVmdCB7IDAgfTsKLSAgICBJbmxpbmVMYXlvdXRVbml0IG1fbGluZUxvZ2lj YWxXaWR0aCB7IDAgfTsKKyAgICBJbmxpbmVMYXlvdXRVbml0IG1faG9yaXpvbnRhbENvbnN0cmFp bnQgeyAwIH07CiAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2NvbnRlbnRMb2dpY2FsV2lkdGggeyAw IH07CiAgICAgYm9vbCBtX2hhc0ludHJ1c2l2ZUZsb2F0IHsgZmFsc2UgfTsKICAgICBib29sIG1f aXNWaXN1YWxseUVtcHR5IHsgdHJ1ZSB9OwogICAgIE9wdGlvbmFsPGJvb2w+IG1fbGluZUlzVmlz dWFsbHlFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudDsKICAgICBib29sIG1fc2hv dWxkSWdub3JlVHJhaWxpbmdMZXR0ZXJTcGFjaW5nIHsgZmFsc2UgfTsKICNpZiBBU1NFUlRfRU5B QkxFRAotICAgIGJvb2wgbV9pc0Nsb3NlZCB7IGZhbHNlIH07CisgICAgYm9vbCBtX2lzQ2xvc2Vk IHsgdHJ1ZSB9OwogI2VuZGlmCiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5kZXggNjRi M2I4MmQzZDQxNGIwM2MxNjY1YjNlZTViM2ZjMGMzZjk0Zjg5Zi4uZjEyNmVhZWY3NmJjNjI4NTky OTY4YzE0MGYzOTg3N2Q4OTgzZTNiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApAQCAtMzAz LDggKzMwMyw4IEBAIExpbmVCdWlsZGVyOjpMaW5lQ29udGVudCBMaW5lQnVpbGRlcjo6bGF5b3V0 SW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmCiAgICAgYXV0byBsaW5lSXNWaXN1 YWxseUVtcHR5ID0gbV9saW5lLmlzVmlzdWFsbHlFbXB0eSgpID8gTGluZUJveDo6SXNMaW5lVmlz dWFsbHlFbXB0eTo6WWVzIDogTGluZUJveDo6SXNMaW5lVmlzdWFsbHlFbXB0eTo6Tm87CiAgICAg cmV0dXJuIExpbmVDb250ZW50IHsgY29tbWl0dGVkQ29udGVudC5wYXJ0aWFsVHJhaWxpbmdDb250 ZW50LCBjb21taXR0ZWRSYW5nZSwgbV9mbG9hdHMsIG1fbGluZS5oYXNJbnRydXNpdmVGbG9hdCgp CiAgICAgICAgICwgbGluZUxvZ2ljYWxUb3BMZWZ0Ci0gICAgICAgICwgbV9saW5lLmxpbmVMb2dp Y2FsV2lkdGgoKQotICAgICAgICAsIExpbmVCb3ggeyBmb3JtYXR0aW5nQ29udGV4dCgpLCBtX2xp bmUubGluZUxvZ2ljYWxXaWR0aCgpLCBtX2xpbmUuY29udGVudExvZ2ljYWxXaWR0aCgpLCBtX2xp bmUucnVucygpLCBsaW5lSXNWaXN1YWxseUVtcHR5CisgICAgICAgICwgbV9saW5lLmhvcml6b250 YWxDb25zdHJhaW50KCkKKyAgICAgICAgLCBMaW5lQm94IHsgZm9ybWF0dGluZ0NvbnRleHQoKSwg bV9saW5lLmhvcml6b250YWxDb25zdHJhaW50KCksIG1fbGluZS5jb250ZW50TG9naWNhbFdpZHRo KCksIG1fbGluZS5ydW5zKCksIGxpbmVJc1Zpc3VhbGx5RW1wdHkKICAgICAgICAgLCBpc0xhc3RM aW5lID8gTGluZUJveDo6SXNMYXN0TGluZVdpdGhJbmxpbmVDb250ZW50OjpZZXMgOiBMaW5lQm94 OjpJc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQ6Ok5vIH0KICAgICAgICAgLCBtX2xpbmUucnVu cygpIH07CiB9CkBAIC01NjYsNyArNTY2LDcgQEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVp bGRlcjo6aGFuZGxlRmxvYXRzQW5kSW5saW5lQ29udGVudChMaW5lQnJlYWtlciYgbGluZUIKICAg ICAgICAgQVNTRVJUKHJlc3VsdC5pc0VuZE9mTGluZSA9PSBMaW5lQnJlYWtlcjo6SXNFbmRPZkxp bmU6Olllcyk7CiAgICAgICAgIC8vIE5vdCBvbmx5IHRoaXMgY29udGVudCBjYW4ndCBiZSBwbGFj ZWQgb24gdGhlIGN1cnJlbnQgbGluZSwgYnV0IHdlIGV2ZW4gbmVlZCB0byByZXZlcnQgdGhlIGxp bmUgYmFjayB0byBhbiBlYXJsaWVyIHBvc2l0aW9uLgogICAgICAgICBBU1NFUlQobV9sYXN0V3Jh cE9wcG9ydHVuaXR5SXRlbSk7Ci0gICAgICAgIHJldHVybiB7IExpbmVCcmVha2VyOjpJc0VuZE9m TGluZTo6WWVzLCB7IHJlYnVpbGRMaW5lKGxheW91dFJhbmdlKSwgdHJ1ZSB9IH07CisgICAgICAg IHJldHVybiB7IExpbmVCcmVha2VyOjpJc0VuZE9mTGluZTo6WWVzLCB7IHJlYnVpbGRMaW5lKGxh eW91dFJhbmdlLCAqbV9sYXN0V3JhcE9wcG9ydHVuaXR5SXRlbSksIHRydWUgfSB9OwogICAgIH0K ICAgICBpZiAocmVzdWx0LmFjdGlvbiA9PSBMaW5lQnJlYWtlcjo6UmVzdWx0OjpBY3Rpb246OlNw bGl0KSB7CiAgICAgICAgIEFTU0VSVChyZXN1bHQuaXNFbmRPZkxpbmUgPT0gTGluZUJyZWFrZXI6 OklzRW5kT2ZMaW5lOjpZZXMpOwpAQCAtNjEyLDE3ICs2MTIsMjAgQEAgdm9pZCBMaW5lQnVpbGRl cjo6Y29tbWl0UGFydGlhbENvbnRlbnQoY29uc3QgTGluZUJyZWFrZXI6OlJ1bkxpc3QmIHJ1bnMs IGNvbnN0IEwKICAgICB9CiB9CiAKLXNpemVfdCBMaW5lQnVpbGRlcjo6cmVidWlsZExpbmUoY29u c3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSkKK3NpemVfdCBMaW5lQnVpbGRlcjo6cmVi dWlsZExpbmUoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBsYXlvdXRSYW5nZSwgY29uc3QgSW5saW5l SXRlbSYgbGFzdFJ1blRvQWRkKQogewotICAgIC8vIENsZWFyIHRoZSBsaW5lIGFuZCBzdGFydCBh cHBlbmRpbmcgdGhlIGlubGluZSBpdGVtcyBjbG9zaW5nIHdpdGggdGhlIGxhc3Qgd3JhcCBvcHBv cnR1bml0eSBydW4uCi0gICAgbV9saW5lLmNsZWFyQ29udGVudCgpOworICAgIC8vIFdlIG1pZ2h0 IGFscmVhZHkgaGF2ZSBhZGRlZCBpbnRydXNpdmUgZmxvYXRzLiBUaGV5IHNocmluayB0aGUgYXZp bGFibGUgaG9yaXpvbnRhbCBzcGFjZSBmb3IgdGhlIGxpbmUuCisgICAgLy8gTGV0J3MganVzdCBy ZXVzZSB3aGF0IHRoZSBsaW5lIGhhcyBhdCB0aGlzIHBvaW50LgorICAgIGF1dG8gbGluZUxvZ2lj YWxXaWR0aCA9IG1fbGluZS5ob3Jpem9udGFsQ29uc3RyYWludCgpOworICAgIG1fbGluZS5jbG9z ZShmYWxzZSk7CisgICAgbV9saW5lLm9wZW4obGluZUxvZ2ljYWxXaWR0aCk7CiAgICAgYXV0byBj dXJyZW50SXRlbUluZGV4ID0gbGF5b3V0UmFuZ2Uuc3RhcnQ7CiAgICAgYXV0byBsb2dpY2FsUmln aHQgPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKICAgICBpZiAobV9wYXJ0aWFsTGVhZGluZ1RleHRJ dGVtKSB7CiAgICAgICAgIGF1dG8gbG9naWNhbFdpZHRoID0gaW5saW5lSXRlbVdpZHRoKCptX3Bh cnRpYWxMZWFkaW5nVGV4dEl0ZW0sIGxvZ2ljYWxSaWdodCk7CiAgICAgICAgIG1fbGluZS5hcHBl bmQoKm1fcGFydGlhbExlYWRpbmdUZXh0SXRlbSwgbG9naWNhbFdpZHRoKTsKICAgICAgICAgbG9n aWNhbFJpZ2h0ICs9IGxvZ2ljYWxXaWR0aDsKLSAgICAgICAgaWYgKCZtX3BhcnRpYWxMZWFkaW5n VGV4dEl0ZW0udmFsdWUoKSA9PSBtX2xhc3RXcmFwT3Bwb3J0dW5pdHlJdGVtKQorICAgICAgICBp ZiAoJm1fcGFydGlhbExlYWRpbmdUZXh0SXRlbS52YWx1ZSgpID09ICZsYXN0UnVuVG9BZGQpCiAg ICAgICAgICAgICByZXR1cm4gMTsKICAgICAgICAgKytjdXJyZW50SXRlbUluZGV4OwogICAgIH0K QEAgLTYzMSw3ICs2MzQsNyBAQCBzaXplX3QgTGluZUJ1aWxkZXI6OnJlYnVpbGRMaW5lKGNvbnN0 IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFuZ2UpCiAgICAgICAgIGF1dG8gbG9naWNhbFdpZHRo ID0gaW5saW5lSXRlbVdpZHRoKGlubGluZUl0ZW0sIGxvZ2ljYWxSaWdodCk7CiAgICAgICAgIG1f bGluZS5hcHBlbmQoaW5saW5lSXRlbSwgbG9naWNhbFdpZHRoKTsKICAgICAgICAgbG9naWNhbFJp Z2h0ICs9IGxvZ2ljYWxXaWR0aDsKLSAgICAgICAgaWYgKCZpbmxpbmVJdGVtID09IG1fbGFzdFdy YXBPcHBvcnR1bml0eUl0ZW0pCisgICAgICAgIGlmICgmaW5saW5lSXRlbSA9PSAmbGFzdFJ1blRv QWRkKQogICAgICAgICAgICAgcmV0dXJuIGN1cnJlbnRJdGVtSW5kZXggLSBsYXlvdXRSYW5nZS5z dGFydCArIDE7CiAgICAgfQogICAgIHJldHVybiBsYXlvdXRSYW5nZS5zaXplKCk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVp bGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJ1aWxkZXIuaAppbmRleCBkMDg5ZmJmNDMwZmMxNGViZTE5ZDdlMThjZDVmZDc1NzNiOWRiOWNm Li4yMWM0MWU5ZmEwZjUzNzJkMGJkOTU2Y2EzODdjNjRmYzgwOTExYWY1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVC dWlsZGVyLmgKQEAgLTk0LDcgKzk0LDcgQEAgcHJpdmF0ZToKICAgICBVc2VkQ29uc3RyYWludHMg Y29uc3RyYWludHNGb3JMaW5lKGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0OjpDb25zdHJhaW50c0Zv ckluRmxvd0NvbnRlbnQmIGluaXRpYWxMaW5lQ29uc3RyYWludHMsIGJvb2wgaXNGaXJzdExpbmUp OwogICAgIHZvaWQgY29tbWl0RmxvYXRzKGNvbnN0IExpbmVDYW5kaWRhdGUmLCBDb21taXRJbnRy dXNpdmVGbG9hdHNPbmx5ID0gQ29tbWl0SW50cnVzaXZlRmxvYXRzT25seTo6Tm8pOwogICAgIFJl c3VsdCBoYW5kbGVGbG9hdHNBbmRJbmxpbmVDb250ZW50KExpbmVCcmVha2VyJiwgY29uc3QgSW5s aW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBjb25zdCBMaW5lQ2FuZGlkYXRlJik7Ci0g ICAgc2l6ZV90IHJlYnVpbGRMaW5lKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRS YW5nZSk7CisgICAgc2l6ZV90IHJlYnVpbGRMaW5lKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbmVl ZHNMYXlvdXRSYW5nZSwgY29uc3QgSW5saW5lSXRlbSYgbGFzdFJ1blRvQWRkKTsKICAgICB2b2lk IGNvbW1pdFBhcnRpYWxDb250ZW50KGNvbnN0IExpbmVCcmVha2VyOjpSdW5MaXN0JiwgY29uc3Qg TGluZUJyZWFrZXI6OlJlc3VsdDo6UGFydGlhbFRyYWlsaW5nQ29udGVudCYpOwogICAgIHZvaWQg aW5pdGlhbGl6ZShjb25zdCBVc2VkQ29uc3RyYWludHMmKTsKICAgICBzdHJ1Y3QgQ29tbWl0dGVk Q29udGVudCB7Cg== 408248 2020-09-08 11:46:14 -0700 2020-09-09 09:05:55 -0700 Patch bug-216260-20200908114613.patch text/plain 11215 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2NjkxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzNlZjE1MGQ0YzFiYTA5 MDE0NzYxYTdkYmNmYzMwNGMzOGRjMGNlYy4uNTkyMzc5Yzg0OTc3NDA0MDhiYmE3YjZjOTU4NmVh MDNhNzk3YTVhZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTA5LTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBMaW5lQnVp bGRlcjo6cmVidWlsZExpbmUgc2hvdWxkIGp1c3QgcmUtaW5pdGlhbGl6ZSB0aGUgY3VycmVudCBs aW5lCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTYy NjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBOb3cg dGhhdCBMaW5lQnVpbGRlciBtYW5hZ2VzIHRoZSBMaW5lLCBpdCBjYW4gcHJvcGVybHkgcmVzZXQg aXQgd2hlbiB3ZSBuZWVkIGl0IGNsZWFuIGZvciB0aGUgInJlYnVpbGQiIGNhc2UuCisgICAgICAg IFRoaXMgcGF0Y2ggYWxzbyBtYWtlcyAibGluZSBjbG9zaW5nIiBtb3JlIGV4cGxpY2l0IGJ5IGNh bGxpbmcgY29sbGFwc2UgdHJhaWxpbmcgY29udGVudCArIGFwcGx5IHJ1biBleHBhbnNpb24gc2Vw YXJhdGVseS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpvcGVuKToKKyAgICAgICAgKFdl YkNvcmU6OkxheW91dDo6TGluZTo6bW92ZUxvZ2ljYWxMZWZ0KToKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6TGluZTo6bW92ZUxvZ2ljYWxSaWdodCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6OmNsZWFyQ29udGVudCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkxpbmU6OmF2YWlsYWJsZVdpZHRoIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6TGluZTo6bGluZUxvZ2ljYWxXaWR0aCBjb25zdCk6IERlbGV0ZWQuCisgICAgICAgICogbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVudCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpoYW5kbGVGbG9hdHNBbmRJbmxpbmVDb250 ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OnJlYnVpbGRMaW5l KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5o OgorCiAyMDIwLTA5LTA4ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW0xGQ11bSUZDXSBMaW5lIHNob3VsZCBub3Qga25vdyBhYm91dCBmbG9hdHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAK aW5kZXggYzljYTY3NDdhMGM3NmE0ZjAwMmEzZjMwZTE2ZDZkNmU3ZmQxZTM3ZC4uNWMxMjg3MTQx ZGE1MWM3YzQ2NDNiNGNlZmViZTg2YTUwMTRmZWE0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAKQEAgLTU1LDE3ICs1 NSw5IEBAIExpbmU6On5MaW5lKCkKIHsKIH0KIAotdm9pZCBMaW5lOjpvcGVuKElubGluZUxheW91 dFVuaXQgaG9yaXpvbnRhbENvbnN0cmFpbnQpCit2b2lkIExpbmU6OmluaXRpYWxpemUoSW5saW5l TGF5b3V0VW5pdCBob3Jpem9udGFsQ29uc3RyYWludCkKIHsKICAgICBtX2hvcml6b250YWxDb25z dHJhaW50ID0gaG9yaXpvbnRhbENvbnN0cmFpbnQ7Ci0gICAgY2xlYXJDb250ZW50KCk7Ci0jaWYg QVNTRVJUX0VOQUJMRUQKLSAgICBtX2lzQ2xvc2VkID0gZmFsc2U7Ci0jZW5kaWYKLX0KLQotdm9p ZCBMaW5lOjpjbGVhckNvbnRlbnQoKQotewogICAgIG1fY29udGVudExvZ2ljYWxXaWR0aCA9IHsg fTsKICAgICBtX2lzVmlzdWFsbHlFbXB0eSA9IHRydWU7CiAgICAgbV9ydW5zLmNsZWFyKCk7CkBA IC03Myw1OSArNjUsNTMgQEAgdm9pZCBMaW5lOjpjbGVhckNvbnRlbnQoKQogICAgIG1fbGluZUlz VmlzdWFsbHlFbXB0eUJlZm9yZVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCA9IHsgfTsKIH0KIAot dm9pZCBMaW5lOjpjbG9zZShib29sIGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudCkKK3ZvaWQg TGluZTo6cmVtb3ZlQ29sbGFwc2libGVDb250ZW50KCkKIHsKLSNpZiBBU1NFUlRfRU5BQkxFRAot ICAgIG1faXNDbG9zZWQgPSB0cnVlOwotI2VuZGlmCiAgICAgcmVtb3ZlVHJhaWxpbmdUcmltbWFi bGVDb250ZW50KCk7CiAgICAgdmlzdWFsbHlDb2xsYXBzZVByZVdyYXBPdmVyZmxvd0NvbnRlbnQo KTsKK30KIAotICAgIGF1dG8gY29tcHV0ZUV4cGFuc2lvbkZvclJ1bnNJZk5lZWRlZCA9IFsmXSB7 Ci0gICAgICAgIGlmIChmb3JtYXR0aW5nQ29udGV4dCgpLnJvb3QoKS5zdHlsZSgpLnRleHRBbGln bigpICE9IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAg ICAgIC8vIFRleHQgaXMganVzdGlmaWVkIGFjY29yZGluZyB0byB0aGUgbWV0aG9kIHNwZWNpZmll ZCBieSB0aGUgdGV4dC1qdXN0aWZ5IHByb3BlcnR5LAotICAgICAgICAvLyBpbiBvcmRlciB0byBl eGFjdGx5IGZpbGwgdGhlIGxpbmUgYm94LiBVbmxlc3Mgb3RoZXJ3aXNlIHNwZWNpZmllZCBieSB0 ZXh0LWFsaWduLWxhc3QsCi0gICAgICAgIC8vIHRoZSBsYXN0IGxpbmUgYmVmb3JlIGEgZm9yY2Vk IGJyZWFrIG9yIHRoZSBlbmQgb2YgdGhlIGJsb2NrIGlzIHN0YXJ0LWFsaWduZWQuCi0gICAgICAg IGlmIChpc0xhc3RMaW5lV2l0aElubGluZUNvbnRlbnQpCi0gICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgIGlmIChtX3J1bnMuaXNFbXB0eSgpIHx8IG1fcnVucy5sYXN0KCkuaXNMaW5lQnJlYWso KSkKLSAgICAgICAgICAgIHJldHVybjsKK3ZvaWQgTGluZTo6YXBwbHlSdW5FeHBhbnNpb24oKQor eworICAgIEFTU0VSVChmb3JtYXR0aW5nQ29udGV4dCgpLnJvb3QoKS5zdHlsZSgpLnRleHRBbGln bigpID09IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkpOworICAgIC8vIFRleHQgaXMganVzdGlmaWVk IGFjY29yZGluZyB0byB0aGUgbWV0aG9kIHNwZWNpZmllZCBieSB0aGUgdGV4dC1qdXN0aWZ5IHBy b3BlcnR5LAorICAgIC8vIGluIG9yZGVyIHRvIGV4YWN0bHkgZmlsbCB0aGUgbGluZSBib3guIFVu bGVzcyBvdGhlcndpc2Ugc3BlY2lmaWVkIGJ5IHRleHQtYWxpZ24tbGFzdCwKKyAgICAvLyB0aGUg bGFzdCBsaW5lIGJlZm9yZSBhIGZvcmNlZCBicmVhayBvciB0aGUgZW5kIG9mIHRoZSBibG9jayBp cyBzdGFydC1hbGlnbmVkLgorICAgIGlmIChtX3J1bnMuaXNFbXB0eSgpIHx8IG1fcnVucy5sYXN0 KCkuaXNMaW5lQnJlYWsoKSkKKyAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGF1dG8gZXhwYW5z aW9uT3Bwb3J0dW5pdHlDb3VudCA9IDA7Ci0gICAgICAgIFJ1biogbGFzdFJ1bldpdGhDb250ZW50 ID0gbnVsbHB0cjsKLSAgICAgICAgLy8gQ29sbGVjdCBhbmQgZGlzdHJpYnV0ZSB0aGUgZXhwYW5z aW9uIG9wcG9ydHVuaXRpZXMuCi0gICAgICAgIGZvciAoYXV0byYgcnVuIDogbV9ydW5zKSB7Ci0g ICAgICAgICAgICBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50ICs9IHJ1bi5leHBhbnNpb25PcHBv cnR1bml0eUNvdW50KCk7Ci0gICAgICAgICAgICBpZiAocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc0Jv eCgpKQotICAgICAgICAgICAgICAgIGxhc3RSdW5XaXRoQ29udGVudCA9ICZydW47Ci0gICAgICAg IH0KLSAgICAgICAgLy8gTmVlZCB0byBmaXggdXAgdGhlIGxhc3QgcnVuJ3MgdHJhaWxpbmcgZXhw YW5zaW9uLgotICAgICAgICBpZiAobGFzdFJ1bldpdGhDb250ZW50ICYmIGxhc3RSdW5XaXRoQ29u dGVudC0+aGFzRXhwYW5zaW9uT3Bwb3J0dW5pdHkoKSkgewotICAgICAgICAgICAgLy8gVHVybiBv ZmYgdGhlIHRyYWlsaW5nIGJpdHMgZmlyc3QgYW5kIGFkZCB0aGUgZm9yYmlkIHRyYWlsaW5nIGV4 cGFuc2lvbi4KLSAgICAgICAgICAgIGF1dG8gbGVhZGluZ0V4cGFuc2lvbiA9IGxhc3RSdW5XaXRo Q29udGVudC0+ZXhwYW5zaW9uQmVoYXZpb3IoKSAmIExlZnRFeHBhbnNpb25NYXNrOwotICAgICAg ICAgICAgbGFzdFJ1bldpdGhDb250ZW50LT5zZXRFeHBhbnNpb25CZWhhdmlvcihsZWFkaW5nRXhw YW5zaW9uIHwgRm9yYmlkUmlnaHRFeHBhbnNpb24pOwotICAgICAgICB9Ci0gICAgICAgIC8vIEFu eXRoaW5nIHRvIGRpc3RyaWJ1dGU/Ci0gICAgICAgIGlmIChleHBhbnNpb25PcHBvcnR1bml0eUNv dW50ICYmIGF2YWlsYWJsZVdpZHRoKCkpIHsKLSAgICAgICAgICAgIC8vIERpc3RyaWJ1dGUgdGhl IGV4dHJhIHNwYWNlLgotICAgICAgICAgICAgYXV0byBleHBhbnNpb25Ub0Rpc3RyaWJ1dGUgPSBh dmFpbGFibGVXaWR0aCgpIC8gZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudDsKLSAgICAgICAgICAg IGF1dG8gYWNjdW11bGF0ZWRFeHBhbnNpb24gPSBJbmxpbmVMYXlvdXRVbml0IHsgfTsKLSAgICAg ICAgICAgIGZvciAoYXV0byYgcnVuIDogbV9ydW5zKSB7Ci0gICAgICAgICAgICAgICAgLy8gRXhw YW5kIGFuZCBtb3ZlIHJ1bnMgYnkgdGhlIGFjY3VtdWxhdGVkIGV4cGFuc2lvbi4KLSAgICAgICAg ICAgICAgICBydW4ubW92ZUhvcml6b250YWxseShhY2N1bXVsYXRlZEV4cGFuc2lvbik7Ci0gICAg ICAgICAgICAgICAgaWYgKCFydW4uaGFzRXhwYW5zaW9uT3Bwb3J0dW5pdHkoKSkKLSAgICAgICAg ICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgICAgICAgICAgQVNTRVJUKHJ1bi5leHBhbnNp b25PcHBvcnR1bml0eUNvdW50KCkpOwotICAgICAgICAgICAgICAgIGF1dG8gY29tcHV0ZWRFeHBh bnNpb24gPSBleHBhbnNpb25Ub0Rpc3RyaWJ1dGUgKiBydW4uZXhwYW5zaW9uT3Bwb3J0dW5pdHlD b3VudCgpOwotICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBDaGVjayB3aHkgd2UgbmVlZCB0byBz ZXQgYm90aC4KLSAgICAgICAgICAgICAgICBydW4uc2V0SG9yaXpvbnRhbEV4cGFuc2lvbihjb21w dXRlZEV4cGFuc2lvbik7Ci0gICAgICAgICAgICAgICAgcnVuLnNocmlua0hvcml6b250YWxseSgt Y29tcHV0ZWRFeHBhbnNpb24pOwotICAgICAgICAgICAgICAgIGFjY3VtdWxhdGVkRXhwYW5zaW9u ICs9IGNvbXB1dGVkRXhwYW5zaW9uOwotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAgfTsK LSAgICBjb21wdXRlRXhwYW5zaW9uRm9yUnVuc0lmTmVlZGVkKCk7CisgICAgYXV0byBleHBhbnNp b25PcHBvcnR1bml0eUNvdW50ID0gMDsKKyAgICBSdW4qIGxhc3RSdW5XaXRoQ29udGVudCA9IG51 bGxwdHI7CisgICAgLy8gQ29sbGVjdCBhbmQgZGlzdHJpYnV0ZSB0aGUgZXhwYW5zaW9uIG9wcG9y dHVuaXRpZXMuCisgICAgZm9yIChhdXRvJiBydW4gOiBtX3J1bnMpIHsKKyAgICAgICAgZXhwYW5z aW9uT3Bwb3J0dW5pdHlDb3VudCArPSBydW4uZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCgpOwor ICAgICAgICBpZiAocnVuLmlzVGV4dCgpIHx8IHJ1bi5pc0JveCgpKQorICAgICAgICAgICAgbGFz dFJ1bldpdGhDb250ZW50ID0gJnJ1bjsKKyAgICB9CisgICAgLy8gTmVlZCB0byBmaXggdXAgdGhl IGxhc3QgcnVuJ3MgdHJhaWxpbmcgZXhwYW5zaW9uLgorICAgIGlmIChsYXN0UnVuV2l0aENvbnRl bnQgJiYgbGFzdFJ1bldpdGhDb250ZW50LT5oYXNFeHBhbnNpb25PcHBvcnR1bml0eSgpKSB7Cisg ICAgICAgIC8vIFR1cm4gb2ZmIHRoZSB0cmFpbGluZyBiaXRzIGZpcnN0IGFuZCBhZGQgdGhlIGZv cmJpZCB0cmFpbGluZyBleHBhbnNpb24uCisgICAgICAgIGF1dG8gbGVhZGluZ0V4cGFuc2lvbiA9 IGxhc3RSdW5XaXRoQ29udGVudC0+ZXhwYW5zaW9uQmVoYXZpb3IoKSAmIExlZnRFeHBhbnNpb25N YXNrOworICAgICAgICBsYXN0UnVuV2l0aENvbnRlbnQtPnNldEV4cGFuc2lvbkJlaGF2aW9yKGxl YWRpbmdFeHBhbnNpb24gfCBGb3JiaWRSaWdodEV4cGFuc2lvbik7CisgICAgfQorICAgIC8vIEFu eXRoaW5nIHRvIGRpc3RyaWJ1dGU/CisgICAgaWYgKCFleHBhbnNpb25PcHBvcnR1bml0eUNvdW50 IHx8ICFhdmFpbGFibGVXaWR0aCgpKQorICAgICAgICByZXR1cm47CisgICAgLy8gRGlzdHJpYnV0 ZSB0aGUgZXh0cmEgc3BhY2UuCisgICAgYXV0byBleHBhbnNpb25Ub0Rpc3RyaWJ1dGUgPSBhdmFp bGFibGVXaWR0aCgpIC8gZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudDsKKyAgICBhdXRvIGFjY3Vt dWxhdGVkRXhwYW5zaW9uID0gSW5saW5lTGF5b3V0VW5pdCB7IH07CisgICAgZm9yIChhdXRvJiBy dW4gOiBtX3J1bnMpIHsKKyAgICAgICAgLy8gRXhwYW5kIGFuZCBtb3ZlIHJ1bnMgYnkgdGhlIGFj Y3VtdWxhdGVkIGV4cGFuc2lvbi4KKyAgICAgICAgcnVuLm1vdmVIb3Jpem9udGFsbHkoYWNjdW11 bGF0ZWRFeHBhbnNpb24pOworICAgICAgICBpZiAoIXJ1bi5oYXNFeHBhbnNpb25PcHBvcnR1bml0 eSgpKQorICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIEFTU0VSVChydW4uZXhwYW5zaW9u T3Bwb3J0dW5pdHlDb3VudCgpKTsKKyAgICAgICAgYXV0byBjb21wdXRlZEV4cGFuc2lvbiA9IGV4 cGFuc2lvblRvRGlzdHJpYnV0ZSAqIHJ1bi5leHBhbnNpb25PcHBvcnR1bml0eUNvdW50KCk7Cisg ICAgICAgIC8vIEZJWE1FOiBDaGVjayB3aHkgd2UgbmVlZCB0byBzZXQgYm90aC4KKyAgICAgICAg cnVuLnNldEhvcml6b250YWxFeHBhbnNpb24oY29tcHV0ZWRFeHBhbnNpb24pOworICAgICAgICBy dW4uc2hyaW5rSG9yaXpvbnRhbGx5KC1jb21wdXRlZEV4cGFuc2lvbik7CisgICAgICAgIGFjY3Vt dWxhdGVkRXhwYW5zaW9uICs9IGNvbXB1dGVkRXhwYW5zaW9uOworICAgIH0KIH0KIAogdm9pZCBM aW5lOjpyZW1vdmVUcmFpbGluZ1RyaW1tYWJsZUNvbnRlbnQoKQpAQCAtMjIyLDcgKzIwOCw2IEBA IHZvaWQgTGluZTo6bW92ZUxvZ2ljYWxSaWdodChJbmxpbmVMYXlvdXRVbml0IGRlbHRhKQogCiB2 b2lkIExpbmU6OmFwcGVuZChjb25zdCBJbmxpbmVJdGVtJiBpbmxpbmVJdGVtLCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCkKIHsKLSAgICBBU1NFUlQoIW1faXNDbG9zZWQpOwogICAgIGFw cGVuZFdpdGgoaW5saW5lSXRlbSwgeyBsb2dpY2FsV2lkdGgsIGZhbHNlIH0pOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgK aW5kZXggNjg2YjEzMGFlM2IwOTg0ZmNjMDNhMTZjZTI4YTBmNTVhYjU0NTJjZi4uZDcwNTVlNmJm YzNmYjljOWI3MDU5Nzc4ZjdiNmE0YTFhMGJiOWIzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaApAQCAtNDIsOSArNDIsNyBA QCBwdWJsaWM6CiAgICAgTGluZShjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYpOwogICAg IH5MaW5lKCk7CiAKLSAgICB2b2lkIG9wZW4oSW5saW5lTGF5b3V0VW5pdCBob3Jpem9udGFsQ29u c3RyYWludCk7Ci0gICAgdm9pZCBjbG9zZShib29sIGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVu dCk7Ci0gICAgdm9pZCBjbGVhckNvbnRlbnQoKTsKKyAgICB2b2lkIGluaXRpYWxpemUoSW5saW5l TGF5b3V0VW5pdCBob3Jpem9udGFsQ29uc3RyYWludCk7CiAKICAgICB2b2lkIGFwcGVuZChjb25z dCBJbmxpbmVJdGVtJiwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogICAgIHZvaWQg YXBwZW5kUGFydGlhbFRyYWlsaW5nVGV4dEl0ZW0oY29uc3QgSW5saW5lVGV4dEl0ZW0mLCBJbmxp bmVMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCwgYm9vbCBuZWVkc0h5cGVuKTsKQEAgLTYxLDYgKzU5 LDkgQEAgcHVibGljOgogICAgIHZvaWQgbW92ZUxvZ2ljYWxMZWZ0KElubGluZUxheW91dFVuaXQp OwogICAgIHZvaWQgbW92ZUxvZ2ljYWxSaWdodChJbmxpbmVMYXlvdXRVbml0KTsKIAorICAgIHZv aWQgcmVtb3ZlQ29sbGFwc2libGVDb250ZW50KCk7CisgICAgdm9pZCBhcHBseVJ1bkV4cGFuc2lv bigpOworCiAgICAgc3RydWN0IFJ1biB7CiAgICAgICAgIGJvb2wgaXNUZXh0KCkgY29uc3QgeyBy ZXR1cm4gbV90eXBlID09IElubGluZUl0ZW06OlR5cGU6OlRleHQ7IH0KICAgICAgICAgYm9vbCBp c0JveCgpIGNvbnN0IHsgcmV0dXJuIG1fdHlwZSA9PSBJbmxpbmVJdGVtOjpUeXBlOjpCb3g7IH0K QEAgLTE4MSw5ICsxODIsNiBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9pc1Zpc3VhbGx5RW1wdHkg eyB0cnVlIH07CiAgICAgT3B0aW9uYWw8Ym9vbD4gbV9saW5lSXNWaXN1YWxseUVtcHR5QmVmb3Jl VHJpbW1hYmxlVHJhaWxpbmdDb250ZW50OwogICAgIGJvb2wgbV9zaG91bGRJZ25vcmVUcmFpbGlu Z0xldHRlclNwYWNpbmcgeyBmYWxzZSB9OwotI2lmIEFTU0VSVF9FTkFCTEVECi0gICAgYm9vbCBt X2lzQ2xvc2VkIHsgZmFsc2UgfTsKLSNlbmRpZgogfTsKIAogaW5saW5lIHZvaWQgTGluZTo6VHJp bW1hYmxlVHJhaWxpbmdDb250ZW50OjpyZXNldCgpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnVpbGRlci5jcHAKaW5k ZXggYjEyOWQ2MTc0ZjlkY2U0ZjFhMGJkYzIyOTY4NjM5ZmQ3MzIyNWQyMy4uOTM1OWMyYjdmZDMy ZWI3NmJlODMyYTY5MDU0MmE2NzIwNzMwMzczNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJ1aWxkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmVCdWlsZGVyLmNwcApA QCAtMzIzLDcgKzMyMyw3IEBAIHZvaWQgTGluZUJ1aWxkZXI6OmluaXRpYWxpemUoY29uc3QgVXNl ZENvbnN0cmFpbnRzJiBsaW5lQ29uc3RyYWludHMpCiAgICAgbV9wYXJ0aWFsTGVhZGluZ1RleHRJ dGVtID0geyB9OwogICAgIG1fbGFzdFdyYXBPcHBvcnR1bml0eUl0ZW0gPSB7IH07CiAKLSAgICBt X2xpbmUub3BlbihsaW5lQ29uc3RyYWludHMuYXZhaWxhYmxlTG9naWNhbFdpZHRoKTsKKyAgICBt X2xpbmUuaW5pdGlhbGl6ZShsaW5lQ29uc3RyYWludHMuYXZhaWxhYmxlTG9naWNhbFdpZHRoKTsK ICAgICBtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IGxpbmVDb25zdHJhaW50cy5pc0Nv bnN0cmFpbmVkQnlGbG9hdDsKIH0KIApAQCAtMzczLDcgKzM3MywxMSBAQCBMaW5lQnVpbGRlcjo6 SW5saW5lSXRlbVJhbmdlIExpbmVCdWlsZGVyOjpjbG9zZShjb25zdCBJbmxpbmVJdGVtUmFuZ2Um IG5lZWRzTGF5bwogICAgIEFTU0VSVChsaW5lUmFuZ2UuZW5kIDw9IG5lZWRzTGF5b3V0UmFuZ2Uu ZW5kKTsKICAgICAvLyBBZGp1c3QgaHlwaGVuYXRlZCBsaW5lIGNvdW50LgogICAgIG1fc3VjY2Vz c2l2ZUh5cGhlbmF0ZWRMaW5lQ291bnQgPSBjb21taXR0ZWRDb250ZW50LnBhcnRpYWxUcmFpbGlu Z0NvbnRlbnQgJiYgY29tbWl0dGVkQ29udGVudC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50LT50cmFp bGluZ0NvbnRlbnRIYXNIeXBoZW4gPyBtX3N1Y2Nlc3NpdmVIeXBoZW5hdGVkTGluZUNvdW50ICsg MSA6IDA7Ci0gICAgbV9saW5lLmNsb3NlKGlzTGFzdExpbmVXaXRoSW5saW5lQ29udGVudChsaW5l UmFuZ2UsIG5lZWRzTGF5b3V0UmFuZ2UuZW5kLCBjb21taXR0ZWRDb250ZW50LnBhcnRpYWxUcmFp bGluZ0NvbnRlbnQuaGFzVmFsdWUoKSkpOworICAgIG1fbGluZS5yZW1vdmVDb2xsYXBzaWJsZUNv bnRlbnQoKTsKKyAgICBhdXRvIGhvcml6b250YWxBbGlnbm1lbnQgPSByb290KCkuc3R5bGUoKS50 ZXh0QWxpZ24oKTsKKyAgICBhdXRvIHJ1bnNFeHBhbmRIb3Jpem9udGFsbHkgPSBob3Jpem9udGFs QWxpZ25tZW50ID09IFRleHRBbGlnbk1vZGU6Okp1c3RpZnkgJiYgIWlzTGFzdExpbmVXaXRoSW5s aW5lQ29udGVudChsaW5lUmFuZ2UsIG5lZWRzTGF5b3V0UmFuZ2UuZW5kLCBjb21taXR0ZWRDb250 ZW50LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnQuaGFzVmFsdWUoKSk7CisgICAgaWYgKHJ1bnNFeHBh bmRIb3Jpem9udGFsbHkpCisgICAgICAgIG1fbGluZS5hcHBseVJ1bkV4cGFuc2lvbigpOwogICAg IHJldHVybiBsaW5lUmFuZ2U7CiB9CiAKQEAgLTYxMiw4ICs2MTYsMTAgQEAgdm9pZCBMaW5lQnVp bGRlcjo6Y29tbWl0UGFydGlhbENvbnRlbnQoY29uc3QgTGluZUJyZWFrZXI6OlJ1bkxpc3QmIHJ1 bnMsIGNvbnN0IEwKIAogc2l6ZV90IExpbmVCdWlsZGVyOjpyZWJ1aWxkTGluZShjb25zdCBJbmxp bmVJdGVtUmFuZ2UmIGxheW91dFJhbmdlKQogewotICAgIC8vIENsZWFyIHRoZSBsaW5lIGFuZCBz dGFydCBhcHBlbmRpbmcgdGhlIGlubGluZSBpdGVtcyBjbG9zaW5nIHdpdGggdGhlIGxhc3Qgd3Jh cCBvcHBvcnR1bml0eSBydW4uCi0gICAgbV9saW5lLmNsZWFyQ29udGVudCgpOworICAgIEFTU0VS VChtX2xhc3RXcmFwT3Bwb3J0dW5pdHlJdGVtKTsKKyAgICAvLyBXZSBtaWdodCBhbHJlYWR5IGhh dmUgYWRkZWQgaW50cnVzaXZlIGZsb2F0cy4gVGhleSBzaHJpbmsgdGhlIGF2aWxhYmxlIGhvcml6 b250YWwgc3BhY2UgZm9yIHRoZSBsaW5lLgorICAgIC8vIExldCdzIGp1c3QgcmV1c2Ugd2hhdCB0 aGUgbGluZSBoYXMgYXQgdGhpcyBwb2ludC4KKyAgICBtX2xpbmUuaW5pdGlhbGl6ZShtX2xpbmUu aG9yaXpvbnRhbENvbnN0cmFpbnQoKSk7CiAgICAgYXV0byBjdXJyZW50SXRlbUluZGV4ID0gbGF5 b3V0UmFuZ2Uuc3RhcnQ7CiAgICAgYXV0byBsb2dpY2FsUmlnaHQgPSBJbmxpbmVMYXlvdXRVbml0 IHsgfTsKICAgICBpZiAobV9wYXJ0aWFsTGVhZGluZ1RleHRJdGVtKSB7Cg==