246465 2022-10-13 10:57:47 -0700 [LFC][IFC] Fix fast/inline/inline-root-with-negative-margin-and-sibling-float.html 2022-10-13 20:56:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham hhjalmarsson koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1905375 0 zalan 2022-10-13 10:57:47 -0700 ssia 1905377 1 462967 zalan 2022-10-13 11:05:59 -0700 Created attachment 462967 Patch 1905385 2 462968 zalan 2022-10-13 11:38:51 -0700 Created attachment 462968 Patch 1905387 3 zalan 2022-10-13 11:40:17 -0700 *** Bug 246464 has been marked as a duplicate of this bug. *** 1905389 4 webkit-bug-importer 2022-10-13 11:41:25 -0700 <rdar://problem/101136432> 1905518 5 462974 zalan 2022-10-13 20:22:32 -0700 Created attachment 462974 [fast-cq]Patch 1905529 6 ews-feeder 2022-10-13 20:56:44 -0700 Committed 255522@main (bf02baf78117): <https://commits.webkit.org/255522@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 462974. 462967 2022-10-13 11:05:59 -0700 2022-10-13 11:38:49 -0700 Patch bug-246465-20221013110558.patch text/plain 11138 zalan RnJvbSBiZTM3ZWJlNTRhNzZlZDA4OWM2ZjhlYjA0ZDYxYjQ0NzcwZjA4ZDg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDEzIE9jdCAyMDIyIDEwOjU4OjAxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBGaXgKIGZhc3QvaW5saW5lL2lubGluZS1yb290LXdpdGgtbmVnYXRpdmUtbWFyZ2luLWFuZC1z aWJsaW5nLWZsb2F0Lmh0bWwKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNDY0NjUKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKMS4gVGhlIGxpbmUgaXMgbm90 IGNvbnNpZGVyZWQgZW1wdHkgZnJvbSBsaW5lLWJyZWFraW5nIHBvaW50IG9mIHZpZXcgd2hlbiBp dCBpcyBjb25zdHJhaW5lZCBieSBhIGZsb2F0IGJveCAoaXQgc2ltcGx5IG1lYW5zIHRoYXQgd2Ug ZG9uJ3QgZm9yY2Ugb3ZlcmZsb3dpbmcgaW5saW5lIGNvbnRlbnQgb24gdGhlIGxpbmUpCjIuIEFu IGludHJ1c2l2ZSBmbG9hdCBib3ggbWF5IHByZXZlbnQgdG8gcHV0IGFueSBjb250ZW50IG9uIHRo ZSBsaW5lLgpOb3cgdGhhdCB3ZSBkb24ndCBpbmZsYXRlIHRoZSBpbml0aWFsIGxpbmUgaGVpZ2h0 IGluIHF1aXJrcyBtb2RlIGFueW1vcmUsIHdlIGRvbid0IG5lY2Vzc2lhcmlseSBmaW5kIGZsb2F0 cyB3aGlsZSB3ZSBhcmUgc2V0dGluZyB1cCB0aGUgbGluZS4gU3VjaCBmbG9hdHMgYXJlIGZvdW5k IGxhdGVyIHdoZW4gd2UgY2hlY2sgZm9yIGF2YWlsYWJsZSB3aWR0aCBmb3IgdGhlIGNhbmRpZGF0 ZSBpbmxpbmUgY29udGVudC4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5l QnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWls ZGVyOjppbml0aWFsaXplKToKKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmNsb3NlKToK KFdlYkNvcmU6OkxheW91dDo6ZWxpZ2libGVPdmVyZmxvd1dpZHRoQXNMZWFkaW5nKToKKFdlYkNv cmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxpbmVSZWN0Rm9yQ2FuZGlkYXRlSW5saW5lQ29udGVu dCBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjp0cnlQbGFjaW5nRmxvYXRC b3gpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudCk6 CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuaDoKLS0tCiAuLi4vaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCAgICAg ICAgICAgICAgfCAzMSArKysrKysrKystLS0tLS0tLS0tCiAuLi4vaW5saW5lL0lubGluZUxpbmVC dWlsZGVyLmggICAgICAgICAgICAgICAgfCAgNCArLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTcgaW5z ZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuY3BwCmluZGV4IGZjNWUwOGU5OTQzZC4uNzRjYmI0MzEwYzNkIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVM aW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCkBAIC0zNTksNyArMzU5LDcgQEAgTGlu ZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNv bnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAgICAgLCBwYXJ0aWFsT3ZlcmZsb3dpbmdDb250ZW50 ID8gc3RkOjpudWxsb3B0IDogY29tbWl0dGVkQ29udGVudC5vdmVyZmxvd0xvZ2ljYWxXaWR0aAog ICAgICAgICAsIFdURk1vdmUobV9wbGFjZWRGbG9hdHMpCiAgICAgICAgICwgV1RGTW92ZShtX292 ZXJmbG93aW5nRmxvYXRzKQotICAgICAgICAsIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0 CisgICAgICAgICwgbV9saW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQKICAgICAgICAgLCBtX2xpbmVJ bml0aWFsTG9naWNhbExlZnQKICAgICAgICAgLCBtX2xpbmVMb2dpY2FsUmVjdC50b3BMZWZ0KCkK ICAgICAgICAgLCBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpCkBAIC00NDUsNyArNDQ1LDcgQEAg dm9pZCBMaW5lQnVpbGRlcjo6aW5pdGlhbGl6ZShjb25zdCBVc2VkQ29uc3RyYWludHMmIGxpbmVD b25zdHJhaW50cywgY29uc3QgSW5saW4KICAgICAvLyBXaGlsZSBuZWdhdGl2ZSBtYXJnaW5zIG5v cm1hbGx5IGRvbid0IGV4cGFuZCB0aGUgYXZhaWxhYmxlIHNwYWNlLCBwcmVmZXJyZWQgd2lkdGgg Y29tcHV0YXRpb24gZ2V0cyBjb25mdXNlZCBieSBuZWdhdGl2ZSB0ZXh0LWluZGVudAogICAgIC8v IChzaHJpbmsgdGhlIHNwYWNlIG5lZWRlZCBmb3IgdGhlIGNvbnRlbnQpIHdoaWNoIHdlIGhhdmUg dG8gYmFsYW5jZSBpdCBoZXJlLgogICAgIG1fbGluZUxvZ2ljYWxSZWN0LmV4cGFuZEhvcml6b250 YWxseSgtbV9saW5lTWFyZ2luU3RhcnQpOwotICAgIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZs b2F0ID0gbGluZUNvbnN0cmFpbnRzLmlzQ29uc3RyYWluZWRCeUZsb2F0OworICAgIG1fbGluZUlz Q29uc3RyYWluZWRCeUZsb2F0ID0gbGluZUNvbnN0cmFpbnRzLmlzQ29uc3RyYWluZWRCeUZsb2F0 OwogCiAgICAgaWYgKHByZXZpb3VzTGluZSkgewogICAgICAgICBpZiAocHJldmlvdXNMaW5lLT5w YXJ0aWFsT3ZlcmZsb3dpbmdDb250ZW50KSB7CkBAIC01MzIsNyArNTMyLDcgQEAgTGluZUJ1aWxk ZXI6OkNvbW1pdHRlZENvbnRlbnQgTGluZUJ1aWxkZXI6OnBsYWNlSW5saW5lQ29udGVudChjb25z dCBJbmxpbmVJdGVtUmEKIAogTGluZUJ1aWxkZXI6OklubGluZUl0ZW1SYW5nZSBMaW5lQnVpbGRl cjo6Y2xvc2UoY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBjb25zdCBD b21taXR0ZWRDb250ZW50JiBjb21taXR0ZWRDb250ZW50KQogewotICAgIEFTU0VSVChjb21taXR0 ZWRDb250ZW50Lml0ZW1Db3VudCB8fCAhbV9wbGFjZWRGbG9hdHMuaXNFbXB0eSgpIHx8IG1fY29u dGVudElzQ29uc3RyYWluZWRCeUZsb2F0KTsKKyAgICBBU1NFUlQoY29tbWl0dGVkQ29udGVudC5p dGVtQ291bnQgfHwgIW1fcGxhY2VkRmxvYXRzLmlzRW1wdHkoKSB8fCBtX2xpbmVJc0NvbnN0cmFp bmVkQnlGbG9hdCk7CiAgICAgYXV0byYgcm9vdFN0eWxlID0gdGhpcy0+cm9vdFN0eWxlKCk7CiAg ICAgYXV0byBudW1iZXJPZkNvbW1pdHRlZEl0ZW1zID0gY29tbWl0dGVkQ29udGVudC5pdGVtQ291 bnQ7CiAgICAgYXV0byB0cmFpbGluZ0lubGluZUl0ZW1JbmRleCA9IG5lZWRzTGF5b3V0UmFuZ2Uu c3RhcnQgKyBudW1iZXJPZkNvbW1pdHRlZEl0ZW1zIC0gMTsKQEAgLTg0OSwxNSArODQ5LDE0IEBA IHN0YXRpYyBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IGVsaWdpYmxlT3ZlcmZsb3dX aWR0aEFzTGVhZGluZyhjb25zdCBJbmxpCiAgICAgaWYgKGxpbmVCcmVha2luZ1Jlc3VsdC5hY3Rp b24gPT0gSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdDo6QWN0aW9uOjpCcmVhayAmJiBsaW5l QnJlYWtpbmdSZXN1bHQucGFydGlhbFRyYWlsaW5nQ29udGVudC0+cGFydGlhbFJ1bikKICAgICAg ICAgcmV0dXJuIGxvZ2ljYWxXaWR0aEZvck5leHRMaW5lQXNMZWFkaW5nIC0gbGluZUJyZWFraW5n UmVzdWx0LnBhcnRpYWxUcmFpbGluZ0NvbnRlbnQtPnBhcnRpYWxSdW4tPmxvZ2ljYWxXaWR0aDsK ICAgICByZXR1cm4geyB9OwotfTsKLQorfQogCi1JbmxpbmVSZWN0IExpbmVCdWlsZGVyOjpsaW5l UmVjdEZvckNhbmRpZGF0ZUlubGluZUNvbnRlbnQoY29uc3QgTGluZUNhbmRpZGF0ZSYgbGluZUNh bmRpZGF0ZSkgY29uc3QKK3N0ZDo6dHVwbGU8SW5saW5lUmVjdCwgYm9vbD4gTGluZUJ1aWxkZXI6 OmxpbmVSZWN0Rm9yQ2FuZGlkYXRlSW5saW5lQ29udGVudChjb25zdCBMaW5lQ2FuZGlkYXRlJiBs aW5lQ2FuZGlkYXRlKSBjb25zdAogewogICAgIGF1dG8mIGlubGluZUNvbnRlbnQgPSBsaW5lQ2Fu ZGlkYXRlLmlubGluZUNvbnRlbnQ7CiAgICAgLy8gQ2hlY2sgaWYgdGhlIGNhbmRpZGF0ZSBjb250 ZW50IHdvdWxkIHN0cmV0Y2ggdGhlIGxpbmUgYW5kIHdoZXRoZXIgYWRkaXRpb25hbCBmbG9hdHMg YXJlIGdldHRpbmcgaW4gdGhlIHdheS4KICAgICBpZiAoaXNJbkludHJpbnNpY1dpZHRoTW9kZSgp KQotICAgICAgICByZXR1cm4gbV9saW5lTG9naWNhbFJlY3Q7CisgICAgICAgIHJldHVybiB7IG1f bGluZUxvZ2ljYWxSZWN0LCBmYWxzZSB9OwogICAgIGF1dG8gbWF4aW11bUxpbmVMb2dpY2FsSGVp Z2h0ID0gbV9saW5lTG9naWNhbFJlY3QuaGVpZ2h0KCk7CiAgICAgZm9yIChhdXRvJiBydW4gOiBp bmxpbmVDb250ZW50LmNvbnRpbnVvdXNDb250ZW50KCkucnVucygpKSB7CiAgICAgICAgIGF1dG8m IGlubGluZUl0ZW0gPSBydW4uaW5saW5lSXRlbTsKQEAgLTg2OSwxNCArODY4LDE0IEBAIElubGlu ZVJlY3QgTGluZUJ1aWxkZXI6OmxpbmVSZWN0Rm9yQ2FuZGlkYXRlSW5saW5lQ29udGVudChjb25z dCBMaW5lQ2FuZGlkYXRlJiBsCiAgICAgICAgIH0KICAgICB9CiAgICAgaWYgKG1heGltdW1MaW5l TG9naWNhbEhlaWdodCA9PSBtX2xpbmVMb2dpY2FsUmVjdC5oZWlnaHQoKSkKLSAgICAgICAgcmV0 dXJuIG1fbGluZUxvZ2ljYWxSZWN0OworICAgICAgICByZXR1cm4geyBtX2xpbmVMb2dpY2FsUmVj dCwgZmFsc2UgfTsKICAgICBhdXRvIGFkanVzdGVkTGluZUxvZ2ljYWxSZWN0ID0gSW5saW5lUmVj dCB7IG1fbGluZUxvZ2ljYWxSZWN0LnRvcCgpLCBtX2xpbmVMb2dpY2FsUmVjdC5sZWZ0KCksIG1f bGluZUxvZ2ljYWxSZWN0LndpZHRoKCksIG1heGltdW1MaW5lTG9naWNhbEhlaWdodCB9OwogICAg IGF1dG8gbGluZUNvbnN0cmFpbnRzID0gZmxvYXRDb25zdHJhaW50cyhhZGp1c3RlZExpbmVMb2dp Y2FsUmVjdCk7CiAgICAgaWYgKGxpbmVDb25zdHJhaW50cy5sZWZ0KQogICAgICAgICBhZGp1c3Rl ZExpbmVMb2dpY2FsUmVjdC5zaGlmdExlZnRUbyhzdGQ6Om1heDxJbmxpbmVMYXlvdXRVbml0Pihh ZGp1c3RlZExpbmVMb2dpY2FsUmVjdC5sZWZ0KCksIGxpbmVDb25zdHJhaW50cy5sZWZ0LT54KSk7 CiAgICAgaWYgKGxpbmVDb25zdHJhaW50cy5yaWdodCkKICAgICAgICAgYWRqdXN0ZWRMaW5lTG9n aWNhbFJlY3Quc2V0UmlnaHQoc3RkOjptYXgoYWRqdXN0ZWRMaW5lTG9naWNhbFJlY3QubGVmdCgp LCBzdGQ6Om1pbjxJbmxpbmVMYXlvdXRVbml0PihhZGp1c3RlZExpbmVMb2dpY2FsUmVjdC5yaWdo dCgpLCBsaW5lQ29uc3RyYWludHMucmlnaHQtPngpKSk7Ci0gICAgcmV0dXJuIGFkanVzdGVkTGlu ZUxvZ2ljYWxSZWN0OworICAgIHJldHVybiB7IGFkanVzdGVkTGluZUxvZ2ljYWxSZWN0LCAgbGlu ZUNvbnN0cmFpbnRzLmxlZnQgfHwgbGluZUNvbnN0cmFpbnRzLnJpZ2h0IH07CiB9CiAKIGJvb2wg TGluZUJ1aWxkZXI6OnRyeVBsYWNpbmdGbG9hdEJveChjb25zdCBJbmxpbmVJdGVtJiBmbG9hdEl0 ZW0sIExpbmVCb3hDb25zdHJhaW50QXBwbGllcyBsaW5lQm94Q29uc3RyYWludEFwcGxpZXMpCkBA IC05MDQsNyArOTAzLDcgQEAgYm9vbCBMaW5lQnVpbGRlcjo6dHJ5UGxhY2luZ0Zsb2F0Qm94KGNv bnN0IElubGluZUl0ZW0mIGZsb2F0SXRlbSwgTGluZUJveENvbnN0cmEKICAgICAgICAgICAgIEFT U0VSVChtX292ZXJmbG93aW5nRmxvYXRzLmlzRW1wdHkoKSk7CiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICAgICAgfQotICAgICAgICBhdXRvIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSA9ICFt X2xpbmUuaGFzQ29udGVudCgpICYmICFtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKKyAg ICAgICAgYXV0byBsaW5lSXNDb25zaWRlcmVkRW1wdHkgPSAhbV9saW5lLmhhc0NvbnRlbnQoKSAm JiAhbV9saW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQ7CiAgICAgICAgIGlmIChsaW5lSXNDb25zaWRl cmVkRW1wdHkpCiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgYXV0byBhdmFpbGFi bGVXaWR0aEZvckZsb2F0ID0gbV9saW5lTG9naWNhbFJlY3Qud2lkdGgoKSAtIG1fbGluZS5jb250 ZW50TG9naWNhbFJpZ2h0KCkgKyB0cmltbWFibGVUcmFpbGluZ0NvbnRlbnRXaWR0aChtX2xpbmUp OwpAQCAtOTQ2LDcgKzk0NSw3IEBAIGJvb2wgTGluZUJ1aWxkZXI6OnRyeVBsYWNpbmdGbG9hdEJv eChjb25zdCBJbmxpbmVJdGVtJiBmbG9hdEl0ZW0sIExpbmVCb3hDb25zdHJhCiAgICAgfQogCiAg ICAgLy8gU2hyaW5rIHRoZSBsaW5lIGJveCB3aXRoIHRoZSBpbnRydXNpdmUgZmxvYXQgYm94J3Mg bWFyZ2luIGJveC4KLSAgICBtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IHRydWU7Cisg ICAgbV9saW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgPSB0cnVlOwogICAgIGF1dG8gc2hvdWxkQWRq dXN0TGluZUxvZ2ljYWxMZWZ0ID0gWyZdIHsKICAgICAgICAgYXV0byBtYXRjaGluZ0lubGluZURp cmVjdGlvbiA9IGZsb2F0aW5nU3RhdGUoKS0+aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID09IGZv cm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLnN0eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigp OwogICAgICAgICAvLyBGbG9hdGluZyBzdGF0ZSBpbmhlcml0ZWQgZnJvbSB0aGUgcGFyZW50IEJG QyB3aXRoIG1pc21hdGNoaW5nIGlubGluZSBkaXJlY3Rpb24gKGx0ciB2cy4gcnRsKSBwdXRzCkBA IC05ODAsOSArOTc5LDkgQEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxl SW5saW5lQ29udGVudChJbmxpbmVDb250ZW50QnJlYWtlciYgaW5saW4KICAgICAgICAgaW5saW5l Q29udGVudEJyZWFrZXIuc2V0SHlwaGVuYXRpb25EaXNhYmxlZCgpOwogCiAgICAgLy8gV2hpbGUg dGhlIGZsb2F0cyBhcmUgbm90IGNvbnNpZGVyZWQgdG8gYmUgb24gdGhlIGxpbmUsIHRoZXkgbWFr ZSB0aGUgbGluZSBjb250ZW50ZnVsIGZvciBsaW5lIGJyZWFraW5nLgotICAgIGF1dG8gYWRqdXN0 ZWRMaW5lRm9yQ2FuZGlkYXRlQ29udGVudCA9IGxpbmVSZWN0Rm9yQ2FuZGlkYXRlSW5saW5lQ29u dGVudChsaW5lQ2FuZGlkYXRlKTsKKyAgICBhdXRvIFthZGp1c3RlZExpbmVGb3JDYW5kaWRhdGVD b250ZW50LCBjYW5kaWRhdGVDb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXRdID0gbGluZVJlY3RG b3JDYW5kaWRhdGVJbmxpbmVDb250ZW50KGxpbmVDYW5kaWRhdGUpOwogICAgIGF1dG8gYXZhaWxh YmxlV2lkdGhGb3JDYW5kaWRhdGVDb250ZW50ID0gYXZhaWxhYmxlV2lkdGgoaW5saW5lQ29udGVu dCwgbV9saW5lLCBhZGp1c3RlZExpbmVGb3JDYW5kaWRhdGVDb250ZW50LndpZHRoKCkpOwotICAg IGF1dG8gbGluZUlzQ29uc2lkZXJlZENvbnRlbnRmdWwgPSBtX2xpbmUuaGFzQ29udGVudCgpIHx8 IG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0OworICAgIGF1dG8gbGluZUlzQ29uc2lkZXJl ZENvbnRlbnRmdWwgPSBtX2xpbmUuaGFzQ29udGVudCgpIHx8IG1fbGluZUlzQ29uc3RyYWluZWRC eUZsb2F0IHx8IGNhbmRpZGF0ZUNvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKICAgICBhdXRv IGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5j b250ZW50TG9naWNhbFJpZ2h0KCksIGF2YWlsYWJsZVdpZHRoRm9yQ2FuZGlkYXRlQ29udGVudCwg dHJpbW1hYmxlVHJhaWxpbmdDb250ZW50V2lkdGgobV9saW5lKSwgbV9saW5lLnRyYWlsaW5nU29m dEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1RyYWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwgbGlu ZUlzQ29uc2lkZXJlZENvbnRlbnRmdWwsICFtX3dyYXBPcHBvcnR1bml0eUxpc3QuaXNFbXB0eSgp IH07CiAgICAgYXV0byB0b0xpbmVCdWlsZGVyUmVzdWx0ID0gWyZdKGF1dG8mIGxpbmVCcmVha2lu Z1Jlc3VsdCkgLT4gTGluZUJ1aWxkZXI6OlJlc3VsdCB7CiAgICAgICAgIGF1dG8mIGNhbmRpZGF0 ZVJ1bnMgPSBjb250aW51b3VzSW5saW5lQ29udGVudC5ydW5zKCk7CkBAIC0xMDc2LDExICsxMDc1 LDExIEBAIExpbmVCdWlsZGVyOjpSZXN1bHQgTGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZUNvbnRl bnQoSW5saW5lQ29udGVudEJyZWFrZXImIGlubGluCiAgICAgYXV0byBsaW5lQnJlYWtpbmdSZXN1 bHQgPSBpbmxpbmVDb250ZW50QnJlYWtlci5wcm9jZXNzSW5saW5lQ29udGVudChjb250aW51b3Vz SW5saW5lQ29udGVudCwgbGluZVN0YXR1cyk7CiAgICAgYXV0byBsaW5lR2FpbnNOZXdDb250ZW50 ID0gbGluZUJyZWFraW5nUmVzdWx0LmFjdGlvbiA9PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVz dWx0OjpBY3Rpb246OktlZXAgfHwgbGluZUJyZWFraW5nUmVzdWx0LmFjdGlvbiA9PSBJbmxpbmVD b250ZW50QnJlYWtlcjo6UmVzdWx0OjpBY3Rpb246OkJyZWFrOyAKICAgICBpZiAobGluZUdhaW5z TmV3Q29udGVudCkgewotICAgICAgICAvLyBTb21ldGltZXMgaW4gb3JkZXIgdG8gcHV0IHRoaXMg Y29udGVudCBvbiB0aGUgbGluZSwgd2UgaGF2ZSB0byBhdm9pZCBhZGRpdG9uYWwgZmxvYXQgYm94 ZXMgKHdoZW4gdGhlIG5ldyBjb250ZW50IGlzIHRhbGxlciB0aGFuIGFueSBwcmV2aW91cyBjb250 ZW50IGFuZCB3ZSBoYXZlIHZlcnRpY2FsbHkgc3RhY2tlZCBmbG9hdHMgb24gdGhpcyBsaW5lKQot ICAgICAgICAvLyB3aGljaCBtZWFucyB3ZSBuZWVkIHRvIGFkanVzdCB0aGUgbGluZSByZWN0IHRv IGFjY29tb2RhdGUgc3VjaCBuZXcgY29uc3RyYWludHMuCi0gICAgICAgIG1fY29udGVudElzQ29u c3RyYWluZWRCeUZsb2F0ID0gbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQgfHwgbV9saW5l TG9naWNhbFJlY3QgIT0gYWRqdXN0ZWRMaW5lRm9yQ2FuZGlkYXRlQ29udGVudDsKKyAgICAgICAg Ly8gU29tZXRpbWVzIGluIG9yZGVyIHRvIHB1dCB0aGlzIGNvbnRlbnQgb24gdGhlIGxpbmUsIHdl IGhhdmUgdG8gYXZvaWQgYWRkaXRpb25hbCBmbG9hdCBib3hlcyAod2hlbiB0aGUgbmV3IGNvbnRl bnQgaXMgdGFsbGVyIHRoYW4gYW55IHByZXZpb3VzIGNvbnRlbnQgYW5kIHdlIGhhdmUgdmVydGlj YWxseSBzdGFja2VkIGZsb2F0cyBvbiB0aGlzIGxpbmUpCisgICAgICAgIC8vIHdoaWNoIG1lYW5z IHdlIG5lZWQgdG8gYWRqdXN0IHRoZSBsaW5lIHJlY3QgdG8gYWNjb21tb2RhdGUgc3VjaCBuZXcg Y29uc3RyYWludHMuCiAgICAgICAgIG1fbGluZUxvZ2ljYWxSZWN0ID0gYWRqdXN0ZWRMaW5lRm9y Q2FuZGlkYXRlQ29udGVudDsKICAgICB9CisgICAgbV9saW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQg PSBtX2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB8fCBjYW5kaWRhdGVDb250ZW50SXNDb25zdHJh aW5lZEJ5RmxvYXQ7CiAgICAgcmV0dXJuIHRvTGluZUJ1aWxkZXJSZXN1bHQobGluZUJyZWFraW5n UmVzdWx0KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRp bmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXgg NWUxM2ZkNmI1YTZmLi43NDY1MWY5YjhmOWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuaApAQCAtMTE3LDcgKzExNyw3IEBAIHByaXZhdGU6CiAgICAgZW51bSBMaW5lQm94 Q29uc3RyYWludEFwcGxpZXMgOiB1aW50OF90IHsgWWVzLCBObyB9OwogICAgIGJvb2wgdHJ5UGxh Y2luZ0Zsb2F0Qm94KGNvbnN0IElubGluZUl0ZW0mLCBMaW5lQm94Q29uc3RyYWludEFwcGxpZXMp OwogICAgIFJlc3VsdCBoYW5kbGVJbmxpbmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2VyJiwg Y29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVkc0xheW91dFJhbmdlLCBjb25zdCBMaW5lQ2FuZGlk YXRlJik7Ci0gICAgSW5saW5lUmVjdCBsaW5lUmVjdEZvckNhbmRpZGF0ZUlubGluZUNvbnRlbnQo Y29uc3QgTGluZUNhbmRpZGF0ZSYpIGNvbnN0OworICAgIHN0ZDo6dHVwbGU8SW5saW5lUmVjdCwg Ym9vbD4gbGluZVJlY3RGb3JDYW5kaWRhdGVJbmxpbmVDb250ZW50KGNvbnN0IExpbmVDYW5kaWRh dGUmKSBjb25zdDsKICAgICBzaXplX3QgcmVidWlsZExpbmVXaXRoSW5saW5lQ29udGVudChjb25z dCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5b3V0UmFuZ2UsIGNvbnN0IElubGluZUl0ZW0mIGxh c3RJbmxpbmVJdGVtVG9BZGQpOwogICAgIHNpemVfdCByZWJ1aWxkTGluZUZvclRyYWlsaW5nU29m dEh5cGhlbihjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIGxheW91dFJhbmdlKTsKICAgICB2b2lkIGNv bW1pdFBhcnRpYWxDb250ZW50KGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3Vz Q29udGVudDo6UnVuTGlzdCYsIGNvbnN0IElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQ6OlBh cnRpYWxUcmFpbGluZ0NvbnRlbnQmKTsKQEAgLTE2OCw3ICsxNjgsNyBAQCBwcml2YXRlOgogICAg IFZlY3Rvcjxjb25zdCBJbmxpbmVJdGVtKj4gbV93cmFwT3Bwb3J0dW5pdHlMaXN0OwogICAgIFZl Y3RvcjxJbmxpbmVJdGVtPiBtX2xpbmVTcGFubmluZ0lubGluZUJveGVzOwogICAgIHVuc2lnbmVk IG1fc3VjY2Vzc2l2ZUh5cGhlbmF0ZWRMaW5lQ291bnQgeyAwIH07Ci0gICAgYm9vbCBtX2NvbnRl bnRJc0NvbnN0cmFpbmVkQnlGbG9hdCB7IGZhbHNlIH07CisgICAgYm9vbCBtX2xpbmVJc0NvbnN0 cmFpbmVkQnlGbG9hdCB7IGZhbHNlIH07CiB9OwogCiBpbmxpbmUgTGluZUJ1aWxkZXI6OlBhcnRp YWxDb250ZW50OjpQYXJ0aWFsQ29udGVudChzaXplX3QgbGVuZ3RoLCBzdGQ6Om9wdGlvbmFsPElu bGluZUxheW91dFVuaXQ+IHdpZHRoKQo= 462968 2022-10-13 11:38:51 -0700 2022-10-13 20:22:30 -0700 Patch bug-246465-20221013113850.patch text/plain 12622 zalan RnJvbSBiZWQwMTI1MjE5NTQ1OGYwMDVlMWQwMGVjMTc3YzFjM2QwNWMyMTQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDEzIE9jdCAyMDIyIDEwOjU4OjAxIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBGaXgKIGZhc3QvaW5saW5lL2lubGluZS1yb290LXdpdGgtbmVnYXRpdmUtbWFyZ2luLWFuZC1z aWJsaW5nLWZsb2F0Lmh0bWwKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNDY0NjUKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKMS4gVGhlIGxpbmUgaXMgbm90 IGNvbnNpZGVyZWQgZW1wdHkgZnJvbSBsaW5lLWJyZWFraW5nIHBvaW50IG9mIHZpZXcgd2hlbiBp dCBpcyBjb25zdHJhaW5lZCBieSBhIGZsb2F0IGJveCAoaXQgc2ltcGx5IG1lYW5zIHRoYXQgd2Ug ZG9uJ3QgZm9yY2Ugb3ZlcmZsb3dpbmcgaW5saW5lIGNvbnRlbnQgb24gdGhlIGxpbmUpCjIuIEFu IGludHJ1c2l2ZSBmbG9hdCBib3ggbWF5IHByZXZlbnQgdG8gcHV0IGFueSBjb250ZW50IG9uIHRo ZSBsaW5lLgpOb3cgdGhhdCB3ZSBkb24ndCBpbmZsYXRlIHRoZSBpbml0aWFsIGxpbmUgaGVpZ2h0 IGluIHF1aXJrcyBtb2RlIGFueW1vcmUsIHdlIGRvbid0IG5lY2Vzc2lhcmlseSBmaW5kIGZsb2F0 cyB3aGlsZSB3ZSBhcmUgc2V0dGluZyB1cCB0aGUgbGluZS4gU3VjaCBmbG9hdHMgYXJlIGZvdW5k IGxhdGVyIHdoZW4gd2UgY2hlY2sgZm9yIGF2YWlsYWJsZSB3aWR0aCBmb3IgdGhlIGNhbmRpZGF0 ZSBpbmxpbmUgY29udGVudC4KCiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250 ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5l QnVpbGRlcjo6bGF5b3V0SW5saW5lQ29udGVudCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWls ZGVyOjppbml0aWFsaXplKToKKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmNsb3NlKToK KFdlYkNvcmU6OkxheW91dDo6ZWxpZ2libGVPdmVyZmxvd1dpZHRoQXNMZWFkaW5nKToKKFdlYkNv cmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmxpbmVSZWN0Rm9yQ2FuZGlkYXRlSW5saW5lQ29udGVu dCBjb25zdCk6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjp0cnlQbGFjaW5nRmxvYXRC b3gpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudCk6 CiogU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5l TGluZUJ1aWxkZXIuaDoKLS0tCiAuLi4vaW5saW5lL0lubGluZUxpbmVCdWlsZGVyLmNwcCAgICAg ICAgICAgICAgfCAzMSArKysrKysrKystLS0tLS0tLS0tCiAuLi4vaW5saW5lL0lubGluZUxpbmVC dWlsZGVyLmggICAgICAgICAgICAgICAgfCAgNCArLS0KIExheW91dFRlc3RzL3BsYXRmb3JtL2lv cy13azIvVGVzdEV4cGVjdGF0aW9ucyB8ICAyIC0tCiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMv VGVzdEV4cGVjdGF0aW9ucyAgICAgfCAgMiAtLQogNCBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNlcnRp b25zKCspLCAyMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVp bGRlci5jcHAKaW5kZXggODliNjk3OWRlNjc3Li5iN2Y1NjZkNmNjZDkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5saW5lL0lubGluZUxpbmVC dWlsZGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRz L2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKQEAgLTM1OCw3ICszNTgsNyBAQCBMaW5lQnVp bGRlcjo6TGluZUNvbnRlbnQgTGluZUJ1aWxkZXI6OmxheW91dElubGluZUNvbnRlbnQoY29uc3Qg SW5saW5lSXRlbVJhbmdlJgogICAgICAgICAsIHBhcnRpYWxPdmVyZmxvd2luZ0NvbnRlbnQgPyBz dGQ6Om51bGxvcHQgOiBjb21taXR0ZWRDb250ZW50Lm92ZXJmbG93TG9naWNhbFdpZHRoCiAgICAg ICAgICwgV1RGTW92ZShtX3BsYWNlZEZsb2F0cykKICAgICAgICAgLCBXVEZNb3ZlKG1fb3ZlcmZs b3dpbmdGbG9hdHMpCi0gICAgICAgICwgbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQKKyAg ICAgICAgLCBtX2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdAogICAgICAgICAsIG1fbGluZUluaXRp YWxMb2dpY2FsTGVmdAogICAgICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0LnRvcExlZnQoKQogICAg ICAgICAsIG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCkKQEAgLTQ0NCw3ICs0NDQsNyBAQCB2b2lk IExpbmVCdWlsZGVyOjppbml0aWFsaXplKGNvbnN0IFVzZWRDb25zdHJhaW50cyYgbGluZUNvbnN0 cmFpbnRzLCBjb25zdCBJbmxpbgogICAgIC8vIFdoaWxlIG5lZ2F0aXZlIG1hcmdpbnMgbm9ybWFs bHkgZG9uJ3QgZXhwYW5kIHRoZSBhdmFpbGFibGUgc3BhY2UsIHByZWZlcnJlZCB3aWR0aCBjb21w dXRhdGlvbiBnZXRzIGNvbmZ1c2VkIGJ5IG5lZ2F0aXZlIHRleHQtaW5kZW50CiAgICAgLy8gKHNo cmluayB0aGUgc3BhY2UgbmVlZGVkIGZvciB0aGUgY29udGVudCkgd2hpY2ggd2UgaGF2ZSB0byBi YWxhbmNlIGl0IGhlcmUuCiAgICAgbV9saW5lTG9naWNhbFJlY3QuZXhwYW5kSG9yaXpvbnRhbGx5 KC1tX2xpbmVNYXJnaW5TdGFydCk7Ci0gICAgbV9jb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQg PSBsaW5lQ29uc3RyYWludHMuaXNDb25zdHJhaW5lZEJ5RmxvYXQ7CisgICAgbV9saW5lSXNDb25z dHJhaW5lZEJ5RmxvYXQgPSBsaW5lQ29uc3RyYWludHMuaXNDb25zdHJhaW5lZEJ5RmxvYXQ7CiAK ICAgICBpZiAocHJldmlvdXNMaW5lKSB7CiAgICAgICAgIGlmIChwcmV2aW91c0xpbmUtPnBhcnRp YWxPdmVyZmxvd2luZ0NvbnRlbnQpIHsKQEAgLTUzMSw3ICs1MzEsNyBAQCBMaW5lQnVpbGRlcjo6 Q29tbWl0dGVkQ29udGVudCBMaW5lQnVpbGRlcjo6cGxhY2VJbmxpbmVDb250ZW50KGNvbnN0IElu bGluZUl0ZW1SYQogCiBMaW5lQnVpbGRlcjo6SW5saW5lSXRlbVJhbmdlIExpbmVCdWlsZGVyOjpj bG9zZShjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5b3V0UmFuZ2UsIGNvbnN0IENvbW1p dHRlZENvbnRlbnQmIGNvbW1pdHRlZENvbnRlbnQpCiB7Ci0gICAgQVNTRVJUKGNvbW1pdHRlZENv bnRlbnQuaXRlbUNvdW50IHx8ICFtX3BsYWNlZEZsb2F0cy5pc0VtcHR5KCkgfHwgbV9jb250ZW50 SXNDb25zdHJhaW5lZEJ5RmxvYXQpOworICAgIEFTU0VSVChjb21taXR0ZWRDb250ZW50Lml0ZW1D b3VudCB8fCAhbV9wbGFjZWRGbG9hdHMuaXNFbXB0eSgpIHx8IG1fbGluZUlzQ29uc3RyYWluZWRC eUZsb2F0KTsKICAgICBhdXRvJiByb290U3R5bGUgPSB0aGlzLT5yb290U3R5bGUoKTsKICAgICBh dXRvIG51bWJlck9mQ29tbWl0dGVkSXRlbXMgPSBjb21taXR0ZWRDb250ZW50Lml0ZW1Db3VudDsK ICAgICBhdXRvIHRyYWlsaW5nSW5saW5lSXRlbUluZGV4ID0gbmVlZHNMYXlvdXRSYW5nZS5zdGFy dCArIG51bWJlck9mQ29tbWl0dGVkSXRlbXMgLSAxOwpAQCAtODQ4LDE1ICs4NDgsMTQgQEAgc3Rh dGljIHN0ZDo6b3B0aW9uYWw8SW5saW5lTGF5b3V0VW5pdD4gZWxpZ2libGVPdmVyZmxvd1dpZHRo QXNMZWFkaW5nKGNvbnN0IElubGkKICAgICBpZiAobGluZUJyZWFraW5nUmVzdWx0LmFjdGlvbiA9 PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0OjpBY3Rpb246OkJyZWFrICYmIGxpbmVCcmVh a2luZ1Jlc3VsdC5wYXJ0aWFsVHJhaWxpbmdDb250ZW50LT5wYXJ0aWFsUnVuKQogICAgICAgICBy ZXR1cm4gbG9naWNhbFdpZHRoRm9yTmV4dExpbmVBc0xlYWRpbmcgLSBsaW5lQnJlYWtpbmdSZXN1 bHQucGFydGlhbFRyYWlsaW5nQ29udGVudC0+cGFydGlhbFJ1bi0+bG9naWNhbFdpZHRoOwogICAg IHJldHVybiB7IH07Ci19OwotCit9CiAKLUlubGluZVJlY3QgTGluZUJ1aWxkZXI6OmxpbmVSZWN0 Rm9yQ2FuZGlkYXRlSW5saW5lQ29udGVudChjb25zdCBMaW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlk YXRlKSBjb25zdAorc3RkOjp0dXBsZTxJbmxpbmVSZWN0LCBib29sPiBMaW5lQnVpbGRlcjo6bGlu ZVJlY3RGb3JDYW5kaWRhdGVJbmxpbmVDb250ZW50KGNvbnN0IExpbmVDYW5kaWRhdGUmIGxpbmVD YW5kaWRhdGUpIGNvbnN0CiB7CiAgICAgYXV0byYgaW5saW5lQ29udGVudCA9IGxpbmVDYW5kaWRh dGUuaW5saW5lQ29udGVudDsKICAgICAvLyBDaGVjayBpZiB0aGUgY2FuZGlkYXRlIGNvbnRlbnQg d291bGQgc3RyZXRjaCB0aGUgbGluZSBhbmQgd2hldGhlciBhZGRpdGlvbmFsIGZsb2F0cyBhcmUg Z2V0dGluZyBpbiB0aGUgd2F5LgogICAgIGlmIChpc0luSW50cmluc2ljV2lkdGhNb2RlKCkpCi0g ICAgICAgIHJldHVybiBtX2xpbmVMb2dpY2FsUmVjdDsKKyAgICAgICAgcmV0dXJuIHsgbV9saW5l TG9naWNhbFJlY3QsIGZhbHNlIH07CiAgICAgYXV0byBtYXhpbXVtTGluZUxvZ2ljYWxIZWlnaHQg PSBtX2xpbmVMb2dpY2FsUmVjdC5oZWlnaHQoKTsKICAgICBmb3IgKGF1dG8mIHJ1biA6IGlubGlu ZUNvbnRlbnQuY29udGludW91c0NvbnRlbnQoKS5ydW5zKCkpIHsKICAgICAgICAgYXV0byYgaW5s aW5lSXRlbSA9IHJ1bi5pbmxpbmVJdGVtOwpAQCAtODY4LDE0ICs4NjcsMTQgQEAgSW5saW5lUmVj dCBMaW5lQnVpbGRlcjo6bGluZVJlY3RGb3JDYW5kaWRhdGVJbmxpbmVDb250ZW50KGNvbnN0IExp bmVDYW5kaWRhdGUmIGwKICAgICAgICAgfQogICAgIH0KICAgICBpZiAobWF4aW11bUxpbmVMb2dp Y2FsSGVpZ2h0ID09IG1fbGluZUxvZ2ljYWxSZWN0LmhlaWdodCgpKQotICAgICAgICByZXR1cm4g bV9saW5lTG9naWNhbFJlY3Q7CisgICAgICAgIHJldHVybiB7IG1fbGluZUxvZ2ljYWxSZWN0LCBm YWxzZSB9OwogICAgIGF1dG8gYWRqdXN0ZWRMaW5lTG9naWNhbFJlY3QgPSBJbmxpbmVSZWN0IHsg bV9saW5lTG9naWNhbFJlY3QudG9wKCksIG1fbGluZUxvZ2ljYWxSZWN0LmxlZnQoKSwgbV9saW5l TG9naWNhbFJlY3Qud2lkdGgoKSwgbWF4aW11bUxpbmVMb2dpY2FsSGVpZ2h0IH07CiAgICAgYXV0 byBsaW5lQ29uc3RyYWludHMgPSBmbG9hdENvbnN0cmFpbnRzKGFkanVzdGVkTGluZUxvZ2ljYWxS ZWN0KTsKICAgICBpZiAobGluZUNvbnN0cmFpbnRzLmxlZnQpCiAgICAgICAgIGFkanVzdGVkTGlu ZUxvZ2ljYWxSZWN0LnNoaWZ0TGVmdFRvKHN0ZDo6bWF4PElubGluZUxheW91dFVuaXQ+KGFkanVz dGVkTGluZUxvZ2ljYWxSZWN0LmxlZnQoKSwgbGluZUNvbnN0cmFpbnRzLmxlZnQtPngpKTsKICAg ICBpZiAobGluZUNvbnN0cmFpbnRzLnJpZ2h0KQogICAgICAgICBhZGp1c3RlZExpbmVMb2dpY2Fs UmVjdC5zZXRSaWdodChzdGQ6Om1heChhZGp1c3RlZExpbmVMb2dpY2FsUmVjdC5sZWZ0KCksIHN0 ZDo6bWluPElubGluZUxheW91dFVuaXQ+KGFkanVzdGVkTGluZUxvZ2ljYWxSZWN0LnJpZ2h0KCks IGxpbmVDb25zdHJhaW50cy5yaWdodC0+eCkpKTsKLSAgICByZXR1cm4gYWRqdXN0ZWRMaW5lTG9n aWNhbFJlY3Q7CisgICAgcmV0dXJuIHsgYWRqdXN0ZWRMaW5lTG9naWNhbFJlY3QsICBsaW5lQ29u c3RyYWludHMubGVmdCB8fCBsaW5lQ29uc3RyYWludHMucmlnaHQgfTsKIH0KIAogYm9vbCBMaW5l QnVpbGRlcjo6dHJ5UGxhY2luZ0Zsb2F0Qm94KGNvbnN0IElubGluZUl0ZW0mIGZsb2F0SXRlbSwg TGluZUJveENvbnN0cmFpbnRBcHBsaWVzIGxpbmVCb3hDb25zdHJhaW50QXBwbGllcykKQEAgLTkw Myw3ICs5MDIsNyBAQCBib29sIExpbmVCdWlsZGVyOjp0cnlQbGFjaW5nRmxvYXRCb3goY29uc3Qg SW5saW5lSXRlbSYgZmxvYXRJdGVtLCBMaW5lQm94Q29uc3RyYQogICAgICAgICAgICAgQVNTRVJU KG1fb3ZlcmZsb3dpbmdGbG9hdHMuaXNFbXB0eSgpKTsKICAgICAgICAgICAgIHJldHVybiB0cnVl OwogICAgICAgICB9Ci0gICAgICAgIGF1dG8gbGluZUlzQ29uc2lkZXJlZEVtcHR5ID0gIW1fbGlu ZS5oYXNDb250ZW50KCkgJiYgIW1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0OworICAgICAg ICBhdXRvIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSA9ICFtX2xpbmUuaGFzQ29udGVudCgpICYmICFt X2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdDsKICAgICAgICAgaWYgKGxpbmVJc0NvbnNpZGVyZWRF bXB0eSkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBhdXRvIGF2YWlsYWJsZVdp ZHRoRm9yRmxvYXQgPSBtX2xpbmVMb2dpY2FsUmVjdC53aWR0aCgpIC0gbV9saW5lLmNvbnRlbnRM b2dpY2FsUmlnaHQoKSArIHRyaW1tYWJsZVRyYWlsaW5nQ29udGVudFdpZHRoKG1fbGluZSk7CkBA IC05NDUsNyArOTQ0LDcgQEAgYm9vbCBMaW5lQnVpbGRlcjo6dHJ5UGxhY2luZ0Zsb2F0Qm94KGNv bnN0IElubGluZUl0ZW0mIGZsb2F0SXRlbSwgTGluZUJveENvbnN0cmEKICAgICB9CiAKICAgICAv LyBTaHJpbmsgdGhlIGxpbmUgYm94IHdpdGggdGhlIGludHJ1c2l2ZSBmbG9hdCBib3gncyBtYXJn aW4gYm94LgotICAgIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0ID0gdHJ1ZTsKKyAgICBt X2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IHRydWU7CiAgICAgYXV0byBzaG91bGRBZGp1c3RM aW5lTG9naWNhbExlZnQgPSBbJl0gewogICAgICAgICBhdXRvIG1hdGNoaW5nSW5saW5lRGlyZWN0 aW9uID0gZmxvYXRpbmdTdGF0ZSgpLT5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCkgPT0gZm9ybWF0 dGluZ0NvbnRleHQoKS5yb290KCkuc3R5bGUoKS5pc0xlZnRUb1JpZ2h0RGlyZWN0aW9uKCk7CiAg ICAgICAgIC8vIEZsb2F0aW5nIHN0YXRlIGluaGVyaXRlZCBmcm9tIHRoZSBwYXJlbnQgQkZDIHdp dGggbWlzbWF0Y2hpbmcgaW5saW5lIGRpcmVjdGlvbiAobHRyIHZzLiBydGwpIHB1dHMKQEAgLTk3 OSw5ICs5NzgsOSBAQCBMaW5lQnVpbGRlcjo6UmVzdWx0IExpbmVCdWlsZGVyOjpoYW5kbGVJbmxp bmVDb250ZW50KElubGluZUNvbnRlbnRCcmVha2VyJiBpbmxpbgogICAgICAgICBpbmxpbmVDb250 ZW50QnJlYWtlci5zZXRIeXBoZW5hdGlvbkRpc2FibGVkKCk7CiAKICAgICAvLyBXaGlsZSB0aGUg ZmxvYXRzIGFyZSBub3QgY29uc2lkZXJlZCB0byBiZSBvbiB0aGUgbGluZSwgdGhleSBtYWtlIHRo ZSBsaW5lIGNvbnRlbnRmdWwgZm9yIGxpbmUgYnJlYWtpbmcuCi0gICAgYXV0byBhZGp1c3RlZExp bmVGb3JDYW5kaWRhdGVDb250ZW50ID0gbGluZVJlY3RGb3JDYW5kaWRhdGVJbmxpbmVDb250ZW50 KGxpbmVDYW5kaWRhdGUpOworICAgIGF1dG8gW2FkanVzdGVkTGluZUZvckNhbmRpZGF0ZUNvbnRl bnQsIGNhbmRpZGF0ZUNvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdF0gPSBsaW5lUmVjdEZvckNh bmRpZGF0ZUlubGluZUNvbnRlbnQobGluZUNhbmRpZGF0ZSk7CiAgICAgYXV0byBhdmFpbGFibGVX aWR0aEZvckNhbmRpZGF0ZUNvbnRlbnQgPSBhdmFpbGFibGVXaWR0aChpbmxpbmVDb250ZW50LCBt X2xpbmUsIGFkanVzdGVkTGluZUZvckNhbmRpZGF0ZUNvbnRlbnQud2lkdGgoKSk7Ci0gICAgYXV0 byBsaW5lSXNDb25zaWRlcmVkQ29udGVudGZ1bCA9IG1fbGluZS5oYXNDb250ZW50KCkgfHwgbV9j b250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7CisgICAgYXV0byBsaW5lSXNDb25zaWRlcmVkQ29u dGVudGZ1bCA9IG1fbGluZS5oYXNDb250ZW50KCkgfHwgbV9saW5lSXNDb25zdHJhaW5lZEJ5Rmxv YXQgfHwgY2FuZGlkYXRlQ29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0OwogICAgIGF1dG8gbGlu ZVN0YXR1cyA9IElubGluZUNvbnRlbnRCcmVha2VyOjpMaW5lU3RhdHVzIHsgbV9saW5lLmNvbnRl bnRMb2dpY2FsUmlnaHQoKSwgYXZhaWxhYmxlV2lkdGhGb3JDYW5kaWRhdGVDb250ZW50LCB0cmlt bWFibGVUcmFpbGluZ0NvbnRlbnRXaWR0aChtX2xpbmUpLCBtX2xpbmUudHJhaWxpbmdTb2Z0SHlw aGVuV2lkdGgoKSwgbV9saW5lLmlzVHJhaWxpbmdSdW5GdWxseVRyaW1tYWJsZSgpLCBsaW5lSXND b25zaWRlcmVkQ29udGVudGZ1bCwgIW1fd3JhcE9wcG9ydHVuaXR5TGlzdC5pc0VtcHR5KCkgfTsK ICAgICBhdXRvIHRvTGluZUJ1aWxkZXJSZXN1bHQgPSBbJl0oYXV0byYgbGluZUJyZWFraW5nUmVz dWx0KSAtPiBMaW5lQnVpbGRlcjo6UmVzdWx0IHsKICAgICAgICAgYXV0byYgY2FuZGlkYXRlUnVu cyA9IGNvbnRpbnVvdXNJbmxpbmVDb250ZW50LnJ1bnMoKTsKQEAgLTEwNzUsMTEgKzEwNzQsMTEg QEAgTGluZUJ1aWxkZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudChJ bmxpbmVDb250ZW50QnJlYWtlciYgaW5saW4KICAgICBhdXRvIGxpbmVCcmVha2luZ1Jlc3VsdCA9 IGlubGluZUNvbnRlbnRCcmVha2VyLnByb2Nlc3NJbmxpbmVDb250ZW50KGNvbnRpbnVvdXNJbmxp bmVDb250ZW50LCBsaW5lU3RhdHVzKTsKICAgICBhdXRvIGxpbmVHYWluc05ld0NvbnRlbnQgPSBs aW5lQnJlYWtpbmdSZXN1bHQuYWN0aW9uID09IElubGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQ6 OkFjdGlvbjo6S2VlcCB8fCBsaW5lQnJlYWtpbmdSZXN1bHQuYWN0aW9uID09IElubGluZUNvbnRl bnRCcmVha2VyOjpSZXN1bHQ6OkFjdGlvbjo6QnJlYWs7IAogICAgIGlmIChsaW5lR2FpbnNOZXdD b250ZW50KSB7Ci0gICAgICAgIC8vIFNvbWV0aW1lcyBpbiBvcmRlciB0byBwdXQgdGhpcyBjb250 ZW50IG9uIHRoZSBsaW5lLCB3ZSBoYXZlIHRvIGF2b2lkIGFkZGl0b25hbCBmbG9hdCBib3hlcyAo d2hlbiB0aGUgbmV3IGNvbnRlbnQgaXMgdGFsbGVyIHRoYW4gYW55IHByZXZpb3VzIGNvbnRlbnQg YW5kIHdlIGhhdmUgdmVydGljYWxseSBzdGFja2VkIGZsb2F0cyBvbiB0aGlzIGxpbmUpCi0gICAg ICAgIC8vIHdoaWNoIG1lYW5zIHdlIG5lZWQgdG8gYWRqdXN0IHRoZSBsaW5lIHJlY3QgdG8gYWNj b21vZGF0ZSBzdWNoIG5ldyBjb25zdHJhaW50cy4KLSAgICAgICAgbV9jb250ZW50SXNDb25zdHJh aW5lZEJ5RmxvYXQgPSBtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdCB8fCBtX2xpbmVMb2dp Y2FsUmVjdCAhPSBhZGp1c3RlZExpbmVGb3JDYW5kaWRhdGVDb250ZW50OworICAgICAgICAvLyBT b21ldGltZXMgaW4gb3JkZXIgdG8gcHV0IHRoaXMgY29udGVudCBvbiB0aGUgbGluZSwgd2UgaGF2 ZSB0byBhdm9pZCBhZGRpdGlvbmFsIGZsb2F0IGJveGVzICh3aGVuIHRoZSBuZXcgY29udGVudCBp cyB0YWxsZXIgdGhhbiBhbnkgcHJldmlvdXMgY29udGVudCBhbmQgd2UgaGF2ZSB2ZXJ0aWNhbGx5 IHN0YWNrZWQgZmxvYXRzIG9uIHRoaXMgbGluZSkKKyAgICAgICAgLy8gd2hpY2ggbWVhbnMgd2Ug bmVlZCB0byBhZGp1c3QgdGhlIGxpbmUgcmVjdCB0byBhY2NvbW1vZGF0ZSBzdWNoIG5ldyBjb25z dHJhaW50cy4KICAgICAgICAgbV9saW5lTG9naWNhbFJlY3QgPSBhZGp1c3RlZExpbmVGb3JDYW5k aWRhdGVDb250ZW50OwogICAgIH0KKyAgICBtX2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCA9IG1f bGluZUlzQ29uc3RyYWluZWRCeUZsb2F0IHx8IGNhbmRpZGF0ZUNvbnRlbnRJc0NvbnN0cmFpbmVk QnlGbG9hdDsKICAgICByZXR1cm4gdG9MaW5lQnVpbGRlclJlc3VsdChsaW5lQnJlYWtpbmdSZXN1 bHQpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0Nv bnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaAppbmRleCAyYTRk ZDJmODJlYzYuLmU0NWU3NWMxN2YyMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0 L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVp bGRlci5oCkBAIC0xMTcsNyArMTE3LDcgQEAgcHJpdmF0ZToKICAgICBlbnVtIExpbmVCb3hDb25z dHJhaW50QXBwbGllcyA6IHVpbnQ4X3QgeyBZZXMsIE5vIH07CiAgICAgYm9vbCB0cnlQbGFjaW5n RmxvYXRCb3goY29uc3QgSW5saW5lSXRlbSYsIExpbmVCb3hDb25zdHJhaW50QXBwbGllcyk7CiAg ICAgUmVzdWx0IGhhbmRsZUlubGluZUNvbnRlbnQoSW5saW5lQ29udGVudEJyZWFrZXImLCBjb25z dCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5b3V0UmFuZ2UsIGNvbnN0IExpbmVDYW5kaWRhdGUm KTsKLSAgICBJbmxpbmVSZWN0IGxpbmVSZWN0Rm9yQ2FuZGlkYXRlSW5saW5lQ29udGVudChjb25z dCBMaW5lQ2FuZGlkYXRlJikgY29uc3Q7CisgICAgc3RkOjp0dXBsZTxJbmxpbmVSZWN0LCBib29s PiBsaW5lUmVjdEZvckNhbmRpZGF0ZUlubGluZUNvbnRlbnQoY29uc3QgTGluZUNhbmRpZGF0ZSYp IGNvbnN0OwogICAgIHNpemVfdCByZWJ1aWxkTGluZVdpdGhJbmxpbmVDb250ZW50KGNvbnN0IElu bGluZUl0ZW1SYW5nZSYgbmVlZHNMYXlvdXRSYW5nZSwgY29uc3QgSW5saW5lSXRlbSYgbGFzdElu bGluZUl0ZW1Ub0FkZCk7CiAgICAgc2l6ZV90IHJlYnVpbGRMaW5lRm9yVHJhaWxpbmdTb2Z0SHlw aGVuKGNvbnN0IElubGluZUl0ZW1SYW5nZSYgbGF5b3V0UmFuZ2UpOwogICAgIHZvaWQgY29tbWl0 UGFydGlhbENvbnRlbnQoY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OkNvbnRpbnVvdXNDb250 ZW50OjpSdW5MaXN0JiwgY29uc3QgSW5saW5lQ29udGVudEJyZWFrZXI6OlJlc3VsdDo6UGFydGlh bFRyYWlsaW5nQ29udGVudCYpOwpAQCAtMTY4LDcgKzE2OCw3IEBAIHByaXZhdGU6CiAgICAgVmVj dG9yPGNvbnN0IElubGluZUl0ZW0qPiBtX3dyYXBPcHBvcnR1bml0eUxpc3Q7CiAgICAgVmVjdG9y PElubGluZUl0ZW0+IG1fbGluZVNwYW5uaW5nSW5saW5lQm94ZXM7CiAgICAgdW5zaWduZWQgbV9z dWNjZXNzaXZlSHlwaGVuYXRlZExpbmVDb3VudCB7IDAgfTsKLSAgICBib29sIG1fY29udGVudElz Q29uc3RyYWluZWRCeUZsb2F0IHsgZmFsc2UgfTsKKyAgICBib29sIG1fbGluZUlzQ29uc3RyYWlu ZWRCeUZsb2F0IHsgZmFsc2UgfTsKIH07CiAKIGlubGluZSBMaW5lQnVpbGRlcjo6UGFydGlhbENv bnRlbnQ6OlBhcnRpYWxDb250ZW50KHNpemVfdCBsZW5ndGgsIHN0ZDo6b3B0aW9uYWw8SW5saW5l TGF5b3V0VW5pdD4gd2lkdGgpCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mt d2syL1Rlc3RFeHBlY3RhdGlvbnMgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL1Rlc3RF eHBlY3RhdGlvbnMKaW5kZXggM2E1ZDhhZDdhYjgxLi43OTBkZDAwMTFmZTYgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2lvcy13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlv dXRUZXN0cy9wbGF0Zm9ybS9pb3Mtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTI0MjEsNSArMjQy MSwzIEBAIHdlYmtpdC5vcmcvYi8yNDU5OTQgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0 cy9zdHJlYW1zL3JlYWRhYmxlLWJ5dGUtc3RyZWFtCiBbIFJlbGVhc2UgXSBodHRwL3dwdC93ZWJh dXRobi9wdWJsaWMta2V5LWNyZWRlbnRpYWwtY3JlYXRlLXN1Y2Nlc3MtaGlkLmh0dHBzLmh0bWwg WyBTa2lwIF0KIAogd2Via2l0Lm9yZy9iLzI0NjQyNyBpbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3Jt LXRlc3RzL3ByZWxvYWQvcHJlbG9hZC1yZWZlcnJlci1wb2xpY3kuaHRtbCBbIFBhc3MgRmFpbHVy ZSBdCi0KLXdlYmtpdC5vcmcvYi8yNDY0NjQgZmFzdC9ib3gtc2hhZG93L2luc2V0LXNwcmVhZC1i b3gtc2hhZG93LXNwbGl0LWlubGluZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRl c3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCmluZGV4IGVkZDNjZDBkNzEyMC4uNTZi MWRkOTZhMzJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVj dGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucwpA QCAtMjM3OCw1ICsyMzc4LDMgQEAgd2Via2l0Lm9yZy9iLzI0NTk5NCBpbXBvcnRlZC93M2Mvd2Vi LXBsYXRmb3JtLXRlc3RzL3N0cmVhbXMvcmVhZGFibGUtYnl0ZS1zdHJlYW0KIFsgUmVsZWFzZSBd IGh0dHAvd3B0L3dlYmF1dGhuL3B1YmxpYy1rZXktY3JlZGVudGlhbC1nZXQtc3VjY2Vzcy11MmYu aHR0cHMuaHRtbCBbIFNraXAgXQogWyBSZWxlYXNlIF0gaHR0cC93cHQvd2ViYXV0aG4vcHVibGlj LWtleS1jcmVkZW50aWFsLWdldC1mYWlsdXJlLWhpZC1zaWxlbnQuaHR0cHMuaHRtbCBbIFNraXAg XQogWyBSZWxlYXNlIF0gaHR0cC93cHQvd2ViYXV0aG4vcHVibGljLWtleS1jcmVkZW50aWFsLWNy ZWF0ZS1zdWNjZXNzLWhpZC5odHRwcy5odG1sIFsgU2tpcCBdCi0KLXdlYmtpdC5vcmcvYi8yNDY0 NjQgZmFzdC9ib3gtc2hhZG93L2luc2V0LXNwcmVhZC1ib3gtc2hhZG93LXNwbGl0LWlubGluZS5o dG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCg== 462974 2022-10-13 20:22:32 -0700 2022-10-13 20:56:45 -0700 [fast-cq]Patch bug-246465-20221013202231.patch text/plain 11706 zalan RnJvbSBlZjkzNDhkMmI1NzlkYWQ4MjA5OWY3MGZmOTQyMGM5NzBkZjlkZjlhIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGFuIEJ1anRhcyA8emFsYW5AYXBwbGUuY29tPgpEYXRlOiBU aHUsIDEzIE9jdCAyMDIyIDE5OjAyOjEyIC0wNzAwClN1YmplY3Q6IFtQQVRDSF0gW0xGQ11bSUZD XSBGaXgKIGZhc3QvaW5saW5lL2lubGluZS1yb290LXdpdGgtbmVnYXRpdmUtbWFyZ2luLWFuZC1z aWJsaW5nLWZsb2F0Lmh0bWwKIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yNDY0NjUKClJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgoKMS4gVGhlIGxpbmUgaXMgbm90 IGNvbnNpZGVyZWQgZW1wdHkgZnJvbSBsaW5lLWJyZWFraW5nIHBvaW50IG9mIHZpZXcgd2hlbiBp dCBpcyBjb25zdHJhaW5lZCBieSBhIGZsb2F0IGJveCAoaXQgc2ltcGx5IG1lYW5zIHRoYXQgd2Ug ZG9uJ3QgZm9yY2Ugb3ZlcmZsb3dpbmcgaW5saW5lIGNvbnRlbnQgb24gdGhlIGxpbmUpCjIuIEFu IGludHJ1c2l2ZSBmbG9hdCBib3ggbWF5IHByZXZlbnQgdG8gcHV0IGFueSBjb250ZW50IG9uIHRo ZSBsaW5lLgpOb3cgdGhhdCB3ZSBkb24ndCBpbmZsYXRlIHRoZSBpbml0aWFsIGxpbmUgaGVpZ2h0 IGluIHF1aXJrcyBtb2RlIGFueW1vcmUsIHdlIGRvbid0IG5lY2Vzc2lhcmlseSBmaW5kIGZsb2F0 cyB3aGlsZSB3ZSBhcmUgc2V0dGluZyB1cCB0aGUgbGluZS4gU3VjaCBmbG9hdHMgYXJlIGZvdW5k IGxhdGVyIHdoZW4gd2UgY2hlY2sgZm9yIGF2YWlsYWJsZSB3aWR0aCBmb3IgdGhlIGNhbmRpZGF0 ZSBpbmxpbmUgY29udGVudC4KCiogTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9uczoKKiBTb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvZm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVp bGRlci5jcHA6CihXZWJDb3JlOjpMYXlvdXQ6OkxpbmVCdWlsZGVyOjpsYXlvdXRJbmxpbmVDb250 ZW50KToKKFdlYkNvcmU6OkxheW91dDo6TGluZUJ1aWxkZXI6OmluaXRpYWxpemUpOgooV2ViQ29y ZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6Y2xvc2UpOgooV2ViQ29yZTo6TGF5b3V0OjplbGlnaWJs ZU92ZXJmbG93V2lkdGhBc0xlYWRpbmcpOgooV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnVpbGRlcjo6 bGluZVJlY3RGb3JDYW5kaWRhdGVJbmxpbmVDb250ZW50IGNvbnN0KToKKFdlYkNvcmU6OkxheW91 dDo6TGluZUJ1aWxkZXI6OnRyeVBsYWNpbmdGbG9hdEJveCk6CihXZWJDb3JlOjpMYXlvdXQ6Okxp bmVCdWlsZGVyOjpoYW5kbGVJbmxpbmVDb250ZW50KToKKiBTb3VyY2UvV2ViQ29yZS9sYXlvdXQv Zm9ybWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5oOgotLS0KIC4uLi9p bmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwICAgICAgICAgICAgICB8IDMxICsrKysrKysrKy0t LS0tLS0tLS0KIC4uLi9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaCAgICAgICAgICAgICAgICB8 ICA0ICstLQogTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyAgICAgICAgICAgICAgICAgIHwg IDMgLS0KIDMgZmlsZXMgY2hhbmdlZCwgMTcgaW5zZXJ0aW9ucygrKSwgMjEgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9p bmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuY3BwCmluZGV4IDg5YjY5Nzlk ZTY3Ny4uYjdmNTY2ZDZjY2Q5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvZm9y bWF0dGluZ0NvbnRleHRzL2lubGluZS9JbmxpbmVMaW5lQnVpbGRlci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxk ZXIuY3BwCkBAIC0zNTgsNyArMzU4LDcgQEAgTGluZUJ1aWxkZXI6OkxpbmVDb250ZW50IExpbmVC dWlsZGVyOjpsYXlvdXRJbmxpbmVDb250ZW50KGNvbnN0IElubGluZUl0ZW1SYW5nZSYKICAgICAg ICAgLCBwYXJ0aWFsT3ZlcmZsb3dpbmdDb250ZW50ID8gc3RkOjpudWxsb3B0IDogY29tbWl0dGVk Q29udGVudC5vdmVyZmxvd0xvZ2ljYWxXaWR0aAogICAgICAgICAsIFdURk1vdmUobV9wbGFjZWRG bG9hdHMpCiAgICAgICAgICwgV1RGTW92ZShtX292ZXJmbG93aW5nRmxvYXRzKQotICAgICAgICAs IG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0CisgICAgICAgICwgbV9saW5lSXNDb25zdHJh aW5lZEJ5RmxvYXQKICAgICAgICAgLCBtX2xpbmVJbml0aWFsTG9naWNhbExlZnQKICAgICAgICAg LCBtX2xpbmVMb2dpY2FsUmVjdC50b3BMZWZ0KCkKICAgICAgICAgLCBtX2xpbmVMb2dpY2FsUmVj dC53aWR0aCgpCkBAIC00NDQsNyArNDQ0LDcgQEAgdm9pZCBMaW5lQnVpbGRlcjo6aW5pdGlhbGl6 ZShjb25zdCBVc2VkQ29uc3RyYWludHMmIGxpbmVDb25zdHJhaW50cywgY29uc3QgSW5saW4KICAg ICAvLyBXaGlsZSBuZWdhdGl2ZSBtYXJnaW5zIG5vcm1hbGx5IGRvbid0IGV4cGFuZCB0aGUgYXZh aWxhYmxlIHNwYWNlLCBwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24gZ2V0cyBjb25mdXNlZCBi eSBuZWdhdGl2ZSB0ZXh0LWluZGVudAogICAgIC8vIChzaHJpbmsgdGhlIHNwYWNlIG5lZWRlZCBm b3IgdGhlIGNvbnRlbnQpIHdoaWNoIHdlIGhhdmUgdG8gYmFsYW5jZSBpdCBoZXJlLgogICAgIG1f bGluZUxvZ2ljYWxSZWN0LmV4cGFuZEhvcml6b250YWxseSgtbV9saW5lTWFyZ2luU3RhcnQpOwot ICAgIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0ID0gbGluZUNvbnN0cmFpbnRzLmlzQ29u c3RyYWluZWRCeUZsb2F0OworICAgIG1fbGluZUlzQ29uc3RyYWluZWRCeUZsb2F0ID0gbGluZUNv bnN0cmFpbnRzLmlzQ29uc3RyYWluZWRCeUZsb2F0OwogCiAgICAgaWYgKHByZXZpb3VzTGluZSkg ewogICAgICAgICBpZiAocHJldmlvdXNMaW5lLT5wYXJ0aWFsT3ZlcmZsb3dpbmdDb250ZW50KSB7 CkBAIC01MzEsNyArNTMxLDcgQEAgTGluZUJ1aWxkZXI6OkNvbW1pdHRlZENvbnRlbnQgTGluZUJ1 aWxkZXI6OnBsYWNlSW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmEKIAogTGluZUJ1aWxk ZXI6OklubGluZUl0ZW1SYW5nZSBMaW5lQnVpbGRlcjo6Y2xvc2UoY29uc3QgSW5saW5lSXRlbVJh bmdlJiBuZWVkc0xheW91dFJhbmdlLCBjb25zdCBDb21taXR0ZWRDb250ZW50JiBjb21taXR0ZWRD b250ZW50KQogewotICAgIEFTU0VSVChjb21taXR0ZWRDb250ZW50Lml0ZW1Db3VudCB8fCAhbV9w bGFjZWRGbG9hdHMuaXNFbXB0eSgpIHx8IG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0KTsK KyAgICBBU1NFUlQoY29tbWl0dGVkQ29udGVudC5pdGVtQ291bnQgfHwgIW1fcGxhY2VkRmxvYXRz LmlzRW1wdHkoKSB8fCBtX2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCk7CiAgICAgYXV0byYgcm9v dFN0eWxlID0gdGhpcy0+cm9vdFN0eWxlKCk7CiAgICAgYXV0byBudW1iZXJPZkNvbW1pdHRlZEl0 ZW1zID0gY29tbWl0dGVkQ29udGVudC5pdGVtQ291bnQ7CiAgICAgYXV0byB0cmFpbGluZ0lubGlu ZUl0ZW1JbmRleCA9IG5lZWRzTGF5b3V0UmFuZ2Uuc3RhcnQgKyBudW1iZXJPZkNvbW1pdHRlZEl0 ZW1zIC0gMTsKQEAgLTg0OCwxNSArODQ4LDE0IEBAIHN0YXRpYyBzdGQ6Om9wdGlvbmFsPElubGlu ZUxheW91dFVuaXQ+IGVsaWdpYmxlT3ZlcmZsb3dXaWR0aEFzTGVhZGluZyhjb25zdCBJbmxpCiAg ICAgaWYgKGxpbmVCcmVha2luZ1Jlc3VsdC5hY3Rpb24gPT0gSW5saW5lQ29udGVudEJyZWFrZXI6 OlJlc3VsdDo6QWN0aW9uOjpCcmVhayAmJiBsaW5lQnJlYWtpbmdSZXN1bHQucGFydGlhbFRyYWls aW5nQ29udGVudC0+cGFydGlhbFJ1bikKICAgICAgICAgcmV0dXJuIGxvZ2ljYWxXaWR0aEZvck5l eHRMaW5lQXNMZWFkaW5nIC0gbGluZUJyZWFraW5nUmVzdWx0LnBhcnRpYWxUcmFpbGluZ0NvbnRl bnQtPnBhcnRpYWxSdW4tPmxvZ2ljYWxXaWR0aDsKICAgICByZXR1cm4geyB9OwotfTsKLQorfQog Ci1JbmxpbmVSZWN0IExpbmVCdWlsZGVyOjpsaW5lUmVjdEZvckNhbmRpZGF0ZUlubGluZUNvbnRl bnQoY29uc3QgTGluZUNhbmRpZGF0ZSYgbGluZUNhbmRpZGF0ZSkgY29uc3QKK3N0ZDo6dHVwbGU8 SW5saW5lUmVjdCwgYm9vbD4gTGluZUJ1aWxkZXI6OmxpbmVSZWN0Rm9yQ2FuZGlkYXRlSW5saW5l Q29udGVudChjb25zdCBMaW5lQ2FuZGlkYXRlJiBsaW5lQ2FuZGlkYXRlKSBjb25zdAogewogICAg IGF1dG8mIGlubGluZUNvbnRlbnQgPSBsaW5lQ2FuZGlkYXRlLmlubGluZUNvbnRlbnQ7CiAgICAg Ly8gQ2hlY2sgaWYgdGhlIGNhbmRpZGF0ZSBjb250ZW50IHdvdWxkIHN0cmV0Y2ggdGhlIGxpbmUg YW5kIHdoZXRoZXIgYWRkaXRpb25hbCBmbG9hdHMgYXJlIGdldHRpbmcgaW4gdGhlIHdheS4KICAg ICBpZiAoaXNJbkludHJpbnNpY1dpZHRoTW9kZSgpKQotICAgICAgICByZXR1cm4gbV9saW5lTG9n aWNhbFJlY3Q7CisgICAgICAgIHJldHVybiB7IG1fbGluZUxvZ2ljYWxSZWN0LCBmYWxzZSB9Owog ICAgIGF1dG8gbWF4aW11bUxpbmVMb2dpY2FsSGVpZ2h0ID0gbV9saW5lTG9naWNhbFJlY3QuaGVp Z2h0KCk7CiAgICAgZm9yIChhdXRvJiBydW4gOiBpbmxpbmVDb250ZW50LmNvbnRpbnVvdXNDb250 ZW50KCkucnVucygpKSB7CiAgICAgICAgIGF1dG8mIGlubGluZUl0ZW0gPSBydW4uaW5saW5lSXRl bTsKQEAgLTg2OCwxNCArODY3LDE0IEBAIElubGluZVJlY3QgTGluZUJ1aWxkZXI6OmxpbmVSZWN0 Rm9yQ2FuZGlkYXRlSW5saW5lQ29udGVudChjb25zdCBMaW5lQ2FuZGlkYXRlJiBsCiAgICAgICAg IH0KICAgICB9CiAgICAgaWYgKG1heGltdW1MaW5lTG9naWNhbEhlaWdodCA9PSBtX2xpbmVMb2dp Y2FsUmVjdC5oZWlnaHQoKSkKLSAgICAgICAgcmV0dXJuIG1fbGluZUxvZ2ljYWxSZWN0OworICAg ICAgICByZXR1cm4geyBtX2xpbmVMb2dpY2FsUmVjdCwgZmFsc2UgfTsKICAgICBhdXRvIGFkanVz dGVkTGluZUxvZ2ljYWxSZWN0ID0gSW5saW5lUmVjdCB7IG1fbGluZUxvZ2ljYWxSZWN0LnRvcCgp LCBtX2xpbmVMb2dpY2FsUmVjdC5sZWZ0KCksIG1fbGluZUxvZ2ljYWxSZWN0LndpZHRoKCksIG1h eGltdW1MaW5lTG9naWNhbEhlaWdodCB9OwogICAgIGF1dG8gbGluZUNvbnN0cmFpbnRzID0gZmxv YXRDb25zdHJhaW50cyhhZGp1c3RlZExpbmVMb2dpY2FsUmVjdCk7CiAgICAgaWYgKGxpbmVDb25z dHJhaW50cy5sZWZ0KQogICAgICAgICBhZGp1c3RlZExpbmVMb2dpY2FsUmVjdC5zaGlmdExlZnRU byhzdGQ6Om1heDxJbmxpbmVMYXlvdXRVbml0PihhZGp1c3RlZExpbmVMb2dpY2FsUmVjdC5sZWZ0 KCksIGxpbmVDb25zdHJhaW50cy5sZWZ0LT54KSk7CiAgICAgaWYgKGxpbmVDb25zdHJhaW50cy5y aWdodCkKICAgICAgICAgYWRqdXN0ZWRMaW5lTG9naWNhbFJlY3Quc2V0UmlnaHQoc3RkOjptYXgo YWRqdXN0ZWRMaW5lTG9naWNhbFJlY3QubGVmdCgpLCBzdGQ6Om1pbjxJbmxpbmVMYXlvdXRVbml0 PihhZGp1c3RlZExpbmVMb2dpY2FsUmVjdC5yaWdodCgpLCBsaW5lQ29uc3RyYWludHMucmlnaHQt PngpKSk7Ci0gICAgcmV0dXJuIGFkanVzdGVkTGluZUxvZ2ljYWxSZWN0OworICAgIHJldHVybiB7 IGFkanVzdGVkTGluZUxvZ2ljYWxSZWN0LCAgbGluZUNvbnN0cmFpbnRzLmxlZnQgfHwgbGluZUNv bnN0cmFpbnRzLnJpZ2h0IH07CiB9CiAKIGJvb2wgTGluZUJ1aWxkZXI6OnRyeVBsYWNpbmdGbG9h dEJveChjb25zdCBJbmxpbmVJdGVtJiBmbG9hdEl0ZW0sIExpbmVCb3hDb25zdHJhaW50QXBwbGll cyBsaW5lQm94Q29uc3RyYWludEFwcGxpZXMpCkBAIC05MDMsNyArOTAyLDcgQEAgYm9vbCBMaW5l QnVpbGRlcjo6dHJ5UGxhY2luZ0Zsb2F0Qm94KGNvbnN0IElubGluZUl0ZW0mIGZsb2F0SXRlbSwg TGluZUJveENvbnN0cmEKICAgICAgICAgICAgIEFTU0VSVChtX292ZXJmbG93aW5nRmxvYXRzLmlz RW1wdHkoKSk7CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAgfQotICAgICAgICBh dXRvIGxpbmVJc0NvbnNpZGVyZWRFbXB0eSA9ICFtX2xpbmUuaGFzQ29udGVudCgpICYmICFtX2Nv bnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdDsKKyAgICAgICAgYXV0byBsaW5lSXNDb25zaWRlcmVk RW1wdHkgPSAhbV9saW5lLmhhc0NvbnRlbnQoKSAmJiAhbV9saW5lSXNDb25zdHJhaW5lZEJ5Rmxv YXQ7CiAgICAgICAgIGlmIChsaW5lSXNDb25zaWRlcmVkRW1wdHkpCiAgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKICAgICAgICAgYXV0byBhdmFpbGFibGVXaWR0aEZvckZsb2F0ID0gbV9saW5lTG9n aWNhbFJlY3Qud2lkdGgoKSAtIG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCkgKyB0cmltbWFi bGVUcmFpbGluZ0NvbnRlbnRXaWR0aChtX2xpbmUpOwpAQCAtOTQ1LDcgKzk0NCw3IEBAIGJvb2wg TGluZUJ1aWxkZXI6OnRyeVBsYWNpbmdGbG9hdEJveChjb25zdCBJbmxpbmVJdGVtJiBmbG9hdEl0 ZW0sIExpbmVCb3hDb25zdHJhCiAgICAgfQogCiAgICAgLy8gU2hyaW5rIHRoZSBsaW5lIGJveCB3 aXRoIHRoZSBpbnRydXNpdmUgZmxvYXQgYm94J3MgbWFyZ2luIGJveC4KLSAgICBtX2NvbnRlbnRJ c0NvbnN0cmFpbmVkQnlGbG9hdCA9IHRydWU7CisgICAgbV9saW5lSXNDb25zdHJhaW5lZEJ5Rmxv YXQgPSB0cnVlOwogICAgIGF1dG8gc2hvdWxkQWRqdXN0TGluZUxvZ2ljYWxMZWZ0ID0gWyZdIHsK ICAgICAgICAgYXV0byBtYXRjaGluZ0lubGluZURpcmVjdGlvbiA9IGZsb2F0aW5nU3RhdGUoKS0+ aXNMZWZ0VG9SaWdodERpcmVjdGlvbigpID09IGZvcm1hdHRpbmdDb250ZXh0KCkucm9vdCgpLnN0 eWxlKCkuaXNMZWZ0VG9SaWdodERpcmVjdGlvbigpOwogICAgICAgICAvLyBGbG9hdGluZyBzdGF0 ZSBpbmhlcml0ZWQgZnJvbSB0aGUgcGFyZW50IEJGQyB3aXRoIG1pc21hdGNoaW5nIGlubGluZSBk aXJlY3Rpb24gKGx0ciB2cy4gcnRsKSBwdXRzCkBAIC05NzksOSArOTc4LDkgQEAgTGluZUJ1aWxk ZXI6OlJlc3VsdCBMaW5lQnVpbGRlcjo6aGFuZGxlSW5saW5lQ29udGVudChJbmxpbmVDb250ZW50 QnJlYWtlciYgaW5saW4KICAgICAgICAgaW5saW5lQ29udGVudEJyZWFrZXIuc2V0SHlwaGVuYXRp b25EaXNhYmxlZCgpOwogCiAgICAgLy8gV2hpbGUgdGhlIGZsb2F0cyBhcmUgbm90IGNvbnNpZGVy ZWQgdG8gYmUgb24gdGhlIGxpbmUsIHRoZXkgbWFrZSB0aGUgbGluZSBjb250ZW50ZnVsIGZvciBs aW5lIGJyZWFraW5nLgotICAgIGF1dG8gYWRqdXN0ZWRMaW5lRm9yQ2FuZGlkYXRlQ29udGVudCA9 IGxpbmVSZWN0Rm9yQ2FuZGlkYXRlSW5saW5lQ29udGVudChsaW5lQ2FuZGlkYXRlKTsKKyAgICBh dXRvIFthZGp1c3RlZExpbmVGb3JDYW5kaWRhdGVDb250ZW50LCBjYW5kaWRhdGVDb250ZW50SXND b25zdHJhaW5lZEJ5RmxvYXRdID0gbGluZVJlY3RGb3JDYW5kaWRhdGVJbmxpbmVDb250ZW50KGxp bmVDYW5kaWRhdGUpOwogICAgIGF1dG8gYXZhaWxhYmxlV2lkdGhGb3JDYW5kaWRhdGVDb250ZW50 ID0gYXZhaWxhYmxlV2lkdGgoaW5saW5lQ29udGVudCwgbV9saW5lLCBhZGp1c3RlZExpbmVGb3JD YW5kaWRhdGVDb250ZW50LndpZHRoKCkpOwotICAgIGF1dG8gbGluZUlzQ29uc2lkZXJlZENvbnRl bnRmdWwgPSBtX2xpbmUuaGFzQ29udGVudCgpIHx8IG1fY29udGVudElzQ29uc3RyYWluZWRCeUZs b2F0OworICAgIGF1dG8gbGluZUlzQ29uc2lkZXJlZENvbnRlbnRmdWwgPSBtX2xpbmUuaGFzQ29u dGVudCgpIHx8IG1fbGluZUlzQ29uc3RyYWluZWRCeUZsb2F0IHx8IGNhbmRpZGF0ZUNvbnRlbnRJ c0NvbnN0cmFpbmVkQnlGbG9hdDsKICAgICBhdXRvIGxpbmVTdGF0dXMgPSBJbmxpbmVDb250ZW50 QnJlYWtlcjo6TGluZVN0YXR1cyB7IG1fbGluZS5jb250ZW50TG9naWNhbFJpZ2h0KCksIGF2YWls YWJsZVdpZHRoRm9yQ2FuZGlkYXRlQ29udGVudCwgdHJpbW1hYmxlVHJhaWxpbmdDb250ZW50V2lk dGgobV9saW5lKSwgbV9saW5lLnRyYWlsaW5nU29mdEh5cGhlbldpZHRoKCksIG1fbGluZS5pc1Ry YWlsaW5nUnVuRnVsbHlUcmltbWFibGUoKSwgbGluZUlzQ29uc2lkZXJlZENvbnRlbnRmdWwsICFt X3dyYXBPcHBvcnR1bml0eUxpc3QuaXNFbXB0eSgpIH07CiAgICAgYXV0byB0b0xpbmVCdWlsZGVy UmVzdWx0ID0gWyZdKGF1dG8mIGxpbmVCcmVha2luZ1Jlc3VsdCkgLT4gTGluZUJ1aWxkZXI6OlJl c3VsdCB7CiAgICAgICAgIGF1dG8mIGNhbmRpZGF0ZVJ1bnMgPSBjb250aW51b3VzSW5saW5lQ29u dGVudC5ydW5zKCk7CkBAIC0xMDc1LDExICsxMDc0LDExIEBAIExpbmVCdWlsZGVyOjpSZXN1bHQg TGluZUJ1aWxkZXI6OmhhbmRsZUlubGluZUNvbnRlbnQoSW5saW5lQ29udGVudEJyZWFrZXImIGlu bGluCiAgICAgYXV0byBsaW5lQnJlYWtpbmdSZXN1bHQgPSBpbmxpbmVDb250ZW50QnJlYWtlci5w cm9jZXNzSW5saW5lQ29udGVudChjb250aW51b3VzSW5saW5lQ29udGVudCwgbGluZVN0YXR1cyk7 CiAgICAgYXV0byBsaW5lR2FpbnNOZXdDb250ZW50ID0gbGluZUJyZWFraW5nUmVzdWx0LmFjdGlv biA9PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0OjpBY3Rpb246OktlZXAgfHwgbGluZUJy ZWFraW5nUmVzdWx0LmFjdGlvbiA9PSBJbmxpbmVDb250ZW50QnJlYWtlcjo6UmVzdWx0OjpBY3Rp b246OkJyZWFrOyAKICAgICBpZiAobGluZUdhaW5zTmV3Q29udGVudCkgewotICAgICAgICAvLyBT b21ldGltZXMgaW4gb3JkZXIgdG8gcHV0IHRoaXMgY29udGVudCBvbiB0aGUgbGluZSwgd2UgaGF2 ZSB0byBhdm9pZCBhZGRpdG9uYWwgZmxvYXQgYm94ZXMgKHdoZW4gdGhlIG5ldyBjb250ZW50IGlz IHRhbGxlciB0aGFuIGFueSBwcmV2aW91cyBjb250ZW50IGFuZCB3ZSBoYXZlIHZlcnRpY2FsbHkg c3RhY2tlZCBmbG9hdHMgb24gdGhpcyBsaW5lKQotICAgICAgICAvLyB3aGljaCBtZWFucyB3ZSBu ZWVkIHRvIGFkanVzdCB0aGUgbGluZSByZWN0IHRvIGFjY29tb2RhdGUgc3VjaCBuZXcgY29uc3Ry YWludHMuCi0gICAgICAgIG1fY29udGVudElzQ29uc3RyYWluZWRCeUZsb2F0ID0gbV9jb250ZW50 SXNDb25zdHJhaW5lZEJ5RmxvYXQgfHwgbV9saW5lTG9naWNhbFJlY3QgIT0gYWRqdXN0ZWRMaW5l Rm9yQ2FuZGlkYXRlQ29udGVudDsKKyAgICAgICAgLy8gU29tZXRpbWVzIGluIG9yZGVyIHRvIHB1 dCB0aGlzIGNvbnRlbnQgb24gdGhlIGxpbmUsIHdlIGhhdmUgdG8gYXZvaWQgYWRkaXRpb25hbCBm bG9hdCBib3hlcyAod2hlbiB0aGUgbmV3IGNvbnRlbnQgaXMgdGFsbGVyIHRoYW4gYW55IHByZXZp b3VzIGNvbnRlbnQgYW5kIHdlIGhhdmUgdmVydGljYWxseSBzdGFja2VkIGZsb2F0cyBvbiB0aGlz IGxpbmUpCisgICAgICAgIC8vIHdoaWNoIG1lYW5zIHdlIG5lZWQgdG8gYWRqdXN0IHRoZSBsaW5l IHJlY3QgdG8gYWNjb21tb2RhdGUgc3VjaCBuZXcgY29uc3RyYWludHMuCiAgICAgICAgIG1fbGlu ZUxvZ2ljYWxSZWN0ID0gYWRqdXN0ZWRMaW5lRm9yQ2FuZGlkYXRlQ29udGVudDsKICAgICB9Cisg ICAgbV9saW5lSXNDb25zdHJhaW5lZEJ5RmxvYXQgPSBtX2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9h dCB8fCBjYW5kaWRhdGVDb250ZW50SXNDb25zdHJhaW5lZEJ5RmxvYXQ7CiAgICAgcmV0dXJuIHRv TGluZUJ1aWxkZXJSZXN1bHQobGluZUJyZWFraW5nUmVzdWx0KTsKIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1hdHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGlu ZUJ1aWxkZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmVCdWlsZGVyLmgKaW5kZXggMmE0ZGQyZjgyZWM2Li5lNDVlNzVjMTdmMjEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9mb3JtYXR0aW5nQ29udGV4dHMvaW5s aW5lL0lubGluZUxpbmVCdWlsZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Zvcm1h dHRpbmdDb250ZXh0cy9pbmxpbmUvSW5saW5lTGluZUJ1aWxkZXIuaApAQCAtMTE3LDcgKzExNyw3 IEBAIHByaXZhdGU6CiAgICAgZW51bSBMaW5lQm94Q29uc3RyYWludEFwcGxpZXMgOiB1aW50OF90 IHsgWWVzLCBObyB9OwogICAgIGJvb2wgdHJ5UGxhY2luZ0Zsb2F0Qm94KGNvbnN0IElubGluZUl0 ZW0mLCBMaW5lQm94Q29uc3RyYWludEFwcGxpZXMpOwogICAgIFJlc3VsdCBoYW5kbGVJbmxpbmVD b250ZW50KElubGluZUNvbnRlbnRCcmVha2VyJiwgY29uc3QgSW5saW5lSXRlbVJhbmdlJiBuZWVk c0xheW91dFJhbmdlLCBjb25zdCBMaW5lQ2FuZGlkYXRlJik7Ci0gICAgSW5saW5lUmVjdCBsaW5l UmVjdEZvckNhbmRpZGF0ZUlubGluZUNvbnRlbnQoY29uc3QgTGluZUNhbmRpZGF0ZSYpIGNvbnN0 OworICAgIHN0ZDo6dHVwbGU8SW5saW5lUmVjdCwgYm9vbD4gbGluZVJlY3RGb3JDYW5kaWRhdGVJ bmxpbmVDb250ZW50KGNvbnN0IExpbmVDYW5kaWRhdGUmKSBjb25zdDsKICAgICBzaXplX3QgcmVi dWlsZExpbmVXaXRoSW5saW5lQ29udGVudChjb25zdCBJbmxpbmVJdGVtUmFuZ2UmIG5lZWRzTGF5 b3V0UmFuZ2UsIGNvbnN0IElubGluZUl0ZW0mIGxhc3RJbmxpbmVJdGVtVG9BZGQpOwogICAgIHNp emVfdCByZWJ1aWxkTGluZUZvclRyYWlsaW5nU29mdEh5cGhlbihjb25zdCBJbmxpbmVJdGVtUmFu Z2UmIGxheW91dFJhbmdlKTsKICAgICB2b2lkIGNvbW1pdFBhcnRpYWxDb250ZW50KGNvbnN0IElu bGluZUNvbnRlbnRCcmVha2VyOjpDb250aW51b3VzQ29udGVudDo6UnVuTGlzdCYsIGNvbnN0IElu bGluZUNvbnRlbnRCcmVha2VyOjpSZXN1bHQ6OlBhcnRpYWxUcmFpbGluZ0NvbnRlbnQmKTsKQEAg LTE2OCw3ICsxNjgsNyBAQCBwcml2YXRlOgogICAgIFZlY3Rvcjxjb25zdCBJbmxpbmVJdGVtKj4g bV93cmFwT3Bwb3J0dW5pdHlMaXN0OwogICAgIFZlY3RvcjxJbmxpbmVJdGVtPiBtX2xpbmVTcGFu bmluZ0lubGluZUJveGVzOwogICAgIHVuc2lnbmVkIG1fc3VjY2Vzc2l2ZUh5cGhlbmF0ZWRMaW5l Q291bnQgeyAwIH07Ci0gICAgYm9vbCBtX2NvbnRlbnRJc0NvbnN0cmFpbmVkQnlGbG9hdCB7IGZh bHNlIH07CisgICAgYm9vbCBtX2xpbmVJc0NvbnN0cmFpbmVkQnlGbG9hdCB7IGZhbHNlIH07CiB9 OwogCiBpbmxpbmUgTGluZUJ1aWxkZXI6OlBhcnRpYWxDb250ZW50OjpQYXJ0aWFsQ29udGVudChz aXplX3QgbGVuZ3RoLCBzdGQ6Om9wdGlvbmFsPElubGluZUxheW91dFVuaXQ+IHdpZHRoKQpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL1Rlc3RF eHBlY3RhdGlvbnMKaW5kZXggNDMxZTQxYWNkNjk5Li41NDE3YWUzZTgxY2UgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvVGVzdEV4cGVj dGF0aW9ucwpAQCAtNjA5OCw2ICs2MDk4LDMgQEAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9pbXBvcnQtbWFwcy9kYXRhLWRyaXZlbi9yZXNvbHZpbmcuaHRtbCBbIFNraXAgXQogCiAj IFdlYktpdDIgT25seQogZnVsbHNjcmVlbi9mdWxsc2NyZWVuLWVudGVyLWJvdHRvbS1wYWRkaW5n LWFuaW1hdGlvbi5odG1sIFsgU2tpcCBdCi0KLSMgd2Via2l0Lm9yZy9iLzI0NjQ2NCBIZWF2eSBF V1MgaW1wYWN0Ci1mYXN0L2JveC1zaGFkb3cvaW5zZXQtc3ByZWFkLWJveC1zaGFkb3ctc3BsaXQt aW5saW5lLmh0bWwgWyBTa2lwIF0K