175610 2017-08-15 17:38:46 -0700 Teach DFGFixupPhase.cpp that the current scope is always a cell 2017-08-17 17:20:53 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Enhancement --- 1 rmorisset webkit-unassigned buildbot commit-queue keith_miller mark.lam msaboff saam webkit-bug-importer oldest_to_newest 1338980 0 rmorisset 2017-08-15 17:38:46 -0700 This applies to - CreateScopedArgument - CreateActivation - PushWithScope - NewFunction - NewGeneratorFunction - NewAsyncFunction Their first argument is currently CellUse, but we can make it KnownCellUse. In the case of PushWithScope we can also speculate that the second argument is likely to be an object (since toObject is called on it). 1339210 1 318271 rmorisset 2017-08-16 10:34:53 -0700 Created attachment 318271 Patch 1339226 2 318271 buildbot 2017-08-16 11:26:08 -0700 Comment on attachment 318271 Patch Attachment 318271 did not pass jsc-ews (mac): Output: http://webkit-queues.webkit.org/results/4325240 New failing tests: stress/eval-func-decl-in-eval-within-with-scope.js.default stress/get-from-scope-dynamic-onto-proxy.js.dfg-eager stress/constant-closure-var-with-dynamic-invalidation.js.ftl-eager stress/es6-default-parameters.js.ftl-eager-no-cjit stress/global-lexical-variable-with-statement.js.dfg-eager-no-cjit-validate stress/eval-func-decl-in-eval-within-with-scope.js.dfg-eager jsc-layout-tests.yaml/js/script-tests/exception-propagate-from-dfg-to-llint.js.layout-ftl-eager-no-cjit stress/eval-func-decl-in-eval-within-with-scope.js.ftl-eager-no-cjit-b3o1 stress/with.js.ftl-no-cjit-validate-sampling-profiler stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-small-pool stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-no-inline-validate stress/lexical-let-and-with-statement.js.ftl-eager-no-cjit-b3o1 stress/constant-closure-var-with-dynamic-invalidation.js.ftl-eager-no-cjit stress/constant-closure-var-with-dynamic-invalidation.js.ftl-eager-no-cjit-b3o1 stress/eval-func-decl-in-eval-within-with-scope.js.dfg-maximal-flush-validate-no-cjit stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-b3o1 stress/const-and-with-statement.js.ftl-eager stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-no-put-stack-validate jsc-layout-tests.yaml/js/script-tests/eval-and-with.js.layout-dfg-eager-no-cjit stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-validate-sampling-profiler stress/eval-func-decl-in-eval-within-with-scope.js.no-llint stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-b3o1 stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-small-pool stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-no-put-stack-validate stress/get-from-scope-dynamic-onto-proxy.js.dfg-eager-no-cjit-validate stress/with.js.ftl-eager-no-cjit-b3o1 mozilla-tests.yaml/js1_5/Scope/regress-208496-002.js.mozilla-ftl-eager-no-cjit-validate-phases stress/const-and-with-statement.js.ftl-eager-no-cjit-b3o1 stress/eval-func-decl-in-eval-within-with-scope.js.no-ftl stress/with.js.dfg-eager-no-cjit-validate stress/with.js.no-cjit-validate-phases stress/eval-func-decl-in-eval-within-with-scope.js.ftl-eager-no-cjit stress/with.js.ftl-no-cjit-no-inline-validate stress/const-and-with-statement.js.ftl-eager-no-cjit stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-validate-sampling-profiler stress/eval-func-decl-in-eval-within-with-scope.js.no-cjit-collect-continuously stress/global-lexical-variable-with-statement.js.dfg-eager stress/es6-default-parameters.js.ftl-eager stress/global-lexical-variable-with-statement.js.ftl-eager-no-cjit-b3o1 stress/es6-default-parameters.js.ftl-eager-no-cjit-b3o1 stress/eval-func-decl-in-eval-within-with-scope.js.no-cjit-validate-phases jsc-layout-tests.yaml/js/script-tests/eval-and-with.js.layout-ftl-eager-no-cjit stress/eval-func-decl-in-eval-within-with-scope.js.dfg-eager-no-cjit-validate stress/get-from-scope-dynamic-onto-proxy.js.ftl-eager-no-cjit-b3o1 stress/get-from-scope-dynamic-onto-proxy.js.ftl-eager stress/with.js.dfg-maximal-flush-validate-no-cjit mozilla-tests.yaml/js1_5/Scope/scope-004.js.mozilla-dfg-eager-no-cjit-validate-phases stress/with.js.ftl-no-cjit-no-put-stack-validate stress/with.js.ftl-eager-no-cjit stress/lexical-let-and-with-statement.js.ftl-eager stress/global-lexical-variable-with-statement.js.ftl-eager-no-cjit stress/with.js.ftl-no-cjit-b3o1 stress/constant-closure-var-with-dynamic-invalidation.js.default stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-no-inline-validate stress/get-from-scope-dynamic-onto-proxy.js.ftl-eager-no-cjit stress/eval-func-decl-in-eval-within-with-scope.js.ftl-eager mozilla-tests.yaml/js1_5/Scope/scope-004.js.mozilla-ftl-eager-no-cjit-validate-phases stress/lexical-let-and-with-statement.js.ftl-eager-no-cjit 1339653 3 318391 rmorisset 2017-08-17 11:33:05 -0700 Created attachment 318391 Patch 1339655 4 buildbot 2017-08-17 11:34:47 -0700 Attachment 318391 did not pass style-queue: ERROR: Source/JavaScriptCore/jit/JITOperations.h:424: The parameter name "exec" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/jit/JITOperations.h:424: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 1339681 5 318391 buildbot 2017-08-17 12:30:31 -0700 Comment on attachment 318391 Patch Attachment 318391 did not pass jsc-ews (mac): Output: http://webkit-queues.webkit.org/results/4331719 New failing tests: stress/eval-func-decl-in-eval-within-with-scope.js.default stress/constant-closure-var-with-dynamic-invalidation.js.ftl-eager stress/es6-default-parameters.js.ftl-eager-no-cjit stress/eval-func-decl-in-eval-within-with-scope.js.ftl-eager-no-cjit-b3o1 stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-small-pool stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-no-inline-validate stress/lexical-let-and-with-statement.js.ftl-eager-no-cjit-b3o1 stress/constant-closure-var-with-dynamic-invalidation.js.ftl-eager-no-cjit stress/constant-closure-var-with-dynamic-invalidation.js.ftl-eager-no-cjit-b3o1 stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-b3o1 stress/const-and-with-statement.js.ftl-eager stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-no-put-stack-validate stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-validate-sampling-profiler stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-b3o1 stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-no-put-stack-validate stress/get-from-scope-dynamic-onto-proxy.js.ftl-eager mozilla-tests.yaml/js1_5/Scope/regress-208496-002.js.mozilla-ftl-eager-no-cjit-validate-phases stress/const-and-with-statement.js.ftl-eager-no-cjit-b3o1 stress/eval-func-decl-in-eval-within-with-scope.js.ftl-eager-no-cjit stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-small-pool stress/const-and-with-statement.js.ftl-eager-no-cjit stress/constant-closure-var-with-dynamic-invalidation.js.ftl-no-cjit-validate-sampling-profiler stress/es6-default-parameters.js.ftl-eager stress/global-lexical-variable-with-statement.js.ftl-eager-no-cjit-b3o1 stress/es6-default-parameters.js.ftl-eager-no-cjit-b3o1 stress/lexical-let-and-with-statement.js.ftl-eager-no-cjit jsc-layout-tests.yaml/js/script-tests/eval-and-with.js.layout-ftl-eager-no-cjit jsc-layout-tests.yaml/js/script-tests/exception-propagate-from-dfg-to-llint.js.layout-ftl-eager-no-cjit stress/get-from-scope-dynamic-onto-proxy.js.ftl-eager-no-cjit-b3o1 stress/lexical-let-and-with-statement.js.ftl-eager stress/global-lexical-variable-with-statement.js.ftl-eager-no-cjit stress/constant-closure-var-with-dynamic-invalidation.js.default stress/eval-func-decl-in-eval-within-with-scope.js.ftl-no-cjit-no-inline-validate stress/get-from-scope-dynamic-onto-proxy.js.ftl-eager-no-cjit stress/eval-func-decl-in-eval-within-with-scope.js.ftl-eager 1339705 6 318391 saam 2017-08-17 13:07:19 -0700 Comment on attachment 318391 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=318391&action=review > Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp:1136 > + if (objectEdge.useKind() == ObjectUse) { You need this logic in the FTL too 1339765 7 318421 rmorisset 2017-08-17 14:28:42 -0700 Created attachment 318421 Patch, with FTL fixed, now passes test locally 1339766 8 buildbot 2017-08-17 14:30:16 -0700 Attachment 318421 did not pass style-queue: ERROR: Source/JavaScriptCore/jit/JITOperations.h:424: The parameter name "exec" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/jit/JITOperations.h:424: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1339774 9 318421 keith_miller 2017-08-17 14:36:26 -0700 Comment on attachment 318421 Patch, with FTL fixed, now passes test locally View in context: https://bugs.webkit.org/attachment.cgi?id=318421&action=review r=me with some minor changes. > Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:1717 > + fixEdge<KnownCellUse>(node->child1()); I would change this to ObjectUse and make a FIXME to add KnownObjectUse. > Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:1723 > + fixEdge<KnownCellUse>(node->child1()); Ditto. > Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp:1146 > + JSValueOperand object(this, node->child2()); Nit: this could be objectEdge. 1339777 10 318421 keith_miller 2017-08-17 14:42:49 -0700 Comment on attachment 318421 Patch, with FTL fixed, now passes test locally View in context: https://bugs.webkit.org/attachment.cgi?id=318421&action=review >> Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:1717 >> + fixEdge<KnownCellUse>(node->child1()); > > I would change this to ObjectUse and make a FIXME to add KnownObjectUse. Nvm. ignore this. Just file a FIXME for the KnownObjectUse. >> Source/JavaScriptCore/dfg/DFGFixupPhase.cpp:1723 >> + fixEdge<KnownCellUse>(node->child1()); > > Ditto. Ditto. > Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp:4279 > + LValue object = lowJSValue(m_node->child2()); Nit: this could also be objectEdge. 1339785 11 318425 rmorisset 2017-08-17 14:54:32 -0700 Created attachment 318425 Patch, with nits fixed 1339786 12 318426 rmorisset 2017-08-17 14:56:48 -0700 Created attachment 318426 Patch, reverting to KnownCellUse 1339787 13 buildbot 2017-08-17 14:59:51 -0700 Attachment 318426 did not pass style-queue: ERROR: Source/JavaScriptCore/jit/JITOperations.h:424: The parameter name "exec" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/jit/JITOperations.h:424: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1339789 14 318427 rmorisset 2017-08-17 15:02:36 -0700 Created attachment 318427 Patch, reverting to KnownCellUse 1339791 15 buildbot 2017-08-17 15:05:22 -0700 Attachment 318427 did not pass style-queue: ERROR: Source/JavaScriptCore/jit/JITOperations.h:424: The parameter name "exec" adds no information, so it should be removed. [readability/parameter_name] [5] ERROR: Source/JavaScriptCore/jit/JITOperations.h:424: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 7 files If any of these errors are false positives, please file a bug against check-webkit-style. 1339864 16 318427 commit-queue 2017-08-17 17:19:43 -0700 Comment on attachment 318427 Patch, reverting to KnownCellUse Clearing flags on attachment: 318427 Committed r220890: <http://trac.webkit.org/changeset/220890> 1339865 17 commit-queue 2017-08-17 17:19:45 -0700 All reviewed patches have been landed. Closing bug. 1339867 18 webkit-bug-importer 2017-08-17 17:20:53 -0700 <rdar://problem/33953899> 318271 2017-08-16 10:34:53 -0700 2017-08-17 11:33:03 -0700 Patch bug-175610-20170816103452.patch text/plain 1972 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 ZjA1Nzg3YjIyZTgxZTYwMjY0OWEzYTJjMDMyM2ZjZWNiZmRhOTU0Li5lZWFmODMwYmE4NmE5ZTU1 MjcxYTA4Yjc4ZDJkZTk1MmRlMDJjZTllIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNyBAQAorMjAxNy0wOC0xNiAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFRlYWNoIERGR0ZpeHVwUGhhc2UuY3BwIHRoYXQgdGhlIGN1cnJlbnQg c2NvcGUgaXMgYWx3YXlzIGEgY2VsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc1NjEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWxzbyB0ZWFjaCBpdCB0aGF0IHRoZSBhcmd1bWVudCB0byB3aXRoIGNh biB1c3VhbGx5IGJlIHNwZWN1bGF0ZWQgdG8gYmUgYW4gb2JqZWN0LAorICAgICAgICBzaW5jZSB0 b09iamVjdCgpIGlzIGNhbGxlZCBvbiBpdC4KKworICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNl LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAg ICAoSlNDOjpERkc6OkZpeHVwUGhhc2U6OnBlcmZvcm1GaXh1cCk6IERlbGV0ZWQuCisKIDIwMTct MDgtMTYgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBG aXggSlNDT25seSBBUk0gYnVpbGRib3RzIGFmdGVyIHIyMjAwNDcgYW5kIHIyMjAxODQKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCmluZGV4IGFlNmUxNjE1ZWU4 MzFiZGE3OThkMDYxZjkxNGRmOGQ1Y2MxOGNkMWEuLmJlOTk3OTkxM2EzZmNjZDViZGNiNDUwYTk2 YzQ3MDMxMjlhYjFhMWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Rml4dXBQaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBo YXNlLmNwcApAQCAtMTcxMCwxMSArMTcxMCwxOSBAQCBwcml2YXRlOgogCiAgICAgICAgIGNhc2Ug Q3JlYXRlU2NvcGVkQXJndW1lbnRzOgogICAgICAgICBjYXNlIENyZWF0ZUFjdGl2YXRpb246Ci0g ICAgICAgIGNhc2UgUHVzaFdpdGhTY29wZToKICAgICAgICAgY2FzZSBOZXdGdW5jdGlvbjoKICAg ICAgICAgY2FzZSBOZXdHZW5lcmF0b3JGdW5jdGlvbjoKICAgICAgICAgY2FzZSBOZXdBc3luY0Z1 bmN0aW9uOiB7Ci0gICAgICAgICAgICBmaXhFZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsK KyAgICAgICAgICAgIC8vIENoaWxkIDEgaXMgYWx3YXlzIHRoZSBjdXJyZW50IHNjb3BlLCB3aGlj aCBpcyBndWFyYW50ZWVkIHRvIGJlIGFuIG9iamVjdAorICAgICAgICAgICAgZml4RWRnZTxLbm93 bkNlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9 CisKKyAgICAgICAgY2FzZSBQdXNoV2l0aFNjb3BlOiB7CisgICAgICAgICAgICAvLyBDaGlsZCAx IGlzIGFsd2F5cyB0aGUgY3VycmVudCBzY29wZSwgd2hpY2ggaXMgZ3VhcmFudGVlZCB0byBiZSBh biBvYmplY3QKKyAgICAgICAgICAgIGZpeEVkZ2U8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDEo KSk7CisgICAgICAgICAgICBpZiAobm9kZS0+Y2hpbGQyKCktPnNob3VsZFNwZWN1bGF0ZU9iamVj dCgpKQorICAgICAgICAgICAgICAgIGZpeEVkZ2U8T2JqZWN0VXNlPihub2RlLT5jaGlsZDIoKSk7 CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQogCg== 318391 2017-08-17 11:33:05 -0700 2017-08-17 14:28:39 -0700 Patch bug-175610-20170817113305.patch text/plain 8311 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwNzk4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA2 ZjA1Nzg3YjIyZTgxZTYwMjY0OWEzYTJjMDMyM2ZjZWNiZmRhOTU0Li42YjZkNTYyNjMzNjViM2Zi OTE1MDk0MWZlZmYyYTc1NzEyNTAzYzRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMyBAQAorMjAxNy0wOC0xNiAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFRlYWNoIERGR0ZpeHVwUGhhc2UuY3BwIHRoYXQgdGhlIGN1cnJlbnQg c2NvcGUgaXMgYWx3YXlzIGEgY2VsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc1NjEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWxzbyB0ZWFjaCBpdCB0aGF0IHRoZSBhcmd1bWVudCB0byB3aXRoIGNh biB1c3VhbGx5IGJlIHNwZWN1bGF0ZWQgdG8gYmUgYW4gb2JqZWN0LAorICAgICAgICBzaW5jZSB0 b09iamVjdCgpIGlzIGNhbGxlZCBvbiBpdC4KKworICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNl LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAg ICAoSlNDOjpERkc6OkZpeHVwUGhhc2U6OnBlcmZvcm1GaXh1cCk6IERlbGV0ZWQuCisgICAgICAg ICogZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxh dGl2ZUpJVDo6Y29tcGlsZVB1c2hXaXRoU2NvcGUpOgorICAgICAgICAqIGRmZy9ERkdTcGVjdWxh dGl2ZUpJVC5oOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjYWxsT3BlcmF0 aW9uKToKKyAgICAgICAgKiBqaXQvSklUT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogaml0L0pJ VE9wZXJhdGlvbnMuaDoKKwogMjAxNy0wOC0xNiAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3 ZWJraXQub3JnPgogCiAgICAgICAgIEZpeCBKU0NPbmx5IEFSTSBidWlsZGJvdHMgYWZ0ZXIgcjIy MDA0NyBhbmQgcjIyMDE4NApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdGaXh1cFBoYXNlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFz ZS5jcHAKaW5kZXggYWU2ZTE2MTVlZTgzMWJkYTc5OGQwNjFmOTE0ZGY4ZDVjYzE4Y2QxYS4uYmU5 OTc5OTEzYTNmY2NkNWJkY2I0NTBhOTZjNDcwMzEyOWFiMWExZiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvZGZnL0RGR0ZpeHVwUGhhc2UuY3BwCkBAIC0xNzEwLDExICsxNzEwLDE5IEBAIHBy aXZhdGU6CiAKICAgICAgICAgY2FzZSBDcmVhdGVTY29wZWRBcmd1bWVudHM6CiAgICAgICAgIGNh c2UgQ3JlYXRlQWN0aXZhdGlvbjoKLSAgICAgICAgY2FzZSBQdXNoV2l0aFNjb3BlOgogICAgICAg ICBjYXNlIE5ld0Z1bmN0aW9uOgogICAgICAgICBjYXNlIE5ld0dlbmVyYXRvckZ1bmN0aW9uOgog ICAgICAgICBjYXNlIE5ld0FzeW5jRnVuY3Rpb246IHsKLSAgICAgICAgICAgIGZpeEVkZ2U8Q2Vs bFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAgLy8gQ2hpbGQgMSBpcyBhbHdheXMg dGhlIGN1cnJlbnQgc2NvcGUsIHdoaWNoIGlzIGd1YXJhbnRlZWQgdG8gYmUgYW4gb2JqZWN0Cisg ICAgICAgICAgICBmaXhFZGdlPEtub3duQ2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAg ICAgICAgYnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBjYXNlIFB1c2hXaXRoU2NvcGU6IHsK KyAgICAgICAgICAgIC8vIENoaWxkIDEgaXMgYWx3YXlzIHRoZSBjdXJyZW50IHNjb3BlLCB3aGlj aCBpcyBndWFyYW50ZWVkIHRvIGJlIGFuIG9iamVjdAorICAgICAgICAgICAgZml4RWRnZTxLbm93 bkNlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIGlmIChub2RlLT5jaGlsZDIo KS0+c2hvdWxkU3BlY3VsYXRlT2JqZWN0KCkpCisgICAgICAgICAgICAgICAgZml4RWRnZTxPYmpl Y3RVc2U+KG5vZGUtPmNoaWxkMigpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQu Y3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKaW5k ZXggMTBhNDE1M2NmNGJiZTIxMzU2YmJhZDUyOTE1ZWY5ZTU3MGJkZGY2YS4uMDkyMGY5ODMxNWEw OTAyZmZkMjg1ZDg0YzEyMGQwNWFiY2I1NTIyNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3Jp cHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAKQEAgLTExMjksMTUgKzExMjksMjcgQEAgdm9p ZCBTcGVjdWxhdGl2ZUpJVDo6Y29tcGlsZVB1c2hXaXRoU2NvcGUoTm9kZSogbm9kZSkKICAgICBT cGVjdWxhdGVDZWxsT3BlcmFuZCBjdXJyZW50U2NvcGUodGhpcywgbm9kZS0+Y2hpbGQxKCkpOwog ICAgIEdQUlJlZyBjdXJyZW50U2NvcGVHUFIgPSBjdXJyZW50U2NvcGUuZ3ByKCk7CiAKLSAgICBK U1ZhbHVlT3BlcmFuZCBvYmplY3QodGhpcywgbm9kZS0+Y2hpbGQyKCkpOwotICAgIEpTVmFsdWVS ZWdzIG9iamVjdFJlZ3MgPSBvYmplY3QuanNWYWx1ZVJlZ3MoKTsKLQogICAgIEdQUkZsdXNoZWRD YWxsUmVzdWx0IHJlc3VsdCh0aGlzKTsKICAgICBHUFJSZWcgcmVzdWx0R1BSID0gcmVzdWx0Lmdw cigpOwotICAgIAotICAgIGZsdXNoUmVnaXN0ZXJzKCk7Ci0gICAgY2FsbE9wZXJhdGlvbihvcGVy YXRpb25QdXNoV2l0aFNjb3BlLCByZXN1bHRHUFIsIGN1cnJlbnRTY29wZUdQUiwgb2JqZWN0UmVn cyk7Ci0gICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsKKworICAgIGF1dG8gb2JqZWN0RWRnZSA9 IG5vZGUtPmNoaWxkMigpOworICAgIGlmIChvYmplY3RFZGdlLnVzZUtpbmQoKSA9PSBPYmplY3RV c2UpIHsKKyAgICAgICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgb2JqZWN0KHRoaXMsIG9iamVjdEVk Z2UpOworICAgICAgICBHUFJSZWcgb2JqZWN0R1BSID0gb2JqZWN0LmdwcigpOworICAgICAgICBz cGVjdWxhdGVPYmplY3Qob2JqZWN0RWRnZSwgb2JqZWN0R1BSKTsKKworICAgICAgICBmbHVzaFJl Z2lzdGVycygpOworICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblB1c2hXaXRoU2NvcGVP YmplY3QsIHJlc3VsdEdQUiwgY3VycmVudFNjb3BlR1BSLCBvYmplY3RHUFIpOworICAgICAgICAv LyBObyBleGNlcHRpb24gY2hlY2sgaGVyZSBhcyB3ZSBkaWQgbm90IGhhdmUgdG8gY2FsbCB0b09i amVjdCgpLgorICAgIH0gZWxzZSB7CisgICAgICAgIEFTU0VSVChvYmplY3RFZGdlLnVzZUtpbmQo KSA9PSBVbnR5cGVkVXNlKTsKKyAgICAgICAgSlNWYWx1ZU9wZXJhbmQgb2JqZWN0KHRoaXMsIG5v ZGUtPmNoaWxkMigpKTsKKyAgICAgICAgSlNWYWx1ZVJlZ3Mgb2JqZWN0UmVncyA9IG9iamVjdC5q c1ZhbHVlUmVncygpOworCisgICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7CisgICAgICAgIGNhbGxP cGVyYXRpb24ob3BlcmF0aW9uUHVzaFdpdGhTY29wZSwgcmVzdWx0R1BSLCBjdXJyZW50U2NvcGVH UFIsIG9iamVjdFJlZ3MpOworICAgICAgICBtX2ppdC5leGNlcHRpb25DaGVjaygpOworICAgIH0K ICAgICAKICAgICBjZWxsUmVzdWx0KHJlc3VsdEdQUiwgbm9kZSk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgKaW5kZXggZjNhNWZkZDUwOWY5Yzll MGFjYmY3YTMzYTMxYmI5OWFhNGY4MTUzZi4uYjY1MTMyODE4MDk3Yjc3OTgxZTNjYWVjOTBjZmNk ODI1ODQzOTdkZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVj dWxhdGl2ZUpJVC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRp dmVKSVQuaApAQCAtMTM5Niw2ICsxMzk2LDExIEBAIHB1YmxpYzoKICAgICAgICAgbV9qaXQuc2V0 dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKGFyZzEsIGFyZzIuZ3ByKCkpOwogICAgICAgICByZXR1 cm4gYXBwZW5kQ2FsbFNldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdCk7CiAgICAgfQorICAgIEpJ VENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oQ19KSVRPcGVyYXRpb25fRUNPIG9wZXJhdGlv biwgR1BSUmVnIHJlc3VsdCwgR1BSUmVnIGFyZzEsIEdQUlJlZyBhcmcyKQorICAgIHsKKyAgICAg ICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKGFyZzEsIGFyZzIpOworICAgICAg ICByZXR1cm4gYXBwZW5kQ2FsbFNldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdCk7CisgICAgfQog ICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oSl9KSVRPcGVyYXRpb25fRUpNaWMg b3BlcmF0aW9uLCBKU1ZhbHVlUmVncyByZXN1bHQsIEpTVmFsdWVSZWdzIGFyZywgVHJ1c3RlZElt bVB0ciBtYXRoSUMpCiAgICAgewogICAgICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dpdGhFeGVj U3RhdGUoYXJnLmdwcigpLCBtYXRoSUMpOwpAQCAtMTk1MCw2ICsxOTU1LDExIEBAIHB1YmxpYzoK ICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKGFyZzEsIGFyZzIucGF5 bG9hZEdQUigpLCBhcmcyLnRhZ0dQUigpKTsKICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxTZXRS ZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwogICAgIH0KKyAgICBKSVRDb21waWxlcjo6Q2FsbCBj YWxsT3BlcmF0aW9uKENfSklUT3BlcmF0aW9uX0VDTyBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHQs IEdQUlJlZyBhcmcxLCBHUFJSZWcgYXJnMikKKyAgICB7CisgICAgICAgIG1faml0LnNldHVwQXJn dW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBhcmcyKTsKKyAgICAgICAgcmV0dXJuIGFwcGVuZENh bGxTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOworICAgIH0KICAgICBKSVRDb21waWxlcjo6 Q2FsbCBjYWxsT3BlcmF0aW9uKEpfSklUT3BlcmF0aW9uX0VKTWljIG9wZXJhdGlvbiwgSlNWYWx1 ZVJlZ3MgcmVzdWx0LCBKU1ZhbHVlUmVncyBhcmcsIFRydXN0ZWRJbW1QdHIgbWF0aElDKQogICAg IHsKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKEVBQklfMzJCSVRf RFVNTVlfQVJHIGFyZy5wYXlsb2FkR1BSKCksIGFyZy50YWdHUFIoKSwgbWF0aElDKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAgYi9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCmluZGV4IGU4NjRiYWYzMDBi Mzk5ZmJmZjdjOGNiMTlkNDNkZWZmZjU5ZWIyNzMuLjNhYjJhNGFhYzk1ZDhlNGM3MDUxNmU2MDI3 NDc4NmQ3ZjRkYjZmOTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU T3BlcmF0aW9ucy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRp b25zLmNwcApAQCAtMjAxMCw2ICsyMDEwLDE0IEBAIEpTQ2VsbCogSklUX09QRVJBVElPTiBvcGVy YXRpb25QdXNoV2l0aFNjb3BlKEV4ZWNTdGF0ZSogZXhlYywgSlNDZWxsKiBjdXJyZW50U2NvCiAg ICAgcmV0dXJuIEpTV2l0aFNjb3BlOjpjcmVhdGUodm0sIGV4ZWMtPmxleGljYWxHbG9iYWxPYmpl Y3QoKSwgY3VycmVudFNjb3BlLCBvYmplY3QpOwogfQogCitKU0NlbGwqIEpJVF9PUEVSQVRJT04g b3BlcmF0aW9uUHVzaFdpdGhTY29wZU9iamVjdChFeGVjU3RhdGUqIGV4ZWMsIEpTQ2VsbCogY3Vy cmVudFNjb3BlQ2VsbCwgSlNPYmplY3QqIG9iamVjdCkKK3sKKyAgICBWTSYgdm0gPSBleGVjLT52 bSgpOworICAgIE5hdGl2ZUNhbGxGcmFtZVRyYWNlciB0cmFjZXIoJnZtLCBleGVjKTsKKyAgICBK U1Njb3BlKiBjdXJyZW50U2NvcGUgPSBqc0Nhc3Q8SlNTY29wZSo+KGN1cnJlbnRTY29wZUNlbGwp OworICAgIHJldHVybiBKU1dpdGhTY29wZTo6Y3JlYXRlKHZtLCBleGVjLT5sZXhpY2FsR2xvYmFs T2JqZWN0KCksIGN1cnJlbnRTY29wZSwgb2JqZWN0KTsKK30KKwogRW5jb2RlZEpTVmFsdWUgSklU X09QRVJBVElPTiBvcGVyYXRpb25JbnN0YW5jZU9mKEV4ZWNTdGF0ZSogZXhlYywgRW5jb2RlZEpT VmFsdWUgZW5jb2RlZFZhbHVlLCBFbmNvZGVkSlNWYWx1ZSBlbmNvZGVkUHJvdG8pCiB7CiAgICAg Vk0mIHZtID0gZXhlYy0+dm0oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9q aXQvSklUT3BlcmF0aW9ucy5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRp b25zLmgKaW5kZXggZTI4YTg5NWVmYjdkOGZiMDY3ZmNkNWRkZWU0NWY0NTNiYjQ4ODcyNi4uYjlk MTI3ODk3Y2Q3N2UzMGU0MTcwNWZiYWUxODAzM2U1YTRhOGQwZCAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmgKKysrIGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmgKQEAgLTIxMyw2ICsyMTMsNyBAQCB0eXBlZGVmIEpT Q2VsbCogKEpJVF9PUEVSQVRJT04gKkNfSklUT3BlcmF0aW9uX0VaKShFeGVjU3RhdGUqLCBpbnQz Ml90KTsKIHR5cGVkZWYgSlNDZWxsKiAoSklUX09QRVJBVElPTiAqQ19KSVRPcGVyYXRpb25fRUpz Y0kpKEV4ZWNTdGF0ZSosIEpTU2NvcGUqLCBVbmlxdWVkU3RyaW5nSW1wbCopOwogdHlwZWRlZiBK U0NlbGwqIChKSVRfT1BFUkFUSU9OICpDX0pJVE9wZXJhdGlvbl9FQ0paKShFeGVjU3RhdGUqLCBK U0NlbGwqLCBFbmNvZGVkSlNWYWx1ZSwgaW50MzJfdCk7CiB0eXBlZGVmIEpTQ2VsbCogKEpJVF9P UEVSQVRJT04gKkNfSklUT3BlcmF0aW9uX0VDSikoRXhlY1N0YXRlKiwgSlNDZWxsKiwgRW5jb2Rl ZEpTVmFsdWUpOwordHlwZWRlZiBKU0NlbGwqIChKSVRfT1BFUkFUSU9OICpDX0pJVE9wZXJhdGlv bl9FQ08pKEV4ZWNTdGF0ZSosIEpTQ2VsbCosIEpTT2JqZWN0Kik7CiB0eXBlZGVmIGRvdWJsZSAo SklUX09QRVJBVElPTiAqRF9KSVRPcGVyYXRpb25fRCkoZG91YmxlKTsKIHR5cGVkZWYgZG91Ymxl IChKSVRfT1BFUkFUSU9OICpEX0pJVE9wZXJhdGlvbl9HKShKU0dsb2JhbE9iamVjdCopOwogdHlw ZWRlZiBkb3VibGUgKEpJVF9PUEVSQVRJT04gKkRfSklUT3BlcmF0aW9uX0REKShkb3VibGUsIGRv dWJsZSk7CkBAIC00MjAsNiArNDIxLDcgQEAgc2l6ZV90IEpJVF9PUEVSQVRJT04gb3BlcmF0aW9u RGVsZXRlQnlJZChFeGVjU3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSBiYXNlLCBVbmlxdWUKIEVuY29k ZWRKU1ZhbHVlIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uRGVsZXRlQnlWYWxKU1Jlc3VsdChFeGVj U3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSBiYXNlLCBFbmNvZGVkSlNWYWx1ZSB0YXJnZXQpIFdURl9J TlRFUk5BTDsKIHNpemVfdCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkRlbGV0ZUJ5VmFsKEV4ZWNT dGF0ZSosIEVuY29kZWRKU1ZhbHVlIGJhc2UsIEVuY29kZWRKU1ZhbHVlIHRhcmdldCkgV1RGX0lO VEVSTkFMOwogSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblB1c2hXaXRoU2NvcGUoRXhl Y1N0YXRlKiwgSlNDZWxsKiBjdXJyZW50U2NvcGVDZWxsLCBFbmNvZGVkSlNWYWx1ZSBvYmplY3Qp IFdURl9JTlRFUk5BTDsKK0pTQ2VsbCogSklUX09QRVJBVElPTiBvcGVyYXRpb25QdXNoV2l0aFNj b3BlT2JqZWN0KEV4ZWNTdGF0ZSogZXhlYywgSlNDZWxsKiBjdXJyZW50U2NvcGVDZWxsLCBKU09i amVjdCogb2JqZWN0KSBXVEZfSU5URVJOQUw7CiBKU0NlbGwqIEpJVF9PUEVSQVRJT04gb3BlcmF0 aW9uR2V0UE5hbWVzKEV4ZWNTdGF0ZSosIEpTT2JqZWN0KikgV1RGX0lOVEVSTkFMOwogRW5jb2Rl ZEpTVmFsdWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25JbnN0YW5jZU9mKEV4ZWNTdGF0ZSosIEVu Y29kZWRKU1ZhbHVlLCBFbmNvZGVkSlNWYWx1ZSBwcm90bykgV1RGX0lOVEVSTkFMOwogaW50MzJf dCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblNpemVGcmFtZUZvckZvcndhcmRBcmd1bWVudHMoRXhl Y1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUgYXJndW1lbnRzLCBpbnQzMl90IG51bVVzZWRTdGFja1Ns b3RzLCBpbnQzMl90IGZpcnN0VmFyQXJnT2Zmc2V0KSBXVEZfSU5URVJOQUw7Cg== 318421 2017-08-17 14:28:42 -0700 2017-08-17 14:54:29 -0700 Patch, with FTL fixed, now passes test locally bug-175610-20170817142841.patch text/plain 9669 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzFhYTBkOWM1NjU0ZjA1MTJhN2E2OTA2YzFmYjkwZWI5ZTljNGY4Li5mZWE1MTBiMDVmZTY5OTNh NmIzNTk2NTcyMzBiYTM1NDA4ZWIwYmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNy0wOC0xNyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFRlYWNoIERGR0ZpeHVwUGhhc2UuY3BwIHRoYXQgdGhlIGN1cnJlbnQg c2NvcGUgaXMgYWx3YXlzIGEgY2VsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc1NjEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWxzbyB0ZWFjaCBpdCB0aGF0IHRoZSBhcmd1bWVudCB0byB3aXRoIGNh biB1c3VhbGx5IGJlIHNwZWN1bGF0ZWQgdG8gYmUgYW4gb2JqZWN0LAorICAgICAgICBzaW5jZSB0 b09iamVjdCgpIGlzIGNhbGxlZCBvbiBpdC4KKworICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNl LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAg ICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3Vs YXRpdmVKSVQuaDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y2FsbE9wZXJh dGlvbik6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKToKKyAgICAgICAg KiBqaXQvSklUT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuaDoK KwogMjAxNy0wOC0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBwcml2YXRlIHN0cnVjdCBmcm9tIEluc3Bl Y3RvclNjcmlwdFByb2ZpbGVyQWdlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHRml4dXBQaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Zp eHVwUGhhc2UuY3BwCmluZGV4IGFlNmUxNjE1ZWU4MzFiZGE3OThkMDYxZjkxNGRmOGQ1Y2MxOGNk MWEuLmJlOTk3OTkxM2EzZmNjZDViZGNiNDUwYTk2YzQ3MDMxMjlhYjFhMWYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcApAQCAtMTcxMCwxMSArMTcxMCwx OSBAQCBwcml2YXRlOgogCiAgICAgICAgIGNhc2UgQ3JlYXRlU2NvcGVkQXJndW1lbnRzOgogICAg ICAgICBjYXNlIENyZWF0ZUFjdGl2YXRpb246Ci0gICAgICAgIGNhc2UgUHVzaFdpdGhTY29wZToK ICAgICAgICAgY2FzZSBOZXdGdW5jdGlvbjoKICAgICAgICAgY2FzZSBOZXdHZW5lcmF0b3JGdW5j dGlvbjoKICAgICAgICAgY2FzZSBOZXdBc3luY0Z1bmN0aW9uOiB7Ci0gICAgICAgICAgICBmaXhF ZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIC8vIENoaWxkIDEgaXMg YWx3YXlzIHRoZSBjdXJyZW50IHNjb3BlLCB3aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGFuIG9i amVjdAorICAgICAgICAgICAgZml4RWRnZTxLbm93bkNlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisKKyAgICAgICAgY2FzZSBQdXNoV2l0aFNj b3BlOiB7CisgICAgICAgICAgICAvLyBDaGlsZCAxIGlzIGFsd2F5cyB0aGUgY3VycmVudCBzY29w ZSwgd2hpY2ggaXMgZ3VhcmFudGVlZCB0byBiZSBhbiBvYmplY3QKKyAgICAgICAgICAgIGZpeEVk Z2U8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBpZiAobm9kZS0+ Y2hpbGQyKCktPnNob3VsZFNwZWN1bGF0ZU9iamVjdCgpKQorICAgICAgICAgICAgICAgIGZpeEVk Z2U8T2JqZWN0VXNlPihub2RlLT5jaGlsZDIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklULmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQu Y3BwCmluZGV4IDEwYTQxNTNjZjRiYmUyMTM1NmJiYWQ1MjkxNWVmOWU1NzBiZGRmNmEuLjA5MjBm OTgzMTVhMDkwMmZmZDI4NWQ4NGMxMjBkMDVhYmNiNTUyMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCkBAIC0xMTI5LDE1ICsxMTI5LDI3 IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKE5vZGUqIG5vZGUp CiAgICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgY3VycmVudFNjb3BlKHRoaXMsIG5vZGUtPmNoaWxk MSgpKTsKICAgICBHUFJSZWcgY3VycmVudFNjb3BlR1BSID0gY3VycmVudFNjb3BlLmdwcigpOwog Ci0gICAgSlNWYWx1ZU9wZXJhbmQgb2JqZWN0KHRoaXMsIG5vZGUtPmNoaWxkMigpKTsKLSAgICBK U1ZhbHVlUmVncyBvYmplY3RSZWdzID0gb2JqZWN0LmpzVmFsdWVSZWdzKCk7Ci0KICAgICBHUFJG bHVzaGVkQ2FsbFJlc3VsdCByZXN1bHQodGhpcyk7CiAgICAgR1BSUmVnIHJlc3VsdEdQUiA9IHJl c3VsdC5ncHIoKTsKLSAgICAKLSAgICBmbHVzaFJlZ2lzdGVycygpOwotICAgIGNhbGxPcGVyYXRp b24ob3BlcmF0aW9uUHVzaFdpdGhTY29wZSwgcmVzdWx0R1BSLCBjdXJyZW50U2NvcGVHUFIsIG9i amVjdFJlZ3MpOwotICAgIG1faml0LmV4Y2VwdGlvbkNoZWNrKCk7CisKKyAgICBhdXRvIG9iamVj dEVkZ2UgPSBub2RlLT5jaGlsZDIoKTsKKyAgICBpZiAob2JqZWN0RWRnZS51c2VLaW5kKCkgPT0g T2JqZWN0VXNlKSB7CisgICAgICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIG9iamVjdCh0aGlzLCBv YmplY3RFZGdlKTsKKyAgICAgICAgR1BSUmVnIG9iamVjdEdQUiA9IG9iamVjdC5ncHIoKTsKKyAg ICAgICAgc3BlY3VsYXRlT2JqZWN0KG9iamVjdEVkZ2UsIG9iamVjdEdQUik7CisKKyAgICAgICAg Zmx1c2hSZWdpc3RlcnMoKTsKKyAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25QdXNoV2l0 aFNjb3BlT2JqZWN0LCByZXN1bHRHUFIsIGN1cnJlbnRTY29wZUdQUiwgb2JqZWN0R1BSKTsKKyAg ICAgICAgLy8gTm8gZXhjZXB0aW9uIGNoZWNrIGhlcmUgYXMgd2UgZGlkIG5vdCBoYXZlIHRvIGNh bGwgdG9PYmplY3QoKS4KKyAgICB9IGVsc2UgeworICAgICAgICBBU1NFUlQob2JqZWN0RWRnZS51 c2VLaW5kKCkgPT0gVW50eXBlZFVzZSk7CisgICAgICAgIEpTVmFsdWVPcGVyYW5kIG9iamVjdCh0 aGlzLCBub2RlLT5jaGlsZDIoKSk7CisgICAgICAgIEpTVmFsdWVSZWdzIG9iamVjdFJlZ3MgPSBv YmplY3QuanNWYWx1ZVJlZ3MoKTsKKworICAgICAgICBmbHVzaFJlZ2lzdGVycygpOworICAgICAg ICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblB1c2hXaXRoU2NvcGUsIHJlc3VsdEdQUiwgY3VycmVu dFNjb3BlR1BSLCBvYmplY3RSZWdzKTsKKyAgICAgICAgbV9qaXQuZXhjZXB0aW9uQ2hlY2soKTsK KyAgICB9CiAgICAgCiAgICAgY2VsbFJlc3VsdChyZXN1bHRHUFIsIG5vZGUpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCmluZGV4IGYzYTVmZGQ1 MDlmOWM5ZTBhY2JmN2EzM2EzMWJiOTlhYTRmODE1M2YuLmI2NTEzMjgxODA5N2I3Nzk4MWUzY2Fl YzkwY2ZjZDgyNTg0Mzk3ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcv REZHU3BlY3VsYXRpdmVKSVQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1Nw ZWN1bGF0aXZlSklULmgKQEAgLTEzOTYsNiArMTM5NiwxMSBAQCBwdWJsaWM6CiAgICAgICAgIG1f aml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBhcmcyLmdwcigpKTsKICAgICAg ICAgcmV0dXJuIGFwcGVuZENhbGxTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwogICAgIH0K KyAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKENfSklUT3BlcmF0aW9uX0VDTyBv cGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIEdQUlJlZyBhcmcxLCBHUFJSZWcgYXJnMikKKyAgICB7 CisgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBhcmcyKTsK KyAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwor ICAgIH0KICAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfSklUT3BlcmF0aW9u X0VKTWljIG9wZXJhdGlvbiwgSlNWYWx1ZVJlZ3MgcmVzdWx0LCBKU1ZhbHVlUmVncyBhcmcsIFRy dXN0ZWRJbW1QdHIgbWF0aElDKQogICAgIHsKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNX aXRoRXhlY1N0YXRlKGFyZy5ncHIoKSwgbWF0aElDKTsKQEAgLTE5NTAsNiArMTk1NSwxMSBAQCBw dWJsaWM6CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBh cmcyLnBheWxvYWRHUFIoKSwgYXJnMi50YWdHUFIoKSk7CiAgICAgICAgIHJldHVybiBhcHBlbmRD YWxsU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKICAgICB9CisgICAgSklUQ29tcGlsZXI6 OkNhbGwgY2FsbE9wZXJhdGlvbihDX0pJVE9wZXJhdGlvbl9FQ08gb3BlcmF0aW9uLCBHUFJSZWcg cmVzdWx0LCBHUFJSZWcgYXJnMSwgR1BSUmVnIGFyZzIpCisgICAgeworICAgICAgICBtX2ppdC5z ZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3RhdGUoYXJnMSwgYXJnMik7CisgICAgICAgIHJldHVybiBh cHBlbmRDYWxsU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKKyAgICB9CiAgICAgSklUQ29t cGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihKX0pJVE9wZXJhdGlvbl9FSk1pYyBvcGVyYXRpb24s IEpTVmFsdWVSZWdzIHJlc3VsdCwgSlNWYWx1ZVJlZ3MgYXJnLCBUcnVzdGVkSW1tUHRyIG1hdGhJ QykKICAgICB7CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShFQUJJ XzMyQklUX0RVTU1ZX0FSRyBhcmcucGF5bG9hZEdQUigpLCBhcmcudGFnR1BSKCksIG1hdGhJQyk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5j cHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKaW5kZXgg OTY2ZWQzYWFhOTlhYjEyNmY4YzA3YTBhMmQzMjE4ZGE3MmU4OTg4Mi4uOTBiZDAyZmE4MjNkZjc2 YjA5Y2YzY2RiMzIxZjlkMTIxMDBkZWI3NiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRD b3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9m dGwvRlRMTG93ZXJERkdUb0IzLmNwcApAQCAtNDI2OSwxMSArNDI2OSwxNyBAQCBwcml2YXRlOgog ICAgIHZvaWQgY29tcGlsZVB1c2hXaXRoU2NvcGUoKQogICAgIHsKICAgICAgICAgTFZhbHVlIHBh cmVudFNjb3BlID0gbG93Q2VsbChtX25vZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgTFZhbHVlIG9i amVjdCA9IGxvd0pTVmFsdWUobV9ub2RlLT5jaGlsZDIoKSk7Ci0KLSAgICAgICAgTFZhbHVlIHJl c3VsdCA9IHZtQ2FsbChJbnQ2NCwgbV9vdXQub3BlcmF0aW9uKG9wZXJhdGlvblB1c2hXaXRoU2Nv cGUpLCBtX2NhbGxGcmFtZSwgcGFyZW50U2NvcGUsIG9iamVjdCk7Ci0KLSAgICAgICAgc2V0SlNW YWx1ZShyZXN1bHQpOworICAgICAgICBhdXRvIG9iamVjdEVkZ2UgPSBtX25vZGUtPmNoaWxkMigp OworICAgICAgICBpZiAob2JqZWN0RWRnZS51c2VLaW5kKCkgPT0gT2JqZWN0VXNlKSB7CisgICAg ICAgICAgICBMVmFsdWUgb2JqZWN0ID0gbG93Tm9uTnVsbE9iamVjdChvYmplY3RFZGdlKTsKKyAg ICAgICAgICAgIExWYWx1ZSByZXN1bHQgPSB2bUNhbGwoSW50NjQsIG1fb3V0Lm9wZXJhdGlvbihv cGVyYXRpb25QdXNoV2l0aFNjb3BlT2JqZWN0KSwgbV9jYWxsRnJhbWUsIHBhcmVudFNjb3BlLCBv YmplY3QpOworICAgICAgICAgICAgc2V0SlNWYWx1ZShyZXN1bHQpOworICAgICAgICB9IGVsc2Ug eworICAgICAgICAgICAgQVNTRVJUKG9iamVjdEVkZ2UudXNlS2luZCgpID09IFVudHlwZWRVc2Up OworICAgICAgICAgICAgTFZhbHVlIG9iamVjdCA9IGxvd0pTVmFsdWUobV9ub2RlLT5jaGlsZDIo KSk7CisgICAgICAgICAgICBMVmFsdWUgcmVzdWx0ID0gdm1DYWxsKEludDY0LCBtX291dC5vcGVy YXRpb24ob3BlcmF0aW9uUHVzaFdpdGhTY29wZSksIG1fY2FsbEZyYW1lLCBwYXJlbnRTY29wZSwg b2JqZWN0KTsKKyAgICAgICAgICAgIHNldEpTVmFsdWUocmVzdWx0KTsKKyAgICAgICAgfQogICAg IH0KIAogICAgIHZvaWQgY29tcGlsZUNyZWF0ZUFjdGl2YXRpb24oKQpkaWZmIC0tZ2l0IGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKaW5kZXggZTg2NGJhZjMwMGIzOTlmYmZmN2M4 Y2IxOWQ0M2RlZmZmNTllYjI3My4uM2FiMmE0YWFjOTVkOGU0YzcwNTE2ZTYwMjc0Nzg2ZDdmNGRi NmY5MCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25z LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwCkBA IC0yMDEwLDYgKzIwMTAsMTQgQEAgSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblB1c2hX aXRoU2NvcGUoRXhlY1N0YXRlKiBleGVjLCBKU0NlbGwqIGN1cnJlbnRTY28KICAgICByZXR1cm4g SlNXaXRoU2NvcGU6OmNyZWF0ZSh2bSwgZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLCBjdXJy ZW50U2NvcGUsIG9iamVjdCk7CiB9CiAKK0pTQ2VsbCogSklUX09QRVJBVElPTiBvcGVyYXRpb25Q dXNoV2l0aFNjb3BlT2JqZWN0KEV4ZWNTdGF0ZSogZXhlYywgSlNDZWxsKiBjdXJyZW50U2NvcGVD ZWxsLCBKU09iamVjdCogb2JqZWN0KQoreworICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7CisgICAg TmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNlcigmdm0sIGV4ZWMpOworICAgIEpTU2NvcGUqIGN1 cnJlbnRTY29wZSA9IGpzQ2FzdDxKU1Njb3BlKj4oY3VycmVudFNjb3BlQ2VsbCk7CisgICAgcmV0 dXJuIEpTV2l0aFNjb3BlOjpjcmVhdGUodm0sIGV4ZWMtPmxleGljYWxHbG9iYWxPYmplY3QoKSwg Y3VycmVudFNjb3BlLCBvYmplY3QpOworfQorCiBFbmNvZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9O IG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1N0YXRlKiBleGVjLCBFbmNvZGVkSlNWYWx1ZSBlbmNv ZGVkVmFsdWUsIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRQcm90bykKIHsKICAgICBWTSYgdm0gPSBl eGVjLT52bSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVy YXRpb25zLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuaAppbmRl eCBlMjhhODk1ZWZiN2Q4ZmIwNjdmY2Q1ZGRlZTQ1ZjQ1M2JiNDg4NzI2Li5iOWQxMjc4OTdjZDc3 ZTMwZTQxNzA1ZmJhZTE4MDMzZTVhNGE4ZDBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L0pJVE9wZXJhdGlvbnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0 L0pJVE9wZXJhdGlvbnMuaApAQCAtMjEzLDYgKzIxMyw3IEBAIHR5cGVkZWYgSlNDZWxsKiAoSklU X09QRVJBVElPTiAqQ19KSVRPcGVyYXRpb25fRVopKEV4ZWNTdGF0ZSosIGludDMyX3QpOwogdHlw ZWRlZiBKU0NlbGwqIChKSVRfT1BFUkFUSU9OICpDX0pJVE9wZXJhdGlvbl9FSnNjSSkoRXhlY1N0 YXRlKiwgSlNTY29wZSosIFVuaXF1ZWRTdHJpbmdJbXBsKik7CiB0eXBlZGVmIEpTQ2VsbCogKEpJ VF9PUEVSQVRJT04gKkNfSklUT3BlcmF0aW9uX0VDSlopKEV4ZWNTdGF0ZSosIEpTQ2VsbCosIEVu Y29kZWRKU1ZhbHVlLCBpbnQzMl90KTsKIHR5cGVkZWYgSlNDZWxsKiAoSklUX09QRVJBVElPTiAq Q19KSVRPcGVyYXRpb25fRUNKKShFeGVjU3RhdGUqLCBKU0NlbGwqLCBFbmNvZGVkSlNWYWx1ZSk7 Cit0eXBlZGVmIEpTQ2VsbCogKEpJVF9PUEVSQVRJT04gKkNfSklUT3BlcmF0aW9uX0VDTykoRXhl Y1N0YXRlKiwgSlNDZWxsKiwgSlNPYmplY3QqKTsKIHR5cGVkZWYgZG91YmxlIChKSVRfT1BFUkFU SU9OICpEX0pJVE9wZXJhdGlvbl9EKShkb3VibGUpOwogdHlwZWRlZiBkb3VibGUgKEpJVF9PUEVS QVRJT04gKkRfSklUT3BlcmF0aW9uX0cpKEpTR2xvYmFsT2JqZWN0Kik7CiB0eXBlZGVmIGRvdWJs ZSAoSklUX09QRVJBVElPTiAqRF9KSVRPcGVyYXRpb25fREQpKGRvdWJsZSwgZG91YmxlKTsKQEAg LTQyMCw2ICs0MjEsNyBAQCBzaXplX3QgSklUX09QRVJBVElPTiBvcGVyYXRpb25EZWxldGVCeUlk KEV4ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlIGJhc2UsIFVuaXF1ZQogRW5jb2RlZEpTVmFsdWUg SklUX09QRVJBVElPTiBvcGVyYXRpb25EZWxldGVCeVZhbEpTUmVzdWx0KEV4ZWNTdGF0ZSosIEVu Y29kZWRKU1ZhbHVlIGJhc2UsIEVuY29kZWRKU1ZhbHVlIHRhcmdldCkgV1RGX0lOVEVSTkFMOwog c2l6ZV90IEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uRGVsZXRlQnlWYWwoRXhlY1N0YXRlKiwgRW5j b2RlZEpTVmFsdWUgYmFzZSwgRW5jb2RlZEpTVmFsdWUgdGFyZ2V0KSBXVEZfSU5URVJOQUw7CiBK U0NlbGwqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHVzaFdpdGhTY29wZShFeGVjU3RhdGUqLCBK U0NlbGwqIGN1cnJlbnRTY29wZUNlbGwsIEVuY29kZWRKU1ZhbHVlIG9iamVjdCkgV1RGX0lOVEVS TkFMOworSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblB1c2hXaXRoU2NvcGVPYmplY3Qo RXhlY1N0YXRlKiBleGVjLCBKU0NlbGwqIGN1cnJlbnRTY29wZUNlbGwsIEpTT2JqZWN0KiBvYmpl Y3QpIFdURl9JTlRFUk5BTDsKIEpTQ2VsbCogSklUX09QRVJBVElPTiBvcGVyYXRpb25HZXRQTmFt ZXMoRXhlY1N0YXRlKiwgSlNPYmplY3QqKSBXVEZfSU5URVJOQUw7CiBFbmNvZGVkSlNWYWx1ZSBK SVRfT1BFUkFUSU9OIG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1N0YXRlKiwgRW5jb2RlZEpTVmFs dWUsIEVuY29kZWRKU1ZhbHVlIHByb3RvKSBXVEZfSU5URVJOQUw7CiBpbnQzMl90IEpJVF9PUEVS QVRJT04gb3BlcmF0aW9uU2l6ZUZyYW1lRm9yRm9yd2FyZEFyZ3VtZW50cyhFeGVjU3RhdGUqLCBF bmNvZGVkSlNWYWx1ZSBhcmd1bWVudHMsIGludDMyX3QgbnVtVXNlZFN0YWNrU2xvdHMsIGludDMy X3QgZmlyc3RWYXJBcmdPZmZzZXQpIFdURl9JTlRFUk5BTDsK 318425 2017-08-17 14:54:32 -0700 2017-08-17 14:56:44 -0700 Patch, with nits fixed bug-175610-20170817145431.patch text/plain 9789 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzFhYTBkOWM1NjU0ZjA1MTJhN2E2OTA2YzFmYjkwZWI5ZTljNGY4Li5mZWE1MTBiMDVmZTY5OTNh NmIzNTk2NTcyMzBiYTM1NDA4ZWIwYmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNy0wOC0xNyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFRlYWNoIERGR0ZpeHVwUGhhc2UuY3BwIHRoYXQgdGhlIGN1cnJlbnQg c2NvcGUgaXMgYWx3YXlzIGEgY2VsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc1NjEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWxzbyB0ZWFjaCBpdCB0aGF0IHRoZSBhcmd1bWVudCB0byB3aXRoIGNh biB1c3VhbGx5IGJlIHNwZWN1bGF0ZWQgdG8gYmUgYW4gb2JqZWN0LAorICAgICAgICBzaW5jZSB0 b09iamVjdCgpIGlzIGNhbGxlZCBvbiBpdC4KKworICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNl LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAg ICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3Vs YXRpdmVKSVQuaDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y2FsbE9wZXJh dGlvbik6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKToKKyAgICAgICAg KiBqaXQvSklUT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuaDoK KwogMjAxNy0wOC0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBwcml2YXRlIHN0cnVjdCBmcm9tIEluc3Bl Y3RvclNjcmlwdFByb2ZpbGVyQWdlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHRml4dXBQaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Zp eHVwUGhhc2UuY3BwCmluZGV4IGFlNmUxNjE1ZWU4MzFiZGE3OThkMDYxZjkxNGRmOGQ1Y2MxOGNk MWEuLmNiOGU4ZjYwYjJjYTEyNDNiYTUxMGUwZThiMWYxMTFmMTIxYTBmMjIgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcApAQCAtMTcxMCwxMSArMTcxMCwy MSBAQCBwcml2YXRlOgogCiAgICAgICAgIGNhc2UgQ3JlYXRlU2NvcGVkQXJndW1lbnRzOgogICAg ICAgICBjYXNlIENyZWF0ZUFjdGl2YXRpb246Ci0gICAgICAgIGNhc2UgUHVzaFdpdGhTY29wZToK ICAgICAgICAgY2FzZSBOZXdGdW5jdGlvbjoKICAgICAgICAgY2FzZSBOZXdHZW5lcmF0b3JGdW5j dGlvbjoKICAgICAgICAgY2FzZSBOZXdBc3luY0Z1bmN0aW9uOiB7Ci0gICAgICAgICAgICBmaXhF ZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIC8vIENoaWxkIDEgaXMg YWx3YXlzIHRoZSBjdXJyZW50IHNjb3BlLCB3aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGFuIG9i amVjdAorICAgICAgICAgICAgLy8gRklYTUU6IHNob3VsZCBiZSBLbm93bk9iamVjdFVzZSBvbmNl IHRoYXQgZXhpc3RzCisgICAgICAgICAgICBmaXhFZGdlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQx KCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBjYXNlIFB1c2hX aXRoU2NvcGU6IHsKKyAgICAgICAgICAgIC8vIENoaWxkIDEgaXMgYWx3YXlzIHRoZSBjdXJyZW50 IHNjb3BlLCB3aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGFuIG9iamVjdAorICAgICAgICAgICAg Ly8gRklYTUU6IHNob3VsZCBiZSBLbm93bk9iamVjdFVzZSBvbmNlIHRoYXQgZXhpc3RzCisgICAg ICAgICAgICBmaXhFZGdlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAgICAgICAg aWYgKG5vZGUtPmNoaWxkMigpLT5zaG91bGRTcGVjdWxhdGVPYmplY3QoKSkKKyAgICAgICAgICAg ICAgICBmaXhFZGdlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAgICAgYnJl YWs7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdTcGVjdWxhdGl2ZUpJVC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1 bGF0aXZlSklULmNwcAppbmRleCAxMGE0MTUzY2Y0YmJlMjEzNTZiYmFkNTI5MTVlZjllNTcwYmRk ZjZhLi4yZTQxNjhlY2E2ZmExOWMzY2JjNmY2YmM5MTM3MTAxNGZlNmQ1NmIyIDEwMDY0NAotLS0g YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcApAQCAtMTEyOSwx NSArMTEyOSwyNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlUHVzaFdpdGhTY29wZShO b2RlKiBub2RlKQogICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGN1cnJlbnRTY29wZSh0aGlzLCBu b2RlLT5jaGlsZDEoKSk7CiAgICAgR1BSUmVnIGN1cnJlbnRTY29wZUdQUiA9IGN1cnJlbnRTY29w ZS5ncHIoKTsKIAotICAgIEpTVmFsdWVPcGVyYW5kIG9iamVjdCh0aGlzLCBub2RlLT5jaGlsZDIo KSk7Ci0gICAgSlNWYWx1ZVJlZ3Mgb2JqZWN0UmVncyA9IG9iamVjdC5qc1ZhbHVlUmVncygpOwot CiAgICAgR1BSRmx1c2hlZENhbGxSZXN1bHQgcmVzdWx0KHRoaXMpOwogICAgIEdQUlJlZyByZXN1 bHRHUFIgPSByZXN1bHQuZ3ByKCk7Ci0gICAgCi0gICAgZmx1c2hSZWdpc3RlcnMoKTsKLSAgICBj YWxsT3BlcmF0aW9uKG9wZXJhdGlvblB1c2hXaXRoU2NvcGUsIHJlc3VsdEdQUiwgY3VycmVudFNj b3BlR1BSLCBvYmplY3RSZWdzKTsKLSAgICBtX2ppdC5leGNlcHRpb25DaGVjaygpOworCisgICAg YXV0byBvYmplY3RFZGdlID0gbm9kZS0+Y2hpbGQyKCk7CisgICAgaWYgKG9iamVjdEVkZ2UudXNl S2luZCgpID09IE9iamVjdFVzZSkgeworICAgICAgICBTcGVjdWxhdGVDZWxsT3BlcmFuZCBvYmpl Y3QodGhpcywgb2JqZWN0RWRnZSk7CisgICAgICAgIEdQUlJlZyBvYmplY3RHUFIgPSBvYmplY3Qu Z3ByKCk7CisgICAgICAgIHNwZWN1bGF0ZU9iamVjdChvYmplY3RFZGdlLCBvYmplY3RHUFIpOwor CisgICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7CisgICAgICAgIGNhbGxPcGVyYXRpb24ob3BlcmF0 aW9uUHVzaFdpdGhTY29wZU9iamVjdCwgcmVzdWx0R1BSLCBjdXJyZW50U2NvcGVHUFIsIG9iamVj dEdQUik7CisgICAgICAgIC8vIE5vIGV4Y2VwdGlvbiBjaGVjayBoZXJlIGFzIHdlIGRpZCBub3Qg aGF2ZSB0byBjYWxsIHRvT2JqZWN0KCkuCisgICAgfSBlbHNlIHsKKyAgICAgICAgQVNTRVJUKG9i amVjdEVkZ2UudXNlS2luZCgpID09IFVudHlwZWRVc2UpOworICAgICAgICBKU1ZhbHVlT3BlcmFu ZCBvYmplY3QodGhpcywgb2JqZWN0RWRnZSk7CisgICAgICAgIEpTVmFsdWVSZWdzIG9iamVjdFJl Z3MgPSBvYmplY3QuanNWYWx1ZVJlZ3MoKTsKKworICAgICAgICBmbHVzaFJlZ2lzdGVycygpOwor ICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblB1c2hXaXRoU2NvcGUsIHJlc3VsdEdQUiwg Y3VycmVudFNjb3BlR1BSLCBvYmplY3RSZWdzKTsKKyAgICAgICAgbV9qaXQuZXhjZXB0aW9uQ2hl Y2soKTsKKyAgICB9CiAgICAgCiAgICAgY2VsbFJlc3VsdChyZXN1bHRHUFIsIG5vZGUpOwogfQpk aWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5o IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCmluZGV4IGYz YTVmZGQ1MDlmOWM5ZTBhY2JmN2EzM2EzMWJiOTlhYTRmODE1M2YuLmI2NTEzMjgxODA5N2I3Nzk4 MWUzY2FlYzkwY2ZjZDgyNTg0Mzk3ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZn L0RGR1NwZWN1bGF0aXZlSklULmgKQEAgLTEzOTYsNiArMTM5NiwxMSBAQCBwdWJsaWM6CiAgICAg ICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBhcmcyLmdwcigpKTsK ICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwog ICAgIH0KKyAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKENfSklUT3BlcmF0aW9u X0VDTyBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIEdQUlJlZyBhcmcxLCBHUFJSZWcgYXJnMikK KyAgICB7CisgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBh cmcyKTsKKyAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1 bHQpOworICAgIH0KICAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfSklUT3Bl cmF0aW9uX0VKTWljIG9wZXJhdGlvbiwgSlNWYWx1ZVJlZ3MgcmVzdWx0LCBKU1ZhbHVlUmVncyBh cmcsIFRydXN0ZWRJbW1QdHIgbWF0aElDKQogICAgIHsKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1 bWVudHNXaXRoRXhlY1N0YXRlKGFyZy5ncHIoKSwgbWF0aElDKTsKQEAgLTE5NTAsNiArMTk1NSwx MSBAQCBwdWJsaWM6CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShh cmcxLCBhcmcyLnBheWxvYWRHUFIoKSwgYXJnMi50YWdHUFIoKSk7CiAgICAgICAgIHJldHVybiBh cHBlbmRDYWxsU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKICAgICB9CisgICAgSklUQ29t cGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihDX0pJVE9wZXJhdGlvbl9FQ08gb3BlcmF0aW9uLCBH UFJSZWcgcmVzdWx0LCBHUFJSZWcgYXJnMSwgR1BSUmVnIGFyZzIpCisgICAgeworICAgICAgICBt X2ppdC5zZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3RhdGUoYXJnMSwgYXJnMik7CisgICAgICAgIHJl dHVybiBhcHBlbmRDYWxsU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKKyAgICB9CiAgICAg SklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihKX0pJVE9wZXJhdGlvbl9FSk1pYyBvcGVy YXRpb24sIEpTVmFsdWVSZWdzIHJlc3VsdCwgSlNWYWx1ZVJlZ3MgYXJnLCBUcnVzdGVkSW1tUHRy IG1hdGhJQykKICAgICB7CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0 ZShFQUJJXzMyQklUX0RVTU1ZX0FSRyBhcmcucGF5bG9hZEdQUigpLCBhcmcudGFnR1BSKCksIG1h dGhJQyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZH VG9CMy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAK aW5kZXggOTY2ZWQzYWFhOTlhYjEyNmY4YzA3YTBhMmQzMjE4ZGE3MmU4OTg4Mi4uOTBiZDAyZmE4 MjNkZjc2YjA5Y2YzY2RiMzIxZjlkMTIxMDBkZWI3NiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFT Y3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcApAQCAtNDI2OSwxMSArNDI2OSwxNyBAQCBwcml2 YXRlOgogICAgIHZvaWQgY29tcGlsZVB1c2hXaXRoU2NvcGUoKQogICAgIHsKICAgICAgICAgTFZh bHVlIHBhcmVudFNjb3BlID0gbG93Q2VsbChtX25vZGUtPmNoaWxkMSgpKTsKLSAgICAgICAgTFZh bHVlIG9iamVjdCA9IGxvd0pTVmFsdWUobV9ub2RlLT5jaGlsZDIoKSk7Ci0KLSAgICAgICAgTFZh bHVlIHJlc3VsdCA9IHZtQ2FsbChJbnQ2NCwgbV9vdXQub3BlcmF0aW9uKG9wZXJhdGlvblB1c2hX aXRoU2NvcGUpLCBtX2NhbGxGcmFtZSwgcGFyZW50U2NvcGUsIG9iamVjdCk7Ci0KLSAgICAgICAg c2V0SlNWYWx1ZShyZXN1bHQpOworICAgICAgICBhdXRvIG9iamVjdEVkZ2UgPSBtX25vZGUtPmNo aWxkMigpOworICAgICAgICBpZiAob2JqZWN0RWRnZS51c2VLaW5kKCkgPT0gT2JqZWN0VXNlKSB7 CisgICAgICAgICAgICBMVmFsdWUgb2JqZWN0ID0gbG93Tm9uTnVsbE9iamVjdChvYmplY3RFZGdl KTsKKyAgICAgICAgICAgIExWYWx1ZSByZXN1bHQgPSB2bUNhbGwoSW50NjQsIG1fb3V0Lm9wZXJh dGlvbihvcGVyYXRpb25QdXNoV2l0aFNjb3BlT2JqZWN0KSwgbV9jYWxsRnJhbWUsIHBhcmVudFNj b3BlLCBvYmplY3QpOworICAgICAgICAgICAgc2V0SlNWYWx1ZShyZXN1bHQpOworICAgICAgICB9 IGVsc2UgeworICAgICAgICAgICAgQVNTRVJUKG9iamVjdEVkZ2UudXNlS2luZCgpID09IFVudHlw ZWRVc2UpOworICAgICAgICAgICAgTFZhbHVlIG9iamVjdCA9IGxvd0pTVmFsdWUobV9ub2RlLT5j aGlsZDIoKSk7CisgICAgICAgICAgICBMVmFsdWUgcmVzdWx0ID0gdm1DYWxsKEludDY0LCBtX291 dC5vcGVyYXRpb24ob3BlcmF0aW9uUHVzaFdpdGhTY29wZSksIG1fY2FsbEZyYW1lLCBwYXJlbnRT Y29wZSwgb2JqZWN0KTsKKyAgICAgICAgICAgIHNldEpTVmFsdWUocmVzdWx0KTsKKyAgICAgICAg fQogICAgIH0KIAogICAgIHZvaWQgY29tcGlsZUNyZWF0ZUFjdGl2YXRpb24oKQpkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcCBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKaW5kZXggZTg2NGJhZjMwMGIzOTlm YmZmN2M4Y2IxOWQ0M2RlZmZmNTllYjI3My4uM2FiMmE0YWFjOTVkOGU0YzcwNTE2ZTYwMjc0Nzg2 ZDdmNGRiNmY5MCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVy YXRpb25zLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMu Y3BwCkBAIC0yMDEwLDYgKzIwMTAsMTQgQEAgSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlv blB1c2hXaXRoU2NvcGUoRXhlY1N0YXRlKiBleGVjLCBKU0NlbGwqIGN1cnJlbnRTY28KICAgICBy ZXR1cm4gSlNXaXRoU2NvcGU6OmNyZWF0ZSh2bSwgZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgp LCBjdXJyZW50U2NvcGUsIG9iamVjdCk7CiB9CiAKK0pTQ2VsbCogSklUX09QRVJBVElPTiBvcGVy YXRpb25QdXNoV2l0aFNjb3BlT2JqZWN0KEV4ZWNTdGF0ZSogZXhlYywgSlNDZWxsKiBjdXJyZW50 U2NvcGVDZWxsLCBKU09iamVjdCogb2JqZWN0KQoreworICAgIFZNJiB2bSA9IGV4ZWMtPnZtKCk7 CisgICAgTmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNlcigmdm0sIGV4ZWMpOworICAgIEpTU2Nv cGUqIGN1cnJlbnRTY29wZSA9IGpzQ2FzdDxKU1Njb3BlKj4oY3VycmVudFNjb3BlQ2VsbCk7Cisg ICAgcmV0dXJuIEpTV2l0aFNjb3BlOjpjcmVhdGUodm0sIGV4ZWMtPmxleGljYWxHbG9iYWxPYmpl Y3QoKSwgY3VycmVudFNjb3BlLCBvYmplY3QpOworfQorCiBFbmNvZGVkSlNWYWx1ZSBKSVRfT1BF UkFUSU9OIG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1N0YXRlKiBleGVjLCBFbmNvZGVkSlNWYWx1 ZSBlbmNvZGVkVmFsdWUsIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRQcm90bykKIHsKICAgICBWTSYg dm0gPSBleGVjLT52bSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVRPcGVyYXRpb25zLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMu aAppbmRleCBlMjhhODk1ZWZiN2Q4ZmIwNjdmY2Q1ZGRlZTQ1ZjQ1M2JiNDg4NzI2Li5iOWQxMjc4 OTdjZDc3ZTMwZTQxNzA1ZmJhZTE4MDMzZTVhNGE4ZDBkIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvaml0L0pJVE9wZXJhdGlvbnMuaApAQCAtMjEzLDYgKzIxMyw3IEBAIHR5cGVkZWYgSlNDZWxs KiAoSklUX09QRVJBVElPTiAqQ19KSVRPcGVyYXRpb25fRVopKEV4ZWNTdGF0ZSosIGludDMyX3Qp OwogdHlwZWRlZiBKU0NlbGwqIChKSVRfT1BFUkFUSU9OICpDX0pJVE9wZXJhdGlvbl9FSnNjSSko RXhlY1N0YXRlKiwgSlNTY29wZSosIFVuaXF1ZWRTdHJpbmdJbXBsKik7CiB0eXBlZGVmIEpTQ2Vs bCogKEpJVF9PUEVSQVRJT04gKkNfSklUT3BlcmF0aW9uX0VDSlopKEV4ZWNTdGF0ZSosIEpTQ2Vs bCosIEVuY29kZWRKU1ZhbHVlLCBpbnQzMl90KTsKIHR5cGVkZWYgSlNDZWxsKiAoSklUX09QRVJB VElPTiAqQ19KSVRPcGVyYXRpb25fRUNKKShFeGVjU3RhdGUqLCBKU0NlbGwqLCBFbmNvZGVkSlNW YWx1ZSk7Cit0eXBlZGVmIEpTQ2VsbCogKEpJVF9PUEVSQVRJT04gKkNfSklUT3BlcmF0aW9uX0VD TykoRXhlY1N0YXRlKiwgSlNDZWxsKiwgSlNPYmplY3QqKTsKIHR5cGVkZWYgZG91YmxlIChKSVRf T1BFUkFUSU9OICpEX0pJVE9wZXJhdGlvbl9EKShkb3VibGUpOwogdHlwZWRlZiBkb3VibGUgKEpJ VF9PUEVSQVRJT04gKkRfSklUT3BlcmF0aW9uX0cpKEpTR2xvYmFsT2JqZWN0Kik7CiB0eXBlZGVm IGRvdWJsZSAoSklUX09QRVJBVElPTiAqRF9KSVRPcGVyYXRpb25fREQpKGRvdWJsZSwgZG91Ymxl KTsKQEAgLTQyMCw2ICs0MjEsNyBAQCBzaXplX3QgSklUX09QRVJBVElPTiBvcGVyYXRpb25EZWxl dGVCeUlkKEV4ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlIGJhc2UsIFVuaXF1ZQogRW5jb2RlZEpT VmFsdWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25EZWxldGVCeVZhbEpTUmVzdWx0KEV4ZWNTdGF0 ZSosIEVuY29kZWRKU1ZhbHVlIGJhc2UsIEVuY29kZWRKU1ZhbHVlIHRhcmdldCkgV1RGX0lOVEVS TkFMOwogc2l6ZV90IEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uRGVsZXRlQnlWYWwoRXhlY1N0YXRl KiwgRW5jb2RlZEpTVmFsdWUgYmFzZSwgRW5jb2RlZEpTVmFsdWUgdGFyZ2V0KSBXVEZfSU5URVJO QUw7CiBKU0NlbGwqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHVzaFdpdGhTY29wZShFeGVjU3Rh dGUqLCBKU0NlbGwqIGN1cnJlbnRTY29wZUNlbGwsIEVuY29kZWRKU1ZhbHVlIG9iamVjdCkgV1RG X0lOVEVSTkFMOworSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblB1c2hXaXRoU2NvcGVP YmplY3QoRXhlY1N0YXRlKiBleGVjLCBKU0NlbGwqIGN1cnJlbnRTY29wZUNlbGwsIEpTT2JqZWN0 KiBvYmplY3QpIFdURl9JTlRFUk5BTDsKIEpTQ2VsbCogSklUX09QRVJBVElPTiBvcGVyYXRpb25H ZXRQTmFtZXMoRXhlY1N0YXRlKiwgSlNPYmplY3QqKSBXVEZfSU5URVJOQUw7CiBFbmNvZGVkSlNW YWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1N0YXRlKiwgRW5jb2Rl ZEpTVmFsdWUsIEVuY29kZWRKU1ZhbHVlIHByb3RvKSBXVEZfSU5URVJOQUw7CiBpbnQzMl90IEpJ VF9PUEVSQVRJT04gb3BlcmF0aW9uU2l6ZUZyYW1lRm9yRm9yd2FyZEFyZ3VtZW50cyhFeGVjU3Rh dGUqLCBFbmNvZGVkSlNWYWx1ZSBhcmd1bWVudHMsIGludDMyX3QgbnVtVXNlZFN0YWNrU2xvdHMs IGludDMyX3QgZmlyc3RWYXJBcmdPZmZzZXQpIFdURl9JTlRFUk5BTDsK 318426 2017-08-17 14:56:48 -0700 2017-08-17 15:02:33 -0700 Patch, reverting to KnownCellUse bug-175610-20170817145647.patch text/plain 9795 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzFhYTBkOWM1NjU0ZjA1MTJhN2E2OTA2YzFmYjkwZWI5ZTljNGY4Li5mZWE1MTBiMDVmZTY5OTNh NmIzNTk2NTcyMzBiYTM1NDA4ZWIwYmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNy0wOC0xNyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFRlYWNoIERGR0ZpeHVwUGhhc2UuY3BwIHRoYXQgdGhlIGN1cnJlbnQg c2NvcGUgaXMgYWx3YXlzIGEgY2VsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc1NjEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWxzbyB0ZWFjaCBpdCB0aGF0IHRoZSBhcmd1bWVudCB0byB3aXRoIGNh biB1c3VhbGx5IGJlIHNwZWN1bGF0ZWQgdG8gYmUgYW4gb2JqZWN0LAorICAgICAgICBzaW5jZSB0 b09iamVjdCgpIGlzIGNhbGxlZCBvbiBpdC4KKworICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNl LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAg ICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3Vs YXRpdmVKSVQuaDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y2FsbE9wZXJh dGlvbik6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKToKKyAgICAgICAg KiBqaXQvSklUT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuaDoK KwogMjAxNy0wOC0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBwcml2YXRlIHN0cnVjdCBmcm9tIEluc3Bl Y3RvclNjcmlwdFByb2ZpbGVyQWdlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHRml4dXBQaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Zp eHVwUGhhc2UuY3BwCmluZGV4IGFlNmUxNjE1ZWU4MzFiZGE3OThkMDYxZjkxNGRmOGQ1Y2MxOGNk MWEuLmUzY2M2M2QyMWMzMTY1MTMzY2FmMThhZDVmODFhZGI0ZTVlY2FhMjMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcApAQCAtMTcxMCwxMSArMTcxMCwy MSBAQCBwcml2YXRlOgogCiAgICAgICAgIGNhc2UgQ3JlYXRlU2NvcGVkQXJndW1lbnRzOgogICAg ICAgICBjYXNlIENyZWF0ZUFjdGl2YXRpb246Ci0gICAgICAgIGNhc2UgUHVzaFdpdGhTY29wZToK ICAgICAgICAgY2FzZSBOZXdGdW5jdGlvbjoKICAgICAgICAgY2FzZSBOZXdHZW5lcmF0b3JGdW5j dGlvbjoKICAgICAgICAgY2FzZSBOZXdBc3luY0Z1bmN0aW9uOiB7Ci0gICAgICAgICAgICBmaXhF ZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIC8vIENoaWxkIDEgaXMg YWx3YXlzIHRoZSBjdXJyZW50IHNjb3BlLCB3aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGFuIG9i amVjdAorICAgICAgICAgICAgLy8gRklYTUU6IHNob3VsZCBiZSBLbm93bk9iamVjdFVzZSBvbmNl IHRoYXQgZXhpc3RzCisgICAgICAgICAgICBmaXhFZGdlPEtub3duQ2VsbFVzZT4obm9kZS0+Y2hp bGQxKCkpOworICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKworICAgICAgICBjYXNlIFB1 c2hXaXRoU2NvcGU6IHsKKyAgICAgICAgICAgIC8vIENoaWxkIDEgaXMgYWx3YXlzIHRoZSBjdXJy ZW50IHNjb3BlLCB3aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGFuIG9iamVjdAorICAgICAgICAg ICAgLy8gRklYTUU6IHNob3VsZCBiZSBLbm93bk9iamVjdFVzZSBvbmNlIHRoYXQgZXhpc3RzCisg ICAgICAgICAgICBmaXhFZGdlPEtub3duQ2VsbFVzZT4obm9kZS0+Y2hpbGQxKCkpOworICAgICAg ICAgICAgaWYgKG5vZGUtPmNoaWxkMigpLT5zaG91bGRTcGVjdWxhdGVPYmplY3QoKSkKKyAgICAg ICAgICAgICAgICBmaXhFZGdlPE9iamVjdFVzZT4obm9kZS0+Y2hpbGQyKCkpOwogICAgICAgICAg ICAgYnJlYWs7CiAgICAgICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RG R1NwZWN1bGF0aXZlSklULmNwcAppbmRleCAxMGE0MTUzY2Y0YmJlMjEzNTZiYmFkNTI5MTVlZjll NTcwYmRkZjZhLi4yZTQxNjhlY2E2ZmExOWMzY2JjNmY2YmM5MTM3MTAxNGZlNmQ1NmIyIDEwMDY0 NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcAor KysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcApAQCAt MTEyOSwxNSArMTEyOSwyNyBAQCB2b2lkIFNwZWN1bGF0aXZlSklUOjpjb21waWxlUHVzaFdpdGhT Y29wZShOb2RlKiBub2RlKQogICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIGN1cnJlbnRTY29wZSh0 aGlzLCBub2RlLT5jaGlsZDEoKSk7CiAgICAgR1BSUmVnIGN1cnJlbnRTY29wZUdQUiA9IGN1cnJl bnRTY29wZS5ncHIoKTsKIAotICAgIEpTVmFsdWVPcGVyYW5kIG9iamVjdCh0aGlzLCBub2RlLT5j aGlsZDIoKSk7Ci0gICAgSlNWYWx1ZVJlZ3Mgb2JqZWN0UmVncyA9IG9iamVjdC5qc1ZhbHVlUmVn cygpOwotCiAgICAgR1BSRmx1c2hlZENhbGxSZXN1bHQgcmVzdWx0KHRoaXMpOwogICAgIEdQUlJl ZyByZXN1bHRHUFIgPSByZXN1bHQuZ3ByKCk7Ci0gICAgCi0gICAgZmx1c2hSZWdpc3RlcnMoKTsK LSAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblB1c2hXaXRoU2NvcGUsIHJlc3VsdEdQUiwgY3Vy cmVudFNjb3BlR1BSLCBvYmplY3RSZWdzKTsKLSAgICBtX2ppdC5leGNlcHRpb25DaGVjaygpOwor CisgICAgYXV0byBvYmplY3RFZGdlID0gbm9kZS0+Y2hpbGQyKCk7CisgICAgaWYgKG9iamVjdEVk Z2UudXNlS2luZCgpID09IE9iamVjdFVzZSkgeworICAgICAgICBTcGVjdWxhdGVDZWxsT3BlcmFu ZCBvYmplY3QodGhpcywgb2JqZWN0RWRnZSk7CisgICAgICAgIEdQUlJlZyBvYmplY3RHUFIgPSBv YmplY3QuZ3ByKCk7CisgICAgICAgIHNwZWN1bGF0ZU9iamVjdChvYmplY3RFZGdlLCBvYmplY3RH UFIpOworCisgICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7CisgICAgICAgIGNhbGxPcGVyYXRpb24o b3BlcmF0aW9uUHVzaFdpdGhTY29wZU9iamVjdCwgcmVzdWx0R1BSLCBjdXJyZW50U2NvcGVHUFIs IG9iamVjdEdQUik7CisgICAgICAgIC8vIE5vIGV4Y2VwdGlvbiBjaGVjayBoZXJlIGFzIHdlIGRp ZCBub3QgaGF2ZSB0byBjYWxsIHRvT2JqZWN0KCkuCisgICAgfSBlbHNlIHsKKyAgICAgICAgQVNT RVJUKG9iamVjdEVkZ2UudXNlS2luZCgpID09IFVudHlwZWRVc2UpOworICAgICAgICBKU1ZhbHVl T3BlcmFuZCBvYmplY3QodGhpcywgb2JqZWN0RWRnZSk7CisgICAgICAgIEpTVmFsdWVSZWdzIG9i amVjdFJlZ3MgPSBvYmplY3QuanNWYWx1ZVJlZ3MoKTsKKworICAgICAgICBmbHVzaFJlZ2lzdGVy cygpOworICAgICAgICBjYWxsT3BlcmF0aW9uKG9wZXJhdGlvblB1c2hXaXRoU2NvcGUsIHJlc3Vs dEdQUiwgY3VycmVudFNjb3BlR1BSLCBvYmplY3RSZWdzKTsKKyAgICAgICAgbV9qaXQuZXhjZXB0 aW9uQ2hlY2soKTsKKyAgICB9CiAgICAgCiAgICAgY2VsbFJlc3VsdChyZXN1bHRHUFIsIG5vZGUp OwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2 ZUpJVC5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdTcGVjdWxhdGl2ZUpJVC5oCmlu ZGV4IGYzYTVmZGQ1MDlmOWM5ZTBhY2JmN2EzM2EzMWJiOTlhYTRmODE1M2YuLmI2NTEzMjgxODA5 N2I3Nzk4MWUzY2FlYzkwY2ZjZDgyNTg0Mzk3ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgKQEAgLTEzOTYsNiArMTM5NiwxMSBAQCBwdWJsaWM6 CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBhcmcyLmdw cigpKTsKICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1 bHQpOwogICAgIH0KKyAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKENfSklUT3Bl cmF0aW9uX0VDTyBvcGVyYXRpb24sIEdQUlJlZyByZXN1bHQsIEdQUlJlZyBhcmcxLCBHUFJSZWcg YXJnMikKKyAgICB7CisgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShh cmcxLCBhcmcyKTsKKyAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxTZXRSZXN1bHQob3BlcmF0aW9u LCByZXN1bHQpOworICAgIH0KICAgICBKSVRDb21waWxlcjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpf SklUT3BlcmF0aW9uX0VKTWljIG9wZXJhdGlvbiwgSlNWYWx1ZVJlZ3MgcmVzdWx0LCBKU1ZhbHVl UmVncyBhcmcsIFRydXN0ZWRJbW1QdHIgbWF0aElDKQogICAgIHsKICAgICAgICAgbV9qaXQuc2V0 dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKGFyZy5ncHIoKSwgbWF0aElDKTsKQEAgLTE5NTAsNiAr MTk1NSwxMSBAQCBwdWJsaWM6CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4ZWNT dGF0ZShhcmcxLCBhcmcyLnBheWxvYWRHUFIoKSwgYXJnMi50YWdHUFIoKSk7CiAgICAgICAgIHJl dHVybiBhcHBlbmRDYWxsU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKICAgICB9CisgICAg SklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihDX0pJVE9wZXJhdGlvbl9FQ08gb3BlcmF0 aW9uLCBHUFJSZWcgcmVzdWx0LCBHUFJSZWcgYXJnMSwgR1BSUmVnIGFyZzIpCisgICAgeworICAg ICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dpdGhFeGVjU3RhdGUoYXJnMSwgYXJnMik7CisgICAg ICAgIHJldHVybiBhcHBlbmRDYWxsU2V0UmVzdWx0KG9wZXJhdGlvbiwgcmVzdWx0KTsKKyAgICB9 CiAgICAgSklUQ29tcGlsZXI6OkNhbGwgY2FsbE9wZXJhdGlvbihKX0pJVE9wZXJhdGlvbl9FSk1p YyBvcGVyYXRpb24sIEpTVmFsdWVSZWdzIHJlc3VsdCwgSlNWYWx1ZVJlZ3MgYXJnLCBUcnVzdGVk SW1tUHRyIG1hdGhJQykKICAgICB7CiAgICAgICAgIG1faml0LnNldHVwQXJndW1lbnRzV2l0aEV4 ZWNTdGF0ZShFQUJJXzMyQklUX0RVTU1ZX0FSRyBhcmcucGF5bG9hZEdQUigpLCBhcmcudGFnR1BS KCksIG1hdGhJQyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExv d2VyREZHVG9CMy5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9C My5jcHAKaW5kZXggOTY2ZWQzYWFhOTlhYjEyNmY4YzA3YTBhMmQzMjE4ZGE3MmU4OTg4Mi4uOTBi ZDAyZmE4MjNkZjc2YjA5Y2YzY2RiMzIxZjlkMTIxMDBkZWI3NiAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcApAQCAtNDI2OSwxMSArNDI2OSwxNyBA QCBwcml2YXRlOgogICAgIHZvaWQgY29tcGlsZVB1c2hXaXRoU2NvcGUoKQogICAgIHsKICAgICAg ICAgTFZhbHVlIHBhcmVudFNjb3BlID0gbG93Q2VsbChtX25vZGUtPmNoaWxkMSgpKTsKLSAgICAg ICAgTFZhbHVlIG9iamVjdCA9IGxvd0pTVmFsdWUobV9ub2RlLT5jaGlsZDIoKSk7Ci0KLSAgICAg ICAgTFZhbHVlIHJlc3VsdCA9IHZtQ2FsbChJbnQ2NCwgbV9vdXQub3BlcmF0aW9uKG9wZXJhdGlv blB1c2hXaXRoU2NvcGUpLCBtX2NhbGxGcmFtZSwgcGFyZW50U2NvcGUsIG9iamVjdCk7Ci0KLSAg ICAgICAgc2V0SlNWYWx1ZShyZXN1bHQpOworICAgICAgICBhdXRvIG9iamVjdEVkZ2UgPSBtX25v ZGUtPmNoaWxkMigpOworICAgICAgICBpZiAob2JqZWN0RWRnZS51c2VLaW5kKCkgPT0gT2JqZWN0 VXNlKSB7CisgICAgICAgICAgICBMVmFsdWUgb2JqZWN0ID0gbG93Tm9uTnVsbE9iamVjdChvYmpl Y3RFZGdlKTsKKyAgICAgICAgICAgIExWYWx1ZSByZXN1bHQgPSB2bUNhbGwoSW50NjQsIG1fb3V0 Lm9wZXJhdGlvbihvcGVyYXRpb25QdXNoV2l0aFNjb3BlT2JqZWN0KSwgbV9jYWxsRnJhbWUsIHBh cmVudFNjb3BlLCBvYmplY3QpOworICAgICAgICAgICAgc2V0SlNWYWx1ZShyZXN1bHQpOworICAg ICAgICB9IGVsc2UgeworICAgICAgICAgICAgQVNTRVJUKG9iamVjdEVkZ2UudXNlS2luZCgpID09 IFVudHlwZWRVc2UpOworICAgICAgICAgICAgTFZhbHVlIG9iamVjdCA9IGxvd0pTVmFsdWUobV9u b2RlLT5jaGlsZDIoKSk7CisgICAgICAgICAgICBMVmFsdWUgcmVzdWx0ID0gdm1DYWxsKEludDY0 LCBtX291dC5vcGVyYXRpb24ob3BlcmF0aW9uUHVzaFdpdGhTY29wZSksIG1fY2FsbEZyYW1lLCBw YXJlbnRTY29wZSwgb2JqZWN0KTsKKyAgICAgICAgICAgIHNldEpTVmFsdWUocmVzdWx0KTsKKyAg ICAgICAgfQogICAgIH0KIAogICAgIHZvaWQgY29tcGlsZUNyZWF0ZUFjdGl2YXRpb24oKQpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKaW5kZXggZTg2NGJhZjMw MGIzOTlmYmZmN2M4Y2IxOWQ0M2RlZmZmNTllYjI3My4uM2FiMmE0YWFjOTVkOGU0YzcwNTE2ZTYw Mjc0Nzg2ZDdmNGRiNmY5MCAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9K SVRPcGVyYXRpb25zLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJh dGlvbnMuY3BwCkBAIC0yMDEwLDYgKzIwMTAsMTQgQEAgSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9w ZXJhdGlvblB1c2hXaXRoU2NvcGUoRXhlY1N0YXRlKiBleGVjLCBKU0NlbGwqIGN1cnJlbnRTY28K ICAgICByZXR1cm4gSlNXaXRoU2NvcGU6OmNyZWF0ZSh2bSwgZXhlYy0+bGV4aWNhbEdsb2JhbE9i amVjdCgpLCBjdXJyZW50U2NvcGUsIG9iamVjdCk7CiB9CiAKK0pTQ2VsbCogSklUX09QRVJBVElP TiBvcGVyYXRpb25QdXNoV2l0aFNjb3BlT2JqZWN0KEV4ZWNTdGF0ZSogZXhlYywgSlNDZWxsKiBj dXJyZW50U2NvcGVDZWxsLCBKU09iamVjdCogb2JqZWN0KQoreworICAgIFZNJiB2bSA9IGV4ZWMt PnZtKCk7CisgICAgTmF0aXZlQ2FsbEZyYW1lVHJhY2VyIHRyYWNlcigmdm0sIGV4ZWMpOworICAg IEpTU2NvcGUqIGN1cnJlbnRTY29wZSA9IGpzQ2FzdDxKU1Njb3BlKj4oY3VycmVudFNjb3BlQ2Vs bCk7CisgICAgcmV0dXJuIEpTV2l0aFNjb3BlOjpjcmVhdGUodm0sIGV4ZWMtPmxleGljYWxHbG9i YWxPYmplY3QoKSwgY3VycmVudFNjb3BlLCBvYmplY3QpOworfQorCiBFbmNvZGVkSlNWYWx1ZSBK SVRfT1BFUkFUSU9OIG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1N0YXRlKiBleGVjLCBFbmNvZGVk SlNWYWx1ZSBlbmNvZGVkVmFsdWUsIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRQcm90bykKIHsKICAg ICBWTSYgdm0gPSBleGVjLT52bSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3Jl L2ppdC9KSVRPcGVyYXRpb25zLmggYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJh dGlvbnMuaAppbmRleCBlMjhhODk1ZWZiN2Q4ZmIwNjdmY2Q1ZGRlZTQ1ZjQ1M2JiNDg4NzI2Li5i OWQxMjc4OTdjZDc3ZTMwZTQxNzA1ZmJhZTE4MDMzZTVhNGE4ZDBkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuaAorKysgYi9Tb3VyY2UvSmF2YVNj cmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuaApAQCAtMjEzLDYgKzIxMyw3IEBAIHR5cGVkZWYg SlNDZWxsKiAoSklUX09QRVJBVElPTiAqQ19KSVRPcGVyYXRpb25fRVopKEV4ZWNTdGF0ZSosIGlu dDMyX3QpOwogdHlwZWRlZiBKU0NlbGwqIChKSVRfT1BFUkFUSU9OICpDX0pJVE9wZXJhdGlvbl9F SnNjSSkoRXhlY1N0YXRlKiwgSlNTY29wZSosIFVuaXF1ZWRTdHJpbmdJbXBsKik7CiB0eXBlZGVm IEpTQ2VsbCogKEpJVF9PUEVSQVRJT04gKkNfSklUT3BlcmF0aW9uX0VDSlopKEV4ZWNTdGF0ZSos IEpTQ2VsbCosIEVuY29kZWRKU1ZhbHVlLCBpbnQzMl90KTsKIHR5cGVkZWYgSlNDZWxsKiAoSklU X09QRVJBVElPTiAqQ19KSVRPcGVyYXRpb25fRUNKKShFeGVjU3RhdGUqLCBKU0NlbGwqLCBFbmNv ZGVkSlNWYWx1ZSk7Cit0eXBlZGVmIEpTQ2VsbCogKEpJVF9PUEVSQVRJT04gKkNfSklUT3BlcmF0 aW9uX0VDTykoRXhlY1N0YXRlKiwgSlNDZWxsKiwgSlNPYmplY3QqKTsKIHR5cGVkZWYgZG91Ymxl IChKSVRfT1BFUkFUSU9OICpEX0pJVE9wZXJhdGlvbl9EKShkb3VibGUpOwogdHlwZWRlZiBkb3Vi bGUgKEpJVF9PUEVSQVRJT04gKkRfSklUT3BlcmF0aW9uX0cpKEpTR2xvYmFsT2JqZWN0Kik7CiB0 eXBlZGVmIGRvdWJsZSAoSklUX09QRVJBVElPTiAqRF9KSVRPcGVyYXRpb25fREQpKGRvdWJsZSwg ZG91YmxlKTsKQEAgLTQyMCw2ICs0MjEsNyBAQCBzaXplX3QgSklUX09QRVJBVElPTiBvcGVyYXRp b25EZWxldGVCeUlkKEV4ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlIGJhc2UsIFVuaXF1ZQogRW5j b2RlZEpTVmFsdWUgSklUX09QRVJBVElPTiBvcGVyYXRpb25EZWxldGVCeVZhbEpTUmVzdWx0KEV4 ZWNTdGF0ZSosIEVuY29kZWRKU1ZhbHVlIGJhc2UsIEVuY29kZWRKU1ZhbHVlIHRhcmdldCkgV1RG X0lOVEVSTkFMOwogc2l6ZV90IEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uRGVsZXRlQnlWYWwoRXhl Y1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUgYmFzZSwgRW5jb2RlZEpTVmFsdWUgdGFyZ2V0KSBXVEZf SU5URVJOQUw7CiBKU0NlbGwqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHVzaFdpdGhTY29wZShF eGVjU3RhdGUqLCBKU0NlbGwqIGN1cnJlbnRTY29wZUNlbGwsIEVuY29kZWRKU1ZhbHVlIG9iamVj dCkgV1RGX0lOVEVSTkFMOworSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblB1c2hXaXRo U2NvcGVPYmplY3QoRXhlY1N0YXRlKiBleGVjLCBKU0NlbGwqIGN1cnJlbnRTY29wZUNlbGwsIEpT T2JqZWN0KiBvYmplY3QpIFdURl9JTlRFUk5BTDsKIEpTQ2VsbCogSklUX09QRVJBVElPTiBvcGVy YXRpb25HZXRQTmFtZXMoRXhlY1N0YXRlKiwgSlNPYmplY3QqKSBXVEZfSU5URVJOQUw7CiBFbmNv ZGVkSlNWYWx1ZSBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkluc3RhbmNlT2YoRXhlY1N0YXRlKiwg RW5jb2RlZEpTVmFsdWUsIEVuY29kZWRKU1ZhbHVlIHByb3RvKSBXVEZfSU5URVJOQUw7CiBpbnQz Ml90IEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uU2l6ZUZyYW1lRm9yRm9yd2FyZEFyZ3VtZW50cyhF eGVjU3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSBhcmd1bWVudHMsIGludDMyX3QgbnVtVXNlZFN0YWNr U2xvdHMsIGludDMyX3QgZmlyc3RWYXJBcmdPZmZzZXQpIFdURl9JTlRFUk5BTDsK 318427 2017-08-17 15:02:36 -0700 2017-08-17 17:19:43 -0700 Patch, reverting to KnownCellUse bug-175610-20170817150236.patch text/plain 9893 rmorisset U3VidmVyc2lvbiBSZXZpc2lvbjogMjIwODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA4 YzFhYTBkOWM1NjU0ZjA1MTJhN2E2OTA2YzFmYjkwZWI5ZTljNGY4Li5mZWE1MTBiMDVmZTY5OTNh NmIzNTk2NTcyMzBiYTM1NDA4ZWIwYmMwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNCBAQAorMjAxNy0wOC0xNyAgUm9iaW4gTW9yaXNzZXQgIDxybW9yaXNzZXRAYXBwbGUu Y29tPgorCisgICAgICAgIFRlYWNoIERGR0ZpeHVwUGhhc2UuY3BwIHRoYXQgdGhlIGN1cnJlbnQg c2NvcGUgaXMgYWx3YXlzIGEgY2VsbAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTc1NjEwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgQWxzbyB0ZWFjaCBpdCB0aGF0IHRoZSBhcmd1bWVudCB0byB3aXRoIGNh biB1c3VhbGx5IGJlIHNwZWN1bGF0ZWQgdG8gYmUgYW4gb2JqZWN0LAorICAgICAgICBzaW5jZSB0 b09iamVjdCgpIGlzIGNhbGxlZCBvbiBpdC4KKworICAgICAgICAqIGRmZy9ERkdGaXh1cFBoYXNl LmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpGaXh1cFBoYXNlOjpmaXh1cE5vZGUpOgorICAgICAg ICAqIGRmZy9ERkdTcGVjdWxhdGl2ZUpJVC5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6U3BlY3Vs YXRpdmVKSVQ6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKToKKyAgICAgICAgKiBkZmcvREZHU3BlY3Vs YXRpdmVKSVQuaDoKKyAgICAgICAgKEpTQzo6REZHOjpTcGVjdWxhdGl2ZUpJVDo6Y2FsbE9wZXJh dGlvbik6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6 OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKToKKyAgICAgICAg KiBqaXQvSklUT3BlcmF0aW9ucy5jcHA6CisgICAgICAgICogaml0L0pJVE9wZXJhdGlvbnMuaDoK KwogMjAxNy0wOC0xNyAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogcmVtb3ZlIHVudXNlZCBwcml2YXRlIHN0cnVjdCBmcm9tIEluc3Bl Y3RvclNjcmlwdFByb2ZpbGVyQWdlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHRml4dXBQaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR0Zp eHVwUGhhc2UuY3BwCmluZGV4IGFlNmUxNjE1ZWU4MzFiZGE3OThkMDYxZjkxNGRmOGQ1Y2MxOGNk MWEuLjEwMmNiMmMxYmI4ZDc0ODJmZDdmZjZhZGFlYjBmMjc3OTY4ZGUwMzcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHRml4dXBQaGFzZS5jcHAKKysrIGIvU291cmNl L0phdmFTY3JpcHRDb3JlL2RmZy9ERkdGaXh1cFBoYXNlLmNwcApAQCAtMTcxMCwxMSArMTcxMCwy MSBAQCBwcml2YXRlOgogCiAgICAgICAgIGNhc2UgQ3JlYXRlU2NvcGVkQXJndW1lbnRzOgogICAg ICAgICBjYXNlIENyZWF0ZUFjdGl2YXRpb246Ci0gICAgICAgIGNhc2UgUHVzaFdpdGhTY29wZToK ICAgICAgICAgY2FzZSBOZXdGdW5jdGlvbjoKICAgICAgICAgY2FzZSBOZXdHZW5lcmF0b3JGdW5j dGlvbjoKICAgICAgICAgY2FzZSBOZXdBc3luY0Z1bmN0aW9uOiB7Ci0gICAgICAgICAgICBmaXhF ZGdlPENlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgICAgIC8vIENoaWxkIDEgaXMg YWx3YXlzIHRoZSBjdXJyZW50IHNjb3BlLCB3aGljaCBpcyBndWFyYW50ZWVkIHRvIGJlIGFuIG9i amVjdAorICAgICAgICAgICAgLy8gRklYTUU6IHNob3VsZCBiZSBLbm93bk9iamVjdFVzZSBvbmNl IHRoYXQgZXhpc3RzIChodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc1 Njg5KQorICAgICAgICAgICAgZml4RWRnZTxLbm93bkNlbGxVc2U+KG5vZGUtPmNoaWxkMSgpKTsK KyAgICAgICAgICAgIGJyZWFrOworICAgICAgICB9CisKKyAgICAgICAgY2FzZSBQdXNoV2l0aFNj b3BlOiB7CisgICAgICAgICAgICAvLyBDaGlsZCAxIGlzIGFsd2F5cyB0aGUgY3VycmVudCBzY29w ZSwgd2hpY2ggaXMgZ3VhcmFudGVlZCB0byBiZSBhbiBvYmplY3QKKyAgICAgICAgICAgIC8vIEZJ WE1FOiBzaG91bGQgYmUgS25vd25PYmplY3RVc2Ugb25jZSB0aGF0IGV4aXN0cyAoaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NTY4OSkKKyAgICAgICAgICAgIGZpeEVk Z2U8S25vd25DZWxsVXNlPihub2RlLT5jaGlsZDEoKSk7CisgICAgICAgICAgICBpZiAobm9kZS0+ Y2hpbGQyKCktPnNob3VsZFNwZWN1bGF0ZU9iamVjdCgpKQorICAgICAgICAgICAgICAgIGZpeEVk Z2U8T2JqZWN0VXNlPihub2RlLT5jaGlsZDIoKSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAg ICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0 aXZlSklULmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQu Y3BwCmluZGV4IDEwYTQxNTNjZjRiYmUyMTM1NmJiYWQ1MjkxNWVmOWU1NzBiZGRmNmEuLjJlNDE2 OGVjYTZmYTE5YzNjYmM2ZjZiYzkxMzcxMDE0ZmU2ZDU2YjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCkBAIC0xMTI5LDE1ICsxMTI5LDI3 IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVQdXNoV2l0aFNjb3BlKE5vZGUqIG5vZGUp CiAgICAgU3BlY3VsYXRlQ2VsbE9wZXJhbmQgY3VycmVudFNjb3BlKHRoaXMsIG5vZGUtPmNoaWxk MSgpKTsKICAgICBHUFJSZWcgY3VycmVudFNjb3BlR1BSID0gY3VycmVudFNjb3BlLmdwcigpOwog Ci0gICAgSlNWYWx1ZU9wZXJhbmQgb2JqZWN0KHRoaXMsIG5vZGUtPmNoaWxkMigpKTsKLSAgICBK U1ZhbHVlUmVncyBvYmplY3RSZWdzID0gb2JqZWN0LmpzVmFsdWVSZWdzKCk7Ci0KICAgICBHUFJG bHVzaGVkQ2FsbFJlc3VsdCByZXN1bHQodGhpcyk7CiAgICAgR1BSUmVnIHJlc3VsdEdQUiA9IHJl c3VsdC5ncHIoKTsKLSAgICAKLSAgICBmbHVzaFJlZ2lzdGVycygpOwotICAgIGNhbGxPcGVyYXRp b24ob3BlcmF0aW9uUHVzaFdpdGhTY29wZSwgcmVzdWx0R1BSLCBjdXJyZW50U2NvcGVHUFIsIG9i amVjdFJlZ3MpOwotICAgIG1faml0LmV4Y2VwdGlvbkNoZWNrKCk7CisKKyAgICBhdXRvIG9iamVj dEVkZ2UgPSBub2RlLT5jaGlsZDIoKTsKKyAgICBpZiAob2JqZWN0RWRnZS51c2VLaW5kKCkgPT0g T2JqZWN0VXNlKSB7CisgICAgICAgIFNwZWN1bGF0ZUNlbGxPcGVyYW5kIG9iamVjdCh0aGlzLCBv YmplY3RFZGdlKTsKKyAgICAgICAgR1BSUmVnIG9iamVjdEdQUiA9IG9iamVjdC5ncHIoKTsKKyAg ICAgICAgc3BlY3VsYXRlT2JqZWN0KG9iamVjdEVkZ2UsIG9iamVjdEdQUik7CisKKyAgICAgICAg Zmx1c2hSZWdpc3RlcnMoKTsKKyAgICAgICAgY2FsbE9wZXJhdGlvbihvcGVyYXRpb25QdXNoV2l0 aFNjb3BlT2JqZWN0LCByZXN1bHRHUFIsIGN1cnJlbnRTY29wZUdQUiwgb2JqZWN0R1BSKTsKKyAg ICAgICAgLy8gTm8gZXhjZXB0aW9uIGNoZWNrIGhlcmUgYXMgd2UgZGlkIG5vdCBoYXZlIHRvIGNh bGwgdG9PYmplY3QoKS4KKyAgICB9IGVsc2UgeworICAgICAgICBBU1NFUlQob2JqZWN0RWRnZS51 c2VLaW5kKCkgPT0gVW50eXBlZFVzZSk7CisgICAgICAgIEpTVmFsdWVPcGVyYW5kIG9iamVjdCh0 aGlzLCBvYmplY3RFZGdlKTsKKyAgICAgICAgSlNWYWx1ZVJlZ3Mgb2JqZWN0UmVncyA9IG9iamVj dC5qc1ZhbHVlUmVncygpOworCisgICAgICAgIGZsdXNoUmVnaXN0ZXJzKCk7CisgICAgICAgIGNh bGxPcGVyYXRpb24ob3BlcmF0aW9uUHVzaFdpdGhTY29wZSwgcmVzdWx0R1BSLCBjdXJyZW50U2Nv cGVHUFIsIG9iamVjdFJlZ3MpOworICAgICAgICBtX2ppdC5leGNlcHRpb25DaGVjaygpOworICAg IH0KICAgICAKICAgICBjZWxsUmVzdWx0KHJlc3VsdEdQUiwgbm9kZSk7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmggYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmgKaW5kZXggZjNhNWZkZDUwOWY5 YzllMGFjYmY3YTMzYTMxYmI5OWFhNGY4MTUzZi4uYjY1MTMyODE4MDk3Yjc3OTgxZTNjYWVjOTBj ZmNkODI1ODQzOTdkZiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdT cGVjdWxhdGl2ZUpJVC5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3Vs YXRpdmVKSVQuaApAQCAtMTM5Niw2ICsxMzk2LDExIEBAIHB1YmxpYzoKICAgICAgICAgbV9qaXQu c2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKGFyZzEsIGFyZzIuZ3ByKCkpOwogICAgICAgICBy ZXR1cm4gYXBwZW5kQ2FsbFNldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdCk7CiAgICAgfQorICAg IEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oQ19KSVRPcGVyYXRpb25fRUNPIG9wZXJh dGlvbiwgR1BSUmVnIHJlc3VsdCwgR1BSUmVnIGFyZzEsIEdQUlJlZyBhcmcyKQorICAgIHsKKyAg ICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKGFyZzEsIGFyZzIpOworICAg ICAgICByZXR1cm4gYXBwZW5kQ2FsbFNldFJlc3VsdChvcGVyYXRpb24sIHJlc3VsdCk7CisgICAg fQogICAgIEpJVENvbXBpbGVyOjpDYWxsIGNhbGxPcGVyYXRpb24oSl9KSVRPcGVyYXRpb25fRUpN aWMgb3BlcmF0aW9uLCBKU1ZhbHVlUmVncyByZXN1bHQsIEpTVmFsdWVSZWdzIGFyZywgVHJ1c3Rl ZEltbVB0ciBtYXRoSUMpCiAgICAgewogICAgICAgICBtX2ppdC5zZXR1cEFyZ3VtZW50c1dpdGhF eGVjU3RhdGUoYXJnLmdwcigpLCBtYXRoSUMpOwpAQCAtMTk1MCw2ICsxOTU1LDExIEBAIHB1Ymxp YzoKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKGFyZzEsIGFyZzIu cGF5bG9hZEdQUigpLCBhcmcyLnRhZ0dQUigpKTsKICAgICAgICAgcmV0dXJuIGFwcGVuZENhbGxT ZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOwogICAgIH0KKyAgICBKSVRDb21waWxlcjo6Q2Fs bCBjYWxsT3BlcmF0aW9uKENfSklUT3BlcmF0aW9uX0VDTyBvcGVyYXRpb24sIEdQUlJlZyByZXN1 bHQsIEdQUlJlZyBhcmcxLCBHUFJSZWcgYXJnMikKKyAgICB7CisgICAgICAgIG1faml0LnNldHVw QXJndW1lbnRzV2l0aEV4ZWNTdGF0ZShhcmcxLCBhcmcyKTsKKyAgICAgICAgcmV0dXJuIGFwcGVu ZENhbGxTZXRSZXN1bHQob3BlcmF0aW9uLCByZXN1bHQpOworICAgIH0KICAgICBKSVRDb21waWxl cjo6Q2FsbCBjYWxsT3BlcmF0aW9uKEpfSklUT3BlcmF0aW9uX0VKTWljIG9wZXJhdGlvbiwgSlNW YWx1ZVJlZ3MgcmVzdWx0LCBKU1ZhbHVlUmVncyBhcmcsIFRydXN0ZWRJbW1QdHIgbWF0aElDKQog ICAgIHsKICAgICAgICAgbV9qaXQuc2V0dXBBcmd1bWVudHNXaXRoRXhlY1N0YXRlKEVBQklfMzJC SVRfRFVNTVlfQVJHIGFyZy5wYXlsb2FkR1BSKCksIGFyZy50YWdHUFIoKSwgbWF0aElDKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAppbmRleCA5NjZl ZDNhYWE5OWFiMTI2ZjhjMDdhMGEyZDMyMThkYTcyZTg5ODgyLi45MGJkMDJmYTgyM2RmNzZiMDlj ZjNjZGIzMjFmOWQxMjEwMGRlYjc2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv ZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9G VExMb3dlckRGR1RvQjMuY3BwCkBAIC00MjY5LDExICs0MjY5LDE3IEBAIHByaXZhdGU6CiAgICAg dm9pZCBjb21waWxlUHVzaFdpdGhTY29wZSgpCiAgICAgewogICAgICAgICBMVmFsdWUgcGFyZW50 U2NvcGUgPSBsb3dDZWxsKG1fbm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICBMVmFsdWUgb2JqZWN0 ID0gbG93SlNWYWx1ZShtX25vZGUtPmNoaWxkMigpKTsKLQotICAgICAgICBMVmFsdWUgcmVzdWx0 ID0gdm1DYWxsKEludDY0LCBtX291dC5vcGVyYXRpb24ob3BlcmF0aW9uUHVzaFdpdGhTY29wZSks IG1fY2FsbEZyYW1lLCBwYXJlbnRTY29wZSwgb2JqZWN0KTsKLQotICAgICAgICBzZXRKU1ZhbHVl KHJlc3VsdCk7CisgICAgICAgIGF1dG8gb2JqZWN0RWRnZSA9IG1fbm9kZS0+Y2hpbGQyKCk7Cisg ICAgICAgIGlmIChvYmplY3RFZGdlLnVzZUtpbmQoKSA9PSBPYmplY3RVc2UpIHsKKyAgICAgICAg ICAgIExWYWx1ZSBvYmplY3QgPSBsb3dOb25OdWxsT2JqZWN0KG9iamVjdEVkZ2UpOworICAgICAg ICAgICAgTFZhbHVlIHJlc3VsdCA9IHZtQ2FsbChJbnQ2NCwgbV9vdXQub3BlcmF0aW9uKG9wZXJh dGlvblB1c2hXaXRoU2NvcGVPYmplY3QpLCBtX2NhbGxGcmFtZSwgcGFyZW50U2NvcGUsIG9iamVj dCk7CisgICAgICAgICAgICBzZXRKU1ZhbHVlKHJlc3VsdCk7CisgICAgICAgIH0gZWxzZSB7Cisg ICAgICAgICAgICBBU1NFUlQob2JqZWN0RWRnZS51c2VLaW5kKCkgPT0gVW50eXBlZFVzZSk7Cisg ICAgICAgICAgICBMVmFsdWUgb2JqZWN0ID0gbG93SlNWYWx1ZShtX25vZGUtPmNoaWxkMigpKTsK KyAgICAgICAgICAgIExWYWx1ZSByZXN1bHQgPSB2bUNhbGwoSW50NjQsIG1fb3V0Lm9wZXJhdGlv bihvcGVyYXRpb25QdXNoV2l0aFNjb3BlKSwgbV9jYWxsRnJhbWUsIHBhcmVudFNjb3BlLCBvYmpl Y3QpOworICAgICAgICAgICAgc2V0SlNWYWx1ZShyZXN1bHQpOworICAgICAgICB9CiAgICAgfQog CiAgICAgdm9pZCBjb21waWxlQ3JlYXRlQWN0aXZhdGlvbigpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2ppdC9KSVRPcGVyYXRpb25zLmNwcAppbmRleCBlODY0YmFmMzAwYjM5OWZiZmY3YzhjYjE5 ZDQzZGVmZmY1OWViMjczLi4zYWIyYTRhYWM5NWQ4ZTRjNzA1MTZlNjAyNzQ3ODZkN2Y0ZGI2Zjkw IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlvbnMuY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5jcHAKQEAgLTIw MTAsNiArMjAxMCwxNCBAQCBKU0NlbGwqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHVzaFdpdGhT Y29wZShFeGVjU3RhdGUqIGV4ZWMsIEpTQ2VsbCogY3VycmVudFNjbwogICAgIHJldHVybiBKU1dp dGhTY29wZTo6Y3JlYXRlKHZtLCBleGVjLT5sZXhpY2FsR2xvYmFsT2JqZWN0KCksIGN1cnJlbnRT Y29wZSwgb2JqZWN0KTsKIH0KIAorSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvblB1c2hX aXRoU2NvcGVPYmplY3QoRXhlY1N0YXRlKiBleGVjLCBKU0NlbGwqIGN1cnJlbnRTY29wZUNlbGws IEpTT2JqZWN0KiBvYmplY3QpCit7CisgICAgVk0mIHZtID0gZXhlYy0+dm0oKTsKKyAgICBOYXRp dmVDYWxsRnJhbWVUcmFjZXIgdHJhY2VyKCZ2bSwgZXhlYyk7CisgICAgSlNTY29wZSogY3VycmVu dFNjb3BlID0ganNDYXN0PEpTU2NvcGUqPihjdXJyZW50U2NvcGVDZWxsKTsKKyAgICByZXR1cm4g SlNXaXRoU2NvcGU6OmNyZWF0ZSh2bSwgZXhlYy0+bGV4aWNhbEdsb2JhbE9iamVjdCgpLCBjdXJy ZW50U2NvcGUsIG9iamVjdCk7Cit9CisKIEVuY29kZWRKU1ZhbHVlIEpJVF9PUEVSQVRJT04gb3Bl cmF0aW9uSW5zdGFuY2VPZihFeGVjU3RhdGUqIGV4ZWMsIEVuY29kZWRKU1ZhbHVlIGVuY29kZWRW YWx1ZSwgRW5jb2RlZEpTVmFsdWUgZW5jb2RlZFByb3RvKQogewogICAgIFZNJiB2bSA9IGV4ZWMt PnZtKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaml0L0pJVE9wZXJhdGlv bnMuaCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklUT3BlcmF0aW9ucy5oCmluZGV4IGUy OGE4OTVlZmI3ZDhmYjA2N2ZjZDVkZGVlNDVmNDUzYmI0ODg3MjYuLmI5ZDEyNzg5N2NkNzdlMzBl NDE3MDVmYmFlMTgwMzNlNWE0YThkMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9qaXQvSklUT3BlcmF0aW9ucy5oCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvSklU T3BlcmF0aW9ucy5oCkBAIC0yMTMsNiArMjEzLDcgQEAgdHlwZWRlZiBKU0NlbGwqIChKSVRfT1BF UkFUSU9OICpDX0pJVE9wZXJhdGlvbl9FWikoRXhlY1N0YXRlKiwgaW50MzJfdCk7CiB0eXBlZGVm IEpTQ2VsbCogKEpJVF9PUEVSQVRJT04gKkNfSklUT3BlcmF0aW9uX0VKc2NJKShFeGVjU3RhdGUq LCBKU1Njb3BlKiwgVW5pcXVlZFN0cmluZ0ltcGwqKTsKIHR5cGVkZWYgSlNDZWxsKiAoSklUX09Q RVJBVElPTiAqQ19KSVRPcGVyYXRpb25fRUNKWikoRXhlY1N0YXRlKiwgSlNDZWxsKiwgRW5jb2Rl ZEpTVmFsdWUsIGludDMyX3QpOwogdHlwZWRlZiBKU0NlbGwqIChKSVRfT1BFUkFUSU9OICpDX0pJ VE9wZXJhdGlvbl9FQ0opKEV4ZWNTdGF0ZSosIEpTQ2VsbCosIEVuY29kZWRKU1ZhbHVlKTsKK3R5 cGVkZWYgSlNDZWxsKiAoSklUX09QRVJBVElPTiAqQ19KSVRPcGVyYXRpb25fRUNPKShFeGVjU3Rh dGUqLCBKU0NlbGwqLCBKU09iamVjdCopOwogdHlwZWRlZiBkb3VibGUgKEpJVF9PUEVSQVRJT04g KkRfSklUT3BlcmF0aW9uX0QpKGRvdWJsZSk7CiB0eXBlZGVmIGRvdWJsZSAoSklUX09QRVJBVElP TiAqRF9KSVRPcGVyYXRpb25fRykoSlNHbG9iYWxPYmplY3QqKTsKIHR5cGVkZWYgZG91YmxlIChK SVRfT1BFUkFUSU9OICpEX0pJVE9wZXJhdGlvbl9ERCkoZG91YmxlLCBkb3VibGUpOwpAQCAtNDIw LDYgKzQyMSw3IEBAIHNpemVfdCBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkRlbGV0ZUJ5SWQoRXhl Y1N0YXRlKiwgRW5jb2RlZEpTVmFsdWUgYmFzZSwgVW5pcXVlCiBFbmNvZGVkSlNWYWx1ZSBKSVRf T1BFUkFUSU9OIG9wZXJhdGlvbkRlbGV0ZUJ5VmFsSlNSZXN1bHQoRXhlY1N0YXRlKiwgRW5jb2Rl ZEpTVmFsdWUgYmFzZSwgRW5jb2RlZEpTVmFsdWUgdGFyZ2V0KSBXVEZfSU5URVJOQUw7CiBzaXpl X3QgSklUX09QRVJBVElPTiBvcGVyYXRpb25EZWxldGVCeVZhbChFeGVjU3RhdGUqLCBFbmNvZGVk SlNWYWx1ZSBiYXNlLCBFbmNvZGVkSlNWYWx1ZSB0YXJnZXQpIFdURl9JTlRFUk5BTDsKIEpTQ2Vs bCogSklUX09QRVJBVElPTiBvcGVyYXRpb25QdXNoV2l0aFNjb3BlKEV4ZWNTdGF0ZSosIEpTQ2Vs bCogY3VycmVudFNjb3BlQ2VsbCwgRW5jb2RlZEpTVmFsdWUgb2JqZWN0KSBXVEZfSU5URVJOQUw7 CitKU0NlbGwqIEpJVF9PUEVSQVRJT04gb3BlcmF0aW9uUHVzaFdpdGhTY29wZU9iamVjdChFeGVj U3RhdGUqIGV4ZWMsIEpTQ2VsbCogY3VycmVudFNjb3BlQ2VsbCwgSlNPYmplY3QqIG9iamVjdCkg V1RGX0lOVEVSTkFMOwogSlNDZWxsKiBKSVRfT1BFUkFUSU9OIG9wZXJhdGlvbkdldFBOYW1lcyhF eGVjU3RhdGUqLCBKU09iamVjdCopIFdURl9JTlRFUk5BTDsKIEVuY29kZWRKU1ZhbHVlIEpJVF9P UEVSQVRJT04gb3BlcmF0aW9uSW5zdGFuY2VPZihFeGVjU3RhdGUqLCBFbmNvZGVkSlNWYWx1ZSwg RW5jb2RlZEpTVmFsdWUgcHJvdG8pIFdURl9JTlRFUk5BTDsKIGludDMyX3QgSklUX09QRVJBVElP TiBvcGVyYXRpb25TaXplRnJhbWVGb3JGb3J3YXJkQXJndW1lbnRzKEV4ZWNTdGF0ZSosIEVuY29k ZWRKU1ZhbHVlIGFyZ3VtZW50cywgaW50MzJfdCBudW1Vc2VkU3RhY2tTbG90cywgaW50MzJfdCBm aXJzdFZhckFyZ09mZnNldCkgV1RGX0lOVEVSTkFMOwo=