177230 2017-09-20 07:28:06 -0700 Object properties are undefined in super.call() but not in this.call() 2017-10-11 06:01:28 -0700 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified macOS 10.13 RESOLVED FIXED InRadar P2 Normal --- 1 mihaly.lengyel ticaiolima adam ap buildbot commit-queue fpizlo keith_miller mark.lam msaboff saam ticaiolima webkit-bug-importer ysuzuki oldest_to_newest 1350732 0 mihaly.lengyel 2017-09-20 07:28:06 -0700 In the call method of the super class called through super ("super.call()") all properties of "this" is undefined. If the same method is called through "this" ("this.call()") the proper values are there. If the same method is renamed to log the problem disappears. This happened in Safari 11, but I can't choose that as a version above. Steps to reproduce: A fiddle showing the problem: https://jsfiddle.net/pohdferq/1/ Expected: The console log showing that the prop field is set to 'value' in every logged case Actual: The console log shows that the prop field is undefined in super.call but not in other cases. Build info: Version 11.0 (13604.1.38.1.6) 1350827 1 ap 2017-09-20 10:31:31 -0700 Is this a new problem in Safari 11, or was this happening with earlier versions too? 1351164 2 mihaly.lengyel 2017-09-21 03:26:42 -0700 I checked, and saw this happen on 10.1.2 (12603.3.8) too. 1358523 3 323247 ticaiolima 2017-10-09 17:08:39 -0700 Created attachment 323247 Patch 1358525 4 323247 saam 2017-10-09 17:13:57 -0700 Comment on attachment 323247 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323247&action=review > Source/JavaScriptCore/parser/ASTBuilder.h:1353 > + if (!previousBaseWasSuper && (dot->identifier() == m_vm->propertyNames->builtinNames().callPublicName() || dot->identifier() == m_vm->propertyNames->builtinNames().callPrivateName())) > node = new (m_parserArena) CallFunctionCallDotNode(location, dot->base(), dot->identifier(), args, divot, divotStart, divotEnd, callOrApplyChildDepth); > - else if (dot->identifier() == m_vm->propertyNames->builtinNames().applyPublicName() || dot->identifier() == m_vm->propertyNames->builtinNames().applyPrivateName()) > + else if (!previousBaseWasSuper && (dot->identifier() == m_vm->propertyNames->builtinNames().applyPublicName() || dot->identifier() == m_vm->propertyNames->builtinNames().applyPrivateName())) Why not just pass a different |this| value when the base is super? 1358570 5 323247 ticaiolima 2017-10-09 18:36:02 -0700 Comment on attachment 323247 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323247&action=review >> Source/JavaScriptCore/parser/ASTBuilder.h:1353 >> + else if (!previousBaseWasSuper && (dot->identifier() == m_vm->propertyNames->builtinNames().applyPublicName() || dot->identifier() == m_vm->propertyNames->builtinNames().applyPrivateName())) > > Why not just pass a different |this| value when the base is super? If I understand correctly, both cases of base.apply and base.call generate different byte code of "FunctionCallDotNode". For example, here is the byte code of reported case with "super.call()": testSuper#ApV04K [ 0] enter [ 1] get_scope loc3 [ 3] mov loc4, loc3 [ 6] check_traps [ 7] get_by_id loc6, head3, PrivateSymbol.homeObject(@id0) predicting None [ 16] get_by_id loc7, loc6, __proto__(@id1) predicting None [ 25] mov loc6, loc7 [ 28] get_by_id_with_this loc8, loc6, this, call(@id2) predicting None [ 34] jneq_ptr loc8, 0 (0x10e7ec160), 22(->56) --> This check here changes the semantics of "super.call()" [ 39] mov loc9, loc6 [ 42] mov loc10, Undefined(const0) [ 45] call loc7, loc9, 1, 16 (this at loc10) status(Could Take Slow Path) Original; predicting None [ 54] jmp 14(->68) [ 56] mov loc10, loc6 [ 59] call loc7, loc8, 1, 16 (this at loc10) status(Could Take Slow Path) Original; predicting None [ 68] mov loc8, this [ 71] get_by_id loc9, head3, PrivateSymbol.homeObject(@id0) predicting None [ 80] get_by_id loc10, loc9, __proto__(@id1) predicting None [ 89] get_by_id_with_this loc6, loc10, loc8, log(@id3) predicting None [ 95] call loc6, loc6, 1, 14 (this at loc8) status(Could Take Slow Path) Original; predicting None [ 104] ret Undefined(const0) Here is the the byte code generated by proposed Patch: testSuper#ApV04K [ 0] enter [ 1] get_scope loc3 [ 3] mov loc4, loc3 [ 6] check_traps [ 7] mov loc8, this [ 10] get_by_id loc9, head3, PrivateSymbol.homeObject(@id0) predicting None [ 19] get_by_id loc10, loc9, __proto__(@id1) predicting None [ 28] get_by_id_with_this loc6, loc10, loc8, call(@id2) predicting None [ 34] call loc6, loc6, 1, 14 (this at loc8) status(Could Take Slow Path) Original; predicting None [ 43] mov loc8, this [ 46] get_by_id loc9, head3, PrivateSymbol.homeObject(@id0) predicting None [ 55] get_by_id loc10, loc9, __proto__(@id1) predicting None [ 64] get_by_id_with_this loc6, loc10, loc8, log(@id3) predicting None [ 70] call loc6, loc6, 1, 14 (this at loc8) status(Could Take Slow Path) Original; predicting None [ 79] ret Undefined(const0) 1358571 6 saam 2017-10-09 18:44:09 -0700 When they make a call, don't they provide a |this|? If so, I think you can pattern match what that |this| is inside bytecode generator. We don't want to give up our .call and .apply optimizations for super.call/super.apply 1358588 7 ticaiolima 2017-10-09 19:10:54 -0700 (In reply to Saam Barati from comment #6) > When they make a call, don't they provide a |this|? If so, I think you can > pattern match what that |this| is inside bytecode generator. We don't want > to give up our .call and .apply optimizations for super.call/super.apply I think I'm missing something here. Are these optimizations applied to super.call/super.apply? Checking the spec I couldn't find any case referring "call/apply" for super. https://tc39.github.io/ecma262/#sec-super-keyword-runtime-semantics-evaluation. What I have in mind is that they should be treat as any other "super.prop" access. 1358602 8 ticaiolima 2017-10-09 19:34:39 -0700 (In reply to Saam Barati from comment #6) > When they make a call, don't they provide a |this|? Yes, but now the |this| actually is homeObject.__proto__. 1358964 9 323247 saam 2017-10-10 16:28:48 -0700 Comment on attachment 323247 Patch r=me 1358997 10 323368 ticaiolima 2017-10-10 18:57:44 -0700 Created attachment 323368 Patch 1358999 11 323368 saam 2017-10-10 19:04:42 -0700 Comment on attachment 323368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=323368&action=review > Source/JavaScriptCore/ChangeLog:10 > + Bytecode generation for "super.call(...)" or "super.apply(...)" > + shouldn't be considered as CallFunctionCallDotNode or > + ApplyFunctionCallDotNode. Please explain why here 1359010 12 323372 ticaiolima 2017-10-10 19:35:02 -0700 Created attachment 323372 Patch For landing 1359147 13 323372 commit-queue 2017-10-11 05:59:39 -0700 Comment on attachment 323372 Patch For landing Clearing flags on attachment: 323372 Committed r223175: <http://trac.webkit.org/changeset/223175> 1359148 14 commit-queue 2017-10-11 05:59:41 -0700 All reviewed patches have been landed. Closing bug. 1359149 15 webkit-bug-importer 2017-10-11 06:01:28 -0700 <rdar://problem/34931958> 323247 2017-10-09 17:08:39 -0700 2017-10-10 18:57:36 -0700 Patch bug-177230-20171009210837.patch text/plain 8650 ticaiolima U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyOTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 YzRlNGM5ZDEyODI1OTNlN2FhZGZmNDMwNDEwZTZiOWE3NTc2ZGU1Li5kNTI4NWYxZDZmNTlkY2Yx NDA1ODk5ZDM5MzI3MTUxMDI1NTBkNDZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNy0xMC0wOSAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+ CisKKyAgICAgICAgT2JqZWN0IHByb3BlcnRpZXMgYXJlIHVuZGVmaW5lZCBpbiBzdXBlci5jYWxs KCkgYnV0IG5vdCBpbiB0aGlzLmNhbGwoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQnl0ZWNvZGUgZ2VuZXJhdGlvbiBmb3IgInN1cGVyLmNhbGwoLi4u KSIgb3IgInN1cGVyLmFwcGx5KC4uLikiCisgICAgICAgIHNob3VsZG4ndCBiZSBjb25zaWRlcmVk IGFzIENhbGxGdW5jdGlvbkNhbGxEb3ROb2RlIG9yCisgICAgICAgIEFwcGx5RnVuY3Rpb25DYWxs RG90Tm9kZS4KKworICAgICAgICAqIHBhcnNlci9BU1RCdWlsZGVyLmg6CisgICAgICAgIChKU0M6 OkFTVEJ1aWxkZXI6Om1ha2VGdW5jdGlvbkNhbGxOb2RlKToKKyAgICAgICAgKiBwYXJzZXIvUGFy c2VyLmNwcDoKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlTWVtYmVyRXhw cmVzc2lvbik6CisgICAgICAgICogcGFyc2VyL1N5bnRheENoZWNrZXIuaDoKKyAgICAgICAgKEpT Qzo6U3ludGF4Q2hlY2tlcjo6bWFrZUZ1bmN0aW9uQ2FsbE5vZGUpOgorCiAyMDE3LTEwLTA1ICBT YWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ugc3VyZSBhbGwg cHJvdG90eXBlcyB1bmRlciBwb2x5IHByb3RvIGdldCBhZGRlZCBpbnRvIHRoZSBWTSdzIHByb3Rv dHlwZSBtYXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvQVNUQnVp bGRlci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9BU1RCdWlsZGVyLmgKaW5kZXgg YjIwZGExOGUxNTc0MmNmYjhhODVkYzc4NWE2MzBhNzY0YTFhZjc4NS4uOGQ5MWNlODYzZWYwNzcz ZTcyMDFhYWMwNjU4MzE2NzA1OWEyZjZhMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL3BhcnNlci9BU1RCdWlsZGVyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNl ci9BU1RCdWlsZGVyLmgKQEAgLTEyOSw3ICsxMjksNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGNv bnN0IGludCAgRG9udEJ1aWxkU3RyaW5ncyA9IDA7CiAKICAgICBFeHByZXNzaW9uTm9kZSogbWFr ZUJpbmFyeU5vZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiwgaW50IHRva2VuLCBzdGQ6OnBhaXI8 RXhwcmVzc2lvbk5vZGUqLCBCaW5hcnlPcEluZm8+LCBzdGQ6OnBhaXI8RXhwcmVzc2lvbk5vZGUq LCBCaW5hcnlPcEluZm8+KTsKLSAgICBFeHByZXNzaW9uTm9kZSogbWFrZUZ1bmN0aW9uQ2FsbE5v ZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiwgRXhwcmVzc2lvbk5vZGUqIGZ1bmMsIEFyZ3VtZW50 c05vZGUqIGFyZ3MsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBkaXZvdFN0YXJ0LCBjb25zdCBKU1Rl eHRQb3NpdGlvbiYgZGl2b3QsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBkaXZvdEVuZCwgc2l6ZV90 IGNhbGxPckFwcGx5Q2hpbGREZXB0aCk7CisgICAgRXhwcmVzc2lvbk5vZGUqIG1ha2VGdW5jdGlv bkNhbGxOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIEV4cHJlc3Npb25Ob2RlKiBmdW5jLCBi b29sIHByZXZpb3VzQmFzZVdhc1N1cGVyLCBBcmd1bWVudHNOb2RlKiBhcmdzLCBjb25zdCBKU1Rl eHRQb3NpdGlvbiYgZGl2b3RTdGFydCwgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRpdm90LCBjb25z dCBKU1RleHRQb3NpdGlvbiYgZGl2b3RFbmQsIHNpemVfdCBjYWxsT3JBcHBseUNoaWxkRGVwdGgp OwogCiAgICAgSlNDOjpTb3VyY2VFbGVtZW50cyogY3JlYXRlU291cmNlRWxlbWVudHMoKSB7IHJl dHVybiBuZXcgKG1fcGFyc2VyQXJlbmEpIEpTQzo6U291cmNlRWxlbWVudHMoKTsgfQogCkBAIC0x MzE3LDcgKzEzMTcsNyBAQCBFeHByZXNzaW9uTm9kZSogQVNUQnVpbGRlcjo6bWFrZUJpdFhPck5v ZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiBsb2NhdGlvbiwgRXhwcgogICAgIHJldHVybiBuZXcg KG1fcGFyc2VyQXJlbmEpIEJpdFhPck5vZGUobG9jYXRpb24sIGV4cHIxLCBleHByMiwgcmlnaHRI YXNBc3NpZ25tZW50cyk7CiB9CiAKLUV4cHJlc3Npb25Ob2RlKiBBU1RCdWlsZGVyOjptYWtlRnVu Y3Rpb25DYWxsTm9kZShjb25zdCBKU1Rva2VuTG9jYXRpb24mIGxvY2F0aW9uLCBFeHByZXNzaW9u Tm9kZSogZnVuYywgQXJndW1lbnRzTm9kZSogYXJncywgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRp dm90U3RhcnQsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBkaXZvdCwgY29uc3QgSlNUZXh0UG9zaXRp b24mIGRpdm90RW5kLCBzaXplX3QgY2FsbE9yQXBwbHlDaGlsZERlcHRoKQorRXhwcmVzc2lvbk5v ZGUqIEFTVEJ1aWxkZXI6Om1ha2VGdW5jdGlvbkNhbGxOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlv biYgbG9jYXRpb24sIEV4cHJlc3Npb25Ob2RlKiBmdW5jLCBib29sIHByZXZpb3VzQmFzZVdhc1N1 cGVyLCBBcmd1bWVudHNOb2RlKiBhcmdzLCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2b3RTdGFy dCwgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRpdm90LCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2 b3RFbmQsIHNpemVfdCBjYWxsT3JBcHBseUNoaWxkRGVwdGgpCiB7CiAgICAgQVNTRVJUKGRpdm90 Lm9mZnNldCA+PSBkaXZvdC5saW5lU3RhcnRPZmZzZXQpOwogICAgIGlmIChmdW5jLT5pc1N1cGVy Tm9kZSgpKQpAQCAtMTM0OCw5ICsxMzQ4LDkgQEAgRXhwcmVzc2lvbk5vZGUqIEFTVEJ1aWxkZXI6 Om1ha2VGdW5jdGlvbkNhbGxOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYgbG9jYXRpb24KICAg ICBBU1NFUlQoZnVuYy0+aXNEb3RBY2Nlc3Nvck5vZGUoKSk7CiAgICAgRG90QWNjZXNzb3JOb2Rl KiBkb3QgPSBzdGF0aWNfY2FzdDxEb3RBY2Nlc3Nvck5vZGUqPihmdW5jKTsKICAgICBGdW5jdGlv bkNhbGxEb3ROb2RlKiBub2RlOwotICAgIGlmIChkb3QtPmlkZW50aWZpZXIoKSA9PSBtX3ZtLT5w cm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS5jYWxsUHVibGljTmFtZSgpIHx8IGRvdC0+aWRl bnRpZmllcigpID09IG1fdm0tPnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmNhbGxQcml2 YXRlTmFtZSgpKQorICAgIGlmICghcHJldmlvdXNCYXNlV2FzU3VwZXIgJiYgKGRvdC0+aWRlbnRp ZmllcigpID09IG1fdm0tPnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmNhbGxQdWJsaWNO YW1lKCkgfHwgZG90LT5pZGVudGlmaWVyKCkgPT0gbV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRp bk5hbWVzKCkuY2FsbFByaXZhdGVOYW1lKCkpKQogICAgICAgICBub2RlID0gbmV3IChtX3BhcnNl ckFyZW5hKSBDYWxsRnVuY3Rpb25DYWxsRG90Tm9kZShsb2NhdGlvbiwgZG90LT5iYXNlKCksIGRv dC0+aWRlbnRpZmllcigpLCBhcmdzLCBkaXZvdCwgZGl2b3RTdGFydCwgZGl2b3RFbmQsIGNhbGxP ckFwcGx5Q2hpbGREZXB0aCk7Ci0gICAgZWxzZSBpZiAoZG90LT5pZGVudGlmaWVyKCkgPT0gbV92 bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkuYXBwbHlQdWJsaWNOYW1lKCkgfHwgZG90 LT5pZGVudGlmaWVyKCkgPT0gbV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkuYXBw bHlQcml2YXRlTmFtZSgpKQorICAgIGVsc2UgaWYgKCFwcmV2aW91c0Jhc2VXYXNTdXBlciAmJiAo ZG90LT5pZGVudGlmaWVyKCkgPT0gbV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCku YXBwbHlQdWJsaWNOYW1lKCkgfHwgZG90LT5pZGVudGlmaWVyKCkgPT0gbV92bS0+cHJvcGVydHlO YW1lcy0+YnVpbHRpbk5hbWVzKCkuYXBwbHlQcml2YXRlTmFtZSgpKSkKICAgICAgICAgbm9kZSA9 IG5ldyAobV9wYXJzZXJBcmVuYSkgQXBwbHlGdW5jdGlvbkNhbGxEb3ROb2RlKGxvY2F0aW9uLCBk b3QtPmJhc2UoKSwgZG90LT5pZGVudGlmaWVyKCksIGFyZ3MsIGRpdm90LCBkaXZvdFN0YXJ0LCBk aXZvdEVuZCwgY2FsbE9yQXBwbHlDaGlsZERlcHRoKTsKICAgICBlbHNlCiAgICAgICAgIG5vZGUg PSBuZXcgKG1fcGFyc2VyQXJlbmEpIEZ1bmN0aW9uQ2FsbERvdE5vZGUobG9jYXRpb24sIGRvdC0+ YmFzZSgpLCBkb3QtPmlkZW50aWZpZXIoKSwgYXJncywgZGl2b3QsIGRpdm90U3RhcnQsIGRpdm90 RW5kKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNw cCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcAppbmRleCA3Y2Q4ZGFj YzFhYTg5Y2Y3ZmZjMTBkOTdhZDBiMTY4MTc1MjAwYTQwLi45YTc4MWU1MmE5M2FiNzgwNGEzN2Vm YTUwNDU3N2UzNjQxNDE5ZjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFy c2VyL1BhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIu Y3BwCkBAIC00NjQwLDYgKzQ2NDAsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRy ZWVFeHByZXNzaW9uIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZU1lbWJlckV4cHJlcwogICAgIH0K IAogICAgIGJvb2wgYmFzZUlzU3VwZXIgPSBtYXRjaChTVVBFUik7CisgICAgYm9vbCBwcmV2aW91 c0Jhc2VXYXNTdXBlciA9IGZhbHNlOwogICAgIGJvb2wgYmFzZUlzSW1wb3J0ID0gbWF0Y2goSU1Q T1JUKTsKICAgICBzZW1hbnRpY0ZhaWxJZlRydWUoKGJhc2VJc1N1cGVyIHx8IGJhc2VJc0ltcG9y dCkgJiYgbmV3Q291bnQsICJDYW5ub3QgdXNlIG5ldyB3aXRoICIsIGdldFRva2VuKCkpOwogCkBA IC00Nzg0LDcgKzQ3ODUsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHBy ZXNzaW9uIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZU1lbWJlckV4cHJlcwogICAgICAgICAgICAg ICAgICAgICBpZiAoY3VycmVudFNjb3BlKCktPmlzQXJyb3dGdW5jdGlvbigpKQogICAgICAgICAg ICAgICAgICAgICAgICAgZnVuY3Rpb25TY29wZS0+c2V0SW5uZXJBcnJvd0Z1bmN0aW9uVXNlc1N1 cGVyQ2FsbCgpOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBiYXNlID0gY29u dGV4dC5tYWtlRnVuY3Rpb25DYWxsTm9kZShzdGFydExvY2F0aW9uLCBiYXNlLCBhcmd1bWVudHMs IGV4cHJlc3Npb25TdGFydCwKKyAgICAgICAgICAgICAgICBiYXNlID0gY29udGV4dC5tYWtlRnVu Y3Rpb25DYWxsTm9kZShzdGFydExvY2F0aW9uLCBiYXNlLCBwcmV2aW91c0Jhc2VXYXNTdXBlciwg YXJndW1lbnRzLCBleHByZXNzaW9uU3RhcnQsCiAgICAgICAgICAgICAgICAgICAgIGV4cHJlc3Np b25FbmQsIGxhc3RUb2tlbkVuZFBvc2l0aW9uKCksIGNhbGxPckFwcGx5RGVwdGhTY29wZSA/IGNh bGxPckFwcGx5RGVwdGhTY29wZS0+ZGlzdGFuY2VUb0lubmVybW9zdENoaWxkKCkgOiAwKTsKICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIG1fcGFyc2VyU3RhdGUubm9uTEhTQ291bnQgPSBub25M SFNDb3VudDsKQEAgLTQ4MTQsNiArNDgxNSw3IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRl cj4gVHJlZUV4cHJlc3Npb24gUGFyc2VyPExleGVyVHlwZT46OnBhcnNlTWVtYmVyRXhwcmVzCiAg ICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBnb3RvIGVuZE1lbWJlckV4cHJlc3Npb247CiAg ICAgICAgIH0KKyAgICAgICAgcHJldmlvdXNCYXNlV2FzU3VwZXIgPSBiYXNlSXNTdXBlcjsKICAg ICAgICAgYmFzZUlzU3VwZXIgPSBmYWxzZTsKICAgICB9CiBlbmRNZW1iZXJFeHByZXNzaW9uOgpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9TeW50YXhDaGVja2VyLmgg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1N5bnRheENoZWNrZXIuaAppbmRleCA5YjU0 OTYzODFmNWI2ZTU1YTNkZjY2ZmFmYmRiYTQ1NWIwNGMzNmI5Li5mYzFiOGNjYWEwNjMxMDIzODIw NTcyNjljYWFmODJlY2NlYTEyYTUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv cGFyc2VyL1N5bnRheENoZWNrZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2Vy L1N5bnRheENoZWNrZXIuaApAQCAtMTQzLDcgKzE0Myw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMg Y29uc3QgdW5zaWduZWQgRG9udEJ1aWxkU3RyaW5ncyA9IExleGVyRmxhZ3NEb250QnVpbGRTdHJp bmdzOwogCiAgICAgaW50IGNyZWF0ZVNvdXJjZUVsZW1lbnRzKCkgeyByZXR1cm4gU291cmNlRWxl bWVudHNSZXN1bHQ7IH0KLSAgICBFeHByZXNzaW9uVHlwZSBtYWtlRnVuY3Rpb25DYWxsTm9kZShj b25zdCBKU1Rva2VuTG9jYXRpb24mLCBpbnQsIGludCwgaW50LCBpbnQsIGludCwgc2l6ZV90KSB7 IHJldHVybiBDYWxsRXhwcjsgfQorICAgIEV4cHJlc3Npb25UeXBlIG1ha2VGdW5jdGlvbkNhbGxO b2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIGludCwgYm9vbCwgaW50LCBpbnQsIGludCwgaW50 LCBzaXplX3QpIHsgcmV0dXJuIENhbGxFeHByOyB9CiAgICAgRXhwcmVzc2lvblR5cGUgY3JlYXRl Q29tbWFFeHByKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIEV4cHJlc3Npb25UeXBlIGV4cHIpIHsg cmV0dXJuIGV4cHI7IH0KICAgICBFeHByZXNzaW9uVHlwZSBhcHBlbmRUb0NvbW1hRXhwcihjb25z dCBKU1Rva2VuTG9jYXRpb24mLCBFeHByZXNzaW9uVHlwZSYgaGVhZCwgRXhwcmVzc2lvblR5cGUs IEV4cHJlc3Npb25UeXBlIG5leHQpIHsgaGVhZCA9IG5leHQ7IHJldHVybiBuZXh0OyB9CiAgICAg RXhwcmVzc2lvblR5cGUgbWFrZUFzc2lnbk5vZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiwgRXhw cmVzc2lvblR5cGUsIE9wZXJhdG9yLCBFeHByZXNzaW9uVHlwZSwgYm9vbCwgYm9vbCwgaW50LCBp bnQsIGludCkgeyByZXR1cm4gQXNzaWdubWVudEV4cHI7IH0KZGlmZiAtLWdpdCBhL0pTVGVzdHMv Q2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzY3MmNkMThmNTY4OGI2MGVkMGRh ZjcwMzk3NTgxOGEwNzU0Y2Q0NC4uOGNjZGMyZGNjZTZhZjU1NzhiNjEyNDQ5YzJiZTY4NWYxMTVj ZmEzZCAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNy0xMC0wOSAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBn bWFpbC5jb20+CisKKyAgICAgICAgT2JqZWN0IHByb3BlcnRpZXMgYXJlIHVuZGVmaW5lZCBpbiBz dXBlci5jYWxsKCkgYnV0IG5vdCBpbiB0aGlzLmNhbGwoKQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBzdHJlc3Mvc3VwZXItZG90LWNhbGwtYW5kLWFw cGx5LmpzOiBBZGRlZC4KKyAgICAgICAgKGFzc2VydCk6CisgICAgICAgIChBKToKKyAgICAgICAg KEEucHJvdG90eXBlLmNhbGwpOgorICAgICAgICAoQS5wcm90b3R5cGUuYXBwbHkpOgorICAgICAg ICAoQi5wcm90b3R5cGUudGVzdFN1cGVyKToKKyAgICAgICAgKEIpOgorCiAyMDE3LTEwLTA1ICBT YWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ugc3VyZSBhbGwg cHJvdG90eXBlcyB1bmRlciBwb2x5IHByb3RvIGdldCBhZGRlZCBpbnRvIHRoZSBWTSdzIHByb3Rv dHlwZSBtYXAKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWRvdC1jYWxsLWFuZC1h cHBseS5qcyBiL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWRvdC1jYWxsLWFuZC1hcHBseS5qcwpuZXcg ZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwLi42ZDViMTQ1Y2EwM2MzYWZmM2UyOWRhMjBkMTNmZTlmN2QyZDA2MGZkCi0tLSAvZGV2 L251bGwKKysrIGIvSlNUZXN0cy9zdHJlc3Mvc3VwZXItZG90LWNhbGwtYW5kLWFwcGx5LmpzCkBA IC0wLDAgKzEsMjYgQEAKK2Z1bmN0aW9uIGFzc2VydChhKSB7CisgICAgaWYgKCFhKQorICAgICAg ICB0aHJvdyBuZXcgRXJyb3IoIkJhZCBBc3NlcnRpb24hIik7Cit9CisKK2NsYXNzIEEgeworICAg IGNvbnN0cnVjdG9yKHByb3ApIHsKKyAgICAgICAgdGhpcy5wcm9wID0gcHJvcDsKKyAgICB9Cisg ICAgY2FsbCgpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMucHJvcDsKKyAgICB9CisgICAgYXBwbHko KSB7CisgICAgICAgIHJldHVybiB0aGlzLnByb3A7CisgICAgfQorfQorCitjbGFzcyBCIGV4dGVu ZHMgQSB7CisgIHRlc3RTdXBlcihhKSB7CisgICAgYXNzZXJ0KHN1cGVyLmNhbGwoKSA9PSAndmFs dWUnKTsKKyAgICBhc3NlcnQoc3VwZXIuYXBwbHkoKSA9PSAndmFsdWUnKTsKKyAgfQorfQorCitj b25zdCBvYmogPSBuZXcgQigndmFsdWUnKQorb2JqLnRlc3RTdXBlcigpCg== 323368 2017-10-10 18:57:44 -0700 2017-10-10 19:35:02 -0700 Patch bug-177230-20171010225740.patch text/plain 9939 ticaiolima U3VidmVyc2lvbiBSZXZpc2lvbjogMjIyOTExCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 YzRlNGM5ZDEyODI1OTNlN2FhZGZmNDMwNDEwZTZiOWE3NTc2ZGU1Li40NTU0ZDlhZDI4ZDYyOGVi MzllNTEwYTViNDdiMjdmZmYwMjcyY2NlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxNy0xMC0xMCAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+ CisKKyAgICAgICAgT2JqZWN0IHByb3BlcnRpZXMgYXJlIHVuZGVmaW5lZCBpbiBzdXBlci5jYWxs KCkgYnV0IG5vdCBpbiB0aGlzLmNhbGwoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FhbSBCYXJh dGkuCisKKyAgICAgICAgQnl0ZWNvZGUgZ2VuZXJhdGlvbiBmb3IgInN1cGVyLmNhbGwoLi4uKSIg b3IgInN1cGVyLmFwcGx5KC4uLikiCisgICAgICAgIHNob3VsZG4ndCBiZSBjb25zaWRlcmVkIGFz IENhbGxGdW5jdGlvbkNhbGxEb3ROb2RlIG9yCisgICAgICAgIEFwcGx5RnVuY3Rpb25DYWxsRG90 Tm9kZS4KKworICAgICAgICAqIHBhcnNlci9BU1RCdWlsZGVyLmg6CisgICAgICAgIChKU0M6OkFT VEJ1aWxkZXI6Om1ha2VGdW5jdGlvbkNhbGxOb2RlKToKKyAgICAgICAgKiBwYXJzZXIvUGFyc2Vy LmNwcDoKKyAgICAgICAgKEpTQzo6UGFyc2VyPExleGVyVHlwZT46OnBhcnNlTWVtYmVyRXhwcmVz c2lvbik6CisgICAgICAgICogcGFyc2VyL1N5bnRheENoZWNrZXIuaDoKKyAgICAgICAgKEpTQzo6 U3ludGF4Q2hlY2tlcjo6bWFrZUZ1bmN0aW9uQ2FsbE5vZGUpOgorCiAyMDE3LTEwLTA1ICBTYWFt IEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgogCiAgICAgICAgIE1ha2Ugc3VyZSBhbGwgcHJv dG90eXBlcyB1bmRlciBwb2x5IHByb3RvIGdldCBhZGRlZCBpbnRvIHRoZSBWTSdzIHByb3RvdHlw ZSBtYXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvQVNUQnVpbGRl ci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9BU1RCdWlsZGVyLmgKaW5kZXggYjIw ZGExOGUxNTc0MmNmYjhhODVkYzc4NWE2MzBhNzY0YTFhZjc4NS4uOGQ5MWNlODYzZWYwNzczZTcy MDFhYWMwNjU4MzE2NzA1OWEyZjZhMyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3BhcnNlci9BU1RCdWlsZGVyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9B U1RCdWlsZGVyLmgKQEAgLTEyOSw3ICsxMjksNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0 IGludCAgRG9udEJ1aWxkU3RyaW5ncyA9IDA7CiAKICAgICBFeHByZXNzaW9uTm9kZSogbWFrZUJp bmFyeU5vZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiwgaW50IHRva2VuLCBzdGQ6OnBhaXI8RXhw cmVzc2lvbk5vZGUqLCBCaW5hcnlPcEluZm8+LCBzdGQ6OnBhaXI8RXhwcmVzc2lvbk5vZGUqLCBC aW5hcnlPcEluZm8+KTsKLSAgICBFeHByZXNzaW9uTm9kZSogbWFrZUZ1bmN0aW9uQ2FsbE5vZGUo Y29uc3QgSlNUb2tlbkxvY2F0aW9uJiwgRXhwcmVzc2lvbk5vZGUqIGZ1bmMsIEFyZ3VtZW50c05v ZGUqIGFyZ3MsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBkaXZvdFN0YXJ0LCBjb25zdCBKU1RleHRQ b3NpdGlvbiYgZGl2b3QsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBkaXZvdEVuZCwgc2l6ZV90IGNh bGxPckFwcGx5Q2hpbGREZXB0aCk7CisgICAgRXhwcmVzc2lvbk5vZGUqIG1ha2VGdW5jdGlvbkNh bGxOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIEV4cHJlc3Npb25Ob2RlKiBmdW5jLCBib29s IHByZXZpb3VzQmFzZVdhc1N1cGVyLCBBcmd1bWVudHNOb2RlKiBhcmdzLCBjb25zdCBKU1RleHRQ b3NpdGlvbiYgZGl2b3RTdGFydCwgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRpdm90LCBjb25zdCBK U1RleHRQb3NpdGlvbiYgZGl2b3RFbmQsIHNpemVfdCBjYWxsT3JBcHBseUNoaWxkRGVwdGgpOwog CiAgICAgSlNDOjpTb3VyY2VFbGVtZW50cyogY3JlYXRlU291cmNlRWxlbWVudHMoKSB7IHJldHVy biBuZXcgKG1fcGFyc2VyQXJlbmEpIEpTQzo6U291cmNlRWxlbWVudHMoKTsgfQogCkBAIC0xMzE3 LDcgKzEzMTcsNyBAQCBFeHByZXNzaW9uTm9kZSogQVNUQnVpbGRlcjo6bWFrZUJpdFhPck5vZGUo Y29uc3QgSlNUb2tlbkxvY2F0aW9uJiBsb2NhdGlvbiwgRXhwcgogICAgIHJldHVybiBuZXcgKG1f cGFyc2VyQXJlbmEpIEJpdFhPck5vZGUobG9jYXRpb24sIGV4cHIxLCBleHByMiwgcmlnaHRIYXNB c3NpZ25tZW50cyk7CiB9CiAKLUV4cHJlc3Npb25Ob2RlKiBBU1RCdWlsZGVyOjptYWtlRnVuY3Rp b25DYWxsTm9kZShjb25zdCBKU1Rva2VuTG9jYXRpb24mIGxvY2F0aW9uLCBFeHByZXNzaW9uTm9k ZSogZnVuYywgQXJndW1lbnRzTm9kZSogYXJncywgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRpdm90 U3RhcnQsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBkaXZvdCwgY29uc3QgSlNUZXh0UG9zaXRpb24m IGRpdm90RW5kLCBzaXplX3QgY2FsbE9yQXBwbHlDaGlsZERlcHRoKQorRXhwcmVzc2lvbk5vZGUq IEFTVEJ1aWxkZXI6Om1ha2VGdW5jdGlvbkNhbGxOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYg bG9jYXRpb24sIEV4cHJlc3Npb25Ob2RlKiBmdW5jLCBib29sIHByZXZpb3VzQmFzZVdhc1N1cGVy LCBBcmd1bWVudHNOb2RlKiBhcmdzLCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2b3RTdGFydCwg Y29uc3QgSlNUZXh0UG9zaXRpb24mIGRpdm90LCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2b3RF bmQsIHNpemVfdCBjYWxsT3JBcHBseUNoaWxkRGVwdGgpCiB7CiAgICAgQVNTRVJUKGRpdm90Lm9m ZnNldCA+PSBkaXZvdC5saW5lU3RhcnRPZmZzZXQpOwogICAgIGlmIChmdW5jLT5pc1N1cGVyTm9k ZSgpKQpAQCAtMTM0OCw5ICsxMzQ4LDkgQEAgRXhwcmVzc2lvbk5vZGUqIEFTVEJ1aWxkZXI6Om1h a2VGdW5jdGlvbkNhbGxOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYgbG9jYXRpb24KICAgICBB U1NFUlQoZnVuYy0+aXNEb3RBY2Nlc3Nvck5vZGUoKSk7CiAgICAgRG90QWNjZXNzb3JOb2RlKiBk b3QgPSBzdGF0aWNfY2FzdDxEb3RBY2Nlc3Nvck5vZGUqPihmdW5jKTsKICAgICBGdW5jdGlvbkNh bGxEb3ROb2RlKiBub2RlOwotICAgIGlmIChkb3QtPmlkZW50aWZpZXIoKSA9PSBtX3ZtLT5wcm9w ZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMoKS5jYWxsUHVibGljTmFtZSgpIHx8IGRvdC0+aWRlbnRp ZmllcigpID09IG1fdm0tPnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmNhbGxQcml2YXRl TmFtZSgpKQorICAgIGlmICghcHJldmlvdXNCYXNlV2FzU3VwZXIgJiYgKGRvdC0+aWRlbnRpZmll cigpID09IG1fdm0tPnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmNhbGxQdWJsaWNOYW1l KCkgfHwgZG90LT5pZGVudGlmaWVyKCkgPT0gbV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5h bWVzKCkuY2FsbFByaXZhdGVOYW1lKCkpKQogICAgICAgICBub2RlID0gbmV3IChtX3BhcnNlckFy ZW5hKSBDYWxsRnVuY3Rpb25DYWxsRG90Tm9kZShsb2NhdGlvbiwgZG90LT5iYXNlKCksIGRvdC0+ aWRlbnRpZmllcigpLCBhcmdzLCBkaXZvdCwgZGl2b3RTdGFydCwgZGl2b3RFbmQsIGNhbGxPckFw cGx5Q2hpbGREZXB0aCk7Ci0gICAgZWxzZSBpZiAoZG90LT5pZGVudGlmaWVyKCkgPT0gbV92bS0+ cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkuYXBwbHlQdWJsaWNOYW1lKCkgfHwgZG90LT5p ZGVudGlmaWVyKCkgPT0gbV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkuYXBwbHlQ cml2YXRlTmFtZSgpKQorICAgIGVsc2UgaWYgKCFwcmV2aW91c0Jhc2VXYXNTdXBlciAmJiAoZG90 LT5pZGVudGlmaWVyKCkgPT0gbV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkuYXBw bHlQdWJsaWNOYW1lKCkgfHwgZG90LT5pZGVudGlmaWVyKCkgPT0gbV92bS0+cHJvcGVydHlOYW1l cy0+YnVpbHRpbk5hbWVzKCkuYXBwbHlQcml2YXRlTmFtZSgpKSkKICAgICAgICAgbm9kZSA9IG5l dyAobV9wYXJzZXJBcmVuYSkgQXBwbHlGdW5jdGlvbkNhbGxEb3ROb2RlKGxvY2F0aW9uLCBkb3Qt PmJhc2UoKSwgZG90LT5pZGVudGlmaWVyKCksIGFyZ3MsIGRpdm90LCBkaXZvdFN0YXJ0LCBkaXZv dEVuZCwgY2FsbE9yQXBwbHlDaGlsZERlcHRoKTsKICAgICBlbHNlCiAgICAgICAgIG5vZGUgPSBu ZXcgKG1fcGFyc2VyQXJlbmEpIEZ1bmN0aW9uQ2FsbERvdE5vZGUobG9jYXRpb24sIGRvdC0+YmFz ZSgpLCBkb3QtPmlkZW50aWZpZXIoKSwgYXJncywgZGl2b3QsIGRpdm90U3RhcnQsIGRpdm90RW5k KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFyc2VyLmNwcAppbmRleCA3Y2Q4ZGFjYzFh YTg5Y2Y3ZmZjMTBkOTdhZDBiMTY4MTc1MjAwYTQwLi45YTc4MWU1MmE5M2FiNzgwNGEzN2VmYTUw NDU3N2UzNjQxNDE5ZjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2Vy L1BhcnNlci5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9QYXJzZXIuY3Bw CkBAIC00NjQwLDYgKzQ2NDAsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVF eHByZXNzaW9uIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZU1lbWJlckV4cHJlcwogICAgIH0KIAog ICAgIGJvb2wgYmFzZUlzU3VwZXIgPSBtYXRjaChTVVBFUik7CisgICAgYm9vbCBwcmV2aW91c0Jh c2VXYXNTdXBlciA9IGZhbHNlOwogICAgIGJvb2wgYmFzZUlzSW1wb3J0ID0gbWF0Y2goSU1QT1JU KTsKICAgICBzZW1hbnRpY0ZhaWxJZlRydWUoKGJhc2VJc1N1cGVyIHx8IGJhc2VJc0ltcG9ydCkg JiYgbmV3Q291bnQsICJDYW5ub3QgdXNlIG5ldyB3aXRoICIsIGdldFRva2VuKCkpOwogCkBAIC00 Nzg0LDcgKzQ3ODUsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1aWxkZXI+IFRyZWVFeHByZXNz aW9uIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZU1lbWJlckV4cHJlcwogICAgICAgICAgICAgICAg ICAgICBpZiAoY3VycmVudFNjb3BlKCktPmlzQXJyb3dGdW5jdGlvbigpKQogICAgICAgICAgICAg ICAgICAgICAgICAgZnVuY3Rpb25TY29wZS0+c2V0SW5uZXJBcnJvd0Z1bmN0aW9uVXNlc1N1cGVy Q2FsbCgpOwogICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAgICAgICBiYXNlID0gY29udGV4 dC5tYWtlRnVuY3Rpb25DYWxsTm9kZShzdGFydExvY2F0aW9uLCBiYXNlLCBhcmd1bWVudHMsIGV4 cHJlc3Npb25TdGFydCwKKyAgICAgICAgICAgICAgICBiYXNlID0gY29udGV4dC5tYWtlRnVuY3Rp b25DYWxsTm9kZShzdGFydExvY2F0aW9uLCBiYXNlLCBwcmV2aW91c0Jhc2VXYXNTdXBlciwgYXJn dW1lbnRzLCBleHByZXNzaW9uU3RhcnQsCiAgICAgICAgICAgICAgICAgICAgIGV4cHJlc3Npb25F bmQsIGxhc3RUb2tlbkVuZFBvc2l0aW9uKCksIGNhbGxPckFwcGx5RGVwdGhTY29wZSA/IGNhbGxP ckFwcGx5RGVwdGhTY29wZS0+ZGlzdGFuY2VUb0lubmVybW9zdENoaWxkKCkgOiAwKTsKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIG1fcGFyc2VyU3RhdGUubm9uTEhTQ291bnQgPSBub25MSFND b3VudDsKQEAgLTQ4MTQsNiArNDgxNSw3IEBAIHRlbXBsYXRlIDxjbGFzcyBUcmVlQnVpbGRlcj4g VHJlZUV4cHJlc3Npb24gUGFyc2VyPExleGVyVHlwZT46OnBhcnNlTWVtYmVyRXhwcmVzCiAgICAg ICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBnb3RvIGVuZE1lbWJlckV4cHJlc3Npb247CiAgICAg ICAgIH0KKyAgICAgICAgcHJldmlvdXNCYXNlV2FzU3VwZXIgPSBiYXNlSXNTdXBlcjsKICAgICAg ICAgYmFzZUlzU3VwZXIgPSBmYWxzZTsKICAgICB9CiBlbmRNZW1iZXJFeHByZXNzaW9uOgpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9TeW50YXhDaGVja2VyLmggYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1N5bnRheENoZWNrZXIuaAppbmRleCA5YjU0OTYz ODFmNWI2ZTU1YTNkZjY2ZmFmYmRiYTQ1NWIwNGMzNmI5Li5mYzFiOGNjYWEwNjMxMDIzODIwNTcy NjljYWFmODJlY2NlYTEyYTUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFy c2VyL1N5bnRheENoZWNrZXIuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1N5 bnRheENoZWNrZXIuaApAQCAtMTQzLDcgKzE0Myw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgY29u c3QgdW5zaWduZWQgRG9udEJ1aWxkU3RyaW5ncyA9IExleGVyRmxhZ3NEb250QnVpbGRTdHJpbmdz OwogCiAgICAgaW50IGNyZWF0ZVNvdXJjZUVsZW1lbnRzKCkgeyByZXR1cm4gU291cmNlRWxlbWVu dHNSZXN1bHQ7IH0KLSAgICBFeHByZXNzaW9uVHlwZSBtYWtlRnVuY3Rpb25DYWxsTm9kZShjb25z dCBKU1Rva2VuTG9jYXRpb24mLCBpbnQsIGludCwgaW50LCBpbnQsIGludCwgc2l6ZV90KSB7IHJl dHVybiBDYWxsRXhwcjsgfQorICAgIEV4cHJlc3Npb25UeXBlIG1ha2VGdW5jdGlvbkNhbGxOb2Rl KGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIGludCwgYm9vbCwgaW50LCBpbnQsIGludCwgaW50LCBz aXplX3QpIHsgcmV0dXJuIENhbGxFeHByOyB9CiAgICAgRXhwcmVzc2lvblR5cGUgY3JlYXRlQ29t bWFFeHByKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIEV4cHJlc3Npb25UeXBlIGV4cHIpIHsgcmV0 dXJuIGV4cHI7IH0KICAgICBFeHByZXNzaW9uVHlwZSBhcHBlbmRUb0NvbW1hRXhwcihjb25zdCBK U1Rva2VuTG9jYXRpb24mLCBFeHByZXNzaW9uVHlwZSYgaGVhZCwgRXhwcmVzc2lvblR5cGUsIEV4 cHJlc3Npb25UeXBlIG5leHQpIHsgaGVhZCA9IG5leHQ7IHJldHVybiBuZXh0OyB9CiAgICAgRXhw cmVzc2lvblR5cGUgbWFrZUFzc2lnbk5vZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiwgRXhwcmVz c2lvblR5cGUsIE9wZXJhdG9yLCBFeHByZXNzaW9uVHlwZSwgYm9vbCwgYm9vbCwgaW50LCBpbnQs IGludCkgeyByZXR1cm4gQXNzaWdubWVudEV4cHI7IH0KZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hh bmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMzY3MmNkMThmNTY4OGI2MGVkMGRhZjcw Mzk3NTgxOGEwNzU0Y2Q0NC4uMDExOWRjZTA3YTYyZTkwZDJmZDUxZTI1M2YxYTFhM2JhYzk4ZmU1 NyAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cK QEAgLTEsMyArMSwyNSBAQAorMjAxNy0xMC0xMCAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFp bC5jb20+CisKKyAgICAgICAgT2JqZWN0IHByb3BlcnRpZXMgYXJlIHVuZGVmaW5lZCBpbiBzdXBl ci5jYWxsKCkgYnV0IG5vdCBpbiB0aGlzLmNhbGwoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2Fh bSBCYXJhdGkuCisKKyAgICAgICAgKiBzdHJlc3Mvc3VwZXItY2FsbC1mdW5jdGlvbi1zdWJjbGFz cy5qczogQWRkZWQuCisgICAgICAgIChhc3NlcnQpOgorICAgICAgICAoQS5wcm90b3R5cGUudCk6 CisgICAgICAgIChBKToKKyAgICAgICAgKiBzdHJlc3Mvc3VwZXItZG90LWNhbGwtYW5kLWFwcGx5 LmpzOiBBZGRlZC4KKyAgICAgICAgKGFzc2VydCk6CisgICAgICAgIChBKToKKyAgICAgICAgKEEu cHJvdG90eXBlLmNhbGwpOgorICAgICAgICAoQS5wcm90b3R5cGUuYXBwbHkpOgorICAgICAgICAo Qi5wcm90b3R5cGUudGVzdFN1cGVyKToKKyAgICAgICAgKEIpOgorICAgICAgICAoY29uc3Qub2Jq Lm5ldy5CLnN0cmluZ19hcHBlYXJlZF9oZXJlLm9iai50ZXN0U3VwZXIuQyk6CisgICAgICAgIChE LnByb3RvdHlwZS50ZXN0U3VwZXIpOgorICAgICAgICAoRCk6CisKIDIwMTctMTAtMDUgIFNhYW0g QmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBzdXJlIGFsbCBwcm90 b3R5cGVzIHVuZGVyIHBvbHkgcHJvdG8gZ2V0IGFkZGVkIGludG8gdGhlIFZNJ3MgcHJvdG90eXBl IG1hcApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3Mvc3VwZXItY2FsbC1mdW5jdGlvbi1zdWJj bGFzcy5qcyBiL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWNhbGwtZnVuY3Rpb24tc3ViY2xhc3MuanMK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uMzc1YzAwOTk2ZThlZDdiNDMyOTQ2ZmZkNDYzZDhmMjRjMTk4YTljNQotLS0g L2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWNhbGwtZnVuY3Rpb24tc3ViY2xh c3MuanMKQEAgLTAsMCArMSwxNSBAQAorZnVuY3Rpb24gYXNzZXJ0KGEpIHsKKyAgICBpZiAoIWEp CisgICAgICAgIHRocm93IG5ldyBFcnJvcigiQmFkIik7Cit9CisKK2NsYXNzIEEgZXh0ZW5kcyBG dW5jdGlvbiB7CisgICAgdCgpIHsKKyAgICAgICAgc3VwZXIuY2FsbCh0aGlzKTsKKyAgICAgICAg cmV0dXJuIDM7CisgICAgfQorfQorCitsZXQgYSA9IG5ldyBBKCk7Cithc3NlcnQoYS50KCkgPT0g Myk7CisKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWRvdC1jYWxsLWFuZC1hcHBs eS5qcyBiL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWRvdC1jYWxsLWFuZC1hcHBseS5qcwpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4wZDUyNjgzZWQ0YWQ5OGEwM2E4ZDVjZGMzY2FkM2RmNmYwYTdiNGFkCi0tLSAvZGV2L251 bGwKKysrIGIvSlNUZXN0cy9zdHJlc3Mvc3VwZXItZG90LWNhbGwtYW5kLWFwcGx5LmpzCkBAIC0w LDAgKzEsNTAgQEAKK2Z1bmN0aW9uIGFzc2VydChhKSB7CisgICAgaWYgKCFhKQorICAgICAgICB0 aHJvdyBuZXcgRXJyb3IoIkJhZCBBc3NlcnRpb24hIik7Cit9CisKK2NsYXNzIEEgeworICAgIGNv bnN0cnVjdG9yKHByb3ApIHsKKyAgICAgICAgdGhpcy5wcm9wID0gcHJvcDsKKyAgICB9CisgICAg Y2FsbCgpIHsKKyAgICAgICAgcmV0dXJuIHRoaXMucHJvcDsKKyAgICB9CisgICAgYXBwbHkoKSB7 CisgICAgICAgIHJldHVybiB0aGlzLnByb3A7CisgICAgfQorfQorCitjbGFzcyBCIGV4dGVuZHMg QSB7CisgIHRlc3RTdXBlcigpIHsKKyAgICBhc3NlcnQoc3VwZXIuY2FsbCgpID09ICd2YWx1ZScp OworICAgIGFzc2VydChzdXBlci5hcHBseSgpID09ICd2YWx1ZScpOworICB9Cit9CisKK2NvbnN0 IG9iaiA9IG5ldyBCKCd2YWx1ZScpCitvYmoudGVzdFN1cGVyKCkKKworY2xhc3MgQyB7fQorCitj bGFzcyBEIGV4dGVuZHMgQyB7CisgICAgdGVzdFN1cGVyKCkgeworICAgICAgICB0cnkgeworICAg ICAgICAgICAgc3VwZXIuY2FsbCgpOworICAgICAgICAgICAgYXNzZXJ0KGZhbHNlKTsKKyAgICAg ICAgfSBjYXRjaChlKSB7CisgICAgICAgICAgICBhc3NlcnQoZS5tZXNzYWdlID09ICJzdXBlci5j YWxsIGlzIG5vdCBhIGZ1bmN0aW9uLiAoSW4gJ3N1cGVyLmNhbGwoKScsICdzdXBlci5jYWxsJyBp cyB1bmRlZmluZWQpIik7CisgICAgICAgIH0KKyAgICAgICAgCisgICAgICAgIHRyeSB7CisgICAg ICAgICAgICBzdXBlci5hcHBseSgpOworICAgICAgICAgICAgYXNzZXJ0KGZhbHNlKTsKKyAgICAg ICAgfSBjYXRjaChlKSB7CisgICAgICAgICAgICBhc3NlcnQoZS5tZXNzYWdlID09ICJzdXBlci5h cHBseSBpcyBub3QgYSBmdW5jdGlvbi4gKEluICdzdXBlci5hcHBseSgpJywgJ3N1cGVyLmFwcGx5 JyBpcyB1bmRlZmluZWQpIik7CisgICAgICAgIH0KKyAgICB9Cit9CisKK2xldCBkID0gbmV3IEQo KTsKK2QudGVzdFN1cGVyKCk7CisK 323372 2017-10-10 19:35:02 -0700 2017-10-11 05:59:39 -0700 Patch For landing super-call-issue.diff text/plain 9721 ticaiolima ZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg MzY3MmNkMS4uMDExOWRjZSAxMDA2NDQKLS0tIGEvSlNUZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNy0xMC0xMCAgQ2FpbyBMaW1hICA8 dGljYWlvbGltYUBnbWFpbC5jb20+CisKKyAgICAgICAgT2JqZWN0IHByb3BlcnRpZXMgYXJlIHVu ZGVmaW5lZCBpbiBzdXBlci5jYWxsKCkgYnV0IG5vdCBpbiB0aGlzLmNhbGwoKQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc3MjMwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgU2FhbSBCYXJhdGkuCisKKyAgICAgICAgKiBzdHJlc3Mvc3VwZXItY2FsbC1m dW5jdGlvbi1zdWJjbGFzcy5qczogQWRkZWQuCisgICAgICAgIChhc3NlcnQpOgorICAgICAgICAo QS5wcm90b3R5cGUudCk6CisgICAgICAgIChBKToKKyAgICAgICAgKiBzdHJlc3Mvc3VwZXItZG90 LWNhbGwtYW5kLWFwcGx5LmpzOiBBZGRlZC4KKyAgICAgICAgKGFzc2VydCk6CisgICAgICAgIChB KToKKyAgICAgICAgKEEucHJvdG90eXBlLmNhbGwpOgorICAgICAgICAoQS5wcm90b3R5cGUuYXBw bHkpOgorICAgICAgICAoQi5wcm90b3R5cGUudGVzdFN1cGVyKToKKyAgICAgICAgKEIpOgorICAg ICAgICAoY29uc3Qub2JqLm5ldy5CLnN0cmluZ19hcHBlYXJlZF9oZXJlLm9iai50ZXN0U3VwZXIu Qyk6CisgICAgICAgIChELnByb3RvdHlwZS50ZXN0U3VwZXIpOgorICAgICAgICAoRCk6CisKIDIw MTctMTAtMDUgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgTWFr ZSBzdXJlIGFsbCBwcm90b3R5cGVzIHVuZGVyIHBvbHkgcHJvdG8gZ2V0IGFkZGVkIGludG8gdGhl IFZNJ3MgcHJvdG90eXBlIG1hcApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3Mvc3VwZXItY2Fs bC1mdW5jdGlvbi1zdWJjbGFzcy5qcyBiL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWNhbGwtZnVuY3Rp b24tc3ViY2xhc3MuanMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMzc1YzAw OQotLS0gL2Rldi9udWxsCisrKyBiL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWNhbGwtZnVuY3Rpb24t c3ViY2xhc3MuanMKQEAgLTAsMCArMSwxNSBAQAorZnVuY3Rpb24gYXNzZXJ0KGEpIHsKKyAgICBp ZiAoIWEpCisgICAgICAgIHRocm93IG5ldyBFcnJvcigiQmFkIik7Cit9CisKK2NsYXNzIEEgZXh0 ZW5kcyBGdW5jdGlvbiB7CisgICAgdCgpIHsKKyAgICAgICAgc3VwZXIuY2FsbCh0aGlzKTsKKyAg ICAgICAgcmV0dXJuIDM7CisgICAgfQorfQorCitsZXQgYSA9IG5ldyBBKCk7Cithc3NlcnQoYS50 KCkgPT0gMyk7CisKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWRvdC1jYWxsLWFu ZC1hcHBseS5qcyBiL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWRvdC1jYWxsLWFuZC1hcHBseS5qcwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4wZDUyNjgzZQotLS0gL2Rldi9udWxs CisrKyBiL0pTVGVzdHMvc3RyZXNzL3N1cGVyLWRvdC1jYWxsLWFuZC1hcHBseS5qcwpAQCAtMCww ICsxLDUwIEBACitmdW5jdGlvbiBhc3NlcnQoYSkgeworICAgIGlmICghYSkKKyAgICAgICAgdGhy b3cgbmV3IEVycm9yKCJCYWQgQXNzZXJ0aW9uISIpOworfQorCitjbGFzcyBBIHsKKyAgICBjb25z dHJ1Y3Rvcihwcm9wKSB7CisgICAgICAgIHRoaXMucHJvcCA9IHByb3A7CisgICAgfQorICAgIGNh bGwoKSB7CisgICAgICAgIHJldHVybiB0aGlzLnByb3A7CisgICAgfQorICAgIGFwcGx5KCkgewor ICAgICAgICByZXR1cm4gdGhpcy5wcm9wOworICAgIH0KK30KKworY2xhc3MgQiBleHRlbmRzIEEg eworICB0ZXN0U3VwZXIoKSB7CisgICAgYXNzZXJ0KHN1cGVyLmNhbGwoKSA9PSAndmFsdWUnKTsK KyAgICBhc3NlcnQoc3VwZXIuYXBwbHkoKSA9PSAndmFsdWUnKTsKKyAgfQorfQorCitjb25zdCBv YmogPSBuZXcgQigndmFsdWUnKQorb2JqLnRlc3RTdXBlcigpCisKK2NsYXNzIEMge30KKworY2xh c3MgRCBleHRlbmRzIEMgeworICAgIHRlc3RTdXBlcigpIHsKKyAgICAgICAgdHJ5IHsKKyAgICAg ICAgICAgIHN1cGVyLmNhbGwoKTsKKyAgICAgICAgICAgIGFzc2VydChmYWxzZSk7CisgICAgICAg IH0gY2F0Y2goZSkgeworICAgICAgICAgICAgYXNzZXJ0KGUubWVzc2FnZSA9PSAic3VwZXIuY2Fs bCBpcyBub3QgYSBmdW5jdGlvbi4gKEluICdzdXBlci5jYWxsKCknLCAnc3VwZXIuY2FsbCcgaXMg dW5kZWZpbmVkKSIpOworICAgICAgICB9CisgICAgICAgIAorICAgICAgICB0cnkgeworICAgICAg ICAgICAgc3VwZXIuYXBwbHkoKTsKKyAgICAgICAgICAgIGFzc2VydChmYWxzZSk7CisgICAgICAg IH0gY2F0Y2goZSkgeworICAgICAgICAgICAgYXNzZXJ0KGUubWVzc2FnZSA9PSAic3VwZXIuYXBw bHkgaXMgbm90IGEgZnVuY3Rpb24uIChJbiAnc3VwZXIuYXBwbHkoKScsICdzdXBlci5hcHBseScg aXMgdW5kZWZpbmVkKSIpOworICAgICAgICB9CisgICAgfQorfQorCitsZXQgZCA9IG5ldyBEKCk7 CitkLnRlc3RTdXBlcigpOworCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hh bmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1YzRlNGM5Li4y YzAwNzJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNSBAQAorMjAxNy0x MC0xMCAgQ2FpbyBMaW1hICA8dGljYWlvbGltYUBnbWFpbC5jb20+CisKKyAgICAgICAgT2JqZWN0 IHByb3BlcnRpZXMgYXJlIHVuZGVmaW5lZCBpbiBzdXBlci5jYWxsKCkgYnV0IG5vdCBpbiB0aGlz LmNhbGwoKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTc3MjMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FhbSBCYXJhdGkuCisKKyAgICAgICAgQnl0 ZWNvZGUgZ2VuZXJhdGlvbiBmb3IgInN1cGVyLmNhbGwoLi4uKSIgb3IgInN1cGVyLmFwcGx5KC4u LikiCisgICAgICAgIHNob3VsZG4ndCBiZSBjb25zaWRlcmVkIGFzIENhbGxGdW5jdGlvbkNhbGxE b3ROb2RlIG9yCisgICAgICAgIEFwcGx5RnVuY3Rpb25DYWxsRG90Tm9kZSBiZWNhdXNlIHRoZXkg c2hvdWxkIGJlIGNvbnNpZGVyZWQgYXMgY29tbW9uCisgICAgICAgIHN1cGVyIHByb3BlcnR5IGFj Y2VzcyBhcyBhbnkgb3RoZXIgZnVuY3Rpb24uIEFjY29yZGluZyB0byBzcGVjWzFdLAorICAgICAg ICAic3VwZXIiIGlzIG5vdCByZWZlcmluZyB0byBwYXJlbnQgY29uc3RydWN0b3IuCisKKyAgICAg ICAgWzFdIC0gaHR0cHM6Ly90YzM5LmdpdGh1Yi5pby9lY21hMjYyLyNzZWMtc3VwZXIta2V5d29y ZC1ydW50aW1lLXNlbWFudGljcy1ldmFsdWF0aW9uCisKKyAgICAgICAgKiBwYXJzZXIvQVNUQnVp bGRlci5oOgorICAgICAgICAoSlNDOjpBU1RCdWlsZGVyOjptYWtlRnVuY3Rpb25DYWxsTm9kZSk6 CisgICAgICAgICogcGFyc2VyL1BhcnNlci5jcHA6CisgICAgICAgIChKU0M6OlBhcnNlcjxMZXhl clR5cGU+OjpwYXJzZU1lbWJlckV4cHJlc3Npb24pOgorICAgICAgICAqIHBhcnNlci9TeW50YXhD aGVja2VyLmg6CisgICAgICAgIChKU0M6OlN5bnRheENoZWNrZXI6Om1ha2VGdW5jdGlvbkNhbGxO b2RlKToKKwogMjAxNy0xMC0wNSAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KIAog ICAgICAgICBNYWtlIHN1cmUgYWxsIHByb3RvdHlwZXMgdW5kZXIgcG9seSBwcm90byBnZXQgYWRk ZWQgaW50byB0aGUgVk0ncyBwcm90b3R5cGUgbWFwCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvcGFyc2VyL0FTVEJ1aWxkZXIuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJz ZXIvQVNUQnVpbGRlci5oCmluZGV4IGIyMGRhMTguLjhkOTFjZTggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvQVNUQnVpbGRlci5oCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9wYXJzZXIvQVNUQnVpbGRlci5oCkBAIC0xMjksNyArMTI5LDcgQEAgcHVibGljOgog ICAgIHN0YXRpYyBjb25zdCBpbnQgIERvbnRCdWlsZFN0cmluZ3MgPSAwOwogCiAgICAgRXhwcmVz c2lvbk5vZGUqIG1ha2VCaW5hcnlOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIGludCB0b2tl biwgc3RkOjpwYWlyPEV4cHJlc3Npb25Ob2RlKiwgQmluYXJ5T3BJbmZvPiwgc3RkOjpwYWlyPEV4 cHJlc3Npb25Ob2RlKiwgQmluYXJ5T3BJbmZvPik7Ci0gICAgRXhwcmVzc2lvbk5vZGUqIG1ha2VG dW5jdGlvbkNhbGxOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIEV4cHJlc3Npb25Ob2RlKiBm dW5jLCBBcmd1bWVudHNOb2RlKiBhcmdzLCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2b3RTdGFy dCwgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRpdm90LCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2 b3RFbmQsIHNpemVfdCBjYWxsT3JBcHBseUNoaWxkRGVwdGgpOworICAgIEV4cHJlc3Npb25Ob2Rl KiBtYWtlRnVuY3Rpb25DYWxsTm9kZShjb25zdCBKU1Rva2VuTG9jYXRpb24mLCBFeHByZXNzaW9u Tm9kZSogZnVuYywgYm9vbCBwcmV2aW91c0Jhc2VXYXNTdXBlciwgQXJndW1lbnRzTm9kZSogYXJn cywgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRpdm90U3RhcnQsIGNvbnN0IEpTVGV4dFBvc2l0aW9u JiBkaXZvdCwgY29uc3QgSlNUZXh0UG9zaXRpb24mIGRpdm90RW5kLCBzaXplX3QgY2FsbE9yQXBw bHlDaGlsZERlcHRoKTsKIAogICAgIEpTQzo6U291cmNlRWxlbWVudHMqIGNyZWF0ZVNvdXJjZUVs ZW1lbnRzKCkgeyByZXR1cm4gbmV3IChtX3BhcnNlckFyZW5hKSBKU0M6OlNvdXJjZUVsZW1lbnRz KCk7IH0KIApAQCAtMTMxNyw3ICsxMzE3LDcgQEAgRXhwcmVzc2lvbk5vZGUqIEFTVEJ1aWxkZXI6 Om1ha2VCaXRYT3JOb2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYgbG9jYXRpb24sIEV4cHIKICAg ICByZXR1cm4gbmV3IChtX3BhcnNlckFyZW5hKSBCaXRYT3JOb2RlKGxvY2F0aW9uLCBleHByMSwg ZXhwcjIsIHJpZ2h0SGFzQXNzaWdubWVudHMpOwogfQogCi1FeHByZXNzaW9uTm9kZSogQVNUQnVp bGRlcjo6bWFrZUZ1bmN0aW9uQ2FsbE5vZGUoY29uc3QgSlNUb2tlbkxvY2F0aW9uJiBsb2NhdGlv biwgRXhwcmVzc2lvbk5vZGUqIGZ1bmMsIEFyZ3VtZW50c05vZGUqIGFyZ3MsIGNvbnN0IEpTVGV4 dFBvc2l0aW9uJiBkaXZvdFN0YXJ0LCBjb25zdCBKU1RleHRQb3NpdGlvbiYgZGl2b3QsIGNvbnN0 IEpTVGV4dFBvc2l0aW9uJiBkaXZvdEVuZCwgc2l6ZV90IGNhbGxPckFwcGx5Q2hpbGREZXB0aCkK K0V4cHJlc3Npb25Ob2RlKiBBU1RCdWlsZGVyOjptYWtlRnVuY3Rpb25DYWxsTm9kZShjb25zdCBK U1Rva2VuTG9jYXRpb24mIGxvY2F0aW9uLCBFeHByZXNzaW9uTm9kZSogZnVuYywgYm9vbCBwcmV2 aW91c0Jhc2VXYXNTdXBlciwgQXJndW1lbnRzTm9kZSogYXJncywgY29uc3QgSlNUZXh0UG9zaXRp b24mIGRpdm90U3RhcnQsIGNvbnN0IEpTVGV4dFBvc2l0aW9uJiBkaXZvdCwgY29uc3QgSlNUZXh0 UG9zaXRpb24mIGRpdm90RW5kLCBzaXplX3QgY2FsbE9yQXBwbHlDaGlsZERlcHRoKQogewogICAg IEFTU0VSVChkaXZvdC5vZmZzZXQgPj0gZGl2b3QubGluZVN0YXJ0T2Zmc2V0KTsKICAgICBpZiAo ZnVuYy0+aXNTdXBlck5vZGUoKSkKQEAgLTEzNDgsOSArMTM0OCw5IEBAIEV4cHJlc3Npb25Ob2Rl KiBBU1RCdWlsZGVyOjptYWtlRnVuY3Rpb25DYWxsTm9kZShjb25zdCBKU1Rva2VuTG9jYXRpb24m IGxvY2F0aW9uCiAgICAgQVNTRVJUKGZ1bmMtPmlzRG90QWNjZXNzb3JOb2RlKCkpOwogICAgIERv dEFjY2Vzc29yTm9kZSogZG90ID0gc3RhdGljX2Nhc3Q8RG90QWNjZXNzb3JOb2RlKj4oZnVuYyk7 CiAgICAgRnVuY3Rpb25DYWxsRG90Tm9kZSogbm9kZTsKLSAgICBpZiAoZG90LT5pZGVudGlmaWVy KCkgPT0gbV92bS0+cHJvcGVydHlOYW1lcy0+YnVpbHRpbk5hbWVzKCkuY2FsbFB1YmxpY05hbWUo KSB8fCBkb3QtPmlkZW50aWZpZXIoKSA9PSBtX3ZtLT5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFt ZXMoKS5jYWxsUHJpdmF0ZU5hbWUoKSkKKyAgICBpZiAoIXByZXZpb3VzQmFzZVdhc1N1cGVyICYm IChkb3QtPmlkZW50aWZpZXIoKSA9PSBtX3ZtLT5wcm9wZXJ0eU5hbWVzLT5idWlsdGluTmFtZXMo KS5jYWxsUHVibGljTmFtZSgpIHx8IGRvdC0+aWRlbnRpZmllcigpID09IG1fdm0tPnByb3BlcnR5 TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmNhbGxQcml2YXRlTmFtZSgpKSkKICAgICAgICAgbm9kZSA9 IG5ldyAobV9wYXJzZXJBcmVuYSkgQ2FsbEZ1bmN0aW9uQ2FsbERvdE5vZGUobG9jYXRpb24sIGRv dC0+YmFzZSgpLCBkb3QtPmlkZW50aWZpZXIoKSwgYXJncywgZGl2b3QsIGRpdm90U3RhcnQsIGRp dm90RW5kLCBjYWxsT3JBcHBseUNoaWxkRGVwdGgpOwotICAgIGVsc2UgaWYgKGRvdC0+aWRlbnRp ZmllcigpID09IG1fdm0tPnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmFwcGx5UHVibGlj TmFtZSgpIHx8IGRvdC0+aWRlbnRpZmllcigpID09IG1fdm0tPnByb3BlcnR5TmFtZXMtPmJ1aWx0 aW5OYW1lcygpLmFwcGx5UHJpdmF0ZU5hbWUoKSkKKyAgICBlbHNlIGlmICghcHJldmlvdXNCYXNl V2FzU3VwZXIgJiYgKGRvdC0+aWRlbnRpZmllcigpID09IG1fdm0tPnByb3BlcnR5TmFtZXMtPmJ1 aWx0aW5OYW1lcygpLmFwcGx5UHVibGljTmFtZSgpIHx8IGRvdC0+aWRlbnRpZmllcigpID09IG1f dm0tPnByb3BlcnR5TmFtZXMtPmJ1aWx0aW5OYW1lcygpLmFwcGx5UHJpdmF0ZU5hbWUoKSkpCiAg ICAgICAgIG5vZGUgPSBuZXcgKG1fcGFyc2VyQXJlbmEpIEFwcGx5RnVuY3Rpb25DYWxsRG90Tm9k ZShsb2NhdGlvbiwgZG90LT5iYXNlKCksIGRvdC0+aWRlbnRpZmllcigpLCBhcmdzLCBkaXZvdCwg ZGl2b3RTdGFydCwgZGl2b3RFbmQsIGNhbGxPckFwcGx5Q2hpbGREZXB0aCk7CiAgICAgZWxzZQog ICAgICAgICBub2RlID0gbmV3IChtX3BhcnNlckFyZW5hKSBGdW5jdGlvbkNhbGxEb3ROb2RlKGxv Y2F0aW9uLCBkb3QtPmJhc2UoKSwgZG90LT5pZGVudGlmaWVyKCksIGFyZ3MsIGRpdm90LCBkaXZv dFN0YXJ0LCBkaXZvdEVuZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFy c2VyL1BhcnNlci5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcGFyc2VyL1BhcnNlci5jcHAK aW5kZXggN2NkOGRhYy4uOWE3ODFlNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L3BhcnNlci9QYXJzZXIuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvUGFy c2VyLmNwcApAQCAtNDY0MCw2ICs0NjQwLDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVy PiBUcmVlRXhwcmVzc2lvbiBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VNZW1iZXJFeHByZXMKICAg ICB9CiAKICAgICBib29sIGJhc2VJc1N1cGVyID0gbWF0Y2goU1VQRVIpOworICAgIGJvb2wgcHJl dmlvdXNCYXNlV2FzU3VwZXIgPSBmYWxzZTsKICAgICBib29sIGJhc2VJc0ltcG9ydCA9IG1hdGNo KElNUE9SVCk7CiAgICAgc2VtYW50aWNGYWlsSWZUcnVlKChiYXNlSXNTdXBlciB8fCBiYXNlSXNJ bXBvcnQpICYmIG5ld0NvdW50LCAiQ2Fubm90IHVzZSBuZXcgd2l0aCAiLCBnZXRUb2tlbigpKTsK IApAQCAtNDc4NCw3ICs0Nzg1LDcgQEAgdGVtcGxhdGUgPGNsYXNzIFRyZWVCdWlsZGVyPiBUcmVl RXhwcmVzc2lvbiBQYXJzZXI8TGV4ZXJUeXBlPjo6cGFyc2VNZW1iZXJFeHByZXMKICAgICAgICAg ICAgICAgICAgICAgaWYgKGN1cnJlbnRTY29wZSgpLT5pc0Fycm93RnVuY3Rpb24oKSkKICAgICAg ICAgICAgICAgICAgICAgICAgIGZ1bmN0aW9uU2NvcGUtPnNldElubmVyQXJyb3dGdW5jdGlvblVz ZXNTdXBlckNhbGwoKTsKICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgYmFzZSA9 IGNvbnRleHQubWFrZUZ1bmN0aW9uQ2FsbE5vZGUoc3RhcnRMb2NhdGlvbiwgYmFzZSwgYXJndW1l bnRzLCBleHByZXNzaW9uU3RhcnQsCisgICAgICAgICAgICAgICAgYmFzZSA9IGNvbnRleHQubWFr ZUZ1bmN0aW9uQ2FsbE5vZGUoc3RhcnRMb2NhdGlvbiwgYmFzZSwgcHJldmlvdXNCYXNlV2FzU3Vw ZXIsIGFyZ3VtZW50cywgZXhwcmVzc2lvblN0YXJ0LAogICAgICAgICAgICAgICAgICAgICBleHBy ZXNzaW9uRW5kLCBsYXN0VG9rZW5FbmRQb3NpdGlvbigpLCBjYWxsT3JBcHBseURlcHRoU2NvcGUg PyBjYWxsT3JBcHBseURlcHRoU2NvcGUtPmRpc3RhbmNlVG9Jbm5lcm1vc3RDaGlsZCgpIDogMCk7 CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBtX3BhcnNlclN0YXRlLm5vbkxIU0NvdW50ID0g bm9uTEhTQ291bnQ7CkBAIC00ODE0LDYgKzQ4MTUsNyBAQCB0ZW1wbGF0ZSA8Y2xhc3MgVHJlZUJ1 aWxkZXI+IFRyZWVFeHByZXNzaW9uIFBhcnNlcjxMZXhlclR5cGU+OjpwYXJzZU1lbWJlckV4cHJl cwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAgICAgZ290byBlbmRNZW1iZXJFeHByZXNzaW9u OwogICAgICAgICB9CisgICAgICAgIHByZXZpb3VzQmFzZVdhc1N1cGVyID0gYmFzZUlzU3VwZXI7 CiAgICAgICAgIGJhc2VJc1N1cGVyID0gZmFsc2U7CiAgICAgfQogZW5kTWVtYmVyRXhwcmVzc2lv bjoKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9wYXJzZXIvU3ludGF4Q2hlY2tl ci5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9TeW50YXhDaGVja2VyLmgKaW5kZXgg OWI1NDk2My4uZmMxYjhjYyAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNl ci9TeW50YXhDaGVja2VyLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3BhcnNlci9TeW50 YXhDaGVja2VyLmgKQEAgLTE0Myw3ICsxNDMsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGNvbnN0 IHVuc2lnbmVkIERvbnRCdWlsZFN0cmluZ3MgPSBMZXhlckZsYWdzRG9udEJ1aWxkU3RyaW5nczsK IAogICAgIGludCBjcmVhdGVTb3VyY2VFbGVtZW50cygpIHsgcmV0dXJuIFNvdXJjZUVsZW1lbnRz UmVzdWx0OyB9Ci0gICAgRXhwcmVzc2lvblR5cGUgbWFrZUZ1bmN0aW9uQ2FsbE5vZGUoY29uc3Qg SlNUb2tlbkxvY2F0aW9uJiwgaW50LCBpbnQsIGludCwgaW50LCBpbnQsIHNpemVfdCkgeyByZXR1 cm4gQ2FsbEV4cHI7IH0KKyAgICBFeHByZXNzaW9uVHlwZSBtYWtlRnVuY3Rpb25DYWxsTm9kZShj b25zdCBKU1Rva2VuTG9jYXRpb24mLCBpbnQsIGJvb2wsIGludCwgaW50LCBpbnQsIGludCwgc2l6 ZV90KSB7IHJldHVybiBDYWxsRXhwcjsgfQogICAgIEV4cHJlc3Npb25UeXBlIGNyZWF0ZUNvbW1h RXhwcihjb25zdCBKU1Rva2VuTG9jYXRpb24mLCBFeHByZXNzaW9uVHlwZSBleHByKSB7IHJldHVy biBleHByOyB9CiAgICAgRXhwcmVzc2lvblR5cGUgYXBwZW5kVG9Db21tYUV4cHIoY29uc3QgSlNU b2tlbkxvY2F0aW9uJiwgRXhwcmVzc2lvblR5cGUmIGhlYWQsIEV4cHJlc3Npb25UeXBlLCBFeHBy ZXNzaW9uVHlwZSBuZXh0KSB7IGhlYWQgPSBuZXh0OyByZXR1cm4gbmV4dDsgfQogICAgIEV4cHJl c3Npb25UeXBlIG1ha2VBc3NpZ25Ob2RlKGNvbnN0IEpTVG9rZW5Mb2NhdGlvbiYsIEV4cHJlc3Np b25UeXBlLCBPcGVyYXRvciwgRXhwcmVzc2lvblR5cGUsIGJvb2wsIGJvb2wsIGludCwgaW50LCBp bnQpIHsgcmV0dXJuIEFzc2lnbm1lbnRFeHByOyB9Cg==