226249 2021-05-25 16:31:28 -0700 [GStreamer] Stop using UncheckedLock in WebKitCommonEncryptionDecryptorGStreamer 2021-05-25 21:59:52 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 226212 1 cdumez cdumez achristensen bugs-noreply calvaris cgarcia darin ews-watchlist ggaren gustavo mcatanzaro menard pnormand sam vjaquez oldest_to_newest 1763747 0 cdumez 2021-05-25 16:31:28 -0700 Stop using UncheckedLock in WebKitCommonEncryptionDecryptorGStreamer as it is being phased out in favor of WTF::Lock, which supports Clang thread safety analysis. 1763749 1 429710 cdumez 2021-05-25 16:33:32 -0700 Created attachment 429710 Patch 1763759 2 429712 cdumez 2021-05-25 17:02:09 -0700 Created attachment 429712 Patch 1763782 3 429717 cdumez 2021-05-25 17:38:34 -0700 Created attachment 429717 Patch 1763813 4 429717 darin 2021-05-25 20:37:59 -0700 Comment on attachment 429717 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429717&action=review > Source/WebCore/platform/graphics/gstreamer/eme/WebKitCommonEncryptionDecryptorGStreamer.cpp:207 > + // Note that waitFor() releases the lock lock internally while it waits, so isFlushing may have been changed. "the lock lock"? 1763820 5 cdumez 2021-05-25 21:58:34 -0700 Committed r278075 (238154@main): <https://commits.webkit.org/238154@main> 429710 2021-05-25 16:33:32 -0700 2021-05-25 17:38:00 -0700 Patch bug-226249-20210525163331.patch text/plain 6742 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTMxMTA0MzNjYTQ2MDAy NmRmN2E0MTdiZmVlMmM4NzI2NzRkN2JmMy4uMjEwNzhlMzdiNGQ2ZjBmNDI4OGEzMzE2MTU4YmZk Mzg4YzNhOTg4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA1LTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gU3RvcCB1 c2luZyBVbmNoZWNrZWRMb2NrIGluIFdlYktpdENvbW1vbkVuY3J5cHRpb25EZWNyeXB0b3JHU3Ry ZWFtZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NjI0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0 b3AgdXNpbmcgVW5jaGVja2VkTG9jayBpbiBXZWJLaXRDb21tb25FbmNyeXB0aW9uRGVjcnlwdG9y R1N0cmVhbWVyIGFzIGl0IGlzIGJlaW5nIHBoYXNlZCBvdXQKKyAgICAgICAgaW4gZmF2b3Igb2Yg V1RGOjpMb2NrLCB3aGljaCBzdXBwb3J0cyBDbGFuZyB0aHJlYWQgc2FmZXR5IGFuYWx5c2lzLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25F bmNyeXB0aW9uRGVjcnlwdG9yR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHRyYW5zZm9ybUluUGxh Y2UpOgorICAgICAgICAoaXNDRE1Qcm94eUF2YWlsYWJsZSk6CisgICAgICAgIChhdHRhY2hDRE1Q cm94eSk6CisgICAgICAgIChzaW5rRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKHdlYktpdE1lZGlh Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRJc0ZsdXNoaW5nKToKKyAgICAgICAgKHNldENvbnRleHQp OgorCiAyMDIxLTA1LTI1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgU3RvcCB1c2luZyBVbmNoZWNrZWRMb2NrIGluIE5vZGUncyBzX2V2ZW50VGFyZ2V0RGF0YU1h cExvY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL1dlYktpdENvbW1v bkVuY3J5cHRpb25EZWNyeXB0b3JHU3RyZWFtZXIuY3BwCmluZGV4IGViMDg4NTFjYzg2MjEyYjQ2 YmI4MjhjN2IzNzgzZGIzMTU2NGE3ZWQuLmEyNWU4MmFlMWMzM2RhNDMxZjUzZTRkM2QxYzIwMmMw MmZlZTg1YjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJL aXRDb21tb25FbmNyeXB0aW9uRGVjcnlwdG9yR1N0cmVhbWVyLmNwcApAQCAtNTYsOCArNTYsOCBA QCBzdHJ1Y3QgX1dlYktpdE1lZGlhQ29tbW9uRW5jcnlwdGlvbkRlY3J5cHRQcml2YXRlIHsKICAg ICBSZWZQdHI8Q0RNUHJveHk+IGNkbVByb3h5OwogCiAgICAgLy8gUHJvdGVjdCB0aGUgYWNjZXNz IHRvIHRoZSBzdHJ1Y3R1cmUgbWVtYmVycy4KLSAgICBVbmNoZWNrZWRMb2NrIG11dGV4OwotICAg IFVuY2hlY2tlZENvbmRpdGlvbiBjb25kaXRpb247CisgICAgTG9jayBsb2NrOworICAgIENvbmRp dGlvbiBjb25kaXRpb247CiAKICAgICBib29sIGlzRmx1c2hpbmcgeyBmYWxzZSB9OwogICAgIHN0 ZDo6dW5pcXVlX3B0cjxDRE1Qcm94eURlY3J5cHRpb25DbGllbnRJbXBsZW1lbnRhdGlvbj4gY2Rt UHJveHlEZWNyeXB0aW9uQ2xpZW50SW1wbGVtZW50YXRpb247CkBAIC0xOTEsNyArMTkxLDcgQEAg c3RhdGljIEdzdEZsb3dSZXR1cm4gdHJhbnNmb3JtSW5QbGFjZShHc3RCYXNlVHJhbnNmb3JtKiBi YXNlLCBHc3RCdWZmZXIqIGJ1ZmZlcikKICAgICAgICAgcmV0dXJuIEdTVF9GTE9XX09LOwogICAg IH0KIAotICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5tdXRleCB9OworICAgIExvY2tlciBsb2Nr ZXIgeyBwcml2LT5sb2NrIH07CiAKICAgICBpZiAocHJpdi0+aXNGbHVzaGluZykgewogICAgICAg ICBHU1RfREVCVUdfT0JKRUNUKHNlbGYsICJEZWNyeXB0aW9uIGFib3J0ZWQgYmVjYXVzZSBvZiBm bHVzaCIpOwpAQCAtMjAxLDEwICsyMDEsMTAgQEAgc3RhdGljIEdzdEZsb3dSZXR1cm4gdHJhbnNm b3JtSW5QbGFjZShHc3RCYXNlVHJhbnNmb3JtKiBiYXNlLCBHc3RCdWZmZXIqIGJ1ZmZlcikKICAg ICAvLyBUaGUgQ0RNIGluc3RhbmNlIG5lZWRzIHRvIGJlIG5lZ290aWF0ZWQgYmVmb3JlIHdlIGNh biBiZWdpbiBkZWNyeXB0aW9uLgogICAgIGlmICghcHJpdi0+Y2RtUHJveHkpIHsKICAgICAgICAg R1NUX0RFQlVHX09CSkVDVChzZWxmLCAiQ0RNIG5vdCBhdmFpbGFibGUsIGdvaW5nIHRvIHdhaXQg Zm9yIGl0Iik7Ci0gICAgICAgIHByaXYtPmNvbmRpdGlvbi53YWl0Rm9yKHByaXYtPm11dGV4LCBN YXhTZWNvbmRzVG9XYWl0Rm9yQ0RNUHJveHksIFtwcml2XSB7CisgICAgICAgIHByaXYtPmNvbmRp dGlvbi53YWl0Rm9yKHByaXYtPmxvY2ssIE1heFNlY29uZHNUb1dhaXRGb3JDRE1Qcm94eSwgW3By aXZdIHsKICAgICAgICAgICAgIHJldHVybiBwcml2LT5pc0ZsdXNoaW5nIHx8IHByaXYtPmNkbVBy b3h5OwogICAgICAgICB9KTsKLSAgICAgICAgLy8gTm90ZSB0aGF0IHdhaXRGb3IoKSByZWxlYXNl cyB0aGUgbXV0ZXggbG9jayBpbnRlcm5hbGx5IHdoaWxlIGl0IHdhaXRzLCBzbyBpc0ZsdXNoaW5n IG1heSBoYXZlIGJlZW4gY2hhbmdlZC4KKyAgICAgICAgLy8gTm90ZSB0aGF0IHdhaXRGb3IoKSBy ZWxlYXNlcyB0aGUgbG9jayBsb2NrIGludGVybmFsbHkgd2hpbGUgaXQgd2FpdHMsIHNvIGlzRmx1 c2hpbmcgbWF5IGhhdmUgYmVlbiBjaGFuZ2VkLgogICAgICAgICBpZiAocHJpdi0+aXNGbHVzaGlu ZykgewogICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzZWxmLCAiRGVjcnlwdGlvbiBhYm9y dGVkIGJlY2F1c2Ugb2YgZmx1c2giKTsKICAgICAgICAgICAgIHJldHVybiBHU1RfRkxPV19GTFVT SElORzsKQEAgLTI4OCwxNSArMjg4LDE2IEBAIHN0YXRpYyBHc3RGbG93UmV0dXJuIHRyYW5zZm9y bUluUGxhY2UoR3N0QmFzZVRyYW5zZm9ybSogYmFzZSwgR3N0QnVmZmVyKiBidWZmZXIpCiAKICAg ICBHU1RfVFJBQ0VfT0JKRUNUKHNlbGYsICJkZWNyeXB0aW5nIik7CiAKKyAgICBib29sIGRpZERl Y3J5cHRpb25TdWNjZWVkOworCiAgICAgLy8gVGVtcG9yYXJpbHkgcmVsZWFzZSB0aGUgbG9jayB3 aGlsZSB3ZSBkb24ndCBuZWVkIHRvIGFjY2VzcyBwcml2LiBUaGUgbG93ZXIgbGV2ZWwgQVBJIGlz IHVzZWQKICAgICAvLyBpbiBvcmRlciB0byBhdm9pZCBjcmVhdGluZyBzZXZlcmFsIHNjb3BlcyB3 aXRoIGRpZmZlcmVudCBMb2NrZXIgaW5zdGFuY2VzIGluIGVhY2ggb25lLgotICAgIHByaXYtPm11 dGV4LnVubG9jaygpOwotCi0gICAgYm9vbCBkaWREZWNyeXB0aW9uU3VjY2VlZCA9IGtsYXNzLT5k ZWNyeXB0KHNlbGYsIGl2QnVmZmVyLCBrZXlJREJ1ZmZlciwgYnVmZmVyLCBzdWJTYW1wbGVDb3Vu dCwgc3ViU2FtcGxlc0J1ZmZlcik7CisgICAgeworICAgICAgICBEcm9wTG9ja0ZvclNjb3BlIG5v TG9ja1Njb3BlIHsgcHJpdi0+bG9jayB9OworICAgICAgICBkaWREZWNyeXB0aW9uU3VjY2VlZCA9 IGtsYXNzLT5kZWNyeXB0KHNlbGYsIGl2QnVmZmVyLCBrZXlJREJ1ZmZlciwgYnVmZmVyLCBzdWJT YW1wbGVDb3VudCwgc3ViU2FtcGxlc0J1ZmZlcik7CisgICAgfQogCiAgICAgLy8gQWNjZXNzaW5n IHByaXYgbWVtYmVycyBhZ2Fpbi4KLSAgICBwcml2LT5tdXRleC5sb2NrKCk7Ci0KICAgICBpZiAo IWRpZERlY3J5cHRpb25TdWNjZWVkKSB7CiAgICAgICAgIGlmIChwcml2LT5pc0ZsdXNoaW5nKSB7 CiAgICAgICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNlbGYsICJEZWNyeXB0aW9uIGFib3J0ZWQg YmVjYXVzZSBvZiBmbHVzaCIpOwpAQCAtMzEyLDcgKzMxMyw3IEBAIHN0YXRpYyBHc3RGbG93UmV0 dXJuIHRyYW5zZm9ybUluUGxhY2UoR3N0QmFzZVRyYW5zZm9ybSogYmFzZSwgR3N0QnVmZmVyKiBi dWZmZXIpCiBzdGF0aWMgYm9vbCBpc0NETVByb3h5QXZhaWxhYmxlKFdlYktpdE1lZGlhQ29tbW9u RW5jcnlwdGlvbkRlY3J5cHQqIHNlbGYpCiB7CiAgICAgV2ViS2l0TWVkaWFDb21tb25FbmNyeXB0 aW9uRGVjcnlwdFByaXZhdGUqIHByaXYgPSBXRUJLSVRfTUVESUFfQ0VOQ19ERUNSWVBUX0dFVF9Q UklWQVRFKHNlbGYpOwotICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5tdXRleCB9OworICAgIExv Y2tlciBsb2NrZXIgeyBwcml2LT5sb2NrIH07CiAgICAgcmV0dXJuIHByaXYtPmNkbVByb3h5Owog fQogCkBAIC0zNDUsNyArMzQ2LDcgQEAgc3RhdGljIHZvaWQgYXR0YWNoQ0RNUHJveHkoV2ViS2l0 TWVkaWFDb21tb25FbmNyeXB0aW9uRGVjcnlwdCogc2VsZiwgQ0RNUHJveHkqIHAKICAgICBXZWJL aXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0UHJpdmF0ZSogcHJpdiA9IFdFQktJVF9NRURJ QV9DRU5DX0RFQ1JZUFRfR0VUX1BSSVZBVEUoc2VsZik7CiAgICAgV2ViS2l0TWVkaWFDb21tb25F bmNyeXB0aW9uRGVjcnlwdENsYXNzKiBrbGFzcyA9IFdFQktJVF9NRURJQV9DRU5DX0RFQ1JZUFRf R0VUX0NMQVNTKHNlbGYpOwogCi0gICAgTG9ja2VyIGxvY2tlciB7IHByaXYtPm11dGV4IH07Cisg ICAgTG9ja2VyIGxvY2tlciB7IHByaXYtPmxvY2sgfTsKICAgICBHU1RfRVJST1JfT0JKRUNUKHNl bGYsICJBdHRhY2hpbmcgQ0RNUHJveHkgJXAiLCBwcm94eSk7CiAgICAgcHJpdi0+Y2RtUHJveHkg PSBwcm94eTsKICAgICBrbGFzcy0+Y2RtUHJveHlBdHRhY2hlZChzZWxmLCBwcml2LT5jZG1Qcm94 eSk7CkBAIC0zOTMsNyArMzk0LDcgQEAgc3RhdGljIGdib29sZWFuIHNpbmtFdmVudEhhbmRsZXIo R3N0QmFzZVRyYW5zZm9ybSogdHJhbnMsIEdzdEV2ZW50KiBldmVudCkKICAgICBjYXNlIEdTVF9F VkVOVF9GTFVTSF9TVEFSVDoKICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzZWxmLCAiRmx1c2gt c3RhcnQiKTsKICAgICAgICAgewotICAgICAgICAgICAgTG9ja2VyIGxvY2tlciB7IHByaXYtPm11 dGV4IH07CisgICAgICAgICAgICBMb2NrZXIgbG9ja2VyIHsgcHJpdi0+bG9jayB9OwogICAgICAg ICAgICAgYm9vbCBpc0NkbVByb3h5QXR0YWNoZWQgPSBwcml2LT5jZG1Qcm94eTsKICAgICAgICAg ICAgIHByaXYtPmlzRmx1c2hpbmcgPSB0cnVlOwogICAgICAgICAgICAgaWYgKGlzQ2RtUHJveHlB dHRhY2hlZCkgewpAQCAtNDA2LDcgKzQwNyw3IEBAIHN0YXRpYyBnYm9vbGVhbiBzaW5rRXZlbnRI YW5kbGVyKEdzdEJhc2VUcmFuc2Zvcm0qIHRyYW5zLCBHc3RFdmVudCogZXZlbnQpCiAgICAgY2Fz ZSBHU1RfRVZFTlRfRkxVU0hfU1RPUDoKICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzZWxmLCAi Rmx1c2gtc3RvcCIpOwogICAgICAgICB7Ci0gICAgICAgICAgICBMb2NrZXIgbG9ja2VyIHsgcHJp di0+bXV0ZXggfTsKKyAgICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5sb2NrIH07CiAg ICAgICAgICAgICBwcml2LT5pc0ZsdXNoaW5nID0gZmFsc2U7CiAgICAgICAgIH0KICAgICAgICAg YnJlYWs7CkBAIC00MjAsNyArNDIxLDcgQEAgc3RhdGljIGdib29sZWFuIHNpbmtFdmVudEhhbmRs ZXIoR3N0QmFzZVRyYW5zZm9ybSogdHJhbnMsIEdzdEV2ZW50KiBldmVudCkKIGJvb2wgd2ViS2l0 TWVkaWFDb21tb25FbmNyeXB0aW9uRGVjcnlwdElzRmx1c2hpbmcoV2ViS2l0TWVkaWFDb21tb25F bmNyeXB0aW9uRGVjcnlwdCogc2VsZikKIHsKICAgICBXZWJLaXRNZWRpYUNvbW1vbkVuY3J5cHRp b25EZWNyeXB0UHJpdmF0ZSogcHJpdiA9IFdFQktJVF9NRURJQV9DRU5DX0RFQ1JZUFRfR0VUX1BS SVZBVEUoc2VsZik7Ci0gICAgTG9ja2VyIGxvY2tlciB7IHByaXYtPm11dGV4IH07CisgICAgTG9j a2VyIGxvY2tlciB7IHByaXYtPmxvY2sgfTsKICAgICByZXR1cm4gcHJpdi0+aXNGbHVzaGluZzsK IH0KIApAQCAtNDU5LDcgKzQ2MCw3IEBAIHN0YXRpYyB2b2lkIHNldENvbnRleHQoR3N0RWxlbWVu dCogZWxlbWVudCwgR3N0Q29udGV4dCogY29udGV4dCkKIAogICAgIGlmIChnc3RfY29udGV4dF9o YXNfY29udGV4dF90eXBlKGNvbnRleHQsICJkcm0tY2RtLXByb3h5IikpIHsKICAgICAgICAgY29u c3QgR1ZhbHVlKiB2YWx1ZSA9IGdzdF9zdHJ1Y3R1cmVfZ2V0X3ZhbHVlKGdzdF9jb250ZXh0X2dl dF9zdHJ1Y3R1cmUoY29udGV4dCksICJjZG0tcHJveHkiKTsKLSAgICAgICAgTG9ja2VyIGxvY2tl ciB7IHByaXYtPm11dGV4IH07CisgICAgICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5sb2NrIH07 CiAgICAgICAgIHByaXYtPmNkbVByb3h5ID0gdmFsdWUgPyByZWludGVycHJldF9jYXN0PENETVBy b3h5Kj4oZ192YWx1ZV9nZXRfcG9pbnRlcih2YWx1ZSkpIDogbnVsbHB0cjsKICAgICAgICAgR1NU X0RFQlVHX09CSkVDVChzZWxmLCAicmVjZWl2ZWQgbmV3IENETUluc3RhbmNlICVwIiwgcHJpdi0+ Y2RtUHJveHkuZ2V0KCkpOwogICAgICAgICBrbGFzcy0+Y2RtUHJveHlBdHRhY2hlZChzZWxmLCBw cml2LT5jZG1Qcm94eSk7Cg== 429712 2021-05-25 17:02:09 -0700 2021-05-25 18:02:22 -0700 Patch bug-226249-20210525170208.patch text/plain 6738 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTMxMTA0MzNjYTQ2MDAy NmRmN2E0MTdiZmVlMmM4NzI2NzRkN2JmMy4uMjEwNzhlMzdiNGQ2ZjBmNDI4OGEzMzE2MTU4YmZk Mzg4YzNhOTg4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA1LTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gU3RvcCB1 c2luZyBVbmNoZWNrZWRMb2NrIGluIFdlYktpdENvbW1vbkVuY3J5cHRpb25EZWNyeXB0b3JHU3Ry ZWFtZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NjI0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0 b3AgdXNpbmcgVW5jaGVja2VkTG9jayBpbiBXZWJLaXRDb21tb25FbmNyeXB0aW9uRGVjcnlwdG9y R1N0cmVhbWVyIGFzIGl0IGlzIGJlaW5nIHBoYXNlZCBvdXQKKyAgICAgICAgaW4gZmF2b3Igb2Yg V1RGOjpMb2NrLCB3aGljaCBzdXBwb3J0cyBDbGFuZyB0aHJlYWQgc2FmZXR5IGFuYWx5c2lzLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25F bmNyeXB0aW9uRGVjcnlwdG9yR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHRyYW5zZm9ybUluUGxh Y2UpOgorICAgICAgICAoaXNDRE1Qcm94eUF2YWlsYWJsZSk6CisgICAgICAgIChhdHRhY2hDRE1Q cm94eSk6CisgICAgICAgIChzaW5rRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKHdlYktpdE1lZGlh Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRJc0ZsdXNoaW5nKToKKyAgICAgICAgKHNldENvbnRleHQp OgorCiAyMDIxLTA1LTI1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgU3RvcCB1c2luZyBVbmNoZWNrZWRMb2NrIGluIE5vZGUncyBzX2V2ZW50VGFyZ2V0RGF0YU1h cExvY2sKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvZW1lL1dlYktpdENvbW1v bkVuY3J5cHRpb25EZWNyeXB0b3JHU3RyZWFtZXIuY3BwCmluZGV4IGViMDg4NTFjYzg2MjEyYjQ2 YmI4MjhjN2IzNzgzZGIzMTU2NGE3ZWQuLjU4YTNjMzEwY2IwNzJmNDE2YWM0MDhlMjQ4ZTY4Mzli ZmNhZjNiYzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9lbWUvV2ViS2l0Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJL aXRDb21tb25FbmNyeXB0aW9uRGVjcnlwdG9yR1N0cmVhbWVyLmNwcApAQCAtNTYsOCArNTYsOCBA QCBzdHJ1Y3QgX1dlYktpdE1lZGlhQ29tbW9uRW5jcnlwdGlvbkRlY3J5cHRQcml2YXRlIHsKICAg ICBSZWZQdHI8Q0RNUHJveHk+IGNkbVByb3h5OwogCiAgICAgLy8gUHJvdGVjdCB0aGUgYWNjZXNz IHRvIHRoZSBzdHJ1Y3R1cmUgbWVtYmVycy4KLSAgICBVbmNoZWNrZWRMb2NrIG11dGV4OwotICAg IFVuY2hlY2tlZENvbmRpdGlvbiBjb25kaXRpb247CisgICAgTG9jayBsb2NrOworICAgIENvbmRp dGlvbiBjb25kaXRpb247CiAKICAgICBib29sIGlzRmx1c2hpbmcgeyBmYWxzZSB9OwogICAgIHN0 ZDo6dW5pcXVlX3B0cjxDRE1Qcm94eURlY3J5cHRpb25DbGllbnRJbXBsZW1lbnRhdGlvbj4gY2Rt UHJveHlEZWNyeXB0aW9uQ2xpZW50SW1wbGVtZW50YXRpb247CkBAIC0xOTEsNyArMTkxLDcgQEAg c3RhdGljIEdzdEZsb3dSZXR1cm4gdHJhbnNmb3JtSW5QbGFjZShHc3RCYXNlVHJhbnNmb3JtKiBi YXNlLCBHc3RCdWZmZXIqIGJ1ZmZlcikKICAgICAgICAgcmV0dXJuIEdTVF9GTE9XX09LOwogICAg IH0KIAotICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5tdXRleCB9OworICAgIExvY2tlciBsb2Nr ZXIgeyBwcml2LT5sb2NrIH07CiAKICAgICBpZiAocHJpdi0+aXNGbHVzaGluZykgewogICAgICAg ICBHU1RfREVCVUdfT0JKRUNUKHNlbGYsICJEZWNyeXB0aW9uIGFib3J0ZWQgYmVjYXVzZSBvZiBm bHVzaCIpOwpAQCAtMjAxLDEwICsyMDEsMTAgQEAgc3RhdGljIEdzdEZsb3dSZXR1cm4gdHJhbnNm b3JtSW5QbGFjZShHc3RCYXNlVHJhbnNmb3JtKiBiYXNlLCBHc3RCdWZmZXIqIGJ1ZmZlcikKICAg ICAvLyBUaGUgQ0RNIGluc3RhbmNlIG5lZWRzIHRvIGJlIG5lZ290aWF0ZWQgYmVmb3JlIHdlIGNh biBiZWdpbiBkZWNyeXB0aW9uLgogICAgIGlmICghcHJpdi0+Y2RtUHJveHkpIHsKICAgICAgICAg R1NUX0RFQlVHX09CSkVDVChzZWxmLCAiQ0RNIG5vdCBhdmFpbGFibGUsIGdvaW5nIHRvIHdhaXQg Zm9yIGl0Iik7Ci0gICAgICAgIHByaXYtPmNvbmRpdGlvbi53YWl0Rm9yKHByaXYtPm11dGV4LCBN YXhTZWNvbmRzVG9XYWl0Rm9yQ0RNUHJveHksIFtwcml2XSB7CisgICAgICAgIHByaXYtPmNvbmRp dGlvbi53YWl0Rm9yKHByaXYtPmxvY2ssIE1heFNlY29uZHNUb1dhaXRGb3JDRE1Qcm94eSwgW3By aXZdIHsKICAgICAgICAgICAgIHJldHVybiBwcml2LT5pc0ZsdXNoaW5nIHx8IHByaXYtPmNkbVBy b3h5OwogICAgICAgICB9KTsKLSAgICAgICAgLy8gTm90ZSB0aGF0IHdhaXRGb3IoKSByZWxlYXNl cyB0aGUgbXV0ZXggbG9jayBpbnRlcm5hbGx5IHdoaWxlIGl0IHdhaXRzLCBzbyBpc0ZsdXNoaW5n IG1heSBoYXZlIGJlZW4gY2hhbmdlZC4KKyAgICAgICAgLy8gTm90ZSB0aGF0IHdhaXRGb3IoKSBy ZWxlYXNlcyB0aGUgbG9jayBsb2NrIGludGVybmFsbHkgd2hpbGUgaXQgd2FpdHMsIHNvIGlzRmx1 c2hpbmcgbWF5IGhhdmUgYmVlbiBjaGFuZ2VkLgogICAgICAgICBpZiAocHJpdi0+aXNGbHVzaGlu ZykgewogICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzZWxmLCAiRGVjcnlwdGlvbiBhYm9y dGVkIGJlY2F1c2Ugb2YgZmx1c2giKTsKICAgICAgICAgICAgIHJldHVybiBHU1RfRkxPV19GTFVT SElORzsKQEAgLTI4OCwxNSArMjg4LDE2IEBAIHN0YXRpYyBHc3RGbG93UmV0dXJuIHRyYW5zZm9y bUluUGxhY2UoR3N0QmFzZVRyYW5zZm9ybSogYmFzZSwgR3N0QnVmZmVyKiBidWZmZXIpCiAKICAg ICBHU1RfVFJBQ0VfT0JKRUNUKHNlbGYsICJkZWNyeXB0aW5nIik7CiAKKyAgICBib29sIGRpZERl Y3J5cHRpb25TdWNjZWVkOworCiAgICAgLy8gVGVtcG9yYXJpbHkgcmVsZWFzZSB0aGUgbG9jayB3 aGlsZSB3ZSBkb24ndCBuZWVkIHRvIGFjY2VzcyBwcml2LiBUaGUgbG93ZXIgbGV2ZWwgQVBJIGlz IHVzZWQKICAgICAvLyBpbiBvcmRlciB0byBhdm9pZCBjcmVhdGluZyBzZXZlcmFsIHNjb3BlcyB3 aXRoIGRpZmZlcmVudCBMb2NrZXIgaW5zdGFuY2VzIGluIGVhY2ggb25lLgotICAgIHByaXYtPm11 dGV4LnVubG9jaygpOwotCi0gICAgYm9vbCBkaWREZWNyeXB0aW9uU3VjY2VlZCA9IGtsYXNzLT5k ZWNyeXB0KHNlbGYsIGl2QnVmZmVyLCBrZXlJREJ1ZmZlciwgYnVmZmVyLCBzdWJTYW1wbGVDb3Vu dCwgc3ViU2FtcGxlc0J1ZmZlcik7CisgICAgeworICAgICAgICBEcm9wTG9ja0ZvclNjb3BlIG5v TG9ja1Njb3BlIHsgbG9ja2VyIH07CisgICAgICAgIGRpZERlY3J5cHRpb25TdWNjZWVkID0ga2xh c3MtPmRlY3J5cHQoc2VsZiwgaXZCdWZmZXIsIGtleUlEQnVmZmVyLCBidWZmZXIsIHN1YlNhbXBs ZUNvdW50LCBzdWJTYW1wbGVzQnVmZmVyKTsKKyAgICB9CiAKICAgICAvLyBBY2Nlc3NpbmcgcHJp diBtZW1iZXJzIGFnYWluLgotICAgIHByaXYtPm11dGV4LmxvY2soKTsKLQogICAgIGlmICghZGlk RGVjcnlwdGlvblN1Y2NlZWQpIHsKICAgICAgICAgaWYgKHByaXYtPmlzRmx1c2hpbmcpIHsKICAg ICAgICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qoc2VsZiwgIkRlY3J5cHRpb24gYWJvcnRlZCBiZWNh dXNlIG9mIGZsdXNoIik7CkBAIC0zMTIsNyArMzEzLDcgQEAgc3RhdGljIEdzdEZsb3dSZXR1cm4g dHJhbnNmb3JtSW5QbGFjZShHc3RCYXNlVHJhbnNmb3JtKiBiYXNlLCBHc3RCdWZmZXIqIGJ1ZmZl cikKIHN0YXRpYyBib29sIGlzQ0RNUHJveHlBdmFpbGFibGUoV2ViS2l0TWVkaWFDb21tb25FbmNy eXB0aW9uRGVjcnlwdCogc2VsZikKIHsKICAgICBXZWJLaXRNZWRpYUNvbW1vbkVuY3J5cHRpb25E ZWNyeXB0UHJpdmF0ZSogcHJpdiA9IFdFQktJVF9NRURJQV9DRU5DX0RFQ1JZUFRfR0VUX1BSSVZB VEUoc2VsZik7Ci0gICAgTG9ja2VyIGxvY2tlciB7IHByaXYtPm11dGV4IH07CisgICAgTG9ja2Vy IGxvY2tlciB7IHByaXYtPmxvY2sgfTsKICAgICByZXR1cm4gcHJpdi0+Y2RtUHJveHk7CiB9CiAK QEAgLTM0NSw3ICszNDYsNyBAQCBzdGF0aWMgdm9pZCBhdHRhY2hDRE1Qcm94eShXZWJLaXRNZWRp YUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0KiBzZWxmLCBDRE1Qcm94eSogcAogICAgIFdlYktpdE1l ZGlhQ29tbW9uRW5jcnlwdGlvbkRlY3J5cHRQcml2YXRlKiBwcml2ID0gV0VCS0lUX01FRElBX0NF TkNfREVDUllQVF9HRVRfUFJJVkFURShzZWxmKTsKICAgICBXZWJLaXRNZWRpYUNvbW1vbkVuY3J5 cHRpb25EZWNyeXB0Q2xhc3MqIGtsYXNzID0gV0VCS0lUX01FRElBX0NFTkNfREVDUllQVF9HRVRf Q0xBU1Moc2VsZik7CiAKLSAgICBMb2NrZXIgbG9ja2VyIHsgcHJpdi0+bXV0ZXggfTsKKyAgICBM b2NrZXIgbG9ja2VyIHsgcHJpdi0+bG9jayB9OwogICAgIEdTVF9FUlJPUl9PQkpFQ1Qoc2VsZiwg IkF0dGFjaGluZyBDRE1Qcm94eSAlcCIsIHByb3h5KTsKICAgICBwcml2LT5jZG1Qcm94eSA9IHBy b3h5OwogICAgIGtsYXNzLT5jZG1Qcm94eUF0dGFjaGVkKHNlbGYsIHByaXYtPmNkbVByb3h5KTsK QEAgLTM5Myw3ICszOTQsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gc2lua0V2ZW50SGFuZGxlcihHc3RC YXNlVHJhbnNmb3JtKiB0cmFucywgR3N0RXZlbnQqIGV2ZW50KQogICAgIGNhc2UgR1NUX0VWRU5U X0ZMVVNIX1NUQVJUOgogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNlbGYsICJGbHVzaC1zdGFy dCIpOwogICAgICAgICB7Ci0gICAgICAgICAgICBMb2NrZXIgbG9ja2VyIHsgcHJpdi0+bXV0ZXgg fTsKKyAgICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5sb2NrIH07CiAgICAgICAgICAg ICBib29sIGlzQ2RtUHJveHlBdHRhY2hlZCA9IHByaXYtPmNkbVByb3h5OwogICAgICAgICAgICAg cHJpdi0+aXNGbHVzaGluZyA9IHRydWU7CiAgICAgICAgICAgICBpZiAoaXNDZG1Qcm94eUF0dGFj aGVkKSB7CkBAIC00MDYsNyArNDA3LDcgQEAgc3RhdGljIGdib29sZWFuIHNpbmtFdmVudEhhbmRs ZXIoR3N0QmFzZVRyYW5zZm9ybSogdHJhbnMsIEdzdEV2ZW50KiBldmVudCkKICAgICBjYXNlIEdT VF9FVkVOVF9GTFVTSF9TVE9QOgogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNlbGYsICJGbHVz aC1zdG9wIik7CiAgICAgICAgIHsKLSAgICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5t dXRleCB9OworICAgICAgICAgICAgTG9ja2VyIGxvY2tlciB7IHByaXYtPmxvY2sgfTsKICAgICAg ICAgICAgIHByaXYtPmlzRmx1c2hpbmcgPSBmYWxzZTsKICAgICAgICAgfQogICAgICAgICBicmVh azsKQEAgLTQyMCw3ICs0MjEsNyBAQCBzdGF0aWMgZ2Jvb2xlYW4gc2lua0V2ZW50SGFuZGxlcihH c3RCYXNlVHJhbnNmb3JtKiB0cmFucywgR3N0RXZlbnQqIGV2ZW50KQogYm9vbCB3ZWJLaXRNZWRp YUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0SXNGbHVzaGluZyhXZWJLaXRNZWRpYUNvbW1vbkVuY3J5 cHRpb25EZWNyeXB0KiBzZWxmKQogewogICAgIFdlYktpdE1lZGlhQ29tbW9uRW5jcnlwdGlvbkRl Y3J5cHRQcml2YXRlKiBwcml2ID0gV0VCS0lUX01FRElBX0NFTkNfREVDUllQVF9HRVRfUFJJVkFU RShzZWxmKTsKLSAgICBMb2NrZXIgbG9ja2VyIHsgcHJpdi0+bXV0ZXggfTsKKyAgICBMb2NrZXIg bG9ja2VyIHsgcHJpdi0+bG9jayB9OwogICAgIHJldHVybiBwcml2LT5pc0ZsdXNoaW5nOwogfQog CkBAIC00NTksNyArNDYwLDcgQEAgc3RhdGljIHZvaWQgc2V0Q29udGV4dChHc3RFbGVtZW50KiBl bGVtZW50LCBHc3RDb250ZXh0KiBjb250ZXh0KQogCiAgICAgaWYgKGdzdF9jb250ZXh0X2hhc19j b250ZXh0X3R5cGUoY29udGV4dCwgImRybS1jZG0tcHJveHkiKSkgewogICAgICAgICBjb25zdCBH VmFsdWUqIHZhbHVlID0gZ3N0X3N0cnVjdHVyZV9nZXRfdmFsdWUoZ3N0X2NvbnRleHRfZ2V0X3N0 cnVjdHVyZShjb250ZXh0KSwgImNkbS1wcm94eSIpOwotICAgICAgICBMb2NrZXIgbG9ja2VyIHsg cHJpdi0+bXV0ZXggfTsKKyAgICAgICAgTG9ja2VyIGxvY2tlciB7IHByaXYtPmxvY2sgfTsKICAg ICAgICAgcHJpdi0+Y2RtUHJveHkgPSB2YWx1ZSA/IHJlaW50ZXJwcmV0X2Nhc3Q8Q0RNUHJveHkq PihnX3ZhbHVlX2dldF9wb2ludGVyKHZhbHVlKSkgOiBudWxscHRyOwogICAgICAgICBHU1RfREVC VUdfT0JKRUNUKHNlbGYsICJyZWNlaXZlZCBuZXcgQ0RNSW5zdGFuY2UgJXAiLCBwcml2LT5jZG1Q cm94eS5nZXQoKSk7CiAgICAgICAgIGtsYXNzLT5jZG1Qcm94eUF0dGFjaGVkKHNlbGYsIHByaXYt PmNkbVByb3h5KTsK 429717 2021-05-25 17:38:34 -0700 2021-05-25 21:59:52 -0700 Patch bug-226249-20210525173833.patch text/plain 6714 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc4MDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDQyYWY2YTAyOTgwZjcy NzQyYmU2OTcxOTMyZGFlNTliOTAzOGRkNy4uZWJiMzI1OGVhMzEzNDYxMTc4YzM2OGI4YTVjZTMy NmU0YmZmYWQ5MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIxLTA1LTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gU3RvcCB1 c2luZyBVbmNoZWNrZWRMb2NrIGluIFdlYktpdENvbW1vbkVuY3J5cHRpb25EZWNyeXB0b3JHU3Ry ZWFtZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIy NjI0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN0 b3AgdXNpbmcgVW5jaGVja2VkTG9jayBpbiBXZWJLaXRDb21tb25FbmNyeXB0aW9uRGVjcnlwdG9y R1N0cmVhbWVyIGFzIGl0IGlzIGJlaW5nIHBoYXNlZCBvdXQKKyAgICAgICAgaW4gZmF2b3Igb2Yg V1RGOjpMb2NrLCB3aGljaCBzdXBwb3J0cyBDbGFuZyB0aHJlYWQgc2FmZXR5IGFuYWx5c2lzLgor CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25F bmNyeXB0aW9uRGVjcnlwdG9yR1N0cmVhbWVyLmNwcDoKKyAgICAgICAgKHRyYW5zZm9ybUluUGxh Y2UpOgorICAgICAgICAoaXNDRE1Qcm94eUF2YWlsYWJsZSk6CisgICAgICAgIChhdHRhY2hDRE1Q cm94eSk6CisgICAgICAgIChzaW5rRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKHdlYktpdE1lZGlh Q29tbW9uRW5jcnlwdGlvbkRlY3J5cHRJc0ZsdXNoaW5nKToKKyAgICAgICAgKHNldENvbnRleHQp OgorCiAyMDIxLTA1LTI1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAg ICAgQ1NQIGRvZXMgbm90IGFwcGx5IHRvIEF1ZGlvV29ya2xldHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2ViS2l0Q29tbW9uRW5j cnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvZW1lL1dlYktpdENvbW1vbkVuY3J5cHRpb25EZWNyeXB0b3JHU3Ry ZWFtZXIuY3BwCmluZGV4IGViMDg4NTFjYzg2MjEyYjQ2YmI4MjhjN2IzNzgzZGIzMTU2NGE3ZWQu LjU4YTNjMzEwY2IwNzJmNDE2YWM0MDhlMjQ4ZTY4MzliZmNhZjNiYzAgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9lbWUvV2ViS2l0Q29tbW9u RW5jcnlwdGlvbkRlY3J5cHRvckdTdHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL2VtZS9XZWJLaXRDb21tb25FbmNyeXB0aW9uRGVjcnlw dG9yR1N0cmVhbWVyLmNwcApAQCAtNTYsOCArNTYsOCBAQCBzdHJ1Y3QgX1dlYktpdE1lZGlhQ29t bW9uRW5jcnlwdGlvbkRlY3J5cHRQcml2YXRlIHsKICAgICBSZWZQdHI8Q0RNUHJveHk+IGNkbVBy b3h5OwogCiAgICAgLy8gUHJvdGVjdCB0aGUgYWNjZXNzIHRvIHRoZSBzdHJ1Y3R1cmUgbWVtYmVy cy4KLSAgICBVbmNoZWNrZWRMb2NrIG11dGV4OwotICAgIFVuY2hlY2tlZENvbmRpdGlvbiBjb25k aXRpb247CisgICAgTG9jayBsb2NrOworICAgIENvbmRpdGlvbiBjb25kaXRpb247CiAKICAgICBi b29sIGlzRmx1c2hpbmcgeyBmYWxzZSB9OwogICAgIHN0ZDo6dW5pcXVlX3B0cjxDRE1Qcm94eURl Y3J5cHRpb25DbGllbnRJbXBsZW1lbnRhdGlvbj4gY2RtUHJveHlEZWNyeXB0aW9uQ2xpZW50SW1w bGVtZW50YXRpb247CkBAIC0xOTEsNyArMTkxLDcgQEAgc3RhdGljIEdzdEZsb3dSZXR1cm4gdHJh bnNmb3JtSW5QbGFjZShHc3RCYXNlVHJhbnNmb3JtKiBiYXNlLCBHc3RCdWZmZXIqIGJ1ZmZlcikK ICAgICAgICAgcmV0dXJuIEdTVF9GTE9XX09LOwogICAgIH0KIAotICAgIExvY2tlciBsb2NrZXIg eyBwcml2LT5tdXRleCB9OworICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5sb2NrIH07CiAKICAg ICBpZiAocHJpdi0+aXNGbHVzaGluZykgewogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNlbGYs ICJEZWNyeXB0aW9uIGFib3J0ZWQgYmVjYXVzZSBvZiBmbHVzaCIpOwpAQCAtMjAxLDEwICsyMDEs MTAgQEAgc3RhdGljIEdzdEZsb3dSZXR1cm4gdHJhbnNmb3JtSW5QbGFjZShHc3RCYXNlVHJhbnNm b3JtKiBiYXNlLCBHc3RCdWZmZXIqIGJ1ZmZlcikKICAgICAvLyBUaGUgQ0RNIGluc3RhbmNlIG5l ZWRzIHRvIGJlIG5lZ290aWF0ZWQgYmVmb3JlIHdlIGNhbiBiZWdpbiBkZWNyeXB0aW9uLgogICAg IGlmICghcHJpdi0+Y2RtUHJveHkpIHsKICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzZWxmLCAi Q0RNIG5vdCBhdmFpbGFibGUsIGdvaW5nIHRvIHdhaXQgZm9yIGl0Iik7Ci0gICAgICAgIHByaXYt PmNvbmRpdGlvbi53YWl0Rm9yKHByaXYtPm11dGV4LCBNYXhTZWNvbmRzVG9XYWl0Rm9yQ0RNUHJv eHksIFtwcml2XSB7CisgICAgICAgIHByaXYtPmNvbmRpdGlvbi53YWl0Rm9yKHByaXYtPmxvY2ss IE1heFNlY29uZHNUb1dhaXRGb3JDRE1Qcm94eSwgW3ByaXZdIHsKICAgICAgICAgICAgIHJldHVy biBwcml2LT5pc0ZsdXNoaW5nIHx8IHByaXYtPmNkbVByb3h5OwogICAgICAgICB9KTsKLSAgICAg ICAgLy8gTm90ZSB0aGF0IHdhaXRGb3IoKSByZWxlYXNlcyB0aGUgbXV0ZXggbG9jayBpbnRlcm5h bGx5IHdoaWxlIGl0IHdhaXRzLCBzbyBpc0ZsdXNoaW5nIG1heSBoYXZlIGJlZW4gY2hhbmdlZC4K KyAgICAgICAgLy8gTm90ZSB0aGF0IHdhaXRGb3IoKSByZWxlYXNlcyB0aGUgbG9jayBsb2NrIGlu dGVybmFsbHkgd2hpbGUgaXQgd2FpdHMsIHNvIGlzRmx1c2hpbmcgbWF5IGhhdmUgYmVlbiBjaGFu Z2VkLgogICAgICAgICBpZiAocHJpdi0+aXNGbHVzaGluZykgewogICAgICAgICAgICAgR1NUX0RF QlVHX09CSkVDVChzZWxmLCAiRGVjcnlwdGlvbiBhYm9ydGVkIGJlY2F1c2Ugb2YgZmx1c2giKTsK ICAgICAgICAgICAgIHJldHVybiBHU1RfRkxPV19GTFVTSElORzsKQEAgLTI4OCwxNSArMjg4LDE2 IEBAIHN0YXRpYyBHc3RGbG93UmV0dXJuIHRyYW5zZm9ybUluUGxhY2UoR3N0QmFzZVRyYW5zZm9y bSogYmFzZSwgR3N0QnVmZmVyKiBidWZmZXIpCiAKICAgICBHU1RfVFJBQ0VfT0JKRUNUKHNlbGYs ICJkZWNyeXB0aW5nIik7CiAKKyAgICBib29sIGRpZERlY3J5cHRpb25TdWNjZWVkOworCiAgICAg Ly8gVGVtcG9yYXJpbHkgcmVsZWFzZSB0aGUgbG9jayB3aGlsZSB3ZSBkb24ndCBuZWVkIHRvIGFj Y2VzcyBwcml2LiBUaGUgbG93ZXIgbGV2ZWwgQVBJIGlzIHVzZWQKICAgICAvLyBpbiBvcmRlciB0 byBhdm9pZCBjcmVhdGluZyBzZXZlcmFsIHNjb3BlcyB3aXRoIGRpZmZlcmVudCBMb2NrZXIgaW5z dGFuY2VzIGluIGVhY2ggb25lLgotICAgIHByaXYtPm11dGV4LnVubG9jaygpOwotCi0gICAgYm9v bCBkaWREZWNyeXB0aW9uU3VjY2VlZCA9IGtsYXNzLT5kZWNyeXB0KHNlbGYsIGl2QnVmZmVyLCBr ZXlJREJ1ZmZlciwgYnVmZmVyLCBzdWJTYW1wbGVDb3VudCwgc3ViU2FtcGxlc0J1ZmZlcik7Cisg ICAgeworICAgICAgICBEcm9wTG9ja0ZvclNjb3BlIG5vTG9ja1Njb3BlIHsgbG9ja2VyIH07Cisg ICAgICAgIGRpZERlY3J5cHRpb25TdWNjZWVkID0ga2xhc3MtPmRlY3J5cHQoc2VsZiwgaXZCdWZm ZXIsIGtleUlEQnVmZmVyLCBidWZmZXIsIHN1YlNhbXBsZUNvdW50LCBzdWJTYW1wbGVzQnVmZmVy KTsKKyAgICB9CiAKICAgICAvLyBBY2Nlc3NpbmcgcHJpdiBtZW1iZXJzIGFnYWluLgotICAgIHBy aXYtPm11dGV4LmxvY2soKTsKLQogICAgIGlmICghZGlkRGVjcnlwdGlvblN1Y2NlZWQpIHsKICAg ICAgICAgaWYgKHByaXYtPmlzRmx1c2hpbmcpIHsKICAgICAgICAgICAgIEdTVF9ERUJVR19PQkpF Q1Qoc2VsZiwgIkRlY3J5cHRpb24gYWJvcnRlZCBiZWNhdXNlIG9mIGZsdXNoIik7CkBAIC0zMTIs NyArMzEzLDcgQEAgc3RhdGljIEdzdEZsb3dSZXR1cm4gdHJhbnNmb3JtSW5QbGFjZShHc3RCYXNl VHJhbnNmb3JtKiBiYXNlLCBHc3RCdWZmZXIqIGJ1ZmZlcikKIHN0YXRpYyBib29sIGlzQ0RNUHJv eHlBdmFpbGFibGUoV2ViS2l0TWVkaWFDb21tb25FbmNyeXB0aW9uRGVjcnlwdCogc2VsZikKIHsK ICAgICBXZWJLaXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0UHJpdmF0ZSogcHJpdiA9IFdF QktJVF9NRURJQV9DRU5DX0RFQ1JZUFRfR0VUX1BSSVZBVEUoc2VsZik7Ci0gICAgTG9ja2VyIGxv Y2tlciB7IHByaXYtPm11dGV4IH07CisgICAgTG9ja2VyIGxvY2tlciB7IHByaXYtPmxvY2sgfTsK ICAgICByZXR1cm4gcHJpdi0+Y2RtUHJveHk7CiB9CiAKQEAgLTM0NSw3ICszNDYsNyBAQCBzdGF0 aWMgdm9pZCBhdHRhY2hDRE1Qcm94eShXZWJLaXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0 KiBzZWxmLCBDRE1Qcm94eSogcAogICAgIFdlYktpdE1lZGlhQ29tbW9uRW5jcnlwdGlvbkRlY3J5 cHRQcml2YXRlKiBwcml2ID0gV0VCS0lUX01FRElBX0NFTkNfREVDUllQVF9HRVRfUFJJVkFURShz ZWxmKTsKICAgICBXZWJLaXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0Q2xhc3MqIGtsYXNz ID0gV0VCS0lUX01FRElBX0NFTkNfREVDUllQVF9HRVRfQ0xBU1Moc2VsZik7CiAKLSAgICBMb2Nr ZXIgbG9ja2VyIHsgcHJpdi0+bXV0ZXggfTsKKyAgICBMb2NrZXIgbG9ja2VyIHsgcHJpdi0+bG9j ayB9OwogICAgIEdTVF9FUlJPUl9PQkpFQ1Qoc2VsZiwgIkF0dGFjaGluZyBDRE1Qcm94eSAlcCIs IHByb3h5KTsKICAgICBwcml2LT5jZG1Qcm94eSA9IHByb3h5OwogICAgIGtsYXNzLT5jZG1Qcm94 eUF0dGFjaGVkKHNlbGYsIHByaXYtPmNkbVByb3h5KTsKQEAgLTM5Myw3ICszOTQsNyBAQCBzdGF0 aWMgZ2Jvb2xlYW4gc2lua0V2ZW50SGFuZGxlcihHc3RCYXNlVHJhbnNmb3JtKiB0cmFucywgR3N0 RXZlbnQqIGV2ZW50KQogICAgIGNhc2UgR1NUX0VWRU5UX0ZMVVNIX1NUQVJUOgogICAgICAgICBH U1RfREVCVUdfT0JKRUNUKHNlbGYsICJGbHVzaC1zdGFydCIpOwogICAgICAgICB7Ci0gICAgICAg ICAgICBMb2NrZXIgbG9ja2VyIHsgcHJpdi0+bXV0ZXggfTsKKyAgICAgICAgICAgIExvY2tlciBs b2NrZXIgeyBwcml2LT5sb2NrIH07CiAgICAgICAgICAgICBib29sIGlzQ2RtUHJveHlBdHRhY2hl ZCA9IHByaXYtPmNkbVByb3h5OwogICAgICAgICAgICAgcHJpdi0+aXNGbHVzaGluZyA9IHRydWU7 CiAgICAgICAgICAgICBpZiAoaXNDZG1Qcm94eUF0dGFjaGVkKSB7CkBAIC00MDYsNyArNDA3LDcg QEAgc3RhdGljIGdib29sZWFuIHNpbmtFdmVudEhhbmRsZXIoR3N0QmFzZVRyYW5zZm9ybSogdHJh bnMsIEdzdEV2ZW50KiBldmVudCkKICAgICBjYXNlIEdTVF9FVkVOVF9GTFVTSF9TVE9QOgogICAg ICAgICBHU1RfREVCVUdfT0JKRUNUKHNlbGYsICJGbHVzaC1zdG9wIik7CiAgICAgICAgIHsKLSAg ICAgICAgICAgIExvY2tlciBsb2NrZXIgeyBwcml2LT5tdXRleCB9OworICAgICAgICAgICAgTG9j a2VyIGxvY2tlciB7IHByaXYtPmxvY2sgfTsKICAgICAgICAgICAgIHByaXYtPmlzRmx1c2hpbmcg PSBmYWxzZTsKICAgICAgICAgfQogICAgICAgICBicmVhazsKQEAgLTQyMCw3ICs0MjEsNyBAQCBz dGF0aWMgZ2Jvb2xlYW4gc2lua0V2ZW50SGFuZGxlcihHc3RCYXNlVHJhbnNmb3JtKiB0cmFucywg R3N0RXZlbnQqIGV2ZW50KQogYm9vbCB3ZWJLaXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0 SXNGbHVzaGluZyhXZWJLaXRNZWRpYUNvbW1vbkVuY3J5cHRpb25EZWNyeXB0KiBzZWxmKQogewog ICAgIFdlYktpdE1lZGlhQ29tbW9uRW5jcnlwdGlvbkRlY3J5cHRQcml2YXRlKiBwcml2ID0gV0VC S0lUX01FRElBX0NFTkNfREVDUllQVF9HRVRfUFJJVkFURShzZWxmKTsKLSAgICBMb2NrZXIgbG9j a2VyIHsgcHJpdi0+bXV0ZXggfTsKKyAgICBMb2NrZXIgbG9ja2VyIHsgcHJpdi0+bG9jayB9Owog ICAgIHJldHVybiBwcml2LT5pc0ZsdXNoaW5nOwogfQogCkBAIC00NTksNyArNDYwLDcgQEAgc3Rh dGljIHZvaWQgc2V0Q29udGV4dChHc3RFbGVtZW50KiBlbGVtZW50LCBHc3RDb250ZXh0KiBjb250 ZXh0KQogCiAgICAgaWYgKGdzdF9jb250ZXh0X2hhc19jb250ZXh0X3R5cGUoY29udGV4dCwgImRy bS1jZG0tcHJveHkiKSkgewogICAgICAgICBjb25zdCBHVmFsdWUqIHZhbHVlID0gZ3N0X3N0cnVj dHVyZV9nZXRfdmFsdWUoZ3N0X2NvbnRleHRfZ2V0X3N0cnVjdHVyZShjb250ZXh0KSwgImNkbS1w cm94eSIpOwotICAgICAgICBMb2NrZXIgbG9ja2VyIHsgcHJpdi0+bXV0ZXggfTsKKyAgICAgICAg TG9ja2VyIGxvY2tlciB7IHByaXYtPmxvY2sgfTsKICAgICAgICAgcHJpdi0+Y2RtUHJveHkgPSB2 YWx1ZSA/IHJlaW50ZXJwcmV0X2Nhc3Q8Q0RNUHJveHkqPihnX3ZhbHVlX2dldF9wb2ludGVyKHZh bHVlKSkgOiBudWxscHRyOwogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNlbGYsICJyZWNlaXZl ZCBuZXcgQ0RNSW5zdGFuY2UgJXAiLCBwcml2LT5jZG1Qcm94eS5nZXQoKSk7CiAgICAgICAgIGts YXNzLT5jZG1Qcm94eUF0dGFjaGVkKHNlbGYsIHByaXYtPmNkbVByb3h5KTsK