249695 2022-12-20 20:45:39 -0800 [IFC][hanging punctuation] Line::HangingContent should take "StopOrComma" trailing type 2022-12-21 06:49:28 -0800 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 1920989 0 zalan 2022-12-20 20:45:39 -0800 ssia 1920990 1 464133 zalan 2022-12-20 20:49:16 -0800 Created attachment 464133 Patch 1920997 2 464137 zalan 2022-12-20 21:22:55 -0800 Created attachment 464137 Patch 1921059 3 ews-feeder 2022-12-21 06:48:46 -0800 Committed 258188@main (8be5cfd53e57): <https://commits.webkit.org/258188@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 464137. 1921060 4 webkit-bug-importer 2022-12-21 06:49:28 -0800 <rdar://problem/103597041> 464133 2022-12-20 20:49:16 -0800 2022-12-20 21:22:53 -0800 Patch bug-249695-20221220204915.patch text/plain 8683 zalan RnJvbSBhMTM2ODZjY2VmZGU0ZGRlMjNlZTkyMGJmY2UyYTNkYTVjMWFlZGZhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMjAgRGVjIDIwMjIgMjA6NDU6NTIgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVto YW5naW5nIHB1bmN0dWF0aW9uXSBMaW5lOjpIYW5naW5nQ29udGVudCBzaG91bGQgdGFrZQogIlN0 b3BPckNvbWEiIHRyYWlsaW5nIHR5cGUgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTI0OTY5NQoKUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgpUaGlzIGlzIGluIHBy ZXBhcmF0aW9uIGZvciBzdXBwb3J0aW5nICJoYW5naW5nLXB1bmN0dWF0aW9uOiBhbGxvdy1lbmQi LCB3aGVyZSAiQSBzdG9wIG9yIGNvbW1hIGF0IHRoZSBlbmQgb2YgYSBsaW5lIGNvbmRpdGlvbmFs bHkgaGFuZ3MiLgooVGhpcyBwYXRjaCBhbHNvIHJlZmFjdG9ycyBMaW5lOjpoYW5kbGVUcmFpbGlu Z0hhbmdpbmdDb250ZW50IHRvIG1ha2UgaXQgcmVhZCBjbG9zZXIgdG8gdGhlIHNwZWMgbGFuZ3Vh Z2UuKQoKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9J bmxpbmVMaW5lLmNwcDoKKFdlYkNvcmU6OkxheW91dDo6TGluZTo6aGFuZGxlVHJhaWxpbmdIYW5n aW5nQ29udGVudCk6CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZS5oOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nQ29udGVu dDo6aXNUcmFpbGluZ0NvbnRlbnRXaGl0ZXNwYWNlIGNvbnN0KToKKFdlYkNvcmU6OkxheW91dDo6 TGluZTo6SGFuZ2luZ0NvbnRlbnQ6OmlzVHJhaWxpbmdDb250ZW50U3RvcE9yQ29tYSBjb25zdCk6 CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OkhhbmdpbmdDb250ZW50OjpzZXRUcmFpbGluZ1N0b3BP ckNvbWEpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nQ29udGVudDo6cmVzZXRUcmFp bGluZ1B1bmN0dWF0aW9uKToKLS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lLmNwcCAgfCA1OSArKysrKysrKysrLS0tLS0tLS0tCiAuLi4vZm9ybWF0dGluZ0NvbnRl eHRzL2lubGluZS9JbmxpbmVMaW5lLmggICAgfCAxMyArKystCiAyIGZpbGVzIGNoYW5nZWQsIDQx IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwIGIvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5j cHAKaW5kZXggNjBhM2YwNTk0OGVkLi5kMTNlOGIxZWY3NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGlu ZUxpbmUuY3BwCkBAIC0yNTUsNDUgKzI1NSw0NiBAQCB2b2lkIExpbmU6OmhhbmRsZU92ZXJmbG93 aW5nTm9uQnJlYWtpbmdTcGFjZShUcmFpbGluZ0NvbnRlbnRBY3Rpb24gdHJhaWxpbmdDb250ZQog CiB2b2lkIExpbmU6OmhhbmRsZVRyYWlsaW5nSGFuZ2luZ0NvbnRlbnQoc3RkOjpvcHRpb25hbDxJ bnRyaW5zaWNXaWR0aE1vZGU+IGludHJpbnNpY1dpZHRoTW9kZSwgSW5saW5lTGF5b3V0VW5pdCBo b3Jpem9udGFsQXZhaWxhYmxlU3BhY2VGb3JDb250ZW50LCBib29sIGlzTGFzdEZvcm1hdHRlZExp bmUpCiB7CisgICAgaWYgKCFtX2hhbmdpbmdDb250ZW50LnRyYWlsaW5nV2lkdGgoKSkKKyAgICAg ICAgcmV0dXJuOworCiAgICAgaWYgKCFpc0xhc3RGb3JtYXR0ZWRMaW5lKQogICAgICAgICBtX2hh bmdpbmdDb250ZW50LnJlc2V0VHJhaWxpbmdQdW5jdHVhdGlvbigpOwogCi0gICAgYXV0byB0cmlt bVRyYWlsaW5nSGFuZ2luZ0dseXBoc0lmQXBwbGljYWJsZSA9IFsmXSB7Ci0gICAgICAgIGlmICgh bV9oYW5naW5nQ29udGVudC50cmFpbGluZ1dpZHRoKCkpIHsKLSAgICAgICAgICAgIC8vIE5vdGhp bmcgdG8gdHJpbSBoZXJlLgotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9Ci0gICAgICAg IGlmICghaW50cmluc2ljV2lkdGhNb2RlKSB7Ci0gICAgICAgICAgICAvLyBPbmx5IHRyaW0gc3Vj aCBjb250ZW50IGR1cmluZyBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24uCi0gICAgICAgICAg ICByZXR1cm47CisgICAgLy8gaHR0cHM6Ly9kcmFmdHMuY3Nzd2cub3JnL2Nzcy10ZXh0LyNoYW5n aW5nCisgICAgYXV0byBoYW5naW5nVHJhaWxpbmdDb250ZW50SXNDb25kaXRpb25hbCA9IFsmXSB7 CisgICAgICAgIC8vIElmIHdoaXRlLXNwYWNlIGlzIHNldCB0byBwcmUtd3JhcCwgdGhlIFVBIG11 c3QgKHVuY29uZGl0aW9uYWxseSkgaGFuZyB0aGlzIHNlcXVlbmNlLCB1bmxlc3MgdGhlIHNlcXVl bmNlIGlzIGZvbGxvd2VkCisgICAgICAgIC8vIGJ5IGEgZm9yY2VkIGxpbmUgYnJlYWssIGluIHdo aWNoIGNhc2UgaXQgbXVzdCBjb25kaXRpb25hbGx5IGhhbmcgdGhlIHNlcXVlbmNlIGlzIGluc3Rl YWQuCisgICAgICAgIC8vIE5vdGUgdGhhdCBlbmQgb2YgbGFzdCBsaW5lIGluIGEgcGFyYWdyYXBo IGlzIGNvbnNpZGVyZWQgYSBmb3JjZWQgYnJlYWsuCisgICAgICAgIGF1dG8gbGluZUVuZHNXaXRo TGluZUJyZWFrID0gIXJ1bnMoKS5pc0VtcHR5KCkgJiYgcnVucygpLmxhc3QoKS5pc0xpbmVCcmVh aygpOworICAgICAgICBhdXRvIGhhc0NvbmRpdGlvbmFsVHJhaWxpbmdIYW5naW5nV2hpdGVzcGFj ZSA9IG1faGFuZ2luZ0NvbnRlbnQuaXNUcmFpbGluZ0NvbnRlbnRXaGl0ZXNwYWNlKCkgJiYgKGlz TGFzdEZvcm1hdHRlZExpbmUgfHwgbGluZUVuZHNXaXRoTGluZUJyZWFrKTsKKyAgICAgICAgLy8g QSBzdG9wIG9yIGNvbW1hIGF0IHRoZSBlbmQgb2YgYSBsaW5lIGNvbmRpdGlvbmFsbHkgaGFuZ3Mu CisgICAgICAgIGF1dG8gaGFzQ29uZGl0aW9uYWxUcmFpbGluZ1N0b3BPckNvbWEgPSBtX2hhbmdp bmdDb250ZW50LmlzVHJhaWxpbmdDb250ZW50U3RvcE9yQ29tYSgpOworICAgICAgICByZXR1cm4g aGFzQ29uZGl0aW9uYWxUcmFpbGluZ0hhbmdpbmdXaGl0ZXNwYWNlIHx8IGhhc0NvbmRpdGlvbmFs VHJhaWxpbmdTdG9wT3JDb21hOworICAgIH0oKTsKKworICAgIGlmICghaW50cmluc2ljV2lkdGhN b2RlKSB7CisgICAgICAgIC8vIE1ha2Ugc3VyZSB3aGVuIHRoZSBjb25kaXRpb25hbGx5IGhhbmdp bmcgY29udGVudCBhY3R1YWxseSBmaXRzIHdlIGRvbid0IGhhbmcgdGhlIGNvbnRlbnQgYW55bW9y ZSBkdXJpbmcgbm9ybWFsIGxheW91dC4KKyAgICAgICAgaWYgKGhhbmdpbmdUcmFpbGluZ0NvbnRl bnRJc0NvbmRpdGlvbmFsKSB7CisgICAgICAgICAgICAvLyBJbiBzb21lIGNhc2VzLCBhIGdseXBo IGF0IHRoZSBlbmQgb2YgYSBsaW5lIGNhbiBjb25kaXRpb25hbGx5IGhhbmc6IGl0IGhhbmdzIG9u bHkgaWYgaXQgZG9lcyBub3Qgb3RoZXJ3aXNlIGZpdCBpbiB0aGUgbGluZSBwcmlvciB0byBqdXN0 aWZpY2F0aW9uLgorICAgICAgICAgICAgYXV0byBkb2VzVHJhaWxpbmdIYW5naW5nQ29udGVudEZp dCA9IG1fY29udGVudExvZ2ljYWxXaWR0aCA8PSBob3Jpem9udGFsQXZhaWxhYmxlU3BhY2VGb3JD b250ZW50OworICAgICAgICAgICAgaWYgKGRvZXNUcmFpbGluZ0hhbmdpbmdDb250ZW50Rml0KSB7 CisgICAgICAgICAgICAgICAgLy8gUmVzZXQgaGVyZSBtZWFucyB0aGUgdHJhaWxpbmcgY29udGVu dCBpcyBub3QgaGFuZ2luZyBhbnltb3JlIC1pLmUuIHBhcnQgb2YgdGhlIGxpbmUgY29udGVudC4K KyAgICAgICAgICAgICAgICBtX2hhbmdpbmdDb250ZW50LnJlc2V0VHJhaWxpbmdDb250ZW50KCk7 CisgICAgICAgICAgICB9CiAgICAgICAgIH0KKyAgICAgICAgcmV0dXJuOworICAgIH0KIAotICAg ICAgICAvLyAxLiBUaGUgaGFuZ2luZyBnbHlwaCBpcyBhbHNvIG5vdCB0YWtlbiBpbnRvIGFjY291 bnQgd2hlbiBjb21wdXRpbmcgaW50cmluc2ljIHNpemVzIChtaW4tY29udGVudCBzaXplIGFuZCBt YXgtY29udGVudCBzaXplKQorICAgIGlmIChpbnRyaW5zaWNXaWR0aE1vZGUpIHsKKyAgICAgICAg Ly8gMS4gVGhlIGhhbmdpbmcgZ2x5cGggaXMgbm90IHRha2VuIGludG8gYWNjb3VudCB3aGVuIGNv bXB1dGluZyBpbnRyaW5zaWMgc2l6ZXMgKG1pbi1jb250ZW50IHNpemUgYW5kIG1heC1jb250ZW50 IHNpemUpCiAgICAgICAgIC8vIDIuIEdseXBocyB0aGF0IGNvbmRpdGlvbmFsbHkgaGFuZyBhcmUg bm90IHRha2VuIGludG8gYWNjb3VudCB3aGVuIGNvbXB1dGluZyBtaW4tY29udGVudCBzaXplcywg YnV0IHRoZXkgYXJlIHRha2VuIGludG8gYWNjb3VudCBmb3IgbWF4LWNvbnRlbnQgc2l6ZXMuCi0g ICAgICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdGV4dC8jaGFuZ2luZwotICAg ICAgICBhdXRvIHRyaW1tVHJhaWxpbmdIYW5naW5nR2x5cGhzID0gWyZdIHsKKyAgICAgICAgaWYg KCppbnRyaW5zaWNXaWR0aE1vZGUgPT0gSW50cmluc2ljV2lkdGhNb2RlOjpNaW5pbXVtIHx8ICFo YW5naW5nVHJhaWxpbmdDb250ZW50SXNDb25kaXRpb25hbCkgewogICAgICAgICAgICAgQVNTRVJU KG1fdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LmlzRW1wdHkoKSk7CiAgICAgICAgICAgICBtX2Nv bnRlbnRMb2dpY2FsV2lkdGggLT0gbV9oYW5naW5nQ29udGVudC50cmFpbGluZ1dpZHRoKCk7CiAg ICAgICAgICAgICBtX2hhbmdpbmdDb250ZW50LnJlc2V0VHJhaWxpbmdDb250ZW50KCk7Ci0gICAg ICAgIH07Ci0KLSAgICAgICAgaWYgKCppbnRyaW5zaWNXaWR0aE1vZGUgPT0gSW50cmluc2ljV2lk dGhNb2RlOjpNaW5pbXVtKQotICAgICAgICAgICAgdHJpbW1UcmFpbGluZ0hhbmdpbmdHbHlwaHMo KTsKLSAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAvLyBBIGdseXBoIGF0IHRoZSBlbmQgb2Yg YSBsaW5lIGNhbiBjb25kaXRpb25hbGx5IGhhbmc6IGl0IGhhbmdzIG9ubHkgaWYgaXQgZG9lcyBu b3Qgb3RoZXJ3aXNlIGZpdCBpbiB0aGUgbGluZSBwcmlvciB0byBqdXN0aWZpY2F0aW9uCi0gICAg ICAgICAgICBhdXRvIGlzVHJhaWxpbmdIYW5naW5nQ29udGVudENvbmRpdGlvbmFsID0gbV9jb250 ZW50TG9naWNhbFdpZHRoID4gaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlRm9yQ29udGVudDsKLSAg ICAgICAgICAgIC8vIElmIHdoaXRlLXNwYWNlIGlzIHNldCB0byBwcmUtd3JhcCwgdGhlIFVBIG11 c3QgKHVuY29uZGl0aW9uYWxseSkgaGFuZyB0aGlzIHNlcXVlbmNlLCB1bmxlc3MgdGhlIHNlcXVl bmNlIGlzIGZvbGxvd2VkCi0gICAgICAgICAgICAvLyBieSBhIGZvcmNlZCBsaW5lIGJyZWFrLCBp biB3aGljaCBjYXNlIGl0IG11c3QgY29uZGl0aW9uYWxseSBoYW5nIHRoZSBzZXF1ZW5jZSBpcyBp bnN0ZWFkLgotICAgICAgICAgICAgLy8gTm90ZSB0aGF0IGVuZCBvZiBsYXN0IGxpbmUgaW4gYSBw YXJhZ3JhcGggaXMgY29uc2lkZXJlZCBhIGZvcmNlZCBicmVhay4KLSAgICAgICAgICAgIGF1dG8g bGluZUVuZHNXaXRoTGluZUJyZWFrID0gIXJ1bnMoKS5pc0VtcHR5KCkgJiYgcnVucygpLmxhc3Qo KS5pc0xpbmVCcmVhaygpOwotICAgICAgICAgICAgYXV0byBoYXNDb25kaXRpb25hbFRyYWlsaW5n SGFuZ2luZ1doaXRlc3BhY2UgPSBtX2hhbmdpbmdDb250ZW50LnRyYWlsaW5nV2hpdGVzcGFjZVdp ZHRoKCkgJiYgKGlzTGFzdEZvcm1hdHRlZExpbmUgfHwgbGluZUVuZHNXaXRoTGluZUJyZWFrKTsK LQotICAgICAgICAgICAgYXV0byBpc0NvbmRpdGlvbmFsSGFuZ2luZyA9IGhhc0NvbmRpdGlvbmFs VHJhaWxpbmdIYW5naW5nV2hpdGVzcGFjZSB8fCBpc1RyYWlsaW5nSGFuZ2luZ0NvbnRlbnRDb25k aXRpb25hbDsKLSAgICAgICAgICAgIGlmICghaXNDb25kaXRpb25hbEhhbmdpbmcpCi0gICAgICAg ICAgICAgICAgdHJpbW1UcmFpbGluZ0hhbmdpbmdHbHlwaHMoKTsKICAgICAgICAgfQotICAgIH07 Ci0gICAgdHJpbW1UcmFpbGluZ0hhbmdpbmdHbHlwaHNJZkFwcGxpY2FibGUoKTsKKyAgICB9CiB9 CiAKIHZvaWQgTGluZTo6cmVzZXRCaWRpTGV2ZWxGb3JUcmFpbGluZ1doaXRlc3BhY2UoVUJpRGlM ZXZlbCByb290QmlkaUxldmVsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zv cm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCmluZGV4IGVmMTU1ZTA2 ZjEwOC4uZDI1YmExMDg5YTNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmgKKysrIGIvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCkBAIC0yNDAsOCAr MjQwLDEyIEBAIHByaXZhdGU6CiAgICAgc3RydWN0IEhhbmdpbmdDb250ZW50IHsKICAgICAgICAg dm9pZCBzZXRMZWFkaW5nUHVuY3R1YXRpb24oSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgp IHsgbV9sZWFkaW5nUHVuY3R1YXRpb25XaWR0aCA9IGxvZ2ljYWxXaWR0aDsgfQogICAgICAgICB2 b2lkIHNldFRyYWlsaW5nUHVuY3R1YXRpb24oSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgp OworICAgICAgICB2b2lkIHNldFRyYWlsaW5nU3RvcE9yQ29tYShJbmxpbmVMYXlvdXRVbml0IGxv Z2ljYWxXaWR0aCk7CiAgICAgICAgIHZvaWQgc2V0VHJhaWxpbmdXaGl0ZXNwYWNlKHNpemVfdCBs ZW5ndGgsIElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKTsKIAorICAgICAgICBib29sIGlz VHJhaWxpbmdDb250ZW50V2hpdGVzcGFjZSgpIGNvbnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdDb250 ZW50ICYmIG1fdHJhaWxpbmdDb250ZW50LT50eXBlID09IFRyYWlsaW5nQ29udGVudDo6VHlwZTo6 V2hpdGVzcGFjZTsgfQorICAgICAgICBib29sIGlzVHJhaWxpbmdDb250ZW50U3RvcE9yQ29tYSgp IGNvbnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdDb250ZW50ICYmIG1fdHJhaWxpbmdDb250ZW50LT50 eXBlID09IFRyYWlsaW5nQ29udGVudDo6VHlwZTo6U3RvcE9yQ29tYTsgfQorCiAgICAgICAgIHZv aWQgcmVzZXRUcmFpbGluZ0NvbnRlbnQoKSB7IG1fdHJhaWxpbmdDb250ZW50ID0geyB9OyB9CiAg ICAgICAgIHZvaWQgcmVzZXRUcmFpbGluZ1B1bmN0dWF0aW9uKCk7CiAKQEAgLTI1NSw3ICsyNTks NyBAQCBwcml2YXRlOgogICAgICAgICBJbmxpbmVMYXlvdXRVbml0IG1fbGVhZGluZ1B1bmN0dWF0 aW9uV2lkdGggeyAwLmYgfTsKICAgICAgICAgLy8gVGhlcmUncyBlaXRoZXIgYSB3aGl0ZXNwYWNl IG9yIHB1bmN0dWF0aW9uIHRyYWlsaW5nIGNvbnRlbnQuCiAgICAgICAgIHN0cnVjdCBUcmFpbGlu Z0NvbnRlbnQgewotICAgICAgICAgICAgZW51bSBjbGFzcyBUeXBlIDogdWludDhfdCB7IFdoaXRl c3BhY2UsIFB1bmN0dWF0aW9uIH07CisgICAgICAgICAgICBlbnVtIGNsYXNzIFR5cGUgOiB1aW50 OF90IHsgV2hpdGVzcGFjZSwgU3RvcE9yQ29tYSwgUHVuY3R1YXRpb24gfTsKICAgICAgICAgICAg IFR5cGUgdHlwZSB7IFR5cGU6OldoaXRlc3BhY2UgfTsKICAgICAgICAgICAgIHNpemVfdCBsZW5n dGggeyAwIH07CiAgICAgICAgICAgICBJbmxpbmVMYXlvdXRVbml0IHdpZHRoIHsgMC5mIH07CkBA IC0zMDAsNiArMzA0LDExIEBAIGlubGluZSB2b2lkIExpbmU6OkhhbmdpbmdDb250ZW50OjpzZXRU cmFpbGluZ1B1bmN0dWF0aW9uKElubGluZUxheW91dFVuaXQgbG9naWNhCiAgICAgbV90cmFpbGlu Z0NvbnRlbnQgPSB7IFRyYWlsaW5nQ29udGVudDo6VHlwZTo6UHVuY3R1YXRpb24sIDEsIGxvZ2lj YWxXaWR0aCB9OwogfQogCitpbmxpbmUgdm9pZCBMaW5lOjpIYW5naW5nQ29udGVudDo6c2V0VHJh aWxpbmdTdG9wT3JDb21hKElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQoreworICAgIG1f dHJhaWxpbmdDb250ZW50ID0geyBUcmFpbGluZ0NvbnRlbnQ6OlR5cGU6OlN0b3BPckNvbWEsIDEs IGxvZ2ljYWxXaWR0aCB9OworfQorCiBpbmxpbmUgdm9pZCBMaW5lOjpIYW5naW5nQ29udGVudDo6 c2V0VHJhaWxpbmdXaGl0ZXNwYWNlKHNpemVfdCBsZW5ndGgsIElubGluZUxheW91dFVuaXQgbG9n aWNhbFdpZHRoKQogewogICAgIG1fdHJhaWxpbmdDb250ZW50ID0geyBUcmFpbGluZ0NvbnRlbnQ6 OlR5cGU6OldoaXRlc3BhY2UsIGxlbmd0aCwgbG9naWNhbFdpZHRoIH07CkBAIC0zMTcsNyArMzI2 LDcgQEAgaW5saW5lIHNpemVfdCBMaW5lOjpIYW5naW5nQ29udGVudDo6bGVuZ3RoKCkgY29uc3QK IAogaW5saW5lIHZvaWQgTGluZTo6SGFuZ2luZ0NvbnRlbnQ6OnJlc2V0VHJhaWxpbmdQdW5jdHVh dGlvbigpCiB7Ci0gICAgaWYgKCFtX3RyYWlsaW5nQ29udGVudCB8fCBtX3RyYWlsaW5nQ29udGVu dC0+dHlwZSA9PSBUcmFpbGluZ0NvbnRlbnQ6OlR5cGU6OldoaXRlc3BhY2UpCisgICAgaWYgKCFt X3RyYWlsaW5nQ29udGVudCB8fCBtX3RyYWlsaW5nQ29udGVudC0+dHlwZSAhPSBUcmFpbGluZ0Nv bnRlbnQ6OlR5cGU6OlB1bmN0dWF0aW9uKQogICAgICAgICByZXR1cm47CiAgICAgbV90cmFpbGlu Z0NvbnRlbnQgPSB7IH07CiB9Cg== 464137 2022-12-20 21:22:55 -0800 2022-12-21 06:48:47 -0800 Patch bug-249695-20221220212254.patch text/plain 8693 zalan RnJvbSAwMjU1OWQ2MzU3ZGRkZTY1OTJjYjVlOTNhZjJkZDNiNDg1MGNmNGEyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJhcmFkbGF5IDx6YWxhbkBhcHBsZS5jb20+CkRhdGU6 IFR1ZSwgMjAgRGVjIDIwMjIgMjA6NDU6NTIgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbSUZDXVto YW5naW5nIHB1bmN0dWF0aW9uXSBMaW5lOjpIYW5naW5nQ29udGVudCBzaG91bGQgdGFrZQogIlN0 b3BPckNvbW1hIiB0cmFpbGluZyB0eXBlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yNDk2OTUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVGhpcyBpcyBpbiBw cmVwYXJhdGlvbiBmb3Igc3VwcG9ydGluZyAiaGFuZ2luZy1wdW5jdHVhdGlvbjogYWxsb3ctZW5k Iiwgd2hlcmUgIkEgc3RvcCBvciBjb21tYSBhdCB0aGUgZW5kIG9mIGEgbGluZSBjb25kaXRpb25h bGx5IGhhbmdzIi4KKFRoaXMgcGF0Y2ggYWxzbyByZWZhY3RvcnMgTGluZTo6aGFuZGxlVHJhaWxp bmdIYW5naW5nQ29udGVudCB0byBtYWtlIGl0IHJlYWQgY2xvc2VyIHRvIHRoZSBzcGVjIGxhbmd1 YWdlLikKCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUv SW5saW5lTGluZS5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OmhhbmRsZVRyYWlsaW5nSGFu Z2luZ0NvbnRlbnQpOgoqIFNvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMv aW5saW5lL0lubGluZUxpbmUuaDoKKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ0NvbnRl bnQ6OmlzVHJhaWxpbmdDb250ZW50V2hpdGVzcGFjZSBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6 OkxpbmU6OkhhbmdpbmdDb250ZW50Ojppc1RyYWlsaW5nQ29udGVudFN0b3BPckNvbWEgY29uc3Qp OgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lOjpIYW5naW5nQ29udGVudDo6c2V0VHJhaWxpbmdTdG9w T3JDb21hKToKKFdlYkNvcmU6OkxheW91dDo6TGluZTo6SGFuZ2luZ0NvbnRlbnQ6OnJlc2V0VHJh aWxpbmdQdW5jdHVhdGlvbik6Ci0tLQogLi4uL2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5s aW5lTGluZS5jcHAgIHwgNTkgKysrKysrKysrKy0tLS0tLS0tLQogLi4uL2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oICAgIHwgMTMgKysrLQogMiBmaWxlcyBjaGFuZ2VkLCA0 MSBpbnNlcnRpb25zKCspLCAzMSBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUu Y3BwCmluZGV4IDYwYTNmMDU5NDhlZC4uOGYwMDcwNWE4MGFhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lLmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9Jbmxp bmVMaW5lLmNwcApAQCAtMjU1LDQ1ICsyNTUsNDYgQEAgdm9pZCBMaW5lOjpoYW5kbGVPdmVyZmxv d2luZ05vbkJyZWFraW5nU3BhY2UoVHJhaWxpbmdDb250ZW50QWN0aW9uIHRyYWlsaW5nQ29udGUK IAogdm9pZCBMaW5lOjpoYW5kbGVUcmFpbGluZ0hhbmdpbmdDb250ZW50KHN0ZDo6b3B0aW9uYWw8 SW50cmluc2ljV2lkdGhNb2RlPiBpbnRyaW5zaWNXaWR0aE1vZGUsIElubGluZUxheW91dFVuaXQg aG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNlRm9yQ29udGVudCwgYm9vbCBpc0xhc3RGb3JtYXR0ZWRM aW5lKQogeworICAgIGlmICghbV9oYW5naW5nQ29udGVudC50cmFpbGluZ1dpZHRoKCkpCisgICAg ICAgIHJldHVybjsKKwogICAgIGlmICghaXNMYXN0Rm9ybWF0dGVkTGluZSkKICAgICAgICAgbV9o YW5naW5nQ29udGVudC5yZXNldFRyYWlsaW5nUHVuY3R1YXRpb24oKTsKIAotICAgIGF1dG8gdHJp bW1UcmFpbGluZ0hhbmdpbmdHbHlwaHNJZkFwcGxpY2FibGUgPSBbJl0gewotICAgICAgICBpZiAo IW1faGFuZ2luZ0NvbnRlbnQudHJhaWxpbmdXaWR0aCgpKSB7Ci0gICAgICAgICAgICAvLyBOb3Ro aW5nIHRvIHRyaW0gaGVyZS4KLSAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgfQotICAgICAg ICBpZiAoIWludHJpbnNpY1dpZHRoTW9kZSkgewotICAgICAgICAgICAgLy8gT25seSB0cmltIHN1 Y2ggY29udGVudCBkdXJpbmcgcHJlZmVycmVkIHdpZHRoIGNvbXB1dGF0aW9uLgotICAgICAgICAg ICAgcmV0dXJuOworICAgIC8vIGh0dHBzOi8vZHJhZnRzLmNzc3dnLm9yZy9jc3MtdGV4dC8jaGFu Z2luZworICAgIGF1dG8gaGFuZ2luZ1RyYWlsaW5nQ29udGVudElzQ29uZGl0aW9uYWwgPSBbJl0g eworICAgICAgICAvLyBJZiB3aGl0ZS1zcGFjZSBpcyBzZXQgdG8gcHJlLXdyYXAsIHRoZSBVQSBt dXN0ICh1bmNvbmRpdGlvbmFsbHkpIGhhbmcgdGhpcyBzZXF1ZW5jZSwgdW5sZXNzIHRoZSBzZXF1 ZW5jZSBpcyBmb2xsb3dlZAorICAgICAgICAvLyBieSBhIGZvcmNlZCBsaW5lIGJyZWFrLCBpbiB3 aGljaCBjYXNlIGl0IG11c3QgY29uZGl0aW9uYWxseSBoYW5nIHRoZSBzZXF1ZW5jZSBpcyBpbnN0 ZWFkLgorICAgICAgICAvLyBOb3RlIHRoYXQgZW5kIG9mIGxhc3QgbGluZSBpbiBhIHBhcmFncmFw aCBpcyBjb25zaWRlcmVkIGEgZm9yY2VkIGJyZWFrLgorICAgICAgICBhdXRvIGxpbmVFbmRzV2l0 aExpbmVCcmVhayA9ICFydW5zKCkuaXNFbXB0eSgpICYmIHJ1bnMoKS5sYXN0KCkuaXNMaW5lQnJl YWsoKTsKKyAgICAgICAgYXV0byBoYXNDb25kaXRpb25hbFRyYWlsaW5nSGFuZ2luZ1doaXRlc3Bh Y2UgPSBtX2hhbmdpbmdDb250ZW50LmlzVHJhaWxpbmdDb250ZW50V2hpdGVzcGFjZSgpICYmIChp c0xhc3RGb3JtYXR0ZWRMaW5lIHx8IGxpbmVFbmRzV2l0aExpbmVCcmVhayk7CisgICAgICAgIC8v IEEgc3RvcCBvciBjb21tYSBhdCB0aGUgZW5kIG9mIGEgbGluZSBjb25kaXRpb25hbGx5IGhhbmdz LgorICAgICAgICBhdXRvIGhhc0NvbmRpdGlvbmFsVHJhaWxpbmdTdG9wT3JDb21tYSA9IG1faGFu Z2luZ0NvbnRlbnQuaXNUcmFpbGluZ0NvbnRlbnRTdG9wT3JDb21tYSgpOworICAgICAgICByZXR1 cm4gaGFzQ29uZGl0aW9uYWxUcmFpbGluZ0hhbmdpbmdXaGl0ZXNwYWNlIHx8IGhhc0NvbmRpdGlv bmFsVHJhaWxpbmdTdG9wT3JDb21tYTsKKyAgICB9KCk7CisKKyAgICBpZiAoIWludHJpbnNpY1dp ZHRoTW9kZSkgeworICAgICAgICAvLyBNYWtlIHN1cmUgd2hlbiB0aGUgY29uZGl0aW9uYWxseSBo YW5naW5nIGNvbnRlbnQgYWN0dWFsbHkgZml0cyB3ZSBkb24ndCBoYW5nIHRoZSBjb250ZW50IGFu eW1vcmUgZHVyaW5nIG5vcm1hbCBsYXlvdXQuCisgICAgICAgIGlmIChoYW5naW5nVHJhaWxpbmdD b250ZW50SXNDb25kaXRpb25hbCkgeworICAgICAgICAgICAgLy8gSW4gc29tZSBjYXNlcywgYSBn bHlwaCBhdCB0aGUgZW5kIG9mIGEgbGluZSBjYW4gY29uZGl0aW9uYWxseSBoYW5nOiBpdCBoYW5n cyBvbmx5IGlmIGl0IGRvZXMgbm90IG90aGVyd2lzZSBmaXQgaW4gdGhlIGxpbmUgcHJpb3IgdG8g anVzdGlmaWNhdGlvbi4KKyAgICAgICAgICAgIGF1dG8gZG9lc1RyYWlsaW5nSGFuZ2luZ0NvbnRl bnRGaXQgPSBtX2NvbnRlbnRMb2dpY2FsV2lkdGggPD0gaG9yaXpvbnRhbEF2YWlsYWJsZVNwYWNl Rm9yQ29udGVudDsKKyAgICAgICAgICAgIGlmIChkb2VzVHJhaWxpbmdIYW5naW5nQ29udGVudEZp dCkgeworICAgICAgICAgICAgICAgIC8vIFJlc2V0IGhlcmUgbWVhbnMgdGhlIHRyYWlsaW5nIGNv bnRlbnQgaXMgbm90IGhhbmdpbmcgYW55bW9yZSAtaS5lLiBwYXJ0IG9mIHRoZSBsaW5lIGNvbnRl bnQuCisgICAgICAgICAgICAgICAgbV9oYW5naW5nQ29udGVudC5yZXNldFRyYWlsaW5nQ29udGVu dCgpOworICAgICAgICAgICAgfQogICAgICAgICB9CisgICAgICAgIHJldHVybjsKKyAgICB9CiAK LSAgICAgICAgLy8gMS4gVGhlIGhhbmdpbmcgZ2x5cGggaXMgYWxzbyBub3QgdGFrZW4gaW50byBh Y2NvdW50IHdoZW4gY29tcHV0aW5nIGludHJpbnNpYyBzaXplcyAobWluLWNvbnRlbnQgc2l6ZSBh bmQgbWF4LWNvbnRlbnQgc2l6ZSkKKyAgICBpZiAoaW50cmluc2ljV2lkdGhNb2RlKSB7CisgICAg ICAgIC8vIDEuIFRoZSBoYW5naW5nIGdseXBoIGlzIG5vdCB0YWtlbiBpbnRvIGFjY291bnQgd2hl biBjb21wdXRpbmcgaW50cmluc2ljIHNpemVzIChtaW4tY29udGVudCBzaXplIGFuZCBtYXgtY29u dGVudCBzaXplKQogICAgICAgICAvLyAyLiBHbHlwaHMgdGhhdCBjb25kaXRpb25hbGx5IGhhbmcg YXJlIG5vdCB0YWtlbiBpbnRvIGFjY291bnQgd2hlbiBjb21wdXRpbmcgbWluLWNvbnRlbnQgc2l6 ZXMsIGJ1dCB0aGV5IGFyZSB0YWtlbiBpbnRvIGFjY291bnQgZm9yIG1heC1jb250ZW50IHNpemVz LgotICAgICAgICAvLyBodHRwczovL2RyYWZ0cy5jc3N3Zy5vcmcvY3NzLXRleHQvI2hhbmdpbmcK LSAgICAgICAgYXV0byB0cmltbVRyYWlsaW5nSGFuZ2luZ0dseXBocyA9IFsmXSB7CisgICAgICAg IGlmICgqaW50cmluc2ljV2lkdGhNb2RlID09IEludHJpbnNpY1dpZHRoTW9kZTo6TWluaW11bSB8 fCAhaGFuZ2luZ1RyYWlsaW5nQ29udGVudElzQ29uZGl0aW9uYWwpIHsKICAgICAgICAgICAgIEFT U0VSVChtX3RyaW1tYWJsZVRyYWlsaW5nQ29udGVudC5pc0VtcHR5KCkpOwogICAgICAgICAgICAg bV9jb250ZW50TG9naWNhbFdpZHRoIC09IG1faGFuZ2luZ0NvbnRlbnQudHJhaWxpbmdXaWR0aCgp OwogICAgICAgICAgICAgbV9oYW5naW5nQ29udGVudC5yZXNldFRyYWlsaW5nQ29udGVudCgpOwot ICAgICAgICB9OwotCi0gICAgICAgIGlmICgqaW50cmluc2ljV2lkdGhNb2RlID09IEludHJpbnNp Y1dpZHRoTW9kZTo6TWluaW11bSkKLSAgICAgICAgICAgIHRyaW1tVHJhaWxpbmdIYW5naW5nR2x5 cGhzKCk7Ci0gICAgICAgIGVsc2UgewotICAgICAgICAgICAgLy8gQSBnbHlwaCBhdCB0aGUgZW5k IG9mIGEgbGluZSBjYW4gY29uZGl0aW9uYWxseSBoYW5nOiBpdCBoYW5ncyBvbmx5IGlmIGl0IGRv ZXMgbm90IG90aGVyd2lzZSBmaXQgaW4gdGhlIGxpbmUgcHJpb3IgdG8ganVzdGlmaWNhdGlvbgot ICAgICAgICAgICAgYXV0byBpc1RyYWlsaW5nSGFuZ2luZ0NvbnRlbnRDb25kaXRpb25hbCA9IG1f Y29udGVudExvZ2ljYWxXaWR0aCA+IGhvcml6b250YWxBdmFpbGFibGVTcGFjZUZvckNvbnRlbnQ7 Ci0gICAgICAgICAgICAvLyBJZiB3aGl0ZS1zcGFjZSBpcyBzZXQgdG8gcHJlLXdyYXAsIHRoZSBV QSBtdXN0ICh1bmNvbmRpdGlvbmFsbHkpIGhhbmcgdGhpcyBzZXF1ZW5jZSwgdW5sZXNzIHRoZSBz ZXF1ZW5jZSBpcyBmb2xsb3dlZAotICAgICAgICAgICAgLy8gYnkgYSBmb3JjZWQgbGluZSBicmVh aywgaW4gd2hpY2ggY2FzZSBpdCBtdXN0IGNvbmRpdGlvbmFsbHkgaGFuZyB0aGUgc2VxdWVuY2Ug aXMgaW5zdGVhZC4KLSAgICAgICAgICAgIC8vIE5vdGUgdGhhdCBlbmQgb2YgbGFzdCBsaW5lIGlu IGEgcGFyYWdyYXBoIGlzIGNvbnNpZGVyZWQgYSBmb3JjZWQgYnJlYWsuCi0gICAgICAgICAgICBh dXRvIGxpbmVFbmRzV2l0aExpbmVCcmVhayA9ICFydW5zKCkuaXNFbXB0eSgpICYmIHJ1bnMoKS5s YXN0KCkuaXNMaW5lQnJlYWsoKTsKLSAgICAgICAgICAgIGF1dG8gaGFzQ29uZGl0aW9uYWxUcmFp bGluZ0hhbmdpbmdXaGl0ZXNwYWNlID0gbV9oYW5naW5nQ29udGVudC50cmFpbGluZ1doaXRlc3Bh Y2VXaWR0aCgpICYmIChpc0xhc3RGb3JtYXR0ZWRMaW5lIHx8IGxpbmVFbmRzV2l0aExpbmVCcmVh ayk7Ci0KLSAgICAgICAgICAgIGF1dG8gaXNDb25kaXRpb25hbEhhbmdpbmcgPSBoYXNDb25kaXRp b25hbFRyYWlsaW5nSGFuZ2luZ1doaXRlc3BhY2UgfHwgaXNUcmFpbGluZ0hhbmdpbmdDb250ZW50 Q29uZGl0aW9uYWw7Ci0gICAgICAgICAgICBpZiAoIWlzQ29uZGl0aW9uYWxIYW5naW5nKQotICAg ICAgICAgICAgICAgIHRyaW1tVHJhaWxpbmdIYW5naW5nR2x5cGhzKCk7CiAgICAgICAgIH0KLSAg ICB9OwotICAgIHRyaW1tVHJhaWxpbmdIYW5naW5nR2x5cGhzSWZBcHBsaWNhYmxlKCk7CisgICAg fQogfQogCiB2b2lkIExpbmU6OnJlc2V0QmlkaUxldmVsRm9yVHJhaWxpbmdXaGl0ZXNwYWNlKFVC aURpTGV2ZWwgcm9vdEJpZGlMZXZlbCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaAppbmRleCBlZjE1 NWUwNmYxMDguLmU4YzU3ODk0OTAwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZS5oCisrKyBiL1NvdXJjZS9XZWJD b3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmUuaApAQCAtMjQw LDggKzI0MCwxMiBAQCBwcml2YXRlOgogICAgIHN0cnVjdCBIYW5naW5nQ29udGVudCB7CiAgICAg ICAgIHZvaWQgc2V0TGVhZGluZ1B1bmN0dWF0aW9uKElubGluZUxheW91dFVuaXQgbG9naWNhbFdp ZHRoKSB7IG1fbGVhZGluZ1B1bmN0dWF0aW9uV2lkdGggPSBsb2dpY2FsV2lkdGg7IH0KICAgICAg ICAgdm9pZCBzZXRUcmFpbGluZ1B1bmN0dWF0aW9uKElubGluZUxheW91dFVuaXQgbG9naWNhbFdp ZHRoKTsKKyAgICAgICAgdm9pZCBzZXRUcmFpbGluZ1N0b3BPckNvbW1hKElubGluZUxheW91dFVu aXQgbG9naWNhbFdpZHRoKTsKICAgICAgICAgdm9pZCBzZXRUcmFpbGluZ1doaXRlc3BhY2Uoc2l6 ZV90IGxlbmd0aCwgSW5saW5lTGF5b3V0VW5pdCBsb2dpY2FsV2lkdGgpOwogCisgICAgICAgIGJv b2wgaXNUcmFpbGluZ0NvbnRlbnRXaGl0ZXNwYWNlKCkgY29uc3QgeyByZXR1cm4gbV90cmFpbGlu Z0NvbnRlbnQgJiYgbV90cmFpbGluZ0NvbnRlbnQtPnR5cGUgPT0gVHJhaWxpbmdDb250ZW50OjpU eXBlOjpXaGl0ZXNwYWNlOyB9CisgICAgICAgIGJvb2wgaXNUcmFpbGluZ0NvbnRlbnRTdG9wT3JD b21tYSgpIGNvbnN0IHsgcmV0dXJuIG1fdHJhaWxpbmdDb250ZW50ICYmIG1fdHJhaWxpbmdDb250 ZW50LT50eXBlID09IFRyYWlsaW5nQ29udGVudDo6VHlwZTo6U3RvcE9yQ29tbWE7IH0KKwogICAg ICAgICB2b2lkIHJlc2V0VHJhaWxpbmdDb250ZW50KCkgeyBtX3RyYWlsaW5nQ29udGVudCA9IHsg fTsgfQogICAgICAgICB2b2lkIHJlc2V0VHJhaWxpbmdQdW5jdHVhdGlvbigpOwogCkBAIC0yNTUs NyArMjU5LDcgQEAgcHJpdmF0ZToKICAgICAgICAgSW5saW5lTGF5b3V0VW5pdCBtX2xlYWRpbmdQ dW5jdHVhdGlvbldpZHRoIHsgMC5mIH07CiAgICAgICAgIC8vIFRoZXJlJ3MgZWl0aGVyIGEgd2hp dGVzcGFjZSBvciBwdW5jdHVhdGlvbiB0cmFpbGluZyBjb250ZW50LgogICAgICAgICBzdHJ1Y3Qg VHJhaWxpbmdDb250ZW50IHsKLSAgICAgICAgICAgIGVudW0gY2xhc3MgVHlwZSA6IHVpbnQ4X3Qg eyBXaGl0ZXNwYWNlLCBQdW5jdHVhdGlvbiB9OworICAgICAgICAgICAgZW51bSBjbGFzcyBUeXBl IDogdWludDhfdCB7IFdoaXRlc3BhY2UsIFN0b3BPckNvbW1hLCBQdW5jdHVhdGlvbiB9OwogICAg ICAgICAgICAgVHlwZSB0eXBlIHsgVHlwZTo6V2hpdGVzcGFjZSB9OwogICAgICAgICAgICAgc2l6 ZV90IGxlbmd0aCB7IDAgfTsKICAgICAgICAgICAgIElubGluZUxheW91dFVuaXQgd2lkdGggeyAw LmYgfTsKQEAgLTMwMCw2ICszMDQsMTEgQEAgaW5saW5lIHZvaWQgTGluZTo6SGFuZ2luZ0NvbnRl bnQ6OnNldFRyYWlsaW5nUHVuY3R1YXRpb24oSW5saW5lTGF5b3V0VW5pdCBsb2dpY2EKICAgICBt X3RyYWlsaW5nQ29udGVudCA9IHsgVHJhaWxpbmdDb250ZW50OjpUeXBlOjpQdW5jdHVhdGlvbiwg MSwgbG9naWNhbFdpZHRoIH07CiB9CiAKK2lubGluZSB2b2lkIExpbmU6OkhhbmdpbmdDb250ZW50 OjpzZXRUcmFpbGluZ1N0b3BPckNvbW1hKElubGluZUxheW91dFVuaXQgbG9naWNhbFdpZHRoKQor eworICAgIG1fdHJhaWxpbmdDb250ZW50ID0geyBUcmFpbGluZ0NvbnRlbnQ6OlR5cGU6OlN0b3BP ckNvbW1hLCAxLCBsb2dpY2FsV2lkdGggfTsKK30KKwogaW5saW5lIHZvaWQgTGluZTo6SGFuZ2lu Z0NvbnRlbnQ6OnNldFRyYWlsaW5nV2hpdGVzcGFjZShzaXplX3QgbGVuZ3RoLCBJbmxpbmVMYXlv dXRVbml0IGxvZ2ljYWxXaWR0aCkKIHsKICAgICBtX3RyYWlsaW5nQ29udGVudCA9IHsgVHJhaWxp bmdDb250ZW50OjpUeXBlOjpXaGl0ZXNwYWNlLCBsZW5ndGgsIGxvZ2ljYWxXaWR0aCB9OwpAQCAt MzE3LDcgKzMyNiw3IEBAIGlubGluZSBzaXplX3QgTGluZTo6SGFuZ2luZ0NvbnRlbnQ6Omxlbmd0 aCgpIGNvbnN0CiAKIGlubGluZSB2b2lkIExpbmU6OkhhbmdpbmdDb250ZW50OjpyZXNldFRyYWls aW5nUHVuY3R1YXRpb24oKQogewotICAgIGlmICghbV90cmFpbGluZ0NvbnRlbnQgfHwgbV90cmFp bGluZ0NvbnRlbnQtPnR5cGUgPT0gVHJhaWxpbmdDb250ZW50OjpUeXBlOjpXaGl0ZXNwYWNlKQor ICAgIGlmICghbV90cmFpbGluZ0NvbnRlbnQgfHwgbV90cmFpbGluZ0NvbnRlbnQtPnR5cGUgIT0g VHJhaWxpbmdDb250ZW50OjpUeXBlOjpQdW5jdHVhdGlvbikKICAgICAgICAgcmV0dXJuOwogICAg IG1fdHJhaWxpbmdDb250ZW50ID0geyB9OwogfQo=