207330 2020-02-06 06:25:44 -0800 Fix code origin when lowering offlineasm instructions on MIPS/ARM64E 2020-04-18 09:25:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 210639 1 angelos angelos clopez ddkilzer ews-watchlist guijemont keith_miller mark.lam msaboff pmatos saam ticaiolima tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1615599 0 angelos 2020-02-06 06:25:44 -0800 Fix code origin when lowering offlineasm instructions on MIPS 1615600 1 389946 angelos 2020-02-06 06:31:10 -0800 Created attachment 389946 Patch 1615601 2 389947 angelos 2020-02-06 06:36:13 -0800 Created attachment 389947 Patch 1615603 3 389948 angelos 2020-02-06 06:39:37 -0800 Created attachment 389948 Patch 1633314 4 394368 angelos 2020-03-24 08:33:23 -0700 Created attachment 394368 Patch 1633315 5 angelos 2020-03-24 08:34:12 -0700 Rebased and re-tested, no functional changes. 1639558 6 395933 angelos 2020-04-09 03:44:57 -0700 Created attachment 395933 Patch 1642072 7 395933 mark.lam 2020-04-15 17:47:07 -0700 Comment on attachment 395933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395933&action=review The patch login generally looks good but the names don't describe what is actually being done. I suggested replacement names. r- for now because I don't think this patch is ready for landing. > Source/JavaScriptCore/offlineasm/arm64e.rb:57 > + newList << Instruction.duplicate_with_operands(operands) 1. Let's use camel case for the function name because we've been using camel case everywhere else for functions that we define. 2. I suggest calling this cloneWithNewOperands() instead. I think this is a better name because it tells us that we're effectively cloning the instruction, except that we're giving it new operands. "duplicate" implies that we're keeping the original. We're not. We'll be replacing it: returning wasHandled true tells the client that it doesn't need to process this instruction and can skip it, where "processing" this instruction may mean just adding it to the newList as is. > Source/JavaScriptCore/offlineasm/ast.rb:921 > + def duplicate_with_operands(operands) Let's call this cloneWithNewOperands(), and let's rename the argument to newOperands. > Source/JavaScriptCore/offlineasm/mips.rb:560 > + def mipsAsRegister(preList, postList, operandIndex, needRestore) How about calling this mipsCloneWithOperandLowered()? > Source/JavaScriptCore/offlineasm/risc.rb:431 > +def riscOperandAsRegister(insn, preList, postList, operandIndex, suffix, needStore) The old riscAsRegister() name wasn't a very good name to begin with. The new one isn't better. Let's call it riscLowerOperandToRegister() instead. > Source/JavaScriptCore/offlineasm/risc.rb:443 > +def riscOperandsAsRegisters(insn, preList, postList, suffix) Let's call this riscLowerOperandsToRegisters(). > Source/JavaScriptCore/offlineasm/risc.rb:455 > + def riscAsRegister(preList, postList, operandIndex, suffix, needStore) Let's call this riscCloneWithOperandLowered() instead. > Source/JavaScriptCore/offlineasm/risc.rb:461 > + def riscAsRegisters(preList, postList, suffix) Let's call this riscCloneWithOperandsLowered() instead. > Source/JavaScriptCore/offlineasm/risc.rb:483 > + newList << node.riscAsRegisters(newList, postInstructions, "i") riscAsRegisters() is a bad name here. This operation is actually doing 2 things: (1) cloning the instruction, and (2) lowering the operands to registers based on the suffix. How about something like riscCloneWithOperandsLowered()? > Source/JavaScriptCore/offlineasm/risc.rb:498 > + newList << node.riscAsRegister(newList, postInstructions, 0, "p", false) riscAsRegister() is also a bad name here. The operation is actually (1) cloning the instruction with (2) the operand lowered to a register. How about calling this riscCloneWithOperandLowered()? 1642628 8 396753 angelos 2020-04-17 03:32:50 -0700 Created attachment 396753 Patch 1642659 9 angelos 2020-04-17 07:11:17 -0700 Lastest patch implements the suggested naming changes. Thanks! 1642663 10 396753 mark.lam 2020-04-17 07:32:35 -0700 Comment on attachment 396753 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=396753&action=review r=me with fixes. > Source/JavaScriptCore/offlineasm/arm64e.rb:48 > + tag = riscLowerOperandToRegister(node, newList, postInstructions, > + 1, "p", false) Please fix alignment or preferably, put on 1 line. > Source/JavaScriptCore/offlineasm/risc.rb:449 > + newOperands << riscLowerOperandToRegister(insn, preList, postList, > + index, suffix, > + index == insn.operands.size - 1) This alignment is off. Please fix the alignment, or preferably, just put this on 1 line. > Source/JavaScriptCore/offlineasm/risc.rb:458 > + operand = riscLowerOperandToRegister(self, preList, postList, > + operandIndex, suffix, > + needStore) This alignment is off. Please fix the alignment, or preferably, just put this on 1 line. 1642688 11 mark.lam 2020-04-17 08:35:43 -0700 Just a reminder that https://bugs.webkit.org/show_bug.cgi?id=210639 logically conflicts with this patch. The changes may merge cleanly, but it will be broken unless fixed. This patch will have to be updated because there's a new use of riscAsRegisters() added in 210639. 1642973 12 396846 angelos 2020-04-18 07:01:25 -0700 Created attachment 396846 Patch 1642974 13 angelos 2020-04-18 07:03:55 -0700 (In reply to Mark Lam from comment #11) > Just a reminder that https://bugs.webkit.org/show_bug.cgi?id=210639 > logically conflicts with this patch. The changes may merge cleanly, but it > will be broken unless fixed. This patch will have to be updated because > there's a new use of riscAsRegisters() added in 210639. Thanks. Applied the whitespace changes and merged it with 210639. 1642977 14 396846 mark.lam 2020-04-18 07:38:17 -0700 Comment on attachment 396846 Patch r=me 1642986 15 ews-feeder 2020-04-18 07:59:15 -0700 Committed r260310: <https://trac.webkit.org/changeset/260310> All reviewed patches have been landed. Closing bug and clearing flags on attachment 396846. 1642987 16 webkit-bug-importer 2020-04-18 08:00:15 -0700 <rdar://problem/61971467> 1643002 17 ddkilzer 2020-04-18 09:10:21 -0700 This commit appears to have broken some of Apple's internal bots building for iOS 13.4: /bin/sh -c JavaScriptCore.roots/BuildRecords/JavaScriptCore_install/TempContent/Objects/JavaScriptCore.build/Offline\\\ Assembler.build/Script-65788AA018B409EB00C189FF.sh JavaScriptCore.roots/Sources/JavaScriptCore/offlineasm/arm64e.rb:56:in `lowerMisplacedAddressesARM64E': undefined method `cloneWithNewOperands' for Instruction:Class (NoMethodError) from JavaScriptCore.roots/Sources/JavaScriptCore/offlineasm/risc.rb:470:in `block in riscLowerMisplacedAddresses' from JavaScriptCore.roots/Sources/JavaScriptCore/offlineasm/risc.rb:466:in `each' from JavaScriptCore.roots/Sources/JavaScriptCore/offlineasm/risc.rb:466:in `riscLowerMisplacedAddresses' from JavaScriptCore.roots/Sources/JavaScriptCore/offlineasm/arm64e.rb:31:in `getModifiedListARM64E' from JavaScriptCore.roots/Sources/JavaScriptCore/offlineasm/backends.rb:189:in `lower' from JavaScriptCore/offlineasm/asm.rb:406:in `block (5 levels) in <main>' from JavaScriptCore/offlineasm/asm.rb:107:in `inAsm' from JavaScriptCore/offlineasm/asm.rb:405:in `block (4 levels) in <main>' from JavaScriptCore.roots/Sources/JavaScriptCore/offlineasm/settings.rb:210:in `emitCodeInConfiguration' from JavaScriptCore/offlineasm/asm.rb:403:in `block (3 levels) in <main>' from JavaScriptCore.roots/Sources/JavaScriptCore/offlineasm/settings.rb:107:in `forSettings' from JavaScriptCore/offlineasm/asm.rb:390:in `block (2 levels) in <main>' from JavaScriptCore/offlineasm/asm.rb:386:in `each' from JavaScriptCore/offlineasm/asm.rb:386:in `block in <main>' from JavaScriptCore/offlineasm/asm.rb:376:in `open' from JavaScriptCore/offlineasm/asm.rb:376:in `<main>' Command PhaseScriptExecution failed with a nonzero exit code (Apologies for the truncated paths; was necessary to sanitize the output.) 1643007 18 ysuzuki 2020-04-18 09:25:17 -0700 Committed r260314: <https://trac.webkit.org/changeset/260314> 389946 2020-02-06 06:31:10 -0800 2020-02-06 06:36:08 -0800 Patch bug-207330-20200206143109.patch text/plain 12879 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1Nzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvb2ZmbGluZWFzbS9hcm02NGUucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGlu ZWFzbS9hcm02NGUucmIKaW5kZXggMzU5YmVjNzdjNTJhNDhiZTMyNjhkZjg3ZmUzZWI2YjY3ZGNi ODRkZC4uZmI3ZmMyMmZlMzZkMTFlYWFjNWYzMDY5YjBiZTE2OTFlNjUyNWIzZCAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXJtNjRlLnJiCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0ZS5yYgpAQCAtNDQsMTMgKzQ0LDE3IEBA IGNsYXNzIEluc3RydWN0aW9uCiAgICAgICAgICAgICB3aGVuICJqbXAiLCAiY2FsbCIKICAgICAg ICAgICAgICAgICBpZiBub2RlLm9wZXJhbmRzLnNpemUgPiAxCiAgICAgICAgICAgICAgICAgICAg IGlmIG5vZGUub3BlcmFuZHNbMV0uaXNfYT8gUmVnaXN0ZXJJRAotICAgICAgICAgICAgICAgICAg ICAgICAgdGFnID0gcmlzY0FzUmVnaXN0ZXIobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9k ZS5vcGVyYW5kc1sxXSwgInAiLCBmYWxzZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRhZyA9 IHJpc2NPcGVyYW5kQXNSZWdpc3Rlcihub2RlLCBuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDEsICJw IiwgZmFsc2UpCiAgICAgICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAgICAg ICAgIHRhZyA9IFRtcC5uZXcoY29kZU9yaWdpbiwgOmdwcikKICAgICAgICAgICAgICAgICAgICAg ICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGNvZGVPcmlnaW4sICJtb3ZlIiwgW25vZGUu b3BlcmFuZHNbMV0sIHRhZ10sIGFubm90YXRpb24pCiAgICAgICAgICAgICAgICAgICAgIGVuZAot ICAgICAgICAgICAgICAgICAgICBvcGVyYW5kcyA9IFtyaXNjQXNSZWdpc3RlcihuZXdMaXN0LCBw b3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzWzBdLCAicCIsIGZhbHNlKSwgdGFnXQotICAg ICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhjb2RlT3JpZ2luLCBu b2RlLm9wY29kZSwgb3BlcmFuZHMsIGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgICAgIG9w ZXJhbmRzID0gWworICAgICAgICAgICAgICAgICAgICAgICAgcmlzY09wZXJhbmRBc1JlZ2lzdGVy KG5vZGUsIG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIDAsICJwIiwgZmFsc2UpLAorICAgICAg ICAgICAgICAgICAgICAgICAgdGFnCisgICAgICAgICAgICAgICAgICAgIF0KKyAgICAgICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5kdXBsaWNhdGVfd2l0aF9vcGVyYW5kcyhv cGVyYW5kcykKICAgICAgICAgICAgICAgICAgICAgd2FzSGFuZGxlZCA9IHRydWUKICAgICAgICAg ICAgICAgICBlbmQKICAgICAgICAgICAgIHdoZW4gInVudGFnQXJyYXlQdHIiCkBAIC02NCw3ICs2 OCw3IEBAIGNsYXNzIEluc3RydWN0aW9uCiAgICAgICAgICAgICAgICAgICAgICAgICBvcGVyYW5k CiAgICAgICAgICAgICAgICAgICAgIGVuZAogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg ICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhjb2RlT3JpZ2luLCBub2RlLm9wY29kZSwg bmV3T3BlcmFuZHMsIGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0 cnVjdGlvbi5kdXBsaWNhdGVfd2l0aF9vcGVyYW5kcyhuZXdPcGVyYW5kcykKICAgICAgICAgICAg ICAgICB3YXNIYW5kbGVkID0gdHJ1ZQogICAgICAgICAgICAgZW5kCiAgICAgICAgICAgICBuZXdM aXN0ICs9IHBvc3RJbnN0cnVjdGlvbnMgaWYgd2FzSGFuZGxlZApkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXN0LnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3Jl L29mZmxpbmVhc20vYXN0LnJiCmluZGV4IDJlZGNhNzIzNTEzMjU4M2VmNTBkMGMyMTdiYWJiZDY1 MzY5Y2JhMTguLmVjZTYzZGFkMDk4ZTEwMjM5YWU5ODAwNGVkZGE3YzdjMjVhMTE1MjggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYgorKysgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIKQEAgLTkxNyw3ICs5MTcsMTEgQEAg Y2xhc3MgSW5zdHJ1Y3Rpb24gPCBOb2RlCiAgICAgICAgIEBvcGVyYW5kcyA9IG9wZXJhbmRzCiAg ICAgICAgIEBhbm5vdGF0aW9uID0gYW5ub3RhdGlvbgogICAgIGVuZAotICAgIAorCisgICAgZGVm IGR1cGxpY2F0ZV93aXRoX29wZXJhbmRzKG9wZXJhbmRzKQorICAgICAgICBJbnN0cnVjdGlvbi5u ZXcoc2VsZi5jb2RlT3JpZ2luLCBzZWxmLm9wY29kZSwgb3BlcmFuZHMsIHNlbGYuYW5ub3RhdGlv bikKKyAgICBlbmQKKwogICAgIGRlZiBjaGlsZHJlbgogICAgICAgICBvcGVyYW5kcwogICAgIGVu ZApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vbWlwcy5yYiBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL21pcHMucmIKaW5kZXggODkyMDUwODM1 M2VlODE3MDM1YWM0OTJkOGQ4MWI4Nzc5NmEzYTQ2Yy4uYjU1MmZhMzk1MmE4NDg2MDQ2ZTFiODc1 YWVmNTBjZmQ1NTk3YjUxMCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxp bmVhc20vbWlwcy5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9taXBz LnJiCkBAIC01NTQsMjIgKzU1NCwyNyBAQCBjbGFzcyBMb2NhbExhYmVsUmVmZXJlbmNlCiAgICAg ZW5kCiBlbmQKIAotZGVmIG1pcHNBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RMaXN0LCBvcGVyYW5k LCBuZWVkUmVzdG9yZSkKLSAgICB0bXAgPSBNSVBTX0NBTExfUkVHCi0gICAgaWYgb3BlcmFuZC5h ZGRyZXNzPwotICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhvcGVyYW5kLmNvZGVP cmlnaW4sICJsb2FkcCIsIFtvcGVyYW5kLCBNSVBTX0NBTExfUkVHXSkKLSAgICBlbHNpZiBvcGVy YW5kLmlzX2E/IExhYmVsUmVmZXJlbmNlCi0gICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24u bmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgImxhIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUddKQot ICAgIGVsc2lmIG9wZXJhbmQucmVnaXN0ZXI/IGFuZCBvcGVyYW5kICE9IE1JUFNfQ0FMTF9SRUcK LSAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCAi bW92ZSIsIFtvcGVyYW5kLCBNSVBTX0NBTExfUkVHXSkKLSAgICBlbHNlCi0gICAgICAgIG5lZWRS ZXN0b3JlID0gZmFsc2UKLSAgICAgICAgdG1wID0gb3BlcmFuZAotICAgIGVuZAotICAgIGlmIG5l ZWRSZXN0b3JlCi0gICAgICAgIHBvc3RMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhvcGVyYW5kLmNv ZGVPcmlnaW4sICJtb3ZlIiwgW01JUFNfR1BTQVZFX1JFRywgTUlQU19HUF9SRUddKQorY2xhc3Mg SW5zdHJ1Y3Rpb24KKyAgICAjIFJlcGxhY2Ugb3BlcmFuZHMgd2l0aCBhIHNpbmdsZSByZWdpc3Rl ciBvcGVyYW5kLgorICAgICMgTm90ZTogaW4gY29udHJhc3QgdG8gdGhlIHJpc2MgdmVyc2lvbiwg dGhpcyBtZXRob2QgZHJvcHMgYWxsIG90aGVyIG9wZXJhbmRzLgorICAgIGRlZiBtaXBzQXNSZWdp c3RlcihwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZEluZGV4LCBuZWVkUmVzdG9yZSkKKyAgICAg ICAgb3BlcmFuZCA9IHNlbGYub3BlcmFuZHNbb3BlcmFuZEluZGV4XQorICAgICAgICB0bXAgPSBN SVBTX0NBTExfUkVHCisgICAgICAgIGlmIG9wZXJhbmQuYWRkcmVzcz8KKyAgICAgICAgICAgIHBy ZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwgImxvYWRwIiwgW29wZXJh bmQsIE1JUFNfQ0FMTF9SRUddKQorICAgICAgICBlbHNpZiBvcGVyYW5kLmlzX2E/IExhYmVsUmVm ZXJlbmNlCisgICAgICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhzZWxmLmNvZGVP cmlnaW4sICJsYSIsIFtvcGVyYW5kLCBNSVBTX0NBTExfUkVHXSkKKyAgICAgICAgZWxzaWYgb3Bl cmFuZC5yZWdpc3Rlcj8gYW5kIG9wZXJhbmQgIT0gTUlQU19DQUxMX1JFRworICAgICAgICAgICAg cHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoc2VsZi5jb2RlT3JpZ2luLCAibW92ZSIsIFtvcGVy YW5kLCBNSVBTX0NBTExfUkVHXSkKKyAgICAgICAgZWxzZQorICAgICAgICAgICAgbmVlZFJlc3Rv cmUgPSBmYWxzZQorICAgICAgICAgICAgdG1wID0gb3BlcmFuZAorICAgICAgICBlbmQKKyAgICAg ICAgaWYgbmVlZFJlc3RvcmUKKyAgICAgICAgICAgIHBvc3RMaXN0IDw8IEluc3RydWN0aW9uLm5l dyhzZWxmLmNvZGVPcmlnaW4sICJtb3ZlIiwgW01JUFNfR1BTQVZFX1JFRywgTUlQU19HUF9SRUdd KQorICAgICAgICBlbmQKKyAgICAgICAgZHVwbGljYXRlX3dpdGhfb3BlcmFuZHMoW3RtcF0pCiAg ICAgZW5kCi0gICAgdG1wCiBlbmQKIAogZGVmIG1pcHNMb3dlck1pc3BsYWNlZEFkZHJlc3Nlcyhs aXN0KQpAQCAtNTc4LDMzICs1ODMsMjMgQEAgZGVmIG1pcHNMb3dlck1pc3BsYWNlZEFkZHJlc3Nl cyhsaXN0KQogICAgICAgICB8IG5vZGUgfAogICAgICAgICBpZiBub2RlLmlzX2E/IEluc3RydWN0 aW9uCiAgICAgICAgICAgICBwb3N0SW5zdHJ1Y3Rpb25zID0gW10KLSAgICAgICAgICAgIGFubm90 YXRpb24gPSBub2RlLmFubm90YXRpb24KICAgICAgICAgICAgIGNhc2Ugbm9kZS5vcGNvZGUKICAg ICAgICAgICAgIHdoZW4gImptcCIKLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0 aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgW21pcHNBc1JlZ2lzdGVyKG5ld0xpc3QsIFtdLCBub2RlLm9wZXJhbmRzWzBd LCBmYWxzZSldKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5taXBzQXNSZWdpc3Rl cihuZXdMaXN0LCBbXSwgMCwgZmFsc2UpCiAgICAgICAgICAgICB3aGVuICJjYWxsIgotICAgICAg ICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbbWlwc0FzUmVnaXN0ZXIo bmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kc1swXSwgdHJ1ZSldKQorICAg ICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5taXBzQXNSZWdpc3RlcihuZXdMaXN0LCBwb3N0 SW5zdHJ1Y3Rpb25zLCAwLCB0cnVlKQogICAgICAgICAgICAgd2hlbiAic2x0IiwgInNsdHUiCi0g ICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2lu LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2Rl LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lz dGVycyhuZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5kcywgImkiKSkKKyAgICAgICAgICAgICAgICBu ZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCAiaSIpCiAgICAgICAg ICAgICB3aGVuICJzbHR1YiIsICJzbHRiIgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5z dHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgW10sIG5vZGUub3BlcmFu ZHMsICJiIikpCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVy cyhuZXdMaXN0LCBbXSwgImIiKQogICAgICAgICAgICAgd2hlbiAiYW5kYiIKICAgICAgICAgICAg ICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImFuZGkiLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBb XSwgbm9kZS5vcGVyYW5kcywgImIiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByaXNjT3BlcmFuZHNBc1JlZ2lzdGVycyhub2RlLCBuZXdMaXN0LCBbXSwgImIi KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLmFubm90 YXRpb24pCiAgICAgICAgICAgICB3aGVuIC9eKGJ6fGJuenxic3xibykvCiAgICAgICAgICAgICAg ICAgdGwgPSAkfi5wb3N0X21hdGNoID09ICIiID8gImkiIDogJH4ucG9zdF9tYXRjaAotICAgICAg ICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMo bmV3TGlzdCwgW10sIG5vZGUub3BlcmFuZHMsIHRsKSkKKyAgICAgICAgICAgICAgICBuZXdMaXN0 IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCB0bCkKICAgICAgICAgICAgIGVs c2UKICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUKICAgICAgICAgICAgIGVuZApkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcmlzYy5yYiBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Jpc2MucmIKaW5kZXggMWU2NzA0ZmFiNzExYmRh NzdiOTM2NDBiMjg0NzQ4N2M4YjBjOGRkYS4uN2VkM2M1MGE2OGUzNjkzNGJhZTczMjI3MWExMTM5 MmRlMzJkODBjZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v cmlzYy5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9yaXNjLnJiCkBA IC00MjgsMjYgKzQyOCw0MiBAQCBlbmQKICMgYWRkaSB0bXAsIGJhcgogIwogCi1kZWYgcmlzY0Fz UmVnaXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmQsIHN1ZmZpeCwgbmVlZFN0b3JlKQor ZGVmIHJpc2NPcGVyYW5kQXNSZWdpc3RlcihpbnNuLCBwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFu ZEluZGV4LCBzdWZmaXgsIG5lZWRTdG9yZSkKKyAgICBvcGVyYW5kID0gaW5zbi5vcGVyYW5kc1tv cGVyYW5kSW5kZXhdCiAgICAgcmV0dXJuIG9wZXJhbmQgdW5sZXNzIG9wZXJhbmQuYWRkcmVzcz8K ICAgICAKLSAgICB0bXAgPSBUbXAubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgaWYgc3VmZml4ID09 ICJkIiB0aGVuIDpmcHIgZWxzZSA6Z3ByIGVuZCkKLSAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9u Lm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sICJsb2FkIiArIHN1ZmZpeCwgW29wZXJhbmQsIHRtcF0p CisgICAgdG1wID0gVG1wLm5ldyhpbnNuLmNvZGVPcmlnaW4sIGlmIHN1ZmZpeCA9PSAiZCIgdGhl biA6ZnByIGVsc2UgOmdwciBlbmQpCisgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoaW5z bi5jb2RlT3JpZ2luLCAibG9hZCIgKyBzdWZmaXgsIFtvcGVyYW5kLCB0bXBdKQogICAgIGlmIG5l ZWRTdG9yZQotICAgICAgICBwb3N0TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFuZC5jb2Rl T3JpZ2luLCAic3RvcmUiICsgc3VmZml4LCBbdG1wLCBvcGVyYW5kXSkKKyAgICAgICAgcG9zdExp c3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGluc24uY29kZU9yaWdpbiwgInN0b3JlIiArIHN1ZmZpeCwg W3RtcCwgb3BlcmFuZF0pCiAgICAgZW5kCiAgICAgdG1wCiBlbmQKIAotZGVmIHJpc2NBc1JlZ2lz dGVycyhwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZHMsIHN1ZmZpeCkKK2RlZiByaXNjT3BlcmFu ZHNBc1JlZ2lzdGVycyhpbnNuLCBwcmVMaXN0LCBwb3N0TGlzdCwgc3VmZml4KQogICAgIG5ld09w ZXJhbmRzID0gW10KLSAgICBvcGVyYW5kcy5lYWNoX3dpdGhfaW5kZXggeworICAgIGluc24ub3Bl cmFuZHMuZWFjaF93aXRoX2luZGV4IHsKICAgICAgICAgfCBvcGVyYW5kLCBpbmRleCB8Ci0gICAg ICAgIG5ld09wZXJhbmRzIDw8IHJpc2NBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RMaXN0LCBvcGVy YW5kLCBzdWZmaXgsIGluZGV4ID09IG9wZXJhbmRzLnNpemUgLSAxKQorICAgICAgICBuZXdPcGVy YW5kcyA8PCByaXNjT3BlcmFuZEFzUmVnaXN0ZXIoaW5zbiwgcHJlTGlzdCwgcG9zdExpc3QsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmRleCwgc3VmZml4 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5kZXggPT0g aW5zbi5vcGVyYW5kcy5zaXplIC0gMSkKICAgICB9CiAgICAgbmV3T3BlcmFuZHMKIGVuZAogCitj bGFzcyBJbnN0cnVjdGlvbgorICAgIGRlZiByaXNjQXNSZWdpc3RlcihwcmVMaXN0LCBwb3N0TGlz dCwgb3BlcmFuZEluZGV4LCBzdWZmaXgsIG5lZWRTdG9yZSkKKyAgICAgICAgb3BlcmFuZCA9IHJp c2NPcGVyYW5kQXNSZWdpc3RlcihzZWxmLCBwcmVMaXN0LCBwb3N0TGlzdCwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcGVyYW5kSW5kZXgs IHN1ZmZpeCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBuZWVkU3RvcmUpCisgICAgICAgIGR1cGxpY2F0ZV93aXRoX29wZXJhbmRzKFtvcGVy YW5kXSkKKyAgICBlbmQKKyAgICBkZWYgcmlzY0FzUmVnaXN0ZXJzKHByZUxpc3QsIHBvc3RMaXN0 LCBzdWZmaXgpCisgICAgICAgIG9wZXJhbmRzID0gcmlzY09wZXJhbmRzQXNSZWdpc3RlcnMoc2Vs ZiwgcHJlTGlzdCwgcG9zdExpc3QsIHN1ZmZpeCkKKyAgICAgICAgZHVwbGljYXRlX3dpdGhfb3Bl cmFuZHMob3BlcmFuZHMpCisgICAgZW5kCitlbmQKKwogZGVmIHJpc2NMb3dlck1pc3BsYWNlZEFk ZHJlc3NlcyhsaXN0KQogICAgIG5ld0xpc3QgPSBbXQogICAgIGhhc0JhY2tlbmRTcGVjaWZpY0xv d2VyaW5nID0gSW5zdHJ1Y3Rpb24ucmVzcG9uZF90bz8gImxvd2VyTWlzcGxhY2VkQWRkcmVzc2Vz I3skYWN0aXZlQmFja2VuZH0iCkBAIC00NjQsNDMgKzQ4MCwyMiBAQCBkZWYgcmlzY0xvd2VyTWlz cGxhY2VkQWRkcmVzc2VzKGxpc3QpCiAgICAgICAgICAgICBjYXNlIG5vZGUub3Bjb2RlCiAgICAg ICAgICAgICB3aGVuICJhZGRpIiwgImFkZGlzIiwgImFuZGkiLCAibHNoaWZ0aSIsICJtdWxpIiwg Im5lZ2kiLCAibm90aSIsICJvcmkiLCAib3JoIiwgIm9yaXMiLAogICAgICAgICAgICAgICAgICJy c2hpZnRpIiwgInVyc2hpZnRpIiwgInN1YmkiLCAic3ViaXMiLCAieG9yaSIsIC9eYmkvLCAvXmJ0 aS8sIC9eY2kvLCAvXnRpLwotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24u bmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5v cGVyYW5kcywgImkiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBhbm5vdGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdp c3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgImkiKQogICAgICAgICAgICAgd2hlbiAi YWRkcCIsICJhbmRwIiwgImxzaGlmdHAiLCAibXVscCIsICJuZWdwIiwgIm9ycCIsICJyc2hpZnRw IiwgInVyc2hpZnRwIiwKICAgICAgICAgICAgICAgICAic3VicCIsICJ4b3JwIiwgL15icC8sIC9e YnRwLywgL15jcC8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhu b2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFu ZHMsICJwIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5u b3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJz KG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJwIikKICAgICAgICAgICAgIHdoZW4gImFkZHEi LCAiYW5kcSIsICJsc2hpZnRxIiwgIm11bHEiLCAibmVncSIsICJvcnEiLCAicnNoaWZ0cSIsICJ1 cnNoaWZ0cSIsCiAgICAgICAgICAgICAgICAgInN1YnEiLCAieG9ycSIsIC9eYnEvLCAvXmJ0cS8s IC9eY3EvCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5j b2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5v ZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJp c2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzLCAi cSIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90YXRp b24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdM aXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAicSIpCiAgICAgICAgICAgICB3aGVuICJiYmVxIiwgImJi bmVxIiwgImJiYSIsICJiYmFlcSIsICJiYmIiLCAiYmJiZXEiLCAiYnRieiIsICJidGJueiIsICJ0 YnoiLCAidGJueiIsCiAgICAgICAgICAgICAgICAgImNiZXEiLCAiY2JuZXEiLCAiY2JhIiwgImNi YWVxIiwgImNiYiIsICJjYmJlcSIKLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0 aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5v ZGUub3BlcmFuZHMsICJiIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0Fz UmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJiIikKICAgICAgICAgICAgIHdo ZW4gImJiZ3QiLCAiYmJndGVxIiwgImJibHQiLCAiYmJsdGVxIiwgImJ0YnMiLCAidGJzIiwgImNi Z3QiLCAiY2JndGVxIiwgImNibHQiLCAiY2JsdGVxIgotICAgICAgICAgICAgICAgIG5ld0xpc3Qg PDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3Ry dWN0aW9ucywgbm9kZS5vcGVyYW5kcywgImJzIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8 IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJicyIpCiAg ICAgICAgICAgICB3aGVuICJhZGRkIiwgImRpdmQiLCAic3ViZCIsICJtdWxkIiwgInNxcnRkIiwg L15iZC8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNv ZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9k ZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlz Y0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHMsICJk IiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5ub3RhdGlv bikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xp c3QsIHBvc3RJbnN0cnVjdGlvbnMsICJkIikKICAgICAgICAgICAgIHdoZW4gImptcCIsICJjYWxs IgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9y aWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9w Y29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbcmlzY0Fz UmVnaXN0ZXIobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kc1swXSwgInAi LCBmYWxzZSldLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFu bm90YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVy KG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIDAsICJwIiwgZmFsc2UpCiAgICAgICAgICAgICBl bHNlCiAgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlCiAgICAgICAgICAgICBlbmQK 389947 2020-02-06 06:36:13 -0800 2020-02-06 06:39:32 -0800 Patch bug-207330-20200206143612.patch text/plain 13624 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1Nzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 ZjBhNjk4OTNiODgzY2UxMDg1M2NmODZkNWQzOTkxY2U4YzQ4MjAxLi41MjQwMzg0NWQ0ODAzNDVh ZmI4YTczYmZmMDAxOTg2MGI1YWMyYjk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMC0wMi0wNiAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NA aWdhbGlhLmNvbT4KKworICAgICAgICBGaXggY29kZSBvcmlnaW4gd2hlbiBsb3dlcmluZyBvZmZs aW5lYXNtIGluc3RydWN0aW9ucyBvbiBNSVBTCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDczMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIG9mZmxpbmVhc20vYXJtNjRlLnJiOgorICAgICAgICAqIG9m ZmxpbmVhc20vYXN0LnJiOgorICAgICAgICAqIG9mZmxpbmVhc20vbWlwcy5yYjoKKyAgICAgICAg KiBvZmZsaW5lYXNtL3Jpc2MucmI6CisKIDIwMjAtMDItMDQgIFl1c3VrZSBTdXp1a2kgIDx5c3V6 dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBbSlNDXSBTdHJ1Y3R1cmU6OnNldE1heE9mZnNldCBh bmQgc2V0VHJhbnNpdGlvbk9mZnNldCBhcmUgcmFjeQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL29mZmxpbmVhc20vYXJtNjRlLnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29m ZmxpbmVhc20vYXJtNjRlLnJiCmluZGV4IDM1OWJlYzc3YzUyYTQ4YmUzMjY4ZGY4N2ZlM2ViNmI2 N2RjYjg0ZGQuLmZiN2ZjMjJmZTM2ZDExZWFhYzVmMzA2OWIwYmUxNjkxZTY1MjViM2QgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0ZS5yYgorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hcm02NGUucmIKQEAgLTQ0LDEzICs0NCwx NyBAQCBjbGFzcyBJbnN0cnVjdGlvbgogICAgICAgICAgICAgd2hlbiAiam1wIiwgImNhbGwiCiAg ICAgICAgICAgICAgICAgaWYgbm9kZS5vcGVyYW5kcy5zaXplID4gMQogICAgICAgICAgICAgICAg ICAgICBpZiBub2RlLm9wZXJhbmRzWzFdLmlzX2E/IFJlZ2lzdGVySUQKLSAgICAgICAgICAgICAg ICAgICAgICAgIHRhZyA9IHJpc2NBc1JlZ2lzdGVyKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMs IG5vZGUub3BlcmFuZHNbMV0sICJwIiwgZmFsc2UpCisgICAgICAgICAgICAgICAgICAgICAgICB0 YWcgPSByaXNjT3BlcmFuZEFzUmVnaXN0ZXIobm9kZSwgbmV3TGlzdCwgcG9zdEluc3RydWN0aW9u cywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAx LCAicCIsIGZhbHNlKQogICAgICAgICAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAg ICAgICAgICB0YWcgPSBUbXAubmV3KGNvZGVPcmlnaW4sIDpncHIpCiAgICAgICAgICAgICAgICAg ICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhjb2RlT3JpZ2luLCAibW92ZSIsIFtu b2RlLm9wZXJhbmRzWzFdLCB0YWddLCBhbm5vdGF0aW9uKQogICAgICAgICAgICAgICAgICAgICBl bmQKLSAgICAgICAgICAgICAgICAgICAgb3BlcmFuZHMgPSBbcmlzY0FzUmVnaXN0ZXIobmV3TGlz dCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kc1swXSwgInAiLCBmYWxzZSksIHRhZ10K LSAgICAgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9yaWdp biwgbm9kZS5vcGNvZGUsIG9wZXJhbmRzLCBhbm5vdGF0aW9uKQorICAgICAgICAgICAgICAgICAg ICBvcGVyYW5kcyA9IFsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NPcGVyYW5kQXNSZWdp c3Rlcihub2RlLCBuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAwLCAicCIsIGZhbHNlKSwKKyAg ICAgICAgICAgICAgICAgICAgICAgIHRhZworICAgICAgICAgICAgICAgICAgICBdCisgICAgICAg ICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24uZHVwbGljYXRlX3dpdGhfb3BlcmFu ZHMob3BlcmFuZHMpCiAgICAgICAgICAgICAgICAgICAgIHdhc0hhbmRsZWQgPSB0cnVlCiAgICAg ICAgICAgICAgICAgZW5kCiAgICAgICAgICAgICB3aGVuICJ1bnRhZ0FycmF5UHRyIgpAQCAtNjQs NyArNjgsNyBAQCBjbGFzcyBJbnN0cnVjdGlvbgogICAgICAgICAgICAgICAgICAgICAgICAgb3Bl cmFuZAogICAgICAgICAgICAgICAgICAgICBlbmQKICAgICAgICAgICAgICAgICB9Ci0gICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9yaWdpbiwgbm9kZS5vcGNv ZGUsIG5ld09wZXJhbmRzLCBhbm5vdGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwg SW5zdHJ1Y3Rpb24uZHVwbGljYXRlX3dpdGhfb3BlcmFuZHMobmV3T3BlcmFuZHMpCiAgICAgICAg ICAgICAgICAgd2FzSGFuZGxlZCA9IHRydWUKICAgICAgICAgICAgIGVuZAogICAgICAgICAgICAg bmV3TGlzdCArPSBwb3N0SW5zdHJ1Y3Rpb25zIGlmIHdhc0hhbmRsZWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9vZmZsaW5lYXNtL2FzdC5yYgppbmRleCAyZWRjYTcyMzUxMzI1ODNlZjUwZDBjMjE3YmFi YmQ2NTM2OWNiYTE4Li5lY2U2M2RhZDA5OGUxMDIzOWFlOTgwMDRlZGRhN2M3YzI1YTExNTI4IDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXN0LnJiCkBAIC05MTcsNyArOTE3LDEx IEBAIGNsYXNzIEluc3RydWN0aW9uIDwgTm9kZQogICAgICAgICBAb3BlcmFuZHMgPSBvcGVyYW5k cwogICAgICAgICBAYW5ub3RhdGlvbiA9IGFubm90YXRpb24KICAgICBlbmQKLSAgICAKKworICAg IGRlZiBkdXBsaWNhdGVfd2l0aF9vcGVyYW5kcyhvcGVyYW5kcykKKyAgICAgICAgSW5zdHJ1Y3Rp b24ubmV3KHNlbGYuY29kZU9yaWdpbiwgc2VsZi5vcGNvZGUsIG9wZXJhbmRzLCBzZWxmLmFubm90 YXRpb24pCisgICAgZW5kCisKICAgICBkZWYgY2hpbGRyZW4KICAgICAgICAgb3BlcmFuZHMKICAg ICBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL21pcHMu cmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9taXBzLnJiCmluZGV4IDg5MjA1 MDgzNTNlZTgxNzAzNWFjNDkyZDhkODFiODc3OTZhM2E0NmMuLmI1NTJmYTM5NTJhODQ4NjA0NmUx Yjg3NWFlZjUwY2ZkNTU5N2I1MTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9v ZmZsaW5lYXNtL21pcHMucmIKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v bWlwcy5yYgpAQCAtNTU0LDIyICs1NTQsMjcgQEAgY2xhc3MgTG9jYWxMYWJlbFJlZmVyZW5jZQog ICAgIGVuZAogZW5kCiAKLWRlZiBtaXBzQXNSZWdpc3RlcihwcmVMaXN0LCBwb3N0TGlzdCwgb3Bl cmFuZCwgbmVlZFJlc3RvcmUpCi0gICAgdG1wID0gTUlQU19DQUxMX1JFRwotICAgIGlmIG9wZXJh bmQuYWRkcmVzcz8KLSAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFuZC5j b2RlT3JpZ2luLCAibG9hZHAiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCi0gICAgZWxzaWYg b3BlcmFuZC5pc19hPyBMYWJlbFJlZmVyZW5jZQotICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0 aW9uLm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sICJsYSIsIFtvcGVyYW5kLCBNSVBTX0NBTExfUkVH XSkKLSAgICBlbHNpZiBvcGVyYW5kLnJlZ2lzdGVyPyBhbmQgb3BlcmFuZCAhPSBNSVBTX0NBTExf UkVHCi0gICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQuY29kZU9yaWdp biwgIm1vdmUiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCi0gICAgZWxzZQotICAgICAgICBu ZWVkUmVzdG9yZSA9IGZhbHNlCi0gICAgICAgIHRtcCA9IG9wZXJhbmQKLSAgICBlbmQKLSAgICBp ZiBuZWVkUmVzdG9yZQotICAgICAgICBwb3N0TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFu ZC5jb2RlT3JpZ2luLCAibW92ZSIsIFtNSVBTX0dQU0FWRV9SRUcsIE1JUFNfR1BfUkVHXSkKK2Ns YXNzIEluc3RydWN0aW9uCisgICAgIyBSZXBsYWNlIG9wZXJhbmRzIHdpdGggYSBzaW5nbGUgcmVn aXN0ZXIgb3BlcmFuZC4KKyAgICAjIE5vdGU6IGluIGNvbnRyYXN0IHRvIHRoZSByaXNjIHZlcnNp b24sIHRoaXMgbWV0aG9kIGRyb3BzIGFsbCBvdGhlciBvcGVyYW5kcy4KKyAgICBkZWYgbWlwc0Fz UmVnaXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmRJbmRleCwgbmVlZFJlc3RvcmUpCisg ICAgICAgIG9wZXJhbmQgPSBzZWxmLm9wZXJhbmRzW29wZXJhbmRJbmRleF0KKyAgICAgICAgdG1w ID0gTUlQU19DQUxMX1JFRworICAgICAgICBpZiBvcGVyYW5kLmFkZHJlc3M/CisgICAgICAgICAg ICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhzZWxmLmNvZGVPcmlnaW4sICJsb2FkcCIsIFtv cGVyYW5kLCBNSVBTX0NBTExfUkVHXSkKKyAgICAgICAgZWxzaWYgb3BlcmFuZC5pc19hPyBMYWJl bFJlZmVyZW5jZQorICAgICAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoc2VsZi5j b2RlT3JpZ2luLCAibGEiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCisgICAgICAgIGVsc2lm IG9wZXJhbmQucmVnaXN0ZXI/IGFuZCBvcGVyYW5kICE9IE1JUFNfQ0FMTF9SRUcKKyAgICAgICAg ICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwgIm1vdmUiLCBb b3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCisgICAgICAgIGVsc2UKKyAgICAgICAgICAgIG5lZWRS ZXN0b3JlID0gZmFsc2UKKyAgICAgICAgICAgIHRtcCA9IG9wZXJhbmQKKyAgICAgICAgZW5kCisg ICAgICAgIGlmIG5lZWRSZXN0b3JlCisgICAgICAgICAgICBwb3N0TGlzdCA8PCBJbnN0cnVjdGlv bi5uZXcoc2VsZi5jb2RlT3JpZ2luLCAibW92ZSIsIFtNSVBTX0dQU0FWRV9SRUcsIE1JUFNfR1Bf UkVHXSkKKyAgICAgICAgZW5kCisgICAgICAgIGR1cGxpY2F0ZV93aXRoX29wZXJhbmRzKFt0bXBd KQogICAgIGVuZAotICAgIHRtcAogZW5kCiAKIGRlZiBtaXBzTG93ZXJNaXNwbGFjZWRBZGRyZXNz ZXMobGlzdCkKQEAgLTU3OCwzMyArNTgzLDIzIEBAIGRlZiBtaXBzTG93ZXJNaXNwbGFjZWRBZGRy ZXNzZXMobGlzdCkKICAgICAgICAgfCBub2RlIHwKICAgICAgICAgaWYgbm9kZS5pc19hPyBJbnN0 cnVjdGlvbgogICAgICAgICAgICAgcG9zdEluc3RydWN0aW9ucyA9IFtdCi0gICAgICAgICAgICBh bm5vdGF0aW9uID0gbm9kZS5hbm5vdGF0aW9uCiAgICAgICAgICAgICBjYXNlIG5vZGUub3Bjb2Rl CiAgICAgICAgICAgICB3aGVuICJqbXAiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0 cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIFttaXBzQXNSZWdpc3RlcihuZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5k c1swXSwgZmFsc2UpXSkKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUubWlwc0FzUmVn aXN0ZXIobmV3TGlzdCwgW10sIDAsIGZhbHNlKQogICAgICAgICAgICAgd2hlbiAiY2FsbCIKLSAg ICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4s Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgW21pcHNBc1JlZ2lz dGVyKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHNbMF0sIHRydWUpXSkK KyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUubWlwc0FzUmVnaXN0ZXIobmV3TGlzdCwg cG9zdEluc3RydWN0aW9ucywgMCwgdHJ1ZSkKICAgICAgICAgICAgIHdoZW4gInNsdCIsICJzbHR1 IgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9y aWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9w Y29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNS ZWdpc3RlcnMobmV3TGlzdCwgW10sIG5vZGUub3BlcmFuZHMsICJpIikpCisgICAgICAgICAgICAg ICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgImkiKQogICAg ICAgICAgICAgd2hlbiAic2x0dWIiLCAic2x0YiIKLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8 IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCBub2RlLm9w ZXJhbmRzLCAiYiIpKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdp c3RlcnMobmV3TGlzdCwgW10sICJiIikKICAgICAgICAgICAgIHdoZW4gImFuZGIiCiAgICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJhbmRpIiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlz dCwgW10sIG5vZGUub3BlcmFuZHMsICJiIikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgcmlzY09wZXJhbmRzQXNSZWdpc3RlcnMobm9kZSwgbmV3TGlzdCwgW10s ICJiIiksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5h bm5vdGF0aW9uKQogICAgICAgICAgICAgd2hlbiAvXihienxibnp8YnN8Ym8pLwogICAgICAgICAg ICAgICAgIHRsID0gJH4ucG9zdF9tYXRjaCA9PSAiIiA/ICJpIiA6ICR+LnBvc3RfbWF0Y2gKLSAg ICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4s Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0 ZXJzKG5ld0xpc3QsIFtdLCBub2RlLm9wZXJhbmRzLCB0bCkpCisgICAgICAgICAgICAgICAgbmV3 TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgdGwpCiAgICAgICAgICAg ICBlbHNlCiAgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlCiAgICAgICAgICAgICBlbmQK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Jpc2MucmIgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9yaXNjLnJiCmluZGV4IDFlNjcwNGZhYjcx MWJkYTc3YjkzNjQwYjI4NDc0ODdjOGIwYzhkZGEuLjdlZDNjNTBhNjhlMzY5MzRiYWU3MzIyNzFh MTEzOTJkZTMyZDgwY2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5l YXNtL3Jpc2MucmIKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcmlzYy5y YgpAQCAtNDI4LDI2ICs0MjgsNDIgQEAgZW5kCiAjIGFkZGkgdG1wLCBiYXIKICMKIAotZGVmIHJp c2NBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RMaXN0LCBvcGVyYW5kLCBzdWZmaXgsIG5lZWRTdG9y ZSkKK2RlZiByaXNjT3BlcmFuZEFzUmVnaXN0ZXIoaW5zbiwgcHJlTGlzdCwgcG9zdExpc3QsIG9w ZXJhbmRJbmRleCwgc3VmZml4LCBuZWVkU3RvcmUpCisgICAgb3BlcmFuZCA9IGluc24ub3BlcmFu ZHNbb3BlcmFuZEluZGV4XQogICAgIHJldHVybiBvcGVyYW5kIHVubGVzcyBvcGVyYW5kLmFkZHJl c3M/CiAgICAgCi0gICAgdG1wID0gVG1wLm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sIGlmIHN1ZmZp eCA9PSAiZCIgdGhlbiA6ZnByIGVsc2UgOmdwciBlbmQpCi0gICAgcHJlTGlzdCA8PCBJbnN0cnVj dGlvbi5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCAibG9hZCIgKyBzdWZmaXgsIFtvcGVyYW5kLCB0 bXBdKQorICAgIHRtcCA9IFRtcC5uZXcoaW5zbi5jb2RlT3JpZ2luLCBpZiBzdWZmaXggPT0gImQi IHRoZW4gOmZwciBlbHNlIDpncHIgZW5kKQorICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3 KGluc24uY29kZU9yaWdpbiwgImxvYWQiICsgc3VmZml4LCBbb3BlcmFuZCwgdG1wXSkKICAgICBp ZiBuZWVkU3RvcmUKLSAgICAgICAgcG9zdExpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQu Y29kZU9yaWdpbiwgInN0b3JlIiArIHN1ZmZpeCwgW3RtcCwgb3BlcmFuZF0pCisgICAgICAgIHBv c3RMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhpbnNuLmNvZGVPcmlnaW4sICJzdG9yZSIgKyBzdWZm aXgsIFt0bXAsIG9wZXJhbmRdKQogICAgIGVuZAogICAgIHRtcAogZW5kCiAKLWRlZiByaXNjQXNS ZWdpc3RlcnMocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmRzLCBzdWZmaXgpCitkZWYgcmlzY09w ZXJhbmRzQXNSZWdpc3RlcnMoaW5zbiwgcHJlTGlzdCwgcG9zdExpc3QsIHN1ZmZpeCkKICAgICBu ZXdPcGVyYW5kcyA9IFtdCi0gICAgb3BlcmFuZHMuZWFjaF93aXRoX2luZGV4IHsKKyAgICBpbnNu Lm9wZXJhbmRzLmVhY2hfd2l0aF9pbmRleCB7CiAgICAgICAgIHwgb3BlcmFuZCwgaW5kZXggfAot ICAgICAgICBuZXdPcGVyYW5kcyA8PCByaXNjQXNSZWdpc3RlcihwcmVMaXN0LCBwb3N0TGlzdCwg b3BlcmFuZCwgc3VmZml4LCBpbmRleCA9PSBvcGVyYW5kcy5zaXplIC0gMSkKKyAgICAgICAgbmV3 T3BlcmFuZHMgPDwgcmlzY09wZXJhbmRBc1JlZ2lzdGVyKGluc24sIHByZUxpc3QsIHBvc3RMaXN0 LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5kZXgsIHN1 ZmZpeCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluZGV4 ID09IGluc24ub3BlcmFuZHMuc2l6ZSAtIDEpCiAgICAgfQogICAgIG5ld09wZXJhbmRzCiBlbmQK IAorY2xhc3MgSW5zdHJ1Y3Rpb24KKyAgICBkZWYgcmlzY0FzUmVnaXN0ZXIocHJlTGlzdCwgcG9z dExpc3QsIG9wZXJhbmRJbmRleCwgc3VmZml4LCBuZWVkU3RvcmUpCisgICAgICAgIG9wZXJhbmQg PSByaXNjT3BlcmFuZEFzUmVnaXN0ZXIoc2VsZiwgcHJlTGlzdCwgcG9zdExpc3QsCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3BlcmFuZElu ZGV4LCBzdWZmaXgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbmVlZFN0b3JlKQorICAgICAgICBkdXBsaWNhdGVfd2l0aF9vcGVyYW5kcyhb b3BlcmFuZF0pCisgICAgZW5kCisgICAgZGVmIHJpc2NBc1JlZ2lzdGVycyhwcmVMaXN0LCBwb3N0 TGlzdCwgc3VmZml4KQorICAgICAgICBvcGVyYW5kcyA9IHJpc2NPcGVyYW5kc0FzUmVnaXN0ZXJz KHNlbGYsIHByZUxpc3QsIHBvc3RMaXN0LCBzdWZmaXgpCisgICAgICAgIGR1cGxpY2F0ZV93aXRo X29wZXJhbmRzKG9wZXJhbmRzKQorICAgIGVuZAorZW5kCisKIGRlZiByaXNjTG93ZXJNaXNwbGFj ZWRBZGRyZXNzZXMobGlzdCkKICAgICBuZXdMaXN0ID0gW10KICAgICBoYXNCYWNrZW5kU3BlY2lm aWNMb3dlcmluZyA9IEluc3RydWN0aW9uLnJlc3BvbmRfdG8/ICJsb3dlck1pc3BsYWNlZEFkZHJl c3NlcyN7JGFjdGl2ZUJhY2tlbmR9IgpAQCAtNDY0LDQzICs0ODAsMjIgQEAgZGVmIHJpc2NMb3dl ck1pc3BsYWNlZEFkZHJlc3NlcyhsaXN0KQogICAgICAgICAgICAgY2FzZSBub2RlLm9wY29kZQog ICAgICAgICAgICAgd2hlbiAiYWRkaSIsICJhZGRpcyIsICJhbmRpIiwgImxzaGlmdGkiLCAibXVs aSIsICJuZWdpIiwgIm5vdGkiLCAib3JpIiwgIm9yaCIsICJvcmlzIiwKICAgICAgICAgICAgICAg ICAicnNoaWZ0aSIsICJ1cnNoaWZ0aSIsICJzdWJpIiwgInN1YmlzIiwgInhvcmkiLCAvXmJpLywg L15idGkvLCAvXmNpLywgL150aS8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0 aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5v ZGUub3BlcmFuZHMsICJpIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0Fz UmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJpIikKICAgICAgICAgICAgIHdo ZW4gImFkZHAiLCAiYW5kcCIsICJsc2hpZnRwIiwgIm11bHAiLCAibmVncCIsICJvcnAiLCAicnNo aWZ0cCIsICJ1cnNoaWZ0cCIsCiAgICAgICAgICAgICAgICAgInN1YnAiLCAieG9ycCIsIC9eYnAv LCAvXmJ0cC8sIC9eY3AvCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5u ZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9w ZXJhbmRzLCAicCIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lz dGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAicCIpCiAgICAgICAgICAgICB3aGVuICJh ZGRxIiwgImFuZHEiLCAibHNoaWZ0cSIsICJtdWxxIiwgIm5lZ3EiLCAib3JxIiwgInJzaGlmdHEi LCAidXJzaGlmdHEiLAogICAgICAgICAgICAgICAgICJzdWJxIiwgInhvcnEiLCAvXmJxLywgL15i dHEvLCAvXmNxLwotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5v ZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5k cywgInEiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbm5v dGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3RlcnMo bmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgInEiKQogICAgICAgICAgICAgd2hlbiAiYmJlcSIs ICJiYm5lcSIsICJiYmEiLCAiYmJhZXEiLCAiYmJiIiwgImJiYmVxIiwgImJ0YnoiLCAiYnRibnoi LCAidGJ6IiwgInRibnoiLAogICAgICAgICAgICAgICAgICJjYmVxIiwgImNibmVxIiwgImNiYSIs ICJjYmFlcSIsICJjYmIiLCAiY2JiZXEiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0 cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25z LCBub2RlLm9wZXJhbmRzLCAiYiIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJp c2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAiYiIpCiAgICAgICAgICAg ICB3aGVuICJiYmd0IiwgImJiZ3RlcSIsICJiYmx0IiwgImJibHRlcSIsICJidGJzIiwgInRicyIs ICJjYmd0IiwgImNiZ3RlcSIsICJjYmx0IiwgImNibHRlcSIKLSAgICAgICAgICAgICAgICBuZXdM aXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJ bnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHMsICJicyIpLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlz dCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAiYnMi KQogICAgICAgICAgICAgd2hlbiAiYWRkZCIsICJkaXZkIiwgInN1YmQiLCAibXVsZCIsICJzcXJ0 ZCIsIC9eYmQvCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9k ZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRz LCAiZCIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90 YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhu ZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAiZCIpCiAgICAgICAgICAgICB3aGVuICJqbXAiLCAi Y2FsbCIKLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNv ZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9k ZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgW3Jp c2NBc1JlZ2lzdGVyKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHNbMF0s ICJwIiwgZmFsc2UpXSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBhbm5vdGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdp c3RlcihuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAwLCAicCIsIGZhbHNlKQogICAgICAgICAg ICAgZWxzZQogICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZQogICAgICAgICAgICAgZW5k Cg== 389948 2020-02-06 06:39:37 -0800 2020-03-24 08:33:21 -0700 Patch bug-207330-20200206143936.patch text/plain 13886 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1Nzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 ZjBhNjk4OTNiODgzY2UxMDg1M2NmODZkNWQzOTkxY2U4YzQ4MjAxLi5jN2M2ZDMwYWY4N2I1NWRj NzEyMjdkZjdjMjQ4MGU4MWEzMDgzZjM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMC0wMi0wNiAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NA aWdhbGlhLmNvbT4KKworICAgICAgICBGaXggY29kZSBvcmlnaW4gd2hlbiBsb3dlcmluZyBvZmZs aW5lYXNtIGluc3RydWN0aW9ucyBvbiBNSVBTCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDczMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbnN0cnVjdGlvbiBvcGVyYW5kcyBhcmUgbWFwcGVkIHRvIFJl Z2lzdGVySUQgaW4gUmVnaXN0ZXJJRC5mb3JOYW1lCisgICAgICAgIGFuZCB0aGUgb3BlcmF0aW9u IGlzIG1lbW9pemVkLiBUaGVyZWZvcmUsIHdlIGNhbid0IHVzZSB0aGUgY29kZU9yaWdpbgorICAg ICAgICBvZiB0aGUgb3BlcmFuZCBhdCB0aGF0IHBvaW50LiBVc2UgdGhlIGNvZGVPcmlnaW4gb2Yg dGhlIG9yaWdpbmFsCisgICAgICAgIGluc3RydWN0aW9uIGluc3RlYWQuCisKKyAgICAgICAgKiBv ZmZsaW5lYXNtL2FybTY0ZS5yYjoKKyAgICAgICAgKiBvZmZsaW5lYXNtL2FzdC5yYjoKKyAgICAg ICAgKiBvZmZsaW5lYXNtL21pcHMucmI6CisgICAgICAgICogb2ZmbGluZWFzbS9yaXNjLnJiOgor CiAyMDIwLTAyLTA0ICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAg ICAgW0pTQ10gU3RydWN0dXJlOjpzZXRNYXhPZmZzZXQgYW5kIHNldFRyYW5zaXRpb25PZmZzZXQg YXJlIHJhY3kKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2Fy bTY0ZS5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0ZS5yYgppbmRl eCAzNTliZWM3N2M1MmE0OGJlMzI2OGRmODdmZTNlYjZiNjdkY2I4NGRkLi5mYjdmYzIyZmUzNmQx MWVhYWM1ZjMwNjliMGJlMTY5MWU2NTI1YjNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvb2ZmbGluZWFzbS9hcm02NGUucmIKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29m ZmxpbmVhc20vYXJtNjRlLnJiCkBAIC00NCwxMyArNDQsMTcgQEAgY2xhc3MgSW5zdHJ1Y3Rpb24K ICAgICAgICAgICAgIHdoZW4gImptcCIsICJjYWxsIgogICAgICAgICAgICAgICAgIGlmIG5vZGUu b3BlcmFuZHMuc2l6ZSA+IDEKICAgICAgICAgICAgICAgICAgICAgaWYgbm9kZS5vcGVyYW5kc1sx XS5pc19hPyBSZWdpc3RlcklECi0gICAgICAgICAgICAgICAgICAgICAgICB0YWcgPSByaXNjQXNS ZWdpc3RlcihuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzWzFdLCAicCIs IGZhbHNlKQorICAgICAgICAgICAgICAgICAgICAgICAgdGFnID0gcmlzY09wZXJhbmRBc1JlZ2lz dGVyKG5vZGUsIG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMSwgInAiLCBmYWxzZSkKICAgICAgICAg ICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAgICAgICAgICAgdGFnID0gVG1wLm5ldyhj b2RlT3JpZ2luLCA6Z3ByKQogICAgICAgICAgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0 cnVjdGlvbi5uZXcoY29kZU9yaWdpbiwgIm1vdmUiLCBbbm9kZS5vcGVyYW5kc1sxXSwgdGFnXSwg YW5ub3RhdGlvbikKICAgICAgICAgICAgICAgICAgICAgZW5kCi0gICAgICAgICAgICAgICAgICAg IG9wZXJhbmRzID0gW3Jpc2NBc1JlZ2lzdGVyKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5v ZGUub3BlcmFuZHNbMF0sICJwIiwgZmFsc2UpLCB0YWddCi0gICAgICAgICAgICAgICAgICAgIG5l d0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGNvZGVPcmlnaW4sIG5vZGUub3Bjb2RlLCBvcGVyYW5k cywgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICAgICAgb3BlcmFuZHMgPSBbCisgICAgICAg ICAgICAgICAgICAgICAgICByaXNjT3BlcmFuZEFzUmVnaXN0ZXIobm9kZSwgbmV3TGlzdCwgcG9z dEluc3RydWN0aW9ucywgMCwgInAiLCBmYWxzZSksCisgICAgICAgICAgICAgICAgICAgICAgICB0 YWcKKyAgICAgICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8 IEluc3RydWN0aW9uLmR1cGxpY2F0ZV93aXRoX29wZXJhbmRzKG9wZXJhbmRzKQogICAgICAgICAg ICAgICAgICAgICB3YXNIYW5kbGVkID0gdHJ1ZQogICAgICAgICAgICAgICAgIGVuZAogICAgICAg ICAgICAgd2hlbiAidW50YWdBcnJheVB0ciIKQEAgLTY0LDcgKzY4LDcgQEAgY2xhc3MgSW5zdHJ1 Y3Rpb24KICAgICAgICAgICAgICAgICAgICAgICAgIG9wZXJhbmQKICAgICAgICAgICAgICAgICAg ICAgZW5kCiAgICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5z dHJ1Y3Rpb24ubmV3KGNvZGVPcmlnaW4sIG5vZGUub3Bjb2RlLCBuZXdPcGVyYW5kcywgYW5ub3Rh dGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLmR1cGxpY2F0ZV93 aXRoX29wZXJhbmRzKG5ld09wZXJhbmRzKQogICAgICAgICAgICAgICAgIHdhc0hhbmRsZWQgPSB0 cnVlCiAgICAgICAgICAgICBlbmQKICAgICAgICAgICAgIG5ld0xpc3QgKz0gcG9zdEluc3RydWN0 aW9ucyBpZiB3YXNIYW5kbGVkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2Zm bGluZWFzbS9hc3QucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIK aW5kZXggMmVkY2E3MjM1MTMyNTgzZWY1MGQwYzIxN2JhYmJkNjUzNjljYmExOC4uZWNlNjNkYWQw OThlMTAyMzlhZTk4MDA0ZWRkYTdjN2MyNWExMTUyOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL29mZmxpbmVhc20vYXN0LnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9v ZmZsaW5lYXNtL2FzdC5yYgpAQCAtOTE3LDcgKzkxNywxMSBAQCBjbGFzcyBJbnN0cnVjdGlvbiA8 IE5vZGUKICAgICAgICAgQG9wZXJhbmRzID0gb3BlcmFuZHMKICAgICAgICAgQGFubm90YXRpb24g PSBhbm5vdGF0aW9uCiAgICAgZW5kCi0gICAgCisKKyAgICBkZWYgZHVwbGljYXRlX3dpdGhfb3Bl cmFuZHMob3BlcmFuZHMpCisgICAgICAgIEluc3RydWN0aW9uLm5ldyhzZWxmLmNvZGVPcmlnaW4s IHNlbGYub3Bjb2RlLCBvcGVyYW5kcywgc2VsZi5hbm5vdGF0aW9uKQorICAgIGVuZAorCiAgICAg ZGVmIGNoaWxkcmVuCiAgICAgICAgIG9wZXJhbmRzCiAgICAgZW5kCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9taXBzLnJiIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL29mZmxpbmVhc20vbWlwcy5yYgppbmRleCA4OTIwNTA4MzUzZWU4MTcwMzVhYzQ5MmQ4ZDgx Yjg3Nzk2YTNhNDZjLi5iNTUyZmEzOTUyYTg0ODYwNDZlMWI4NzVhZWY1MGNmZDU1OTdiNTEwIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9taXBzLnJiCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL21pcHMucmIKQEAgLTU1NCwyMiArNTU0 LDI3IEBAIGNsYXNzIExvY2FsTGFiZWxSZWZlcmVuY2UKICAgICBlbmQKIGVuZAogCi1kZWYgbWlw c0FzUmVnaXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmQsIG5lZWRSZXN0b3JlKQotICAg IHRtcCA9IE1JUFNfQ0FMTF9SRUcKLSAgICBpZiBvcGVyYW5kLmFkZHJlc3M/Ci0gICAgICAgIHBy ZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgImxvYWRwIiwgW29w ZXJhbmQsIE1JUFNfQ0FMTF9SRUddKQotICAgIGVsc2lmIG9wZXJhbmQuaXNfYT8gTGFiZWxSZWZl cmVuY2UKLSAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFuZC5jb2RlT3Jp Z2luLCAibGEiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCi0gICAgZWxzaWYgb3BlcmFuZC5y ZWdpc3Rlcj8gYW5kIG9wZXJhbmQgIT0gTUlQU19DQUxMX1JFRwotICAgICAgICBwcmVMaXN0IDw8 IEluc3RydWN0aW9uLm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sICJtb3ZlIiwgW29wZXJhbmQsIE1J UFNfQ0FMTF9SRUddKQotICAgIGVsc2UKLSAgICAgICAgbmVlZFJlc3RvcmUgPSBmYWxzZQotICAg ICAgICB0bXAgPSBvcGVyYW5kCi0gICAgZW5kCi0gICAgaWYgbmVlZFJlc3RvcmUKLSAgICAgICAg cG9zdExpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgIm1vdmUiLCBb TUlQU19HUFNBVkVfUkVHLCBNSVBTX0dQX1JFR10pCitjbGFzcyBJbnN0cnVjdGlvbgorICAgICMg UmVwbGFjZSBvcGVyYW5kcyB3aXRoIGEgc2luZ2xlIHJlZ2lzdGVyIG9wZXJhbmQuCisgICAgIyBO b3RlOiBpbiBjb250cmFzdCB0byB0aGUgcmlzYyB2ZXJzaW9uLCB0aGlzIG1ldGhvZCBkcm9wcyBh bGwgb3RoZXIgb3BlcmFuZHMuCisgICAgZGVmIG1pcHNBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RM aXN0LCBvcGVyYW5kSW5kZXgsIG5lZWRSZXN0b3JlKQorICAgICAgICBvcGVyYW5kID0gc2VsZi5v cGVyYW5kc1tvcGVyYW5kSW5kZXhdCisgICAgICAgIHRtcCA9IE1JUFNfQ0FMTF9SRUcKKyAgICAg ICAgaWYgb3BlcmFuZC5hZGRyZXNzPworICAgICAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlv bi5uZXcoc2VsZi5jb2RlT3JpZ2luLCAibG9hZHAiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10p CisgICAgICAgIGVsc2lmIG9wZXJhbmQuaXNfYT8gTGFiZWxSZWZlcmVuY2UKKyAgICAgICAgICAg IHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwgImxhIiwgW29wZXJh bmQsIE1JUFNfQ0FMTF9SRUddKQorICAgICAgICBlbHNpZiBvcGVyYW5kLnJlZ2lzdGVyPyBhbmQg b3BlcmFuZCAhPSBNSVBTX0NBTExfUkVHCisgICAgICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0 aW9uLm5ldyhzZWxmLmNvZGVPcmlnaW4sICJtb3ZlIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUdd KQorICAgICAgICBlbHNlCisgICAgICAgICAgICBuZWVkUmVzdG9yZSA9IGZhbHNlCisgICAgICAg ICAgICB0bXAgPSBvcGVyYW5kCisgICAgICAgIGVuZAorICAgICAgICBpZiBuZWVkUmVzdG9yZQor ICAgICAgICAgICAgcG9zdExpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwg Im1vdmUiLCBbTUlQU19HUFNBVkVfUkVHLCBNSVBTX0dQX1JFR10pCisgICAgICAgIGVuZAorICAg ICAgICBkdXBsaWNhdGVfd2l0aF9vcGVyYW5kcyhbdG1wXSkKICAgICBlbmQKLSAgICB0bXAKIGVu ZAogCiBkZWYgbWlwc0xvd2VyTWlzcGxhY2VkQWRkcmVzc2VzKGxpc3QpCkBAIC01NzgsMzMgKzU4 MywyMyBAQCBkZWYgbWlwc0xvd2VyTWlzcGxhY2VkQWRkcmVzc2VzKGxpc3QpCiAgICAgICAgIHwg bm9kZSB8CiAgICAgICAgIGlmIG5vZGUuaXNfYT8gSW5zdHJ1Y3Rpb24KICAgICAgICAgICAgIHBv c3RJbnN0cnVjdGlvbnMgPSBbXQotICAgICAgICAgICAgYW5ub3RhdGlvbiA9IG5vZGUuYW5ub3Rh dGlvbgogICAgICAgICAgICAgY2FzZSBub2RlLm9wY29kZQogICAgICAgICAgICAgd2hlbiAiam1w IgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9y aWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9w Y29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbbWlwc0Fz UmVnaXN0ZXIobmV3TGlzdCwgW10sIG5vZGUub3BlcmFuZHNbMF0sIGZhbHNlKV0pCisgICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBub2RlLm1pcHNBc1JlZ2lzdGVyKG5ld0xpc3QsIFtdLCAwLCBm YWxzZSkKICAgICAgICAgICAgIHdoZW4gImNhbGwiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8 PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIFttaXBzQXNSZWdpc3RlcihuZXdMaXN0LCBwb3N0SW5zdHJ1 Y3Rpb25zLCBub2RlLm9wZXJhbmRzWzBdLCB0cnVlKV0pCisgICAgICAgICAgICAgICAgbmV3TGlz dCA8PCBub2RlLm1pcHNBc1JlZ2lzdGVyKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIDAsIHRy dWUpCiAgICAgICAgICAgICB3aGVuICJzbHQiLCAic2x0dSIKLSAgICAgICAgICAgICAgICBuZXdM aXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCBu b2RlLm9wZXJhbmRzLCAiaSIpKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNj QXNSZWdpc3RlcnMobmV3TGlzdCwgW10sICJpIikKICAgICAgICAgICAgIHdoZW4gInNsdHViIiwg InNsdGIiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5j b2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5v ZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJp c2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5kcywgImIiKSkKKyAgICAgICAg ICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCAiYiIp CiAgICAgICAgICAgICB3aGVuICJhbmRiIgogICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5z dHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiYW5kaSIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCBub2RlLm9wZXJhbmRzLCAi YiIpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NPcGVy YW5kc0FzUmVnaXN0ZXJzKG5vZGUsIG5ld0xpc3QsIFtdLCAiYiIpLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUuYW5ub3RhdGlvbikKICAgICAgICAgICAg IHdoZW4gL14oYnp8Ym56fGJzfGJvKS8KICAgICAgICAgICAgICAgICB0bCA9ICR+LnBvc3RfbWF0 Y2ggPT0gIiIgPyAiaSIgOiAkfi5wb3N0X21hdGNoCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8 PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgbm9kZS5v cGVyYW5kcywgdGwpKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdp c3RlcnMobmV3TGlzdCwgW10sIHRsKQogICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAg IG5ld0xpc3QgPDwgbm9kZQogICAgICAgICAgICAgZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9yaXNjLnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29m ZmxpbmVhc20vcmlzYy5yYgppbmRleCAxZTY3MDRmYWI3MTFiZGE3N2I5MzY0MGIyODQ3NDg3Yzhi MGM4ZGRhLi43ZWQzYzUwYTY4ZTM2OTM0YmFlNzMyMjcxYTExMzkyZGUzMmQ4MGNkIDEwMDY0NAot LS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9yaXNjLnJiCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Jpc2MucmIKQEAgLTQyOCwyNiArNDI4LDQyIEBA IGVuZAogIyBhZGRpIHRtcCwgYmFyCiAjCiAKLWRlZiByaXNjQXNSZWdpc3RlcihwcmVMaXN0LCBw b3N0TGlzdCwgb3BlcmFuZCwgc3VmZml4LCBuZWVkU3RvcmUpCitkZWYgcmlzY09wZXJhbmRBc1Jl Z2lzdGVyKGluc24sIHByZUxpc3QsIHBvc3RMaXN0LCBvcGVyYW5kSW5kZXgsIHN1ZmZpeCwgbmVl ZFN0b3JlKQorICAgIG9wZXJhbmQgPSBpbnNuLm9wZXJhbmRzW29wZXJhbmRJbmRleF0KICAgICBy ZXR1cm4gb3BlcmFuZCB1bmxlc3Mgb3BlcmFuZC5hZGRyZXNzPwogICAgIAotICAgIHRtcCA9IFRt cC5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCBpZiBzdWZmaXggPT0gImQiIHRoZW4gOmZwciBlbHNl IDpncHIgZW5kKQotICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQuY29kZU9y aWdpbiwgImxvYWQiICsgc3VmZml4LCBbb3BlcmFuZCwgdG1wXSkKKyAgICB0bXAgPSBUbXAubmV3 KGluc24uY29kZU9yaWdpbiwgaWYgc3VmZml4ID09ICJkIiB0aGVuIDpmcHIgZWxzZSA6Z3ByIGVu ZCkKKyAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhpbnNuLmNvZGVPcmlnaW4sICJsb2Fk IiArIHN1ZmZpeCwgW29wZXJhbmQsIHRtcF0pCiAgICAgaWYgbmVlZFN0b3JlCi0gICAgICAgIHBv c3RMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sICJzdG9yZSIgKyBz dWZmaXgsIFt0bXAsIG9wZXJhbmRdKQorICAgICAgICBwb3N0TGlzdCA8PCBJbnN0cnVjdGlvbi5u ZXcoaW5zbi5jb2RlT3JpZ2luLCAic3RvcmUiICsgc3VmZml4LCBbdG1wLCBvcGVyYW5kXSkKICAg ICBlbmQKICAgICB0bXAKIGVuZAogCi1kZWYgcmlzY0FzUmVnaXN0ZXJzKHByZUxpc3QsIHBvc3RM aXN0LCBvcGVyYW5kcywgc3VmZml4KQorZGVmIHJpc2NPcGVyYW5kc0FzUmVnaXN0ZXJzKGluc24s IHByZUxpc3QsIHBvc3RMaXN0LCBzdWZmaXgpCiAgICAgbmV3T3BlcmFuZHMgPSBbXQotICAgIG9w ZXJhbmRzLmVhY2hfd2l0aF9pbmRleCB7CisgICAgaW5zbi5vcGVyYW5kcy5lYWNoX3dpdGhfaW5k ZXggewogICAgICAgICB8IG9wZXJhbmQsIGluZGV4IHwKLSAgICAgICAgbmV3T3BlcmFuZHMgPDwg cmlzY0FzUmVnaXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmQsIHN1ZmZpeCwgaW5kZXgg PT0gb3BlcmFuZHMuc2l6ZSAtIDEpCisgICAgICAgIG5ld09wZXJhbmRzIDw8IHJpc2NPcGVyYW5k QXNSZWdpc3RlcihpbnNuLCBwcmVMaXN0LCBwb3N0TGlzdCwKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGluZGV4LCBzdWZmaXgsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmRleCA9PSBpbnNuLm9wZXJhbmRzLnNpemUg LSAxKQogICAgIH0KICAgICBuZXdPcGVyYW5kcwogZW5kCiAKK2NsYXNzIEluc3RydWN0aW9uCisg ICAgZGVmIHJpc2NBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RMaXN0LCBvcGVyYW5kSW5kZXgsIHN1 ZmZpeCwgbmVlZFN0b3JlKQorICAgICAgICBvcGVyYW5kID0gcmlzY09wZXJhbmRBc1JlZ2lzdGVy KHNlbGYsIHByZUxpc3QsIHBvc3RMaXN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG9wZXJhbmRJbmRleCwgc3VmZml4LAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5lZWRTdG9yZSkK KyAgICAgICAgZHVwbGljYXRlX3dpdGhfb3BlcmFuZHMoW29wZXJhbmRdKQorICAgIGVuZAorICAg IGRlZiByaXNjQXNSZWdpc3RlcnMocHJlTGlzdCwgcG9zdExpc3QsIHN1ZmZpeCkKKyAgICAgICAg b3BlcmFuZHMgPSByaXNjT3BlcmFuZHNBc1JlZ2lzdGVycyhzZWxmLCBwcmVMaXN0LCBwb3N0TGlz dCwgc3VmZml4KQorICAgICAgICBkdXBsaWNhdGVfd2l0aF9vcGVyYW5kcyhvcGVyYW5kcykKKyAg ICBlbmQKK2VuZAorCiBkZWYgcmlzY0xvd2VyTWlzcGxhY2VkQWRkcmVzc2VzKGxpc3QpCiAgICAg bmV3TGlzdCA9IFtdCiAgICAgaGFzQmFja2VuZFNwZWNpZmljTG93ZXJpbmcgPSBJbnN0cnVjdGlv bi5yZXNwb25kX3RvPyAibG93ZXJNaXNwbGFjZWRBZGRyZXNzZXMjeyRhY3RpdmVCYWNrZW5kfSIK QEAgLTQ2NCw0MyArNDgwLDIyIEBAIGRlZiByaXNjTG93ZXJNaXNwbGFjZWRBZGRyZXNzZXMobGlz dCkKICAgICAgICAgICAgIGNhc2Ugbm9kZS5vcGNvZGUKICAgICAgICAgICAgIHdoZW4gImFkZGki LCAiYWRkaXMiLCAiYW5kaSIsICJsc2hpZnRpIiwgIm11bGkiLCAibmVnaSIsICJub3RpIiwgIm9y aSIsICJvcmgiLCAib3JpcyIsCiAgICAgICAgICAgICAgICAgInJzaGlmdGkiLCAidXJzaGlmdGki LCAic3ViaSIsICJzdWJpcyIsICJ4b3JpIiwgL15iaS8sIC9eYnRpLywgL15jaS8sIC9edGkvCi0g ICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2lu LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2Rl LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lz dGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzLCAiaSIpLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90YXRpb24pCisgICAg ICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0 SW5zdHJ1Y3Rpb25zLCAiaSIpCiAgICAgICAgICAgICB3aGVuICJhZGRwIiwgImFuZHAiLCAibHNo aWZ0cCIsICJtdWxwIiwgIm5lZ3AiLCAib3JwIiwgInJzaGlmdHAiLCAidXJzaGlmdHAiLAogICAg ICAgICAgICAgICAgICJzdWJwIiwgInhvcnAiLCAvXmJwLywgL15idHAvLCAvXmNwLwotICAgICAg ICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMo bmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kcywgInAiKSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbm5vdGF0aW9uKQorICAgICAgICAg ICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3Ry dWN0aW9ucywgInAiKQogICAgICAgICAgICAgd2hlbiAiYWRkcSIsICJhbmRxIiwgImxzaGlmdHEi LCAibXVscSIsICJuZWdxIiwgIm9ycSIsICJyc2hpZnRxIiwgInVyc2hpZnRxIiwKICAgICAgICAg ICAgICAgICAic3VicSIsICJ4b3JxIiwgL15icS8sIC9eYnRxLywgL15jcS8KLSAgICAgICAgICAg ICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xp c3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHMsICJxIiksCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAg ICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlv bnMsICJxIikKICAgICAgICAgICAgIHdoZW4gImJiZXEiLCAiYmJuZXEiLCAiYmJhIiwgImJiYWVx IiwgImJiYiIsICJiYmJlcSIsICJidGJ6IiwgImJ0Ym56IiwgInRieiIsICJ0Ym56IiwKICAgICAg ICAgICAgICAgICAiY2JlcSIsICJjYm5lcSIsICJjYmEiLCAiY2JhZXEiLCAiY2JiIiwgImNiYmVx IgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9y aWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9w Y29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNS ZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kcywgImIiKSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbm5vdGF0aW9uKQor ICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwg cG9zdEluc3RydWN0aW9ucywgImIiKQogICAgICAgICAgICAgd2hlbiAiYmJndCIsICJiYmd0ZXEi LCAiYmJsdCIsICJiYmx0ZXEiLCAiYnRicyIsICJ0YnMiLCAiY2JndCIsICJjYmd0ZXEiLCAiY2Js dCIsICJjYmx0ZXEiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXco bm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJh bmRzLCAiYnMiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBh bm5vdGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3Rl cnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgImJzIikKICAgICAgICAgICAgIHdoZW4gImFk ZGQiLCAiZGl2ZCIsICJzdWJkIiwgIm11bGQiLCAic3FydGQiLCAvXmJkLwotICAgICAgICAgICAg ICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlz dCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kcywgImQiKSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbm5vdGF0aW9uKQorICAgICAgICAgICAgICAg IG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9u cywgImQiKQogICAgICAgICAgICAgd2hlbiAiam1wIiwgImNhbGwiCi0gICAgICAgICAgICAgICAg bmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtyaXNjQXNSZWdpc3RlcihuZXdMaXN0LCBw b3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzWzBdLCAicCIsIGZhbHNlKV0sCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAg ICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXIobmV3TGlzdCwgcG9zdEluc3Ry dWN0aW9ucywgMCwgInAiLCBmYWxzZSkKICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAg ICBuZXdMaXN0IDw8IG5vZGUKICAgICAgICAgICAgIGVuZAo= 394368 2020-03-24 08:33:23 -0700 2020-04-09 03:44:53 -0700 Patch bug-207330-20200324153322.patch text/plain 13788 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjU4ODM1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBh ZDFkN2M3NTg0MmNjNzJhMDMwYzQzNGNiMzM1NTY4ODBiMWU5NDVhLi4yMDFmYzdhMmRhOThhMTg4 ZjVmYTNiZTQxZjFlNWVlZTNhYmY4ZTUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMC0wMy0yNCAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NA aWdhbGlhLmNvbT4KKworICAgICAgICBGaXggY29kZSBvcmlnaW4gd2hlbiBsb3dlcmluZyBvZmZs aW5lYXNtIGluc3RydWN0aW9ucyBvbiBNSVBTCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDczMzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbnN0cnVjdGlvbiBvcGVyYW5kcyBhcmUgbWFwcGVkIHRvIFJl Z2lzdGVySUQgaW4gUmVnaXN0ZXJJRC5mb3JOYW1lCisgICAgICAgIGFuZCB0aGUgb3BlcmF0aW9u IGlzIG1lbW9pemVkLiBUaGVyZWZvcmUsIHdlIGNhbid0IHVzZSB0aGUgY29kZU9yaWdpbgorICAg ICAgICBvZiB0aGUgb3BlcmFuZCBhdCB0aGF0IHBvaW50LiBVc2UgdGhlIGNvZGVPcmlnaW4gb2Yg dGhlIG9yaWdpbmFsCisgICAgICAgIGluc3RydWN0aW9uIGluc3RlYWQuCisKKyAgICAgICAgKiBv ZmZsaW5lYXNtL2FybTY0ZS5yYjoKKyAgICAgICAgKiBvZmZsaW5lYXNtL2FzdC5yYjoKKyAgICAg ICAgKiBvZmZsaW5lYXNtL21pcHMucmI6CisgICAgICAgICogb2ZmbGluZWFzbS9yaXNjLnJiOgor CiAyMDIwLTAzLTIyICBZdXN1a2UgU3V6dWtpICA8eXN1enVraUBhcHBsZS5jb20+CiAKICAgICAg ICAgVW5yZXZpZXdlZCwgcmVuYW1lIGtlZXBBbGl2ZSB0byBlbnN1cmVTdGlsbEFsaXZlSGVyZQpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXJtNjRlLnJiIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXJtNjRlLnJiCmluZGV4IDM1OWJlYzc3 YzUyYTQ4YmUzMjY4ZGY4N2ZlM2ViNmI2N2RjYjg0ZGQuLmZiN2ZjMjJmZTM2ZDExZWFhYzVmMzA2 OWIwYmUxNjkxZTY1MjViM2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZs aW5lYXNtL2FybTY0ZS5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9h cm02NGUucmIKQEAgLTQ0LDEzICs0NCwxNyBAQCBjbGFzcyBJbnN0cnVjdGlvbgogICAgICAgICAg ICAgd2hlbiAiam1wIiwgImNhbGwiCiAgICAgICAgICAgICAgICAgaWYgbm9kZS5vcGVyYW5kcy5z aXplID4gMQogICAgICAgICAgICAgICAgICAgICBpZiBub2RlLm9wZXJhbmRzWzFdLmlzX2E/IFJl Z2lzdGVySUQKLSAgICAgICAgICAgICAgICAgICAgICAgIHRhZyA9IHJpc2NBc1JlZ2lzdGVyKG5l d0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHNbMV0sICJwIiwgZmFsc2UpCisg ICAgICAgICAgICAgICAgICAgICAgICB0YWcgPSByaXNjT3BlcmFuZEFzUmVnaXN0ZXIobm9kZSwg bmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAxLCAicCIsIGZhbHNlKQogICAgICAgICAgICAgICAgICAg ICBlbHNlCiAgICAgICAgICAgICAgICAgICAgICAgICB0YWcgPSBUbXAubmV3KGNvZGVPcmlnaW4s IDpncHIpCiAgICAgICAgICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5l dyhjb2RlT3JpZ2luLCAibW92ZSIsIFtub2RlLm9wZXJhbmRzWzFdLCB0YWddLCBhbm5vdGF0aW9u KQogICAgICAgICAgICAgICAgICAgICBlbmQKLSAgICAgICAgICAgICAgICAgICAgb3BlcmFuZHMg PSBbcmlzY0FzUmVnaXN0ZXIobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5k c1swXSwgInAiLCBmYWxzZSksIHRhZ10KLSAgICAgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJ bnN0cnVjdGlvbi5uZXcoY29kZU9yaWdpbiwgbm9kZS5vcGNvZGUsIG9wZXJhbmRzLCBhbm5vdGF0 aW9uKQorICAgICAgICAgICAgICAgICAgICBvcGVyYW5kcyA9IFsKKyAgICAgICAgICAgICAgICAg ICAgICAgIHJpc2NPcGVyYW5kQXNSZWdpc3Rlcihub2RlLCBuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rp b25zLCAwLCAicCIsIGZhbHNlKSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRhZworICAgICAg ICAgICAgICAgICAgICBdCisgICAgICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rp b24uZHVwbGljYXRlX3dpdGhfb3BlcmFuZHMob3BlcmFuZHMpCiAgICAgICAgICAgICAgICAgICAg IHdhc0hhbmRsZWQgPSB0cnVlCiAgICAgICAgICAgICAgICAgZW5kCiAgICAgICAgICAgICB3aGVu ICJ1bnRhZ0FycmF5UHRyIgpAQCAtNjQsNyArNjgsNyBAQCBjbGFzcyBJbnN0cnVjdGlvbgogICAg ICAgICAgICAgICAgICAgICAgICAgb3BlcmFuZAogICAgICAgICAgICAgICAgICAgICBlbmQKICAg ICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5u ZXcoY29kZU9yaWdpbiwgbm9kZS5vcGNvZGUsIG5ld09wZXJhbmRzLCBhbm5vdGF0aW9uKQorICAg ICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24uZHVwbGljYXRlX3dpdGhfb3BlcmFu ZHMobmV3T3BlcmFuZHMpCiAgICAgICAgICAgICAgICAgd2FzSGFuZGxlZCA9IHRydWUKICAgICAg ICAgICAgIGVuZAogICAgICAgICAgICAgbmV3TGlzdCArPSBwb3N0SW5zdHJ1Y3Rpb25zIGlmIHdh c0hhbmRsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2Fz dC5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYgppbmRleCAyZWRj YTcyMzUxMzI1ODNlZjUwZDBjMjE3YmFiYmQ2NTM2OWNiYTE4Li5lY2U2M2RhZDA5OGUxMDIzOWFl OTgwMDRlZGRhN2M3YzI1YTExNTI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv b2ZmbGluZWFzbS9hc3QucmIKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20v YXN0LnJiCkBAIC05MTcsNyArOTE3LDExIEBAIGNsYXNzIEluc3RydWN0aW9uIDwgTm9kZQogICAg ICAgICBAb3BlcmFuZHMgPSBvcGVyYW5kcwogICAgICAgICBAYW5ub3RhdGlvbiA9IGFubm90YXRp b24KICAgICBlbmQKLSAgICAKKworICAgIGRlZiBkdXBsaWNhdGVfd2l0aF9vcGVyYW5kcyhvcGVy YW5kcykKKyAgICAgICAgSW5zdHJ1Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwgc2VsZi5vcGNv ZGUsIG9wZXJhbmRzLCBzZWxmLmFubm90YXRpb24pCisgICAgZW5kCisKICAgICBkZWYgY2hpbGRy ZW4KICAgICAgICAgb3BlcmFuZHMKICAgICBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9vZmZsaW5lYXNtL21pcHMucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGlu ZWFzbS9taXBzLnJiCmluZGV4IDc1ZjA1MjZjZmFhZWMwMjRhNDhhYzc3NTU3MWZhNTcxMzk1ODcy YmIuLjQ0NTZkNGNiODdkNWZmM2NjZDljYWYyOGVjMDEyNmIyMWJiZDllOTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL21pcHMucmIKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL29mZmxpbmVhc20vbWlwcy5yYgpAQCAtNTU0LDIyICs1NTQsMjcgQEAgY2xh c3MgTG9jYWxMYWJlbFJlZmVyZW5jZQogICAgIGVuZAogZW5kCiAKLWRlZiBtaXBzQXNSZWdpc3Rl cihwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZCwgbmVlZFJlc3RvcmUpCi0gICAgdG1wID0gTUlQ U19DQUxMX1JFRwotICAgIGlmIG9wZXJhbmQuYWRkcmVzcz8KLSAgICAgICAgcHJlTGlzdCA8PCBJ bnN0cnVjdGlvbi5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCAibG9hZHAiLCBbb3BlcmFuZCwgTUlQ U19DQUxMX1JFR10pCi0gICAgZWxzaWYgb3BlcmFuZC5pc19hPyBMYWJlbFJlZmVyZW5jZQotICAg ICAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sICJsYSIs IFtvcGVyYW5kLCBNSVBTX0NBTExfUkVHXSkKLSAgICBlbHNpZiBvcGVyYW5kLnJlZ2lzdGVyPyBh bmQgb3BlcmFuZCAhPSBNSVBTX0NBTExfUkVHCi0gICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rp b24ubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgIm1vdmUiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JF R10pCi0gICAgZWxzZQotICAgICAgICBuZWVkUmVzdG9yZSA9IGZhbHNlCi0gICAgICAgIHRtcCA9 IG9wZXJhbmQKLSAgICBlbmQKLSAgICBpZiBuZWVkUmVzdG9yZQotICAgICAgICBwb3N0TGlzdCA8 PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCAibW92ZSIsIFtNSVBTX0dQU0FW RV9SRUcsIE1JUFNfR1BfUkVHXSkKK2NsYXNzIEluc3RydWN0aW9uCisgICAgIyBSZXBsYWNlIG9w ZXJhbmRzIHdpdGggYSBzaW5nbGUgcmVnaXN0ZXIgb3BlcmFuZC4KKyAgICAjIE5vdGU6IGluIGNv bnRyYXN0IHRvIHRoZSByaXNjIHZlcnNpb24sIHRoaXMgbWV0aG9kIGRyb3BzIGFsbCBvdGhlciBv cGVyYW5kcy4KKyAgICBkZWYgbWlwc0FzUmVnaXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJh bmRJbmRleCwgbmVlZFJlc3RvcmUpCisgICAgICAgIG9wZXJhbmQgPSBzZWxmLm9wZXJhbmRzW29w ZXJhbmRJbmRleF0KKyAgICAgICAgdG1wID0gTUlQU19DQUxMX1JFRworICAgICAgICBpZiBvcGVy YW5kLmFkZHJlc3M/CisgICAgICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhzZWxm LmNvZGVPcmlnaW4sICJsb2FkcCIsIFtvcGVyYW5kLCBNSVBTX0NBTExfUkVHXSkKKyAgICAgICAg ZWxzaWYgb3BlcmFuZC5pc19hPyBMYWJlbFJlZmVyZW5jZQorICAgICAgICAgICAgcHJlTGlzdCA8 PCBJbnN0cnVjdGlvbi5uZXcoc2VsZi5jb2RlT3JpZ2luLCAibGEiLCBbb3BlcmFuZCwgTUlQU19D QUxMX1JFR10pCisgICAgICAgIGVsc2lmIG9wZXJhbmQucmVnaXN0ZXI/IGFuZCBvcGVyYW5kICE9 IE1JUFNfQ0FMTF9SRUcKKyAgICAgICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KHNl bGYuY29kZU9yaWdpbiwgIm1vdmUiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCisgICAgICAg IGVsc2UKKyAgICAgICAgICAgIG5lZWRSZXN0b3JlID0gZmFsc2UKKyAgICAgICAgICAgIHRtcCA9 IG9wZXJhbmQKKyAgICAgICAgZW5kCisgICAgICAgIGlmIG5lZWRSZXN0b3JlCisgICAgICAgICAg ICBwb3N0TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoc2VsZi5jb2RlT3JpZ2luLCAibW92ZSIsIFtN SVBTX0dQU0FWRV9SRUcsIE1JUFNfR1BfUkVHXSkKKyAgICAgICAgZW5kCisgICAgICAgIGR1cGxp Y2F0ZV93aXRoX29wZXJhbmRzKFt0bXBdKQogICAgIGVuZAotICAgIHRtcAogZW5kCiAKIGRlZiBt aXBzTG93ZXJNaXNwbGFjZWRBZGRyZXNzZXMobGlzdCkKQEAgLTU4MSwzMCArNTg2LDIxIEBAIGRl ZiBtaXBzTG93ZXJNaXNwbGFjZWRBZGRyZXNzZXMobGlzdCkKICAgICAgICAgICAgIGFubm90YXRp b24gPSBub2RlLmFubm90YXRpb24KICAgICAgICAgICAgIGNhc2Ugbm9kZS5vcGNvZGUKICAgICAg ICAgICAgIHdoZW4gImptcCIKLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9u Lm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgW21pcHNBc1JlZ2lzdGVyKG5ld0xpc3QsIFtdLCBub2RlLm9wZXJhbmRzWzBdLCBm YWxzZSldKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5taXBzQXNSZWdpc3Rlcihu ZXdMaXN0LCBbXSwgMCwgZmFsc2UpCiAgICAgICAgICAgICB3aGVuICJjYWxsIgotICAgICAgICAg ICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbbWlwc0FzUmVnaXN0ZXIobmV3 TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kc1swXSwgdHJ1ZSldKQorICAgICAg ICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5taXBzQXNSZWdpc3RlcihuZXdMaXN0LCBwb3N0SW5z dHJ1Y3Rpb25zLCAwLCB0cnVlKQogICAgICAgICAgICAgd2hlbiAic2x0IiwgInNsdHUiCi0gICAg ICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVy cyhuZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5kcywgImkiKSkKKyAgICAgICAgICAgICAgICBuZXdM aXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCAiaSIpCiAgICAgICAgICAg ICB3aGVuICJzbHR1YiIsICJzbHRiIgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1 Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgW10sIG5vZGUub3BlcmFuZHMs ICJiIikpCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhu ZXdMaXN0LCBbXSwgImIiKQogICAgICAgICAgICAgd2hlbiAiYW5kYiIKICAgICAgICAgICAgICAg ICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImFuZGkiLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwg bm9kZS5vcGVyYW5kcywgImIiKSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICByaXNjT3BlcmFuZHNBc1JlZ2lzdGVycyhub2RlLCBuZXdMaXN0LCBbXSwgImIiKSwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLmFubm90YXRp b24pCiAgICAgICAgICAgICB3aGVuIC9eKGJ6fGJuenxic3xibykvCiAgICAgICAgICAgICAgICAg dGwgPSAkfi5wb3N0X21hdGNoID09ICIiID8gImkiIDogJH4ucG9zdF9tYXRjaAotICAgICAgICAg ICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3 TGlzdCwgW10sIG5vZGUub3BlcmFuZHMsIHRsKSkKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8 IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCB0bCkKICAgICAgICAgICAgIGVsc2UK ICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUKICAgICAgICAgICAgIGVuZApkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcmlzYy5yYiBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Jpc2MucmIKaW5kZXggMWU2NzA0ZmFiNzExYmRhNzdi OTM2NDBiMjg0NzQ4N2M4YjBjOGRkYS4uN2VkM2M1MGE2OGUzNjkzNGJhZTczMjI3MWExMTM5MmRl MzJkODBjZCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcmlz Yy5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9yaXNjLnJiCkBAIC00 MjgsMjYgKzQyOCw0MiBAQCBlbmQKICMgYWRkaSB0bXAsIGJhcgogIwogCi1kZWYgcmlzY0FzUmVn aXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmQsIHN1ZmZpeCwgbmVlZFN0b3JlKQorZGVm IHJpc2NPcGVyYW5kQXNSZWdpc3RlcihpbnNuLCBwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZElu ZGV4LCBzdWZmaXgsIG5lZWRTdG9yZSkKKyAgICBvcGVyYW5kID0gaW5zbi5vcGVyYW5kc1tvcGVy YW5kSW5kZXhdCiAgICAgcmV0dXJuIG9wZXJhbmQgdW5sZXNzIG9wZXJhbmQuYWRkcmVzcz8KICAg ICAKLSAgICB0bXAgPSBUbXAubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgaWYgc3VmZml4ID09ICJk IiB0aGVuIDpmcHIgZWxzZSA6Z3ByIGVuZCkKLSAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5l dyhvcGVyYW5kLmNvZGVPcmlnaW4sICJsb2FkIiArIHN1ZmZpeCwgW29wZXJhbmQsIHRtcF0pCisg ICAgdG1wID0gVG1wLm5ldyhpbnNuLmNvZGVPcmlnaW4sIGlmIHN1ZmZpeCA9PSAiZCIgdGhlbiA6 ZnByIGVsc2UgOmdwciBlbmQpCisgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoaW5zbi5j b2RlT3JpZ2luLCAibG9hZCIgKyBzdWZmaXgsIFtvcGVyYW5kLCB0bXBdKQogICAgIGlmIG5lZWRT dG9yZQotICAgICAgICBwb3N0TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFuZC5jb2RlT3Jp Z2luLCAic3RvcmUiICsgc3VmZml4LCBbdG1wLCBvcGVyYW5kXSkKKyAgICAgICAgcG9zdExpc3Qg PDwgSW5zdHJ1Y3Rpb24ubmV3KGluc24uY29kZU9yaWdpbiwgInN0b3JlIiArIHN1ZmZpeCwgW3Rt cCwgb3BlcmFuZF0pCiAgICAgZW5kCiAgICAgdG1wCiBlbmQKIAotZGVmIHJpc2NBc1JlZ2lzdGVy cyhwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZHMsIHN1ZmZpeCkKK2RlZiByaXNjT3BlcmFuZHNB c1JlZ2lzdGVycyhpbnNuLCBwcmVMaXN0LCBwb3N0TGlzdCwgc3VmZml4KQogICAgIG5ld09wZXJh bmRzID0gW10KLSAgICBvcGVyYW5kcy5lYWNoX3dpdGhfaW5kZXggeworICAgIGluc24ub3BlcmFu ZHMuZWFjaF93aXRoX2luZGV4IHsKICAgICAgICAgfCBvcGVyYW5kLCBpbmRleCB8Ci0gICAgICAg IG5ld09wZXJhbmRzIDw8IHJpc2NBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RMaXN0LCBvcGVyYW5k LCBzdWZmaXgsIGluZGV4ID09IG9wZXJhbmRzLnNpemUgLSAxKQorICAgICAgICBuZXdPcGVyYW5k cyA8PCByaXNjT3BlcmFuZEFzUmVnaXN0ZXIoaW5zbiwgcHJlTGlzdCwgcG9zdExpc3QsCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBpbmRleCwgc3VmZml4LAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5kZXggPT0gaW5z bi5vcGVyYW5kcy5zaXplIC0gMSkKICAgICB9CiAgICAgbmV3T3BlcmFuZHMKIGVuZAogCitjbGFz cyBJbnN0cnVjdGlvbgorICAgIGRlZiByaXNjQXNSZWdpc3RlcihwcmVMaXN0LCBwb3N0TGlzdCwg b3BlcmFuZEluZGV4LCBzdWZmaXgsIG5lZWRTdG9yZSkKKyAgICAgICAgb3BlcmFuZCA9IHJpc2NP cGVyYW5kQXNSZWdpc3RlcihzZWxmLCBwcmVMaXN0LCBwb3N0TGlzdCwKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBvcGVyYW5kSW5kZXgsIHN1 ZmZpeCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBuZWVkU3RvcmUpCisgICAgICAgIGR1cGxpY2F0ZV93aXRoX29wZXJhbmRzKFtvcGVyYW5k XSkKKyAgICBlbmQKKyAgICBkZWYgcmlzY0FzUmVnaXN0ZXJzKHByZUxpc3QsIHBvc3RMaXN0LCBz dWZmaXgpCisgICAgICAgIG9wZXJhbmRzID0gcmlzY09wZXJhbmRzQXNSZWdpc3RlcnMoc2VsZiwg cHJlTGlzdCwgcG9zdExpc3QsIHN1ZmZpeCkKKyAgICAgICAgZHVwbGljYXRlX3dpdGhfb3BlcmFu ZHMob3BlcmFuZHMpCisgICAgZW5kCitlbmQKKwogZGVmIHJpc2NMb3dlck1pc3BsYWNlZEFkZHJl c3NlcyhsaXN0KQogICAgIG5ld0xpc3QgPSBbXQogICAgIGhhc0JhY2tlbmRTcGVjaWZpY0xvd2Vy aW5nID0gSW5zdHJ1Y3Rpb24ucmVzcG9uZF90bz8gImxvd2VyTWlzcGxhY2VkQWRkcmVzc2VzI3sk YWN0aXZlQmFja2VuZH0iCkBAIC00NjQsNDMgKzQ4MCwyMiBAQCBkZWYgcmlzY0xvd2VyTWlzcGxh Y2VkQWRkcmVzc2VzKGxpc3QpCiAgICAgICAgICAgICBjYXNlIG5vZGUub3Bjb2RlCiAgICAgICAg ICAgICB3aGVuICJhZGRpIiwgImFkZGlzIiwgImFuZGkiLCAibHNoaWZ0aSIsICJtdWxpIiwgIm5l Z2kiLCAibm90aSIsICJvcmkiLCAib3JoIiwgIm9yaXMiLAogICAgICAgICAgICAgICAgICJyc2hp ZnRpIiwgInVyc2hpZnRpIiwgInN1YmkiLCAic3ViaXMiLCAieG9yaSIsIC9eYmkvLCAvXmJ0aS8s IC9eY2kvLCAvXnRpLwotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3 KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVy YW5kcywgImkiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBh bm5vdGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3Rl cnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgImkiKQogICAgICAgICAgICAgd2hlbiAiYWRk cCIsICJhbmRwIiwgImxzaGlmdHAiLCAibXVscCIsICJuZWdwIiwgIm9ycCIsICJyc2hpZnRwIiwg InVyc2hpZnRwIiwKICAgICAgICAgICAgICAgICAic3VicCIsICJ4b3JwIiwgL15icC8sIC9eYnRw LywgL15jcC8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2Rl LmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg bm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHMs ICJwIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5ub3Rh dGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5l d0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJwIikKICAgICAgICAgICAgIHdoZW4gImFkZHEiLCAi YW5kcSIsICJsc2hpZnRxIiwgIm11bHEiLCAibmVncSIsICJvcnEiLCAicnNoaWZ0cSIsICJ1cnNo aWZ0cSIsCiAgICAgICAgICAgICAgICAgInN1YnEiLCAieG9ycSIsIC9eYnEvLCAvXmJ0cS8sIC9e Y3EvCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2Rl T3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUu b3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NB c1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzLCAicSIp LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90YXRpb24p CisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0 LCBwb3N0SW5zdHJ1Y3Rpb25zLCAicSIpCiAgICAgICAgICAgICB3aGVuICJiYmVxIiwgImJibmVx IiwgImJiYSIsICJiYmFlcSIsICJiYmIiLCAiYmJiZXEiLCAiYnRieiIsICJidGJueiIsICJ0Ynoi LCAidGJueiIsCiAgICAgICAgICAgICAgICAgImNiZXEiLCAiY2JuZXEiLCAiY2JhIiwgImNiYWVx IiwgImNiYiIsICJjYmJlcSIKLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9u Lm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUu b3BlcmFuZHMsICJiIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVn aXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJiIikKICAgICAgICAgICAgIHdoZW4g ImJiZ3QiLCAiYmJndGVxIiwgImJibHQiLCAiYmJsdGVxIiwgImJ0YnMiLCAidGJzIiwgImNiZ3Qi LCAiY2JndGVxIiwgImNibHQiLCAiY2JsdGVxIgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwg SW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0 aW9ucywgbm9kZS5vcGVyYW5kcywgImJzIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5v ZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJicyIpCiAgICAg ICAgICAgICB3aGVuICJhZGRkIiwgImRpdmQiLCAic3ViZCIsICJtdWxkIiwgInNxcnRkIiwgL15i ZC8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVP cmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5v cGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0Fz UmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHMsICJkIiks Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5ub3RhdGlvbikK KyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3Qs IHBvc3RJbnN0cnVjdGlvbnMsICJkIikKICAgICAgICAgICAgIHdoZW4gImptcCIsICJjYWxsIgot ICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdp biwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29k ZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbcmlzY0FzUmVn aXN0ZXIobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kc1swXSwgInAiLCBm YWxzZSldLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90 YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVyKG5l d0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIDAsICJwIiwgZmFsc2UpCiAgICAgICAgICAgICBlbHNl CiAgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlCiAgICAgICAgICAgICBlbmQK 395933 2020-04-09 03:44:57 -0700 2020-04-17 03:32:46 -0700 Patch bug-207330-20200409104455.patch text/plain 13723 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5Nzg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBm NTgyYmNiODM4MDYyNGJjODRkMDk1ZmYwZjIwNzIwOWY2ZTY5MWRhLi4yOTUwNmRiOGE5NDc4Nzc5 ZWM4MDdmZjdmMTE5MmM0ZmZiODhhYWQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAyMC0wNC0wOSAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NA aWdhbGlhLmNvbT4KKworICAgICAgICBGaXggY29kZSBvcmlnaW4gd2hlbiBsb3dlcmluZyBvZmZs aW5lYXNtIGluc3RydWN0aW9ucyBvbiBNSVBTL0FSTTY0RQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3MzMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdHJ1Y3Rpb24gb3BlcmFuZHMgYXJlIG1hcHBl ZCB0byBSZWdpc3RlcklEIGluIFJlZ2lzdGVySUQuZm9yTmFtZQorICAgICAgICBhbmQgdGhlIG9w ZXJhdGlvbiBpcyBtZW1vaXplZC4gVGhlcmVmb3JlLCB3ZSBjYW4ndCB1c2UgdGhlIGNvZGVPcmln aW4KKyAgICAgICAgb2YgdGhlIG9wZXJhbmQgYXQgdGhhdCBwb2ludC4gVXNlIHRoZSBjb2RlT3Jp Z2luIG9mIHRoZSBvcmlnaW5hbAorICAgICAgICBpbnN0cnVjdGlvbiBpbnN0ZWFkLgorCisgICAg ICAgICogb2ZmbGluZWFzbS9taXBzLnJiOgorICAgICAgICAqIG9mZmxpbmVhc20vcmlzYy5yYjoK KwogMjAyMC0wNC0wOSAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAgICAgICAg SW1wbGVtZW50IGEgbW9yZSBlZmZpY2llbnQgdGFnQ0Z1bmN0aW9uKCkgdG9vbC4KZGlmZiAtLWdp dCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0ZS5yYiBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0ZS5yYgppbmRleCAzNTliZWM3N2M1MmE0OGJl MzI2OGRmODdmZTNlYjZiNjdkY2I4NGRkLi5mYjdmYzIyZmUzNmQxMWVhYWM1ZjMwNjliMGJlMTY5 MWU2NTI1YjNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9h cm02NGUucmIKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXJtNjRlLnJi CkBAIC00NCwxMyArNDQsMTcgQEAgY2xhc3MgSW5zdHJ1Y3Rpb24KICAgICAgICAgICAgIHdoZW4g ImptcCIsICJjYWxsIgogICAgICAgICAgICAgICAgIGlmIG5vZGUub3BlcmFuZHMuc2l6ZSA+IDEK ICAgICAgICAgICAgICAgICAgICAgaWYgbm9kZS5vcGVyYW5kc1sxXS5pc19hPyBSZWdpc3RlcklE Ci0gICAgICAgICAgICAgICAgICAgICAgICB0YWcgPSByaXNjQXNSZWdpc3RlcihuZXdMaXN0LCBw b3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzWzFdLCAicCIsIGZhbHNlKQorICAgICAgICAg ICAgICAgICAgICAgICAgdGFnID0gcmlzY09wZXJhbmRBc1JlZ2lzdGVyKG5vZGUsIG5ld0xpc3Qs IHBvc3RJbnN0cnVjdGlvbnMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgMSwgInAiLCBmYWxzZSkKICAgICAgICAgICAgICAgICAgICAgZWxzZQog ICAgICAgICAgICAgICAgICAgICAgICAgdGFnID0gVG1wLm5ldyhjb2RlT3JpZ2luLCA6Z3ByKQog ICAgICAgICAgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9y aWdpbiwgIm1vdmUiLCBbbm9kZS5vcGVyYW5kc1sxXSwgdGFnXSwgYW5ub3RhdGlvbikKICAgICAg ICAgICAgICAgICAgICAgZW5kCi0gICAgICAgICAgICAgICAgICAgIG9wZXJhbmRzID0gW3Jpc2NB c1JlZ2lzdGVyKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHNbMF0sICJw IiwgZmFsc2UpLCB0YWddCi0gICAgICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rp b24ubmV3KGNvZGVPcmlnaW4sIG5vZGUub3Bjb2RlLCBvcGVyYW5kcywgYW5ub3RhdGlvbikKKyAg ICAgICAgICAgICAgICAgICAgb3BlcmFuZHMgPSBbCisgICAgICAgICAgICAgICAgICAgICAgICBy aXNjT3BlcmFuZEFzUmVnaXN0ZXIobm9kZSwgbmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgMCwg InAiLCBmYWxzZSksCisgICAgICAgICAgICAgICAgICAgICAgICB0YWcKKyAgICAgICAgICAgICAg ICAgICAgXQorICAgICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLmR1cGxp Y2F0ZV93aXRoX29wZXJhbmRzKG9wZXJhbmRzKQogICAgICAgICAgICAgICAgICAgICB3YXNIYW5k bGVkID0gdHJ1ZQogICAgICAgICAgICAgICAgIGVuZAogICAgICAgICAgICAgd2hlbiAidW50YWdB cnJheVB0ciIKQEAgLTY0LDcgKzY4LDcgQEAgY2xhc3MgSW5zdHJ1Y3Rpb24KICAgICAgICAgICAg ICAgICAgICAgICAgIG9wZXJhbmQKICAgICAgICAgICAgICAgICAgICAgZW5kCiAgICAgICAgICAg ICAgICAgfQotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGNvZGVP cmlnaW4sIG5vZGUub3Bjb2RlLCBuZXdPcGVyYW5kcywgYW5ub3RhdGlvbikKKyAgICAgICAgICAg ICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLmR1cGxpY2F0ZV93aXRoX29wZXJhbmRzKG5ld09w ZXJhbmRzKQogICAgICAgICAgICAgICAgIHdhc0hhbmRsZWQgPSB0cnVlCiAgICAgICAgICAgICBl bmQKICAgICAgICAgICAgIG5ld0xpc3QgKz0gcG9zdEluc3RydWN0aW9ucyBpZiB3YXNIYW5kbGVk CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIKaW5kZXggMmVkY2E3MjM1MTMy NTgzZWY1MGQwYzIxN2JhYmJkNjUzNjljYmExOC4uZWNlNjNkYWQwOThlMTAyMzlhZTk4MDA0ZWRk YTdjN2MyNWExMTUyOCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVh c20vYXN0LnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYgpA QCAtOTE3LDcgKzkxNywxMSBAQCBjbGFzcyBJbnN0cnVjdGlvbiA8IE5vZGUKICAgICAgICAgQG9w ZXJhbmRzID0gb3BlcmFuZHMKICAgICAgICAgQGFubm90YXRpb24gPSBhbm5vdGF0aW9uCiAgICAg ZW5kCi0gICAgCisKKyAgICBkZWYgZHVwbGljYXRlX3dpdGhfb3BlcmFuZHMob3BlcmFuZHMpCisg ICAgICAgIEluc3RydWN0aW9uLm5ldyhzZWxmLmNvZGVPcmlnaW4sIHNlbGYub3Bjb2RlLCBvcGVy YW5kcywgc2VsZi5hbm5vdGF0aW9uKQorICAgIGVuZAorCiAgICAgZGVmIGNoaWxkcmVuCiAgICAg ICAgIG9wZXJhbmRzCiAgICAgZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv b2ZmbGluZWFzbS9taXBzLnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vbWlw cy5yYgppbmRleCA3NWYwNTI2Y2ZhYWVjMDI0YTQ4YWM3NzU1NzFmYTU3MTM5NTg3MmJiLi40NDU2 ZDRjYjg3ZDVmZjNjY2Q5Y2FmMjhlYzAxMjZiMjFiYmQ5ZTk1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9taXBzLnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9vZmZsaW5lYXNtL21pcHMucmIKQEAgLTU1NCwyMiArNTU0LDI3IEBAIGNsYXNzIExvY2Fs TGFiZWxSZWZlcmVuY2UKICAgICBlbmQKIGVuZAogCi1kZWYgbWlwc0FzUmVnaXN0ZXIocHJlTGlz dCwgcG9zdExpc3QsIG9wZXJhbmQsIG5lZWRSZXN0b3JlKQotICAgIHRtcCA9IE1JUFNfQ0FMTF9S RUcKLSAgICBpZiBvcGVyYW5kLmFkZHJlc3M/Ci0gICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rp b24ubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgImxvYWRwIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9S RUddKQotICAgIGVsc2lmIG9wZXJhbmQuaXNfYT8gTGFiZWxSZWZlcmVuY2UKLSAgICAgICAgcHJl TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCAibGEiLCBbb3BlcmFu ZCwgTUlQU19DQUxMX1JFR10pCi0gICAgZWxzaWYgb3BlcmFuZC5yZWdpc3Rlcj8gYW5kIG9wZXJh bmQgIT0gTUlQU19DQUxMX1JFRwotICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhv cGVyYW5kLmNvZGVPcmlnaW4sICJtb3ZlIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUddKQotICAg IGVsc2UKLSAgICAgICAgbmVlZFJlc3RvcmUgPSBmYWxzZQotICAgICAgICB0bXAgPSBvcGVyYW5k Ci0gICAgZW5kCi0gICAgaWYgbmVlZFJlc3RvcmUKLSAgICAgICAgcG9zdExpc3QgPDwgSW5zdHJ1 Y3Rpb24ubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgIm1vdmUiLCBbTUlQU19HUFNBVkVfUkVHLCBN SVBTX0dQX1JFR10pCitjbGFzcyBJbnN0cnVjdGlvbgorICAgICMgUmVwbGFjZSBvcGVyYW5kcyB3 aXRoIGEgc2luZ2xlIHJlZ2lzdGVyIG9wZXJhbmQuCisgICAgIyBOb3RlOiBpbiBjb250cmFzdCB0 byB0aGUgcmlzYyB2ZXJzaW9uLCB0aGlzIG1ldGhvZCBkcm9wcyBhbGwgb3RoZXIgb3BlcmFuZHMu CisgICAgZGVmIG1pcHNBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RMaXN0LCBvcGVyYW5kSW5kZXgs IG5lZWRSZXN0b3JlKQorICAgICAgICBvcGVyYW5kID0gc2VsZi5vcGVyYW5kc1tvcGVyYW5kSW5k ZXhdCisgICAgICAgIHRtcCA9IE1JUFNfQ0FMTF9SRUcKKyAgICAgICAgaWYgb3BlcmFuZC5hZGRy ZXNzPworICAgICAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoc2VsZi5jb2RlT3Jp Z2luLCAibG9hZHAiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCisgICAgICAgIGVsc2lmIG9w ZXJhbmQuaXNfYT8gTGFiZWxSZWZlcmVuY2UKKyAgICAgICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1 Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwgImxhIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUdd KQorICAgICAgICBlbHNpZiBvcGVyYW5kLnJlZ2lzdGVyPyBhbmQgb3BlcmFuZCAhPSBNSVBTX0NB TExfUkVHCisgICAgICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhzZWxmLmNvZGVP cmlnaW4sICJtb3ZlIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUddKQorICAgICAgICBlbHNlCisg ICAgICAgICAgICBuZWVkUmVzdG9yZSA9IGZhbHNlCisgICAgICAgICAgICB0bXAgPSBvcGVyYW5k CisgICAgICAgIGVuZAorICAgICAgICBpZiBuZWVkUmVzdG9yZQorICAgICAgICAgICAgcG9zdExp c3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwgIm1vdmUiLCBbTUlQU19HUFNB VkVfUkVHLCBNSVBTX0dQX1JFR10pCisgICAgICAgIGVuZAorICAgICAgICBkdXBsaWNhdGVfd2l0 aF9vcGVyYW5kcyhbdG1wXSkKICAgICBlbmQKLSAgICB0bXAKIGVuZAogCiBkZWYgbWlwc0xvd2Vy TWlzcGxhY2VkQWRkcmVzc2VzKGxpc3QpCkBAIC01ODEsMzAgKzU4NiwyMSBAQCBkZWYgbWlwc0xv d2VyTWlzcGxhY2VkQWRkcmVzc2VzKGxpc3QpCiAgICAgICAgICAgICBhbm5vdGF0aW9uID0gbm9k ZS5hbm5vdGF0aW9uCiAgICAgICAgICAgICBjYXNlIG5vZGUub3Bjb2RlCiAgICAgICAgICAgICB3 aGVuICJqbXAiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9k ZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFttaXBzQXNSZWdpc3RlcihuZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5kc1swXSwgZmFsc2UpXSkK KyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUubWlwc0FzUmVnaXN0ZXIobmV3TGlzdCwg W10sIDAsIGZhbHNlKQogICAgICAgICAgICAgd2hlbiAiY2FsbCIKLSAgICAgICAgICAgICAgICBu ZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgW21pcHNBc1JlZ2lzdGVyKG5ld0xpc3QsIHBv c3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHNbMF0sIHRydWUpXSkKKyAgICAgICAgICAgICAg ICBuZXdMaXN0IDw8IG5vZGUubWlwc0FzUmVnaXN0ZXIobmV3TGlzdCwgcG9zdEluc3RydWN0aW9u cywgMCwgdHJ1ZSkKICAgICAgICAgICAgIHdoZW4gInNsdCIsICJzbHR1IgotICAgICAgICAgICAg ICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlz dCwgW10sIG5vZGUub3BlcmFuZHMsICJpIikpCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBu b2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgImkiKQogICAgICAgICAgICAgd2hlbiAi c2x0dWIiLCAic2x0YiIKLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5l dyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCBub2RlLm9wZXJhbmRzLCAiYiIpKQor ICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwg W10sICJiIikKICAgICAgICAgICAgIHdoZW4gImFuZGIiCiAgICAgICAgICAgICAgICAgbmV3TGlz dCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICJhbmRpIiwKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgW10sIG5vZGUub3Bl cmFuZHMsICJiIikpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg cmlzY09wZXJhbmRzQXNSZWdpc3RlcnMobm9kZSwgbmV3TGlzdCwgW10sICJiIiksCisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5hbm5vdGF0aW9uKQogICAg ICAgICAgICAgd2hlbiAvXihienxibnp8YnN8Ym8pLwogICAgICAgICAgICAgICAgIHRsID0gJH4u cG9zdF9tYXRjaCA9PSAiIiA/ICJpIiA6ICR+LnBvc3RfbWF0Y2gKLSAgICAgICAgICAgICAgICBu ZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtd LCBub2RlLm9wZXJhbmRzLCB0bCkpCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJp c2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgdGwpCiAgICAgICAgICAgICBlbHNlCiAgICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBub2RlCiAgICAgICAgICAgICBlbmQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Jpc2MucmIgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvb2ZmbGluZWFzbS9yaXNjLnJiCmluZGV4IDFlNjcwNGZhYjcxMWJkYTc3YjkzNjQwYjI4 NDc0ODdjOGIwYzhkZGEuLjdlZDNjNTBhNjhlMzY5MzRiYWU3MzIyNzFhMTEzOTJkZTMyZDgwY2Qg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Jpc2MucmIKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcmlzYy5yYgpAQCAtNDI4LDI2ICs0 MjgsNDIgQEAgZW5kCiAjIGFkZGkgdG1wLCBiYXIKICMKIAotZGVmIHJpc2NBc1JlZ2lzdGVyKHBy ZUxpc3QsIHBvc3RMaXN0LCBvcGVyYW5kLCBzdWZmaXgsIG5lZWRTdG9yZSkKK2RlZiByaXNjT3Bl cmFuZEFzUmVnaXN0ZXIoaW5zbiwgcHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmRJbmRleCwgc3Vm Zml4LCBuZWVkU3RvcmUpCisgICAgb3BlcmFuZCA9IGluc24ub3BlcmFuZHNbb3BlcmFuZEluZGV4 XQogICAgIHJldHVybiBvcGVyYW5kIHVubGVzcyBvcGVyYW5kLmFkZHJlc3M/CiAgICAgCi0gICAg dG1wID0gVG1wLm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sIGlmIHN1ZmZpeCA9PSAiZCIgdGhlbiA6 ZnByIGVsc2UgOmdwciBlbmQpCi0gICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFu ZC5jb2RlT3JpZ2luLCAibG9hZCIgKyBzdWZmaXgsIFtvcGVyYW5kLCB0bXBdKQorICAgIHRtcCA9 IFRtcC5uZXcoaW5zbi5jb2RlT3JpZ2luLCBpZiBzdWZmaXggPT0gImQiIHRoZW4gOmZwciBlbHNl IDpncHIgZW5kKQorICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGluc24uY29kZU9yaWdp biwgImxvYWQiICsgc3VmZml4LCBbb3BlcmFuZCwgdG1wXSkKICAgICBpZiBuZWVkU3RvcmUKLSAg ICAgICAgcG9zdExpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgInN0 b3JlIiArIHN1ZmZpeCwgW3RtcCwgb3BlcmFuZF0pCisgICAgICAgIHBvc3RMaXN0IDw8IEluc3Ry dWN0aW9uLm5ldyhpbnNuLmNvZGVPcmlnaW4sICJzdG9yZSIgKyBzdWZmaXgsIFt0bXAsIG9wZXJh bmRdKQogICAgIGVuZAogICAgIHRtcAogZW5kCiAKLWRlZiByaXNjQXNSZWdpc3RlcnMocHJlTGlz dCwgcG9zdExpc3QsIG9wZXJhbmRzLCBzdWZmaXgpCitkZWYgcmlzY09wZXJhbmRzQXNSZWdpc3Rl cnMoaW5zbiwgcHJlTGlzdCwgcG9zdExpc3QsIHN1ZmZpeCkKICAgICBuZXdPcGVyYW5kcyA9IFtd Ci0gICAgb3BlcmFuZHMuZWFjaF93aXRoX2luZGV4IHsKKyAgICBpbnNuLm9wZXJhbmRzLmVhY2hf d2l0aF9pbmRleCB7CiAgICAgICAgIHwgb3BlcmFuZCwgaW5kZXggfAotICAgICAgICBuZXdPcGVy YW5kcyA8PCByaXNjQXNSZWdpc3RlcihwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZCwgc3VmZml4 LCBpbmRleCA9PSBvcGVyYW5kcy5zaXplIC0gMSkKKyAgICAgICAgbmV3T3BlcmFuZHMgPDwgcmlz Y09wZXJhbmRBc1JlZ2lzdGVyKGluc24sIHByZUxpc3QsIHBvc3RMaXN0LAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5kZXgsIHN1ZmZpeCwKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGluZGV4ID09IGluc24ub3BlcmFu ZHMuc2l6ZSAtIDEpCiAgICAgfQogICAgIG5ld09wZXJhbmRzCiBlbmQKIAorY2xhc3MgSW5zdHJ1 Y3Rpb24KKyAgICBkZWYgcmlzY0FzUmVnaXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmRJ bmRleCwgc3VmZml4LCBuZWVkU3RvcmUpCisgICAgICAgIG9wZXJhbmQgPSByaXNjT3BlcmFuZEFz UmVnaXN0ZXIoc2VsZiwgcHJlTGlzdCwgcG9zdExpc3QsCisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3BlcmFuZEluZGV4LCBzdWZmaXgsCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbmVl ZFN0b3JlKQorICAgICAgICBkdXBsaWNhdGVfd2l0aF9vcGVyYW5kcyhbb3BlcmFuZF0pCisgICAg ZW5kCisgICAgZGVmIHJpc2NBc1JlZ2lzdGVycyhwcmVMaXN0LCBwb3N0TGlzdCwgc3VmZml4KQor ICAgICAgICBvcGVyYW5kcyA9IHJpc2NPcGVyYW5kc0FzUmVnaXN0ZXJzKHNlbGYsIHByZUxpc3Qs IHBvc3RMaXN0LCBzdWZmaXgpCisgICAgICAgIGR1cGxpY2F0ZV93aXRoX29wZXJhbmRzKG9wZXJh bmRzKQorICAgIGVuZAorZW5kCisKIGRlZiByaXNjTG93ZXJNaXNwbGFjZWRBZGRyZXNzZXMobGlz dCkKICAgICBuZXdMaXN0ID0gW10KICAgICBoYXNCYWNrZW5kU3BlY2lmaWNMb3dlcmluZyA9IElu c3RydWN0aW9uLnJlc3BvbmRfdG8/ICJsb3dlck1pc3BsYWNlZEFkZHJlc3NlcyN7JGFjdGl2ZUJh Y2tlbmR9IgpAQCAtNDY0LDQzICs0ODAsMjIgQEAgZGVmIHJpc2NMb3dlck1pc3BsYWNlZEFkZHJl c3NlcyhsaXN0KQogICAgICAgICAgICAgY2FzZSBub2RlLm9wY29kZQogICAgICAgICAgICAgd2hl biAiYWRkaSIsICJhZGRpcyIsICJhbmRpIiwgImxzaGlmdGkiLCAibXVsaSIsICJuZWdpIiwgIm5v dGkiLCAib3JpIiwgIm9yaCIsICJvcmlzIiwKICAgICAgICAgICAgICAgICAicnNoaWZ0aSIsICJ1 cnNoaWZ0aSIsICJzdWJpIiwgInN1YmlzIiwgInhvcmkiLCAvXmJpLywgL15idGkvLCAvXmNpLywg L150aS8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNv ZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9k ZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlz Y0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHMsICJp IiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5ub3RhdGlv bikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0FzUmVnaXN0ZXJzKG5ld0xp c3QsIHBvc3RJbnN0cnVjdGlvbnMsICJpIikKICAgICAgICAgICAgIHdoZW4gImFkZHAiLCAiYW5k cCIsICJsc2hpZnRwIiwgIm11bHAiLCAibmVncCIsICJvcnAiLCAicnNoaWZ0cCIsICJ1cnNoaWZ0 cCIsCiAgICAgICAgICAgICAgICAgInN1YnAiLCAieG9ycCIsIC9eYnAvLCAvXmJ0cC8sIC9eY3Av Ci0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3Jp Z2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bj b2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1Jl Z2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzLCAicCIpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90YXRpb24pCisg ICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBw b3N0SW5zdHJ1Y3Rpb25zLCAicCIpCiAgICAgICAgICAgICB3aGVuICJhZGRxIiwgImFuZHEiLCAi bHNoaWZ0cSIsICJtdWxxIiwgIm5lZ3EiLCAib3JxIiwgInJzaGlmdHEiLCAidXJzaGlmdHEiLAog ICAgICAgICAgICAgICAgICJzdWJxIiwgInhvcnEiLCAvXmJxLywgL15idHEvLCAvXmNxLwotICAg ICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3Rl cnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kcywgInEiKSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbm5vdGF0aW9uKQorICAgICAg ICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdElu c3RydWN0aW9ucywgInEiKQogICAgICAgICAgICAgd2hlbiAiYmJlcSIsICJiYm5lcSIsICJiYmEi LCAiYmJhZXEiLCAiYmJiIiwgImJiYmVxIiwgImJ0YnoiLCAiYnRibnoiLCAidGJ6IiwgInRibnoi LAogICAgICAgICAgICAgICAgICJjYmVxIiwgImNibmVxIiwgImNiYSIsICJjYmFlcSIsICJjYmIi LCAiY2JiZXEiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9k ZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRz LCAiYiIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90 YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhu ZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAiYiIpCiAgICAgICAgICAgICB3aGVuICJiYmd0Iiwg ImJiZ3RlcSIsICJiYmx0IiwgImJibHRlcSIsICJidGJzIiwgInRicyIsICJjYmd0IiwgImNiZ3Rl cSIsICJjYmx0IiwgImNibHRlcSIKLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0 aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5v ZGUub3BlcmFuZHMsICJicyIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NB c1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAiYnMiKQogICAgICAgICAgICAg d2hlbiAiYWRkZCIsICJkaXZkIiwgInN1YmQiLCAibXVsZCIsICJzcXJ0ZCIsIC9eYmQvCi0gICAg ICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVy cyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzLCAiZCIpLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90YXRpb24pCisgICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5z dHJ1Y3Rpb25zLCAiZCIpCiAgICAgICAgICAgICB3aGVuICJqbXAiLCAiY2FsbCIKLSAgICAgICAg ICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgW3Jpc2NBc1JlZ2lzdGVyKG5l d0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHNbMF0sICJwIiwgZmFsc2UpXSwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbm5vdGF0aW9uKQor ICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQXNSZWdpc3RlcihuZXdMaXN0LCBw b3N0SW5zdHJ1Y3Rpb25zLCAwLCAicCIsIGZhbHNlKQogICAgICAgICAgICAgZWxzZQogICAgICAg ICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZQogICAgICAgICAgICAgZW5kCg== 396753 2020-04-17 03:32:50 -0700 2020-04-18 07:01:22 -0700 Patch bug-207330-20200417103248.patch text/plain 14040 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMTg0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 MDI5MTBmMjUzY2UyYzRkYjQwNzUwZWJiZjFkYTIyYjZmNGY2YmM3Li42NTBlYjA1YTY5MzczMGI1 YTNhNjgzOTdmYmZhOWM3ZTMyNmQ2Mzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMC0wNC0xNyAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NA aWdhbGlhLmNvbT4KKworICAgICAgICBGaXggY29kZSBvcmlnaW4gd2hlbiBsb3dlcmluZyBvZmZs aW5lYXNtIGluc3RydWN0aW9ucyBvbiBNSVBTL0FSTTY0RQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3MzMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdHJ1Y3Rpb24gb3BlcmFuZHMgYXJlIG1hcHBl ZCB0byBSZWdpc3RlcklEIGluIFJlZ2lzdGVySUQuZm9yTmFtZQorICAgICAgICBhbmQgdGhlIG9w ZXJhdGlvbiBpcyBtZW1vaXplZC4gVGhlcmVmb3JlLCB3ZSBjYW4ndCB1c2UgdGhlIGNvZGVPcmln aW4KKyAgICAgICAgb2YgdGhlIG9wZXJhbmQgYXQgdGhhdCBwb2ludC4gVXNlIHRoZSBjb2RlT3Jp Z2luIG9mIHRoZSBvcmlnaW5hbAorICAgICAgICBpbnN0cnVjdGlvbiBpbnN0ZWFkLgorCisgICAg ICAgICogb2ZmbGluZWFzbS9hcm02NGUucmI6CisgICAgICAgICogb2ZmbGluZWFzbS9hc3QucmI6 CisgICAgICAgICogb2ZmbGluZWFzbS9taXBzLnJiOgorICAgICAgICAqIG9mZmxpbmVhc20vcmlz Yy5yYjoKKwogMjAyMC0wNC0xNiAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBwbGUuY29tPgog CiAgICAgICAgIFtKU0NdIEltcGxlbWVudCBKU01hcEl0ZXJhdG9yL0pTU2V0SXRlcmF0b3Igd2l0 aCBKU0ludGVybmFsRmllbGRPYmplY3RJbXBsCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvb2ZmbGluZWFzbS9hcm02NGUucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGlu ZWFzbS9hcm02NGUucmIKaW5kZXggMzU5YmVjNzdjNTJhNDhiZTMyNjhkZjg3ZmUzZWI2YjY3ZGNi ODRkZC4uNGNjYzRmZjYyMmI2Y2RlZGY1YjhiMDRkMzExNjJjMzI4MWNhYTAxMSAxMDA2NDQKLS0t IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXJtNjRlLnJiCisrKyBiL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0ZS5yYgpAQCAtNDQsMTMgKzQ0LDE3IEBA IGNsYXNzIEluc3RydWN0aW9uCiAgICAgICAgICAgICB3aGVuICJqbXAiLCAiY2FsbCIKICAgICAg ICAgICAgICAgICBpZiBub2RlLm9wZXJhbmRzLnNpemUgPiAxCiAgICAgICAgICAgICAgICAgICAg IGlmIG5vZGUub3BlcmFuZHNbMV0uaXNfYT8gUmVnaXN0ZXJJRAotICAgICAgICAgICAgICAgICAg ICAgICAgdGFnID0gcmlzY0FzUmVnaXN0ZXIobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9k ZS5vcGVyYW5kc1sxXSwgInAiLCBmYWxzZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRhZyA9 IHJpc2NMb3dlck9wZXJhbmRUb1JlZ2lzdGVyKG5vZGUsIG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlv bnMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg MSwgInAiLCBmYWxzZSkKICAgICAgICAgICAgICAgICAgICAgZWxzZQogICAgICAgICAgICAgICAg ICAgICAgICAgdGFnID0gVG1wLm5ldyhjb2RlT3JpZ2luLCA6Z3ByKQogICAgICAgICAgICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9yaWdpbiwgIm1vdmUiLCBb bm9kZS5vcGVyYW5kc1sxXSwgdGFnXSwgYW5ub3RhdGlvbikKICAgICAgICAgICAgICAgICAgICAg ZW5kCi0gICAgICAgICAgICAgICAgICAgIG9wZXJhbmRzID0gW3Jpc2NBc1JlZ2lzdGVyKG5ld0xp c3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFuZHNbMF0sICJwIiwgZmFsc2UpLCB0YWdd Ci0gICAgICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGNvZGVPcmln aW4sIG5vZGUub3Bjb2RlLCBvcGVyYW5kcywgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICAg ICAgb3BlcmFuZHMgPSBbCisgICAgICAgICAgICAgICAgICAgICAgICByaXNjTG93ZXJPcGVyYW5k VG9SZWdpc3Rlcihub2RlLCBuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAwLCAicCIsIGZhbHNl KSwKKyAgICAgICAgICAgICAgICAgICAgICAgIHRhZworICAgICAgICAgICAgICAgICAgICBdCisg ICAgICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24uY2xvbmVXaXRoTmV3T3Bl cmFuZHMob3BlcmFuZHMpCiAgICAgICAgICAgICAgICAgICAgIHdhc0hhbmRsZWQgPSB0cnVlCiAg ICAgICAgICAgICAgICAgZW5kCiAgICAgICAgICAgICB3aGVuICJ1bnRhZ0FycmF5UHRyIgpAQCAt NjQsNyArNjgsNyBAQCBjbGFzcyBJbnN0cnVjdGlvbgogICAgICAgICAgICAgICAgICAgICAgICAg b3BlcmFuZAogICAgICAgICAgICAgICAgICAgICBlbmQKICAgICAgICAgICAgICAgICB9Ci0gICAg ICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoY29kZU9yaWdpbiwgbm9kZS5v cGNvZGUsIG5ld09wZXJhbmRzLCBhbm5vdGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3Qg PDwgSW5zdHJ1Y3Rpb24uY2xvbmVXaXRoTmV3T3BlcmFuZHMobmV3T3BlcmFuZHMpCiAgICAgICAg ICAgICAgICAgd2FzSGFuZGxlZCA9IHRydWUKICAgICAgICAgICAgIGVuZAogICAgICAgICAgICAg bmV3TGlzdCArPSBwb3N0SW5zdHJ1Y3Rpb25zIGlmIHdhc0hhbmRsZWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYiBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9vZmZsaW5lYXNtL2FzdC5yYgppbmRleCBiNDlkYzk4NzcxN2FmNDE2MTliMDFkZWZjN2Jh MWYyN2E5MjkyYjdlLi4wMDlmZWFjNTY0NDU3ZmNmY2QzNDI4NWVmMzRlYjcxY2Y2NDliMjFlIDEw MDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXN0LnJiCkBAIC05MTcsNyArOTE3LDEx IEBAIGNsYXNzIEluc3RydWN0aW9uIDwgTm9kZQogICAgICAgICBAb3BlcmFuZHMgPSBvcGVyYW5k cwogICAgICAgICBAYW5ub3RhdGlvbiA9IGFubm90YXRpb24KICAgICBlbmQKLSAgICAKKworICAg IGRlZiBjbG9uZVdpdGhOZXdPcGVyYW5kcyhuZXdPcGVyYW5kcykKKyAgICAgICAgSW5zdHJ1Y3Rp b24ubmV3KHNlbGYuY29kZU9yaWdpbiwgc2VsZi5vcGNvZGUsIG5ld09wZXJhbmRzLCBzZWxmLmFu bm90YXRpb24pCisgICAgZW5kCisKICAgICBkZWYgY2hpbGRyZW4KICAgICAgICAgb3BlcmFuZHMK ICAgICBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL21p cHMucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9taXBzLnJiCmluZGV4IDc1 ZjA1MjZjZmFhZWMwMjRhNDhhYzc3NTU3MWZhNTcxMzk1ODcyYmIuLmNjOTFmZWRhMGYzN2M0NmMy YTUwNzFhZTMwOTI1NzE1NGJiNDMwMjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9vZmZsaW5lYXNtL21pcHMucmIKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVh c20vbWlwcy5yYgpAQCAtNTU0LDIyICs1NTQsMjcgQEAgY2xhc3MgTG9jYWxMYWJlbFJlZmVyZW5j ZQogICAgIGVuZAogZW5kCiAKLWRlZiBtaXBzQXNSZWdpc3RlcihwcmVMaXN0LCBwb3N0TGlzdCwg b3BlcmFuZCwgbmVlZFJlc3RvcmUpCi0gICAgdG1wID0gTUlQU19DQUxMX1JFRwotICAgIGlmIG9w ZXJhbmQuYWRkcmVzcz8KLSAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3BlcmFu ZC5jb2RlT3JpZ2luLCAibG9hZHAiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCi0gICAgZWxz aWYgb3BlcmFuZC5pc19hPyBMYWJlbFJlZmVyZW5jZQotICAgICAgICBwcmVMaXN0IDw8IEluc3Ry dWN0aW9uLm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sICJsYSIsIFtvcGVyYW5kLCBNSVBTX0NBTExf UkVHXSkKLSAgICBlbHNpZiBvcGVyYW5kLnJlZ2lzdGVyPyBhbmQgb3BlcmFuZCAhPSBNSVBTX0NB TExfUkVHCi0gICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQuY29kZU9y aWdpbiwgIm1vdmUiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCi0gICAgZWxzZQotICAgICAg ICBuZWVkUmVzdG9yZSA9IGZhbHNlCi0gICAgICAgIHRtcCA9IG9wZXJhbmQKLSAgICBlbmQKLSAg ICBpZiBuZWVkUmVzdG9yZQotICAgICAgICBwb3N0TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcob3Bl cmFuZC5jb2RlT3JpZ2luLCAibW92ZSIsIFtNSVBTX0dQU0FWRV9SRUcsIE1JUFNfR1BfUkVHXSkK K2NsYXNzIEluc3RydWN0aW9uCisgICAgIyBSZXBsYWNlIG9wZXJhbmRzIHdpdGggYSBzaW5nbGUg cmVnaXN0ZXIgb3BlcmFuZC4KKyAgICAjIE5vdGU6IGluIGNvbnRyYXN0IHRvIHRoZSByaXNjIHZl cnNpb24sIHRoaXMgbWV0aG9kIGRyb3BzIGFsbCBvdGhlciBvcGVyYW5kcy4KKyAgICBkZWYgbWlw c0Nsb25lV2l0aE9wZXJhbmRMb3dlcmVkKHByZUxpc3QsIHBvc3RMaXN0LCBvcGVyYW5kSW5kZXgs IG5lZWRSZXN0b3JlKQorICAgICAgICBvcGVyYW5kID0gc2VsZi5vcGVyYW5kc1tvcGVyYW5kSW5k ZXhdCisgICAgICAgIHRtcCA9IE1JUFNfQ0FMTF9SRUcKKyAgICAgICAgaWYgb3BlcmFuZC5hZGRy ZXNzPworICAgICAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoc2VsZi5jb2RlT3Jp Z2luLCAibG9hZHAiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JFR10pCisgICAgICAgIGVsc2lmIG9w ZXJhbmQuaXNfYT8gTGFiZWxSZWZlcmVuY2UKKyAgICAgICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1 Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwgImxhIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUdd KQorICAgICAgICBlbHNpZiBvcGVyYW5kLnJlZ2lzdGVyPyBhbmQgb3BlcmFuZCAhPSBNSVBTX0NB TExfUkVHCisgICAgICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhzZWxmLmNvZGVP cmlnaW4sICJtb3ZlIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUddKQorICAgICAgICBlbHNlCisg ICAgICAgICAgICBuZWVkUmVzdG9yZSA9IGZhbHNlCisgICAgICAgICAgICB0bXAgPSBvcGVyYW5k CisgICAgICAgIGVuZAorICAgICAgICBpZiBuZWVkUmVzdG9yZQorICAgICAgICAgICAgcG9zdExp c3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdpbiwgIm1vdmUiLCBbTUlQU19HUFNB VkVfUkVHLCBNSVBTX0dQX1JFR10pCisgICAgICAgIGVuZAorICAgICAgICBjbG9uZVdpdGhOZXdP cGVyYW5kcyhbdG1wXSkKICAgICBlbmQKLSAgICB0bXAKIGVuZAogCiBkZWYgbWlwc0xvd2VyTWlz cGxhY2VkQWRkcmVzc2VzKGxpc3QpCkBAIC01ODEsMzAgKzU4NiwyMSBAQCBkZWYgbWlwc0xvd2Vy TWlzcGxhY2VkQWRkcmVzc2VzKGxpc3QpCiAgICAgICAgICAgICBhbm5vdGF0aW9uID0gbm9kZS5h bm5vdGF0aW9uCiAgICAgICAgICAgICBjYXNlIG5vZGUub3Bjb2RlCiAgICAgICAgICAgICB3aGVu ICJqbXAiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5j b2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5v ZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFtt aXBzQXNSZWdpc3RlcihuZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5kc1swXSwgZmFsc2UpXSkKKyAg ICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUubWlwc0Nsb25lV2l0aE9wZXJhbmRMb3dlcmVk KG5ld0xpc3QsIFtdLCAwLCBmYWxzZSkKICAgICAgICAgICAgIHdoZW4gImNhbGwiCi0gICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFttaXBzQXNSZWdpc3Rlcihu ZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzWzBdLCB0cnVlKV0pCisgICAg ICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLm1pcHNDbG9uZVdpdGhPcGVyYW5kTG93ZXJlZChu ZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAwLCB0cnVlKQogICAgICAgICAgICAgd2hlbiAic2x0 IiwgInNsdHUiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9k ZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5kcywgImkiKSkKKyAgICAg ICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0Nsb25lV2l0aE9wZXJhbmRzTG93ZXJlZChu ZXdMaXN0LCBbXSwgImkiKQogICAgICAgICAgICAgd2hlbiAic2x0dWIiLCAic2x0YiIKLSAgICAg ICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJz KG5ld0xpc3QsIFtdLCBub2RlLm9wZXJhbmRzLCAiYiIpKQorICAgICAgICAgICAgICAgIG5ld0xp c3QgPDwgbm9kZS5yaXNjQ2xvbmVXaXRoT3BlcmFuZHNMb3dlcmVkKG5ld0xpc3QsIFtdLCAiYiIp CiAgICAgICAgICAgICB3aGVuICJhbmRiIgogICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5z dHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAiYW5kaSIsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCBub2RlLm9wZXJhbmRzLCAi YiIpKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NMb3dl ck9wZXJhbmRzVG9SZWdpc3RlcnMobm9kZSwgbmV3TGlzdCwgW10sICJiIiksCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5hbm5vdGF0aW9uKQogICAgICAg ICAgICAgd2hlbiAvXihienxibnp8YnN8Ym8pLwogICAgICAgICAgICAgICAgIHRsID0gJH4ucG9z dF9tYXRjaCA9PSAiIiA/ICJpIiA6ICR+LnBvc3RfbWF0Y2gKLSAgICAgICAgICAgICAgICBuZXdM aXN0IDw8IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIFtdLCBu b2RlLm9wZXJhbmRzLCB0bCkpCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2ND bG9uZVdpdGhPcGVyYW5kc0xvd2VyZWQobmV3TGlzdCwgW10sIHRsKQogICAgICAgICAgICAgZWxz ZQogICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZQogICAgICAgICAgICAgZW5kCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9yaXNjLnJiIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcmlzYy5yYgppbmRleCAxZTY3MDRmYWI3MTFiZGE3 N2I5MzY0MGIyODQ3NDg3YzhiMGM4ZGRhLi40OTVkYWVlNzU2MDE3MTM2ZTE1YTJhNmQ1NTdiMzU5 NjE3YzQ2NGI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9y aXNjLnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Jpc2MucmIKQEAg LTQyOCwyNiArNDI4LDQyIEBAIGVuZAogIyBhZGRpIHRtcCwgYmFyCiAjCiAKLWRlZiByaXNjQXNS ZWdpc3RlcihwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZCwgc3VmZml4LCBuZWVkU3RvcmUpCitk ZWYgcmlzY0xvd2VyT3BlcmFuZFRvUmVnaXN0ZXIoaW5zbiwgcHJlTGlzdCwgcG9zdExpc3QsIG9w ZXJhbmRJbmRleCwgc3VmZml4LCBuZWVkU3RvcmUpCisgICAgb3BlcmFuZCA9IGluc24ub3BlcmFu ZHNbb3BlcmFuZEluZGV4XQogICAgIHJldHVybiBvcGVyYW5kIHVubGVzcyBvcGVyYW5kLmFkZHJl c3M/CiAgICAgCi0gICAgdG1wID0gVG1wLm5ldyhvcGVyYW5kLmNvZGVPcmlnaW4sIGlmIHN1ZmZp eCA9PSAiZCIgdGhlbiA6ZnByIGVsc2UgOmdwciBlbmQpCi0gICAgcHJlTGlzdCA8PCBJbnN0cnVj dGlvbi5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCAibG9hZCIgKyBzdWZmaXgsIFtvcGVyYW5kLCB0 bXBdKQorICAgIHRtcCA9IFRtcC5uZXcoaW5zbi5jb2RlT3JpZ2luLCBpZiBzdWZmaXggPT0gImQi IHRoZW4gOmZwciBlbHNlIDpncHIgZW5kKQorICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3 KGluc24uY29kZU9yaWdpbiwgImxvYWQiICsgc3VmZml4LCBbb3BlcmFuZCwgdG1wXSkKICAgICBp ZiBuZWVkU3RvcmUKLSAgICAgICAgcG9zdExpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQu Y29kZU9yaWdpbiwgInN0b3JlIiArIHN1ZmZpeCwgW3RtcCwgb3BlcmFuZF0pCisgICAgICAgIHBv c3RMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhpbnNuLmNvZGVPcmlnaW4sICJzdG9yZSIgKyBzdWZm aXgsIFt0bXAsIG9wZXJhbmRdKQogICAgIGVuZAogICAgIHRtcAogZW5kCiAKLWRlZiByaXNjQXNS ZWdpc3RlcnMocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmRzLCBzdWZmaXgpCitkZWYgcmlzY0xv d2VyT3BlcmFuZHNUb1JlZ2lzdGVycyhpbnNuLCBwcmVMaXN0LCBwb3N0TGlzdCwgc3VmZml4KQog ICAgIG5ld09wZXJhbmRzID0gW10KLSAgICBvcGVyYW5kcy5lYWNoX3dpdGhfaW5kZXggeworICAg IGluc24ub3BlcmFuZHMuZWFjaF93aXRoX2luZGV4IHsKICAgICAgICAgfCBvcGVyYW5kLCBpbmRl eCB8Ci0gICAgICAgIG5ld09wZXJhbmRzIDw8IHJpc2NBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RM aXN0LCBvcGVyYW5kLCBzdWZmaXgsIGluZGV4ID09IG9wZXJhbmRzLnNpemUgLSAxKQorICAgICAg ICBuZXdPcGVyYW5kcyA8PCByaXNjTG93ZXJPcGVyYW5kVG9SZWdpc3RlcihpbnNuLCBwcmVMaXN0 LCBwb3N0TGlzdCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGluZGV4LCBzdWZmaXgsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBpbmRleCA9PSBpbnNuLm9wZXJhbmRzLnNpemUgLSAxKQogICAgIH0KICAgICBuZXdPcGVy YW5kcwogZW5kCiAKK2NsYXNzIEluc3RydWN0aW9uCisgICAgZGVmIHJpc2NDbG9uZVdpdGhPcGVy YW5kTG93ZXJlZChwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZEluZGV4LCBzdWZmaXgsIG5lZWRT dG9yZSkKKyAgICAgICAgb3BlcmFuZCA9IHJpc2NMb3dlck9wZXJhbmRUb1JlZ2lzdGVyKHNlbGYs IHByZUxpc3QsIHBvc3RMaXN0LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG9wZXJhbmRJbmRleCwgc3VmZml4LAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5lZWRTdG9yZSkKKyAgICAg ICAgY2xvbmVXaXRoTmV3T3BlcmFuZHMoW29wZXJhbmRdKQorICAgIGVuZAorICAgIGRlZiByaXNj Q2xvbmVXaXRoT3BlcmFuZHNMb3dlcmVkKHByZUxpc3QsIHBvc3RMaXN0LCBzdWZmaXgpCisgICAg ICAgIG9wZXJhbmRzID0gcmlzY0xvd2VyT3BlcmFuZHNUb1JlZ2lzdGVycyhzZWxmLCBwcmVMaXN0 LCBwb3N0TGlzdCwgc3VmZml4KQorICAgICAgICBjbG9uZVdpdGhOZXdPcGVyYW5kcyhvcGVyYW5k cykKKyAgICBlbmQKK2VuZAorCiBkZWYgcmlzY0xvd2VyTWlzcGxhY2VkQWRkcmVzc2VzKGxpc3Qp CiAgICAgbmV3TGlzdCA9IFtdCiAgICAgaGFzQmFja2VuZFNwZWNpZmljTG93ZXJpbmcgPSBJbnN0 cnVjdGlvbi5yZXNwb25kX3RvPyAibG93ZXJNaXNwbGFjZWRBZGRyZXNzZXMjeyRhY3RpdmVCYWNr ZW5kfSIKQEAgLTQ2NCw0MyArNDgwLDIyIEBAIGRlZiByaXNjTG93ZXJNaXNwbGFjZWRBZGRyZXNz ZXMobGlzdCkKICAgICAgICAgICAgIGNhc2Ugbm9kZS5vcGNvZGUKICAgICAgICAgICAgIHdoZW4g ImFkZGkiLCAiYWRkaXMiLCAiYW5kaSIsICJsc2hpZnRpIiwgIm11bGkiLCAibmVnaSIsICJub3Rp IiwgIm9yaSIsICJvcmgiLCAib3JpcyIsCiAgICAgICAgICAgICAgICAgInJzaGlmdGkiLCAidXJz aGlmdGkiLCAic3ViaSIsICJzdWJpcyIsICJ4b3JpIiwgL15iaS8sIC9eYnRpLywgL15jaS8sIC9e dGkvCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2Rl T3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUu b3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NB c1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzLCAiaSIp LAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90YXRpb24p CisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NDbG9uZVdpdGhPcGVyYW5kc0xv d2VyZWQobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgImkiKQogICAgICAgICAgICAgd2hlbiAi YWRkcCIsICJhbmRwIiwgImxzaGlmdHAiLCAibXVscCIsICJuZWdwIiwgIm9ycCIsICJyc2hpZnRw IiwgInVyc2hpZnRwIiwKICAgICAgICAgICAgICAgICAic3VicCIsICJ4b3JwIiwgL15icC8sIC9e YnRwLywgL15jcC8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhu b2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5vZGUub3BlcmFu ZHMsICJwIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYW5u b3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0Nsb25lV2l0aE9w ZXJhbmRzTG93ZXJlZChuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAicCIpCiAgICAgICAgICAg ICB3aGVuICJhZGRxIiwgImFuZHEiLCAibHNoaWZ0cSIsICJtdWxxIiwgIm5lZ3EiLCAib3JxIiwg InJzaGlmdHEiLCAidXJzaGlmdHEiLAogICAgICAgICAgICAgICAgICJzdWJxIiwgInhvcnEiLCAv XmJxLywgL15idHEvLCAvXmNxLwotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rp b24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9k ZS5vcGVyYW5kcywgInEiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBhbm5vdGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQ2xv bmVXaXRoT3BlcmFuZHNMb3dlcmVkKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJxIikKICAg ICAgICAgICAgIHdoZW4gImJiZXEiLCAiYmJuZXEiLCAiYmJhIiwgImJiYWVxIiwgImJiYiIsICJi YmJlcSIsICJidGJ6IiwgImJ0Ym56IiwgInRieiIsICJ0Ym56IiwKICAgICAgICAgICAgICAgICAi Y2JlcSIsICJjYm5lcSIsICJjYmEiLCAiY2JhZXEiLCAiY2JiIiwgImNiYmVxIgotICAgICAgICAg ICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3 TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kcywgImIiKSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbm5vdGF0aW9uKQorICAgICAgICAgICAg ICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQ2xvbmVXaXRoT3BlcmFuZHNMb3dlcmVkKG5ld0xpc3Qs IHBvc3RJbnN0cnVjdGlvbnMsICJiIikKICAgICAgICAgICAgIHdoZW4gImJiZ3QiLCAiYmJndGVx IiwgImJibHQiLCAiYmJsdGVxIiwgImJ0YnMiLCAidGJzIiwgImNiZ3QiLCAiY2JndGVxIiwgImNi bHQiLCAiY2JsdGVxIgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3 KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVy YW5kcywgImJzIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg YW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0Nsb25lV2l0 aE9wZXJhbmRzTG93ZXJlZChuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAiYnMiKQogICAgICAg ICAgICAgd2hlbiAiYWRkZCIsICJkaXZkIiwgInN1YmQiLCAibXVsZCIsICJzcXJ0ZCIsIC9eYmQv Ci0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3Jp Z2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bj b2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1Jl Z2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzLCAiZCIpLAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFubm90YXRpb24pCisg ICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NDbG9uZVdpdGhPcGVyYW5kc0xvd2Vy ZWQobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgImQiKQogICAgICAgICAgICAgd2hlbiAiam1w IiwgImNhbGwiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9k ZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFtyaXNjQXNSZWdpc3RlcihuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRz WzBdLCAicCIsIGZhbHNlKV0sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0Ns b25lV2l0aE9wZXJhbmRMb3dlcmVkKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIDAsICJwIiwg ZmFsc2UpCiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2Rl CiAgICAgICAgICAgICBlbmQK 396846 2020-04-18 07:01:25 -0700 2020-04-18 07:59:15 -0700 Patch bug-207330-20200418140124.patch text/plain 14172 angelos U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMjQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAz MjI4ZjNjMDIzZDFmMzE1OWE2ZjMxODhlMWUwMzA4NjM0ZjNiODNhLi5hYjBkNWUzYjdjNTdhZjEy M2UyZDA0MmM3YTgzYzMzZDY0OGZmMjFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMCBAQAorMjAyMC0wNC0xOCAgQW5nZWxvcyBPaWtvbm9tb3BvdWxvcyAgPGFuZ2Vsb3NA aWdhbGlhLmNvbT4KKworICAgICAgICBGaXggY29kZSBvcmlnaW4gd2hlbiBsb3dlcmluZyBvZmZs aW5lYXNtIGluc3RydWN0aW9ucyBvbiBNSVBTL0FSTTY0RQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA3MzMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW5zdHJ1Y3Rpb24gb3BlcmFuZHMgYXJlIG1hcHBl ZCB0byBSZWdpc3RlcklEIGluIFJlZ2lzdGVySUQuZm9yTmFtZQorICAgICAgICBhbmQgdGhlIG9w ZXJhdGlvbiBpcyBtZW1vaXplZC4gVGhlcmVmb3JlLCB3ZSBjYW4ndCB1c2UgdGhlIGNvZGVPcmln aW4KKyAgICAgICAgb2YgdGhlIG9wZXJhbmQgYXQgdGhhdCBwb2ludC4gVXNlIHRoZSBjb2RlT3Jp Z2luIG9mIHRoZSBvcmlnaW5hbAorICAgICAgICBpbnN0cnVjdGlvbiBpbnN0ZWFkLgorCisgICAg ICAgICogb2ZmbGluZWFzbS9hcm02NGUucmI6CisgICAgICAgICogb2ZmbGluZWFzbS9hc3QucmI6 CisgICAgICAgICogb2ZmbGluZWFzbS9taXBzLnJiOgorICAgICAgICAqIG9mZmxpbmVhc20vcmlz Yy5yYjoKKwogMjAyMC0wNC0xNyAgTWFyayBMYW0gIDxtYXJrLmxhbUBhcHBsZS5jb20+CiAKICAg ICAgICAgb2ZmbGluZWFzbSBpcyBnZW5lcmF0aW5nIHRoZSB3cm9uZyBsb2FkL3N0b3JlIGZvciB0 aGUgIm9yaCIgaW5zdHJ1Y3Rpb24uCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv b2ZmbGluZWFzbS9hcm02NGUucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9h cm02NGUucmIKaW5kZXggMzU5YmVjNzdjNTJhNDhiZTMyNjhkZjg3ZmUzZWI2YjY3ZGNiODRkZC4u YTRmODBhNWUxYjU3ODE2YWNlM2RlZGExN2M3ZjE5N2E3ZDJhMDExNiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXJtNjRlLnJiCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FybTY0ZS5yYgpAQCAtNDQsMTMgKzQ0LDE2IEBAIGNsYXNz IEluc3RydWN0aW9uCiAgICAgICAgICAgICB3aGVuICJqbXAiLCAiY2FsbCIKICAgICAgICAgICAg ICAgICBpZiBub2RlLm9wZXJhbmRzLnNpemUgPiAxCiAgICAgICAgICAgICAgICAgICAgIGlmIG5v ZGUub3BlcmFuZHNbMV0uaXNfYT8gUmVnaXN0ZXJJRAotICAgICAgICAgICAgICAgICAgICAgICAg dGFnID0gcmlzY0FzUmVnaXN0ZXIobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVy YW5kc1sxXSwgInAiLCBmYWxzZSkKKyAgICAgICAgICAgICAgICAgICAgICAgIHRhZyA9IHJpc2NM b3dlck9wZXJhbmRUb1JlZ2lzdGVyKG5vZGUsIG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIDEs ICJwIiwgZmFsc2UpCiAgICAgICAgICAgICAgICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICAg ICAgICAgIHRhZyA9IFRtcC5uZXcoY29kZU9yaWdpbiwgOmdwcikKICAgICAgICAgICAgICAgICAg ICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGNvZGVPcmlnaW4sICJtb3ZlIiwgW25v ZGUub3BlcmFuZHNbMV0sIHRhZ10sIGFubm90YXRpb24pCiAgICAgICAgICAgICAgICAgICAgIGVu ZAotICAgICAgICAgICAgICAgICAgICBvcGVyYW5kcyA9IFtyaXNjQXNSZWdpc3RlcihuZXdMaXN0 LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2RlLm9wZXJhbmRzWzBdLCAicCIsIGZhbHNlKSwgdGFnXQot ICAgICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhjb2RlT3JpZ2lu LCBub2RlLm9wY29kZSwgb3BlcmFuZHMsIGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgICAg IG9wZXJhbmRzID0gWworICAgICAgICAgICAgICAgICAgICAgICAgcmlzY0xvd2VyT3BlcmFuZFRv UmVnaXN0ZXIobm9kZSwgbmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgMCwgInAiLCBmYWxzZSks CisgICAgICAgICAgICAgICAgICAgICAgICB0YWcKKyAgICAgICAgICAgICAgICAgICAgXQorICAg ICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0aW9uLmNsb25lV2l0aE5ld09wZXJh bmRzKG9wZXJhbmRzKQogICAgICAgICAgICAgICAgICAgICB3YXNIYW5kbGVkID0gdHJ1ZQogICAg ICAgICAgICAgICAgIGVuZAogICAgICAgICAgICAgd2hlbiAidW50YWdBcnJheVB0ciIKQEAgLTY0 LDcgKzY3LDcgQEAgY2xhc3MgSW5zdHJ1Y3Rpb24KICAgICAgICAgICAgICAgICAgICAgICAgIG9w ZXJhbmQKICAgICAgICAgICAgICAgICAgICAgZW5kCiAgICAgICAgICAgICAgICAgfQotICAgICAg ICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KGNvZGVPcmlnaW4sIG5vZGUub3Bj b2RlLCBuZXdPcGVyYW5kcywgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8 IEluc3RydWN0aW9uLmNsb25lV2l0aE5ld09wZXJhbmRzKG5ld09wZXJhbmRzKQogICAgICAgICAg ICAgICAgIHdhc0hhbmRsZWQgPSB0cnVlCiAgICAgICAgICAgICBlbmQKICAgICAgICAgICAgIG5l d0xpc3QgKz0gcG9zdEluc3RydWN0aW9ucyBpZiB3YXNIYW5kbGVkCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9hc3QucmIgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvb2ZmbGluZWFzbS9hc3QucmIKaW5kZXggYjQ5ZGM5ODc3MTdhZjQxNjE5YjAxZGVmYzdiYTFm MjdhOTI5MmI3ZS4uMDA5ZmVhYzU2NDQ1N2ZjZmNkMzQyODVlZjM0ZWI3MWNmNjQ5YjIxZSAxMDA2 NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vYXN0LnJiCisrKyBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL2FzdC5yYgpAQCAtOTE3LDcgKzkxNywxMSBA QCBjbGFzcyBJbnN0cnVjdGlvbiA8IE5vZGUKICAgICAgICAgQG9wZXJhbmRzID0gb3BlcmFuZHMK ICAgICAgICAgQGFubm90YXRpb24gPSBhbm5vdGF0aW9uCiAgICAgZW5kCi0gICAgCisKKyAgICBk ZWYgY2xvbmVXaXRoTmV3T3BlcmFuZHMobmV3T3BlcmFuZHMpCisgICAgICAgIEluc3RydWN0aW9u Lm5ldyhzZWxmLmNvZGVPcmlnaW4sIHNlbGYub3Bjb2RlLCBuZXdPcGVyYW5kcywgc2VsZi5hbm5v dGF0aW9uKQorICAgIGVuZAorCiAgICAgZGVmIGNoaWxkcmVuCiAgICAgICAgIG9wZXJhbmRzCiAg ICAgZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9taXBz LnJiIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vbWlwcy5yYgppbmRleCA4N2Yz MjM5ODg3MmY4MWNmMzY3N2NkM2JjNjk4MDAzMDg5NTE3YmEzLi5lMTUxNjI2ZjE3NDNhOTEwMTA5 NjY1ZjJkNWFlOWZmZTZhYWU1YjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv b2ZmbGluZWFzbS9taXBzLnJiCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNt L21pcHMucmIKQEAgLTU1NCwyMiArNTU0LDI3IEBAIGNsYXNzIExvY2FsTGFiZWxSZWZlcmVuY2UK ICAgICBlbmQKIGVuZAogCi1kZWYgbWlwc0FzUmVnaXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9w ZXJhbmQsIG5lZWRSZXN0b3JlKQotICAgIHRtcCA9IE1JUFNfQ0FMTF9SRUcKLSAgICBpZiBvcGVy YW5kLmFkZHJlc3M/Ci0gICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQu Y29kZU9yaWdpbiwgImxvYWRwIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUddKQotICAgIGVsc2lm IG9wZXJhbmQuaXNfYT8gTGFiZWxSZWZlcmVuY2UKLSAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVj dGlvbi5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCAibGEiLCBbb3BlcmFuZCwgTUlQU19DQUxMX1JF R10pCi0gICAgZWxzaWYgb3BlcmFuZC5yZWdpc3Rlcj8gYW5kIG9wZXJhbmQgIT0gTUlQU19DQUxM X1JFRwotICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhvcGVyYW5kLmNvZGVPcmln aW4sICJtb3ZlIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUddKQotICAgIGVsc2UKLSAgICAgICAg bmVlZFJlc3RvcmUgPSBmYWxzZQotICAgICAgICB0bXAgPSBvcGVyYW5kCi0gICAgZW5kCi0gICAg aWYgbmVlZFJlc3RvcmUKLSAgICAgICAgcG9zdExpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJh bmQuY29kZU9yaWdpbiwgIm1vdmUiLCBbTUlQU19HUFNBVkVfUkVHLCBNSVBTX0dQX1JFR10pCitj bGFzcyBJbnN0cnVjdGlvbgorICAgICMgUmVwbGFjZSBvcGVyYW5kcyB3aXRoIGEgc2luZ2xlIHJl Z2lzdGVyIG9wZXJhbmQuCisgICAgIyBOb3RlOiBpbiBjb250cmFzdCB0byB0aGUgcmlzYyB2ZXJz aW9uLCB0aGlzIG1ldGhvZCBkcm9wcyBhbGwgb3RoZXIgb3BlcmFuZHMuCisgICAgZGVmIG1pcHND bG9uZVdpdGhPcGVyYW5kTG93ZXJlZChwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZEluZGV4LCBu ZWVkUmVzdG9yZSkKKyAgICAgICAgb3BlcmFuZCA9IHNlbGYub3BlcmFuZHNbb3BlcmFuZEluZGV4 XQorICAgICAgICB0bXAgPSBNSVBTX0NBTExfUkVHCisgICAgICAgIGlmIG9wZXJhbmQuYWRkcmVz cz8KKyAgICAgICAgICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KHNlbGYuY29kZU9yaWdp biwgImxvYWRwIiwgW29wZXJhbmQsIE1JUFNfQ0FMTF9SRUddKQorICAgICAgICBlbHNpZiBvcGVy YW5kLmlzX2E/IExhYmVsUmVmZXJlbmNlCisgICAgICAgICAgICBwcmVMaXN0IDw8IEluc3RydWN0 aW9uLm5ldyhzZWxmLmNvZGVPcmlnaW4sICJsYSIsIFtvcGVyYW5kLCBNSVBTX0NBTExfUkVHXSkK KyAgICAgICAgZWxzaWYgb3BlcmFuZC5yZWdpc3Rlcj8gYW5kIG9wZXJhbmQgIT0gTUlQU19DQUxM X1JFRworICAgICAgICAgICAgcHJlTGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcoc2VsZi5jb2RlT3Jp Z2luLCAibW92ZSIsIFtvcGVyYW5kLCBNSVBTX0NBTExfUkVHXSkKKyAgICAgICAgZWxzZQorICAg ICAgICAgICAgbmVlZFJlc3RvcmUgPSBmYWxzZQorICAgICAgICAgICAgdG1wID0gb3BlcmFuZAor ICAgICAgICBlbmQKKyAgICAgICAgaWYgbmVlZFJlc3RvcmUKKyAgICAgICAgICAgIHBvc3RMaXN0 IDw8IEluc3RydWN0aW9uLm5ldyhzZWxmLmNvZGVPcmlnaW4sICJtb3ZlIiwgW01JUFNfR1BTQVZF X1JFRywgTUlQU19HUF9SRUddKQorICAgICAgICBlbmQKKyAgICAgICAgY2xvbmVXaXRoTmV3T3Bl cmFuZHMoW3RtcF0pCiAgICAgZW5kCi0gICAgdG1wCiBlbmQKIAogZGVmIG1pcHNMb3dlck1pc3Bs YWNlZEFkZHJlc3NlcyhsaXN0KQpAQCAtNTgxLDMwICs1ODYsMjEgQEAgZGVmIG1pcHNMb3dlck1p c3BsYWNlZEFkZHJlc3NlcyhsaXN0KQogICAgICAgICAgICAgYW5ub3RhdGlvbiA9IG5vZGUuYW5u b3RhdGlvbgogICAgICAgICAgICAgY2FzZSBub2RlLm9wY29kZQogICAgICAgICAgICAgd2hlbiAi am1wIgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29k ZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2Rl Lm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbbWlw c0FzUmVnaXN0ZXIobmV3TGlzdCwgW10sIG5vZGUub3BlcmFuZHNbMF0sIGZhbHNlKV0pCisgICAg ICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLm1pcHNDbG9uZVdpdGhPcGVyYW5kTG93ZXJlZChu ZXdMaXN0LCBbXSwgMCwgZmFsc2UpCiAgICAgICAgICAgICB3aGVuICJjYWxsIgotICAgICAgICAg ICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBbbWlwc0FzUmVnaXN0ZXIobmV3 TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kc1swXSwgdHJ1ZSldKQorICAgICAg ICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5taXBzQ2xvbmVXaXRoT3BlcmFuZExvd2VyZWQobmV3 TGlzdCwgcG9zdEluc3RydWN0aW9ucywgMCwgdHJ1ZSkKICAgICAgICAgICAgIHdoZW4gInNsdCIs ICJzbHR1IgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUu Y29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBu b2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBy aXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgW10sIG5vZGUub3BlcmFuZHMsICJpIikpCisgICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NDbG9uZVdpdGhPcGVyYW5kc0xvd2VyZWQobmV3 TGlzdCwgW10sICJpIikKICAgICAgICAgICAgIHdoZW4gInNsdHViIiwgInNsdGIiCi0gICAgICAg ICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhu ZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5kcywgImIiKSkKKyAgICAgICAgICAgICAgICBuZXdMaXN0 IDw8IG5vZGUucmlzY0Nsb25lV2l0aE9wZXJhbmRzTG93ZXJlZChuZXdMaXN0LCBbXSwgImIiKQog ICAgICAgICAgICAgd2hlbiAiYW5kYiIKICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3Ry dWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgImFuZGkiLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgbm9kZS5vcGVyYW5kcywgImIi KSkKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjTG93ZXJP cGVyYW5kc1RvUmVnaXN0ZXJzKG5vZGUsIG5ld0xpc3QsIFtdLCAiYiIpLAorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUuYW5ub3RhdGlvbikKICAgICAgICAg ICAgIHdoZW4gL14oYnp8Ym56fGJzfGJvKS8KICAgICAgICAgICAgICAgICB0bCA9ICR+LnBvc3Rf bWF0Y2ggPT0gIiIgPyAiaSIgOiAkfi5wb3N0X21hdGNoCi0gICAgICAgICAgICAgICAgbmV3TGlz dCA8PCBJbnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBbXSwgbm9k ZS5vcGVyYW5kcywgdGwpKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQ2xv bmVXaXRoT3BlcmFuZHNMb3dlcmVkKG5ld0xpc3QsIFtdLCB0bCkKICAgICAgICAgICAgIGVsc2UK ICAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUKICAgICAgICAgICAgIGVuZApkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcmlzYy5yYiBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9vZmZsaW5lYXNtL3Jpc2MucmIKaW5kZXggZmUzOGU3NDVmMzA4NzFlMzEw NzYzNjA5NTFkNjQxOWNmMGIyZTFiMS4uMGYwNzJlOWZkMTFlMTU4NWFhZjNkZDhlYjA1MGZmZDk0 NjIzOWRmMiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL29mZmxpbmVhc20vcmlz Yy5yYgorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvb2ZmbGluZWFzbS9yaXNjLnJiCkBAIC00 MjgsMjYgKzQyOCwzOCBAQCBlbmQKICMgYWRkaSB0bXAsIGJhcgogIwogCi1kZWYgcmlzY0FzUmVn aXN0ZXIocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmQsIHN1ZmZpeCwgbmVlZFN0b3JlKQorZGVm IHJpc2NMb3dlck9wZXJhbmRUb1JlZ2lzdGVyKGluc24sIHByZUxpc3QsIHBvc3RMaXN0LCBvcGVy YW5kSW5kZXgsIHN1ZmZpeCwgbmVlZFN0b3JlKQorICAgIG9wZXJhbmQgPSBpbnNuLm9wZXJhbmRz W29wZXJhbmRJbmRleF0KICAgICByZXR1cm4gb3BlcmFuZCB1bmxlc3Mgb3BlcmFuZC5hZGRyZXNz PwotICAgIAotICAgIHRtcCA9IFRtcC5uZXcob3BlcmFuZC5jb2RlT3JpZ2luLCBpZiBzdWZmaXgg PT0gImQiIHRoZW4gOmZwciBlbHNlIDpncHIgZW5kKQotICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rp b24ubmV3KG9wZXJhbmQuY29kZU9yaWdpbiwgImxvYWQiICsgc3VmZml4LCBbb3BlcmFuZCwgdG1w XSkKKworICAgIHRtcCA9IFRtcC5uZXcoaW5zbi5jb2RlT3JpZ2luLCBpZiBzdWZmaXggPT0gImQi IHRoZW4gOmZwciBlbHNlIDpncHIgZW5kKQorICAgIHByZUxpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3 KGluc24uY29kZU9yaWdpbiwgImxvYWQiICsgc3VmZml4LCBbb3BlcmFuZCwgdG1wXSkKICAgICBp ZiBuZWVkU3RvcmUKLSAgICAgICAgcG9zdExpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG9wZXJhbmQu Y29kZU9yaWdpbiwgInN0b3JlIiArIHN1ZmZpeCwgW3RtcCwgb3BlcmFuZF0pCisgICAgICAgIHBv c3RMaXN0IDw8IEluc3RydWN0aW9uLm5ldyhpbnNuLmNvZGVPcmlnaW4sICJzdG9yZSIgKyBzdWZm aXgsIFt0bXAsIG9wZXJhbmRdKQogICAgIGVuZAogICAgIHRtcAogZW5kCiAKLWRlZiByaXNjQXNS ZWdpc3RlcnMocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJhbmRzLCBzdWZmaXgpCitkZWYgcmlzY0xv d2VyT3BlcmFuZHNUb1JlZ2lzdGVycyhpbnNuLCBwcmVMaXN0LCBwb3N0TGlzdCwgc3VmZml4KQog ICAgIG5ld09wZXJhbmRzID0gW10KLSAgICBvcGVyYW5kcy5lYWNoX3dpdGhfaW5kZXggeworICAg IGluc24ub3BlcmFuZHMuZWFjaF93aXRoX2luZGV4IHsKICAgICAgICAgfCBvcGVyYW5kLCBpbmRl eCB8Ci0gICAgICAgIG5ld09wZXJhbmRzIDw8IHJpc2NBc1JlZ2lzdGVyKHByZUxpc3QsIHBvc3RM aXN0LCBvcGVyYW5kLCBzdWZmaXgsIGluZGV4ID09IG9wZXJhbmRzLnNpemUgLSAxKQorICAgICAg ICBuZXdPcGVyYW5kcyA8PCByaXNjTG93ZXJPcGVyYW5kVG9SZWdpc3RlcihpbnNuLCBwcmVMaXN0 LCBwb3N0TGlzdCwgaW5kZXgsIHN1ZmZpeCwgaW5kZXggPT0gaW5zbi5vcGVyYW5kcy5zaXplIC0g MSkKICAgICB9CiAgICAgbmV3T3BlcmFuZHMKIGVuZAogCitjbGFzcyBJbnN0cnVjdGlvbgorICAg IGRlZiByaXNjQ2xvbmVXaXRoT3BlcmFuZExvd2VyZWQocHJlTGlzdCwgcG9zdExpc3QsIG9wZXJh bmRJbmRleCwgc3VmZml4LCBuZWVkU3RvcmUpCisgICAgICAgIG9wZXJhbmQgPSByaXNjTG93ZXJP cGVyYW5kVG9SZWdpc3RlcihzZWxmLCBwcmVMaXN0LCBwb3N0TGlzdCwgb3BlcmFuZEluZGV4LCBz dWZmaXgsIG5lZWRTdG9yZSkKKyAgICAgICAgY2xvbmVXaXRoTmV3T3BlcmFuZHMoW29wZXJhbmRd KQorICAgIGVuZAorICAgIGRlZiByaXNjQ2xvbmVXaXRoT3BlcmFuZHNMb3dlcmVkKHByZUxpc3Qs IHBvc3RMaXN0LCBzdWZmaXgpCisgICAgICAgIG9wZXJhbmRzID0gcmlzY0xvd2VyT3BlcmFuZHNU b1JlZ2lzdGVycyhzZWxmLCBwcmVMaXN0LCBwb3N0TGlzdCwgc3VmZml4KQorICAgICAgICBjbG9u ZVdpdGhOZXdPcGVyYW5kcyhvcGVyYW5kcykKKyAgICBlbmQKK2VuZAorCiBkZWYgcmlzY0xvd2Vy TWlzcGxhY2VkQWRkcmVzc2VzKGxpc3QpCiAgICAgbmV3TGlzdCA9IFtdCiAgICAgaGFzQmFja2Vu ZFNwZWNpZmljTG93ZXJpbmcgPSBJbnN0cnVjdGlvbi5yZXNwb25kX3RvPyAibG93ZXJNaXNwbGFj ZWRBZGRyZXNzZXMjeyRhY3RpdmVCYWNrZW5kfSIKQEAgLTQ2NCw0OCArNDc2LDI0IEBAIGRlZiBy aXNjTG93ZXJNaXNwbGFjZWRBZGRyZXNzZXMobGlzdCkKICAgICAgICAgICAgIGNhc2Ugbm9kZS5v cGNvZGUKICAgICAgICAgICAgIHdoZW4gImFkZGkiLCAiYWRkaXMiLCAiYW5kaSIsICJsc2hpZnRp IiwgIm11bGkiLCAibmVnaSIsICJub3RpIiwgIm9yaSIsICJvcmlzIiwKICAgICAgICAgICAgICAg ICAicnNoaWZ0aSIsICJ1cnNoaWZ0aSIsICJzdWJpIiwgInN1YmlzIiwgInhvcmkiLCAvXmJpLywg L15idGkvLCAvXmNpLywgL150aS8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IEluc3RydWN0 aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsIG5v ZGUub3BlcmFuZHMsICJpIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5vZGUucmlzY0Ns b25lV2l0aE9wZXJhbmRzTG93ZXJlZChuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCAiaSIpCiAg ICAgICAgICAgICB3aGVuICJvcmgiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVj dGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBu b2RlLm9wZXJhbmRzLCAiaCIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2ND bG9uZVdpdGhPcGVyYW5kc0xvd2VyZWQobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgImgiKQog ICAgICAgICAgICAgd2hlbiAiYWRkcCIsICJhbmRwIiwgImxzaGlmdHAiLCAibXVscCIsICJuZWdw IiwgIm9ycCIsICJyc2hpZnRwIiwgInVyc2hpZnRwIiwKICAgICAgICAgICAgICAgICAic3VicCIs ICJ4b3JwIiwgL15icC8sIC9eYnRwLywgL15jcC8KLSAgICAgICAgICAgICAgICBuZXdMaXN0IDw8 IEluc3RydWN0aW9uLm5ldyhub2RlLmNvZGVPcmlnaW4sCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgbm9kZS5vcGNvZGUsCi0gICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgcmlzY0FzUmVnaXN0ZXJzKG5ld0xpc3QsIHBvc3RJbnN0cnVj dGlvbnMsIG5vZGUub3BlcmFuZHMsICJwIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8IG5v ZGUucmlzY0Nsb25lV2l0aE9wZXJhbmRzTG93ZXJlZChuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25z LCAicCIpCiAgICAgICAgICAgICB3aGVuICJhZGRxIiwgImFuZHEiLCAibHNoaWZ0cSIsICJtdWxx IiwgIm5lZ3EiLCAib3JxIiwgInJzaGlmdHEiLCAidXJzaGlmdHEiLAogICAgICAgICAgICAgICAg ICJzdWJxIiwgInhvcnEiLCAvXmJxLywgL15idHEvLCAvXmNxLwotICAgICAgICAgICAgICAgIG5l d0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9z dEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kcywgInEiKSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBhbm5vdGF0aW9uKQorICAgICAgICAgICAgICAgIG5ld0xp c3QgPDwgbm9kZS5yaXNjQ2xvbmVXaXRoT3BlcmFuZHNMb3dlcmVkKG5ld0xpc3QsIHBvc3RJbnN0 cnVjdGlvbnMsICJxIikKICAgICAgICAgICAgIHdoZW4gImJiZXEiLCAiYmJuZXEiLCAiYmJhIiwg ImJiYWVxIiwgImJiYiIsICJiYmJlcSIsICJidGJ6IiwgImJ0Ym56IiwgInRieiIsICJ0Ym56IiwK ICAgICAgICAgICAgICAgICAiY2JlcSIsICJjYm5lcSIsICJjYmEiLCAiY2JhZXEiLCAiY2JiIiwg ImNiYmVxIgotICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUu Y29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBu b2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBy aXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgbm9kZS5vcGVyYW5kcywg ImIiKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhbm5vdGF0 aW9uKQorICAgICAgICAgICAgICAgIG5ld0xpc3QgPDwgbm9kZS5yaXNjQ2xvbmVXaXRoT3BlcmFu ZHNMb3dlcmVkKG5ld0xpc3QsIHBvc3RJbnN0cnVjdGlvbnMsICJiIikKICAgICAgICAgICAgIHdo ZW4gImJiZ3QiLCAiYmJndGVxIiwgImJibHQiLCAiYmJsdGVxIiwgImJ0YnMiLCAidGJzIiwgImNi Z3QiLCAiY2JndGVxIiwgImNibHQiLCAiY2JsdGVxIgotICAgICAgICAgICAgICAgIG5ld0xpc3Qg PDwgSW5zdHJ1Y3Rpb24ubmV3KG5vZGUuY29kZU9yaWdpbiwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBub2RlLm9wY29kZSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICByaXNjQXNSZWdpc3RlcnMobmV3TGlzdCwgcG9zdEluc3Ry dWN0aW9ucywgbm9kZS5vcGVyYW5kcywgImJzIiksCi0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdMaXN0IDw8 IG5vZGUucmlzY0Nsb25lV2l0aE9wZXJhbmRzTG93ZXJlZChuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rp b25zLCAiYnMiKQogICAgICAgICAgICAgd2hlbiAiYWRkZCIsICJkaXZkIiwgInN1YmQiLCAibXVs ZCIsICJzcXJ0ZCIsIC9eYmQvCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJbnN0cnVjdGlv bi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHJpc2NBc1JlZ2lzdGVycyhuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rpb25zLCBub2Rl Lm9wZXJhbmRzLCAiZCIpLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGFubm90YXRpb24pCisgICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBub2RlLnJpc2NDbG9u ZVdpdGhPcGVyYW5kc0xvd2VyZWQobmV3TGlzdCwgcG9zdEluc3RydWN0aW9ucywgImQiKQogICAg ICAgICAgICAgd2hlbiAiam1wIiwgImNhbGwiCi0gICAgICAgICAgICAgICAgbmV3TGlzdCA8PCBJ bnN0cnVjdGlvbi5uZXcobm9kZS5jb2RlT3JpZ2luLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIG5vZGUub3Bjb2RlLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIFtyaXNjQXNSZWdpc3RlcihuZXdMaXN0LCBwb3N0SW5zdHJ1Y3Rp b25zLCBub2RlLm9wZXJhbmRzWzBdLCAicCIsIGZhbHNlKV0sCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgYW5ub3RhdGlvbikKKyAgICAgICAgICAgICAgICBuZXdM aXN0IDw8IG5vZGUucmlzY0Nsb25lV2l0aE9wZXJhbmRMb3dlcmVkKG5ld0xpc3QsIHBvc3RJbnN0 cnVjdGlvbnMsIDAsICJwIiwgZmFsc2UpCiAgICAgICAgICAgICBlbHNlCiAgICAgICAgICAgICAg ICAgbmV3TGlzdCA8PCBub2RlCiAgICAgICAgICAgICBlbmQK