185115 2018-04-28 16:12:58 -0700 Math.round() produces wrong result for value prior to 0.5 2019-09-06 15:51:17 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED http://ridiculousfish.com/blog/posts/JavaScript-Rounding.html InRadar P2 Normal --- 1 corydoras ross.kirsling commit-queue ews-watchlist keith_miller mark.lam msaboff ross.kirsling saam sam tzagallo webkit-bug-importer ysuzuki oldest_to_newest 1418831 0 corydoras 2018-04-28 16:12:58 -0700 Math.round(0.499999999999999944) produces 1.0; it should produce 0.0. Likewise for the negated input. Note 0.499999999999999944 is the largest representable double less than 0.5. 1418836 1 339079 corydoras 2018-04-28 16:20:03 -0700 Created attachment 339079 Patch 1418839 2 339080 corydoras 2018-04-28 16:33:18 -0700 Created attachment 339080 Patch 1418844 3 339080 saam 2018-04-28 17:02:40 -0700 Comment on attachment 339080 Patch This doesn't address the bug in our JITs as well. Check out DFG/FTL ArithRound 1568342 4 378145 ross.kirsling 2019-09-05 18:31:25 -0700 Created attachment 378145 Patch 1568358 5 378145 ross.kirsling 2019-09-05 18:54:20 -0700 Comment on attachment 378145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378145&action=review > Source/JavaScriptCore/jit/ThunkGenerators.cpp:1009 > + jit.compareDouble(MacroAssembler::DoubleGreaterThan, SpecializedThunkJIT::fpRegT2, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0); > + jit.convertInt32ToDouble(SpecializedThunkJIT::regT0, SpecializedThunkJIT::fpRegT2); > + jit.subDouble(SpecializedThunkJIT::fpRegT1, SpecializedThunkJIT::fpRegT2, SpecializedThunkJIT::fpRegT0); Note: I'm doing this instead of branching and subtracting a constant 1, because even in the non-subtracting case we would still need to move the result value to fpRegT0. I think this is probably fine (especially since neither branch is more likely than the other) but if I'm overlooking an obvious improvement please let me know. :) 1568700 6 378145 saam 2019-09-06 14:27:55 -0700 Comment on attachment 378145 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=378145&action=review r=me > Source/JavaScriptCore/ChangeLog:8 > + Our Math.round implementation goes in the wrong direction for double values like 0.49999999999999994. 🤔 Gotta keep developers on their toes > Source/JavaScriptCore/ChangeLog:9 > + This requires just a subtle adjustment for three of our four versions; only baseline JIT needed a full rewrite. why didn't it work? Would be good to say why it didn't work too. Writing out why it didn't work would be helpful for folks referring back to this. > Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp:2955 > + LValue scratch = m_out.doubleSub(integerValue, m_out.constDouble(0.5)); style nit: we can probably pick a better name than scratch >> Source/JavaScriptCore/jit/ThunkGenerators.cpp:1009 >> + jit.subDouble(SpecializedThunkJIT::fpRegT1, SpecializedThunkJIT::fpRegT2, SpecializedThunkJIT::fpRegT0); > > Note: I'm doing this instead of branching and subtracting a constant 1, because even in the non-subtracting case we would still need to move the result value to fpRegT0. I think this is probably fine (especially since neither branch is more likely than the other) but if I'm overlooking an obvious improvement please let me know. :) my blind guess is the branch might be faster than convertInt32ToDouble, but I haven't benchmarked it. 1568719 7 378241 ross.kirsling 2019-09-06 14:58:58 -0700 Created attachment 378241 Patch for landing 1568743 8 378241 commit-queue 2019-09-06 15:50:03 -0700 Comment on attachment 378241 Patch for landing Clearing flags on attachment: 378241 Committed r249597: <https://trac.webkit.org/changeset/249597> 1568744 9 commit-queue 2019-09-06 15:50:04 -0700 All reviewed patches have been landed. Closing bug. 1568746 10 webkit-bug-importer 2019-09-06 15:51:17 -0700 <rdar://problem/55131492> 339079 2018-04-28 16:20:03 -0700 2018-04-28 16:33:16 -0700 Patch bug-185115-20180428162002.patch text/plain 2931 corydoras U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi MzQ3NGQwNWUyMGJkNjk0NTUzZmU2MjFhNTY4NzVhMGE1NzhiM2Y0Li42YmMxZTQwOTRmZWY5OWRj ZGQxMGQ0YzJiZGNlNTdjMDhlNGFhYjU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAxOC0wNC0yOCAgUGV0ZXIgQW1tb24gIDxjb3J5ZG9yYXNAcmlkaWN1bG91 c2Zpc2guY29tPgorCisgICAgICAgIE1hdGgucm91bmQoKSBwcm9kdWNlcyB3cm9uZyByZXN1bHQg Zm9yIHZhbHVlIHByaW9yIHRvIDAuNQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg1MTE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBydW50aW1lL01hdGhDb21tb24uY3BwOgorCiAyMDE4LTA0LTI3ICBD YWlvIExpbWEgIDx0aWNhaW9saW1hQGdtYWlsLmNvbT4KIAogICAgICAgICBbRVNOZXh0XVtCaWdJ bnRdIEltcGxlbWVudCBzdXBwb3J0IGZvciAiKiIgb3BlcmF0aW9uCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXRoQ29tbW9uLmNwcCBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9ydW50aW1lL01hdGhDb21tb24uY3BwCmluZGV4IGJkZjE0ODdlYzFlZTc5ZGFiNTUz ZjM1M2JhNTE1ZjYyM2M1YTk1OWQuLmMwZDdiY2M5ZjI5MzA0N2FlMGY5MDI4NGU0NDg3MGMzODNi NmZjZDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hdGhDb21t b24uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hdGhDb21tb24uY3Bw CkBAIC00OTAsOCArNDkwLDggQEAgc3RhdGljIGlubGluZSBib29sIGlzU3RyaWN0SW50MzIoZG91 YmxlIHZhbHVlKQogZXh0ZXJuICJDIiB7CiBkb3VibGUganNSb3VuZChkb3VibGUgdmFsdWUpCiB7 Ci0gICAgZG91YmxlIGludGVnZXIgPSBjZWlsKHZhbHVlKTsKLSAgICByZXR1cm4gaW50ZWdlciAt IChpbnRlZ2VyIC0gdmFsdWUgPiAwLjUpOworICAgIGRvdWJsZSBpbnRlZ2VyID0gZmxvb3IodmFs dWUpOworICAgIHJldHVybiBjb3B5c2lnbihpbnRlZ2VyICsgKHZhbHVlIC0gaW50ZWdlciA+PSAw LjUpLCB2YWx1ZSk7CiB9CiAKICNpZiBDQUxMSU5HX0NPTlZFTlRJT05fSVNfU1REQ0FMTCB8fCBD UFUoQVJNX1RIVU1CMikKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9D aGFuZ2VMb2cKaW5kZXggMWJkYjkxYzcxY2U0NGNmN2RlNjBhOGY3OTYwYWU1MzkyZmNjM2EzMy4u ODM4ZTE0YjhkZDc5ZmIwM2NhM2Y5NDg1NWFmOTA1ZWFkNWVhYjdhYSAxMDA2NDQKLS0tIGEvSlNU ZXN0cy9DaGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAor MjAxOC0wNC0yOCAgUGV0ZXIgQW1tb24gIDxjb3J5ZG9yYXNAcmlkaWN1bG91c2Zpc2guY29tPgor CisgICAgICAgIE1hdGgucm91bmQoKSBwcm9kdWNlcyB3cm9uZyByZXN1bHQgZm9yIHZhbHVlIHBy aW9yIHRvIDAuNQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTg1MTE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgKiBzdHJlc3MvbWF0aC1yb3VuZC1iYXNpY3MuanM6CisKIDIwMTgtMDQtMjcgIENhaW8gTGlt YSAgPHRpY2Fpb2xpbWFAZ21haWwuY29tPgogCiAgICAgICAgIFtFU05leHRdW0JpZ0ludF0gSW1w bGVtZW50IHN1cHBvcnQgZm9yICIqIiBvcGVyYXRpb24KZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3Ry ZXNzL21hdGgtcm91bmQtYmFzaWNzLmpzIGIvSlNUZXN0cy9zdHJlc3MvbWF0aC1yb3VuZC1iYXNp Y3MuanMKaW5kZXggZjYxYTZkNGY0NzY5NTg1ZmU1YjlmNTZmZjBlYWJjNDAyMzAyNDEzYy4uZjMw MWVhZTk2OTQ2YzJlMGI4NTZjNWQ0ZDRlNDliODZkZjQzMGE3MiAxMDA2NDQKLS0tIGEvSlNUZXN0 cy9zdHJlc3MvbWF0aC1yb3VuZC1iYXNpY3MuanMKKysrIGIvSlNUZXN0cy9zdHJlc3MvbWF0aC1y b3VuZC1iYXNpY3MuanMKQEAgLTY5LDYgKzY5LDE0IEBAIGZvciAodmFyIGkgPSAwOyBpIDwgMWU0 OyArK2kpIHsKICAgICBpZiAoIShyb3VuZGVkVmFsdWUgPT09IDAgJiYgKDEvcm91bmRlZFZhbHVl KSA9PT0gLUluZmluaXR5KSkKICAgICAgICAgdGhyb3cgIm1hdGhSb3VuZE9uRG91YmxlcygtMCkg PSAiICsgcm91bmRlZFZhbHVlOwogCisgICAgdmFyIHJvdW5kZWRWYWx1ZSA9IG1hdGhSb3VuZE9u RG91YmxlcygwLjQ5OTk5OTk5OTk5OTk5OTk0NCk7CisgICAgaWYgKCEocm91bmRlZFZhbHVlID09 PSAwICYmICgxL3JvdW5kZWRWYWx1ZSkgPT09IEluZmluaXR5KSkKKyAgICAgICAgdGhyb3cgIm1h dGhSb3VuZE9uRG91YmxlcygwLjQ5OTk5OTk5OTk5OTk5OTk0NCkgPSAiICsgcm91bmRlZFZhbHVl OworCisgICAgdmFyIHJvdW5kZWRWYWx1ZSA9IG1hdGhSb3VuZE9uRG91YmxlcygtMC40OTk5OTk5 OTk5OTk5OTk5NDQpOworICAgIGlmICghKHJvdW5kZWRWYWx1ZSA9PT0gMCAmJiAoMS9yb3VuZGVk VmFsdWUpID09PSAtSW5maW5pdHkpKQorICAgICAgICB0aHJvdyAibWF0aFJvdW5kT25Eb3VibGVz KC0wLjQ5OTk5OTk5OTk5OTk5OTk0NCkgPSAiICsgcm91bmRlZFZhbHVlOworCiAgICAgdmFyIHJv dW5kZWRWYWx1ZSA9IG1hdGhSb3VuZE9uRG91YmxlcyhOYU4pOwogICAgIGlmIChyb3VuZGVkVmFs dWUgPT09IHJvdW5kZWRWYWx1ZSkKICAgICAgICAgdGhyb3cgIm1hdGhSb3VuZE9uRG91YmxlcyhO YU4pID0gIiArIHJvdW5kZWRWYWx1ZTsK 339080 2018-04-28 16:33:18 -0700 2019-09-05 18:31:23 -0700 Patch bug-185115-20180428163317.patch text/plain 4000 corydoras U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxMTMxCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBi MzQ3NGQwNWUyMGJkNjk0NTUzZmU2MjFhNTY4NzVhMGE1NzhiM2Y0Li41MmIxZTViOTE3MzNlMmQ3 NzY4YzljMzc5M2Y3YmQ3Y2E1ZjZkZTJlIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxOC0wNC0yOCAgUGV0ZXIgQW1tb24gIDxjb3J5ZG9yYXNAcmlkaWN1bG91 c2Zpc2guY29tPgorCisgICAgICAgIFtKU0NdIENvcnJlY3QgTWF0aC5yb3VuZCBmb3IgbGFyZ2Vz dCB2YWx1ZSBiZWxvdyAwLjUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE4NTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFByaW9yIHRvIHRoaXMgZml4LCBNYXRoLnJvdW5kIHdvdWxkIGNlaWwoKSB0aGUg aW5wdXQsIGNvbXB1dGUgdGhlIGRlbHRhLAorICAgICAgICBhbmQgdGhlbiBjb3JyZWN0IGl0IGlm IHRoZSBkZWx0YSBleGNlZWRlZCAwLjUuIEhvd2V2ZXIgaWYgdGhlIGlucHV0IGlzIHRoZQorICAg ICAgICBsYXJnZXN0IHJlcHJlc2VudGFibGUgdmFsdWUgYmVsb3cgMC41LCB0aGUgZGVsdGEgc3Vm ZmVycyBwcmVjaXNpb24gbG9zcyBhbmQKKyAgICAgICAgaXMgZ2V0cyByb3VuZGVkIGRvd24gdG8g MC41IGluc3RlYWQgb2YgYmVpbmcgc2xpZ2h0bHkgbGFyZ2VyLiBUaGVyZWZvcmUKKyAgICAgICAg TWF0aC5yb3VuZCgpIG9mIHRoaXMgaW5wdXQgd291bGQgYmUgMS4wIGluc3RlYWQgb2YgdGhlIGNv cnJlY3QgMC4wLgorCisgICAgICAgIFN3aXRjaCB0byBhbiBpbXBsZW1lbnRhdGlvbiAoc3VnZ2Vz dGVkIGJ5IFN0ZXBoZW4gQ2Fub24pIG9mIHVzaW5nIGZsb29yKCkKKyAgICAgICAgYW5kIGluY3Jl bWVudGluZyBpZiB0aGUgZGVsdGEgaXMgKmF0IGxlYXN0KiAwLjUuIFRoaXMgY29ycmVjdHMgdGhl IGhhbmRsaW5nCisgICAgICAgIG9mIHRoZSBiZWZvcmUtMC41IGlucHV0LCBiZWNhdXNlIHRoZSBk ZWx0YSBiZWNvbWVzIGVxdWFsIHRvIHRoZSBpbnB1dCBhbmQKKyAgICAgICAgc28gdGhlcmUgaXMg bm8gcHJlY2lzaW9uIGxvc3MuCisKKyAgICAgICAgRm9yIHRoZSBuZWdhdGVkIGlucHV0IChpLmUu IG5leHRhZnRlcigtMC41LCAraW5mKSkgd2Ugc3RpbGwgc3VmZmVyIHByZWNpc2lvbgorICAgICAg ICBsb3NzIGFuZCBjb21wdXRlIGEgZGVsdGEgb2YgMC41LCBidXQgdGhlID49IHRlc3QgbWVhbnMg d2Ugd2lsbCBzdGlsbCBpbmNyZW1lbnQKKyAgICAgICAgaW4gdGhpcyBjYXNlLCByb3VuZGluZyB0 byAwLgorCisgICAgICAgIFVuZm9ydHVuYXRlbHkgd2UgbXVzdCBkbyBhIHNpZ24gZml4dXAgYWZ0 ZXJ3YXJkcywgYmVjYXVzZSBpbmNyZW1lbnRpbmcgLTEKKyAgICAgICAgcHJvZHVjZXMgKzAuCisK KyAgICAgICAgKiBydW50aW1lL01hdGhDb21tb24uY3BwOgorCiAyMDE4LTA0LTI3ICBDYWlvIExp bWEgIDx0aWNhaW9saW1hQGdtYWlsLmNvbT4KIAogICAgICAgICBbRVNOZXh0XVtCaWdJbnRdIElt cGxlbWVudCBzdXBwb3J0IGZvciAiKiIgb3BlcmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9NYXRoQ29tbW9uLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ydW50aW1lL01hdGhDb21tb24uY3BwCmluZGV4IGJkZjE0ODdlYzFlZTc5ZGFiNTUzZjM1M2Jh NTE1ZjYyM2M1YTk1OWQuLmMwZDdiY2M5ZjI5MzA0N2FlMGY5MDI4NGU0NDg3MGMzODNiNmZjZDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hdGhDb21tb24uY3Bw CisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hdGhDb21tb24uY3BwCkBAIC00 OTAsOCArNDkwLDggQEAgc3RhdGljIGlubGluZSBib29sIGlzU3RyaWN0SW50MzIoZG91YmxlIHZh bHVlKQogZXh0ZXJuICJDIiB7CiBkb3VibGUganNSb3VuZChkb3VibGUgdmFsdWUpCiB7Ci0gICAg ZG91YmxlIGludGVnZXIgPSBjZWlsKHZhbHVlKTsKLSAgICByZXR1cm4gaW50ZWdlciAtIChpbnRl Z2VyIC0gdmFsdWUgPiAwLjUpOworICAgIGRvdWJsZSBpbnRlZ2VyID0gZmxvb3IodmFsdWUpOwor ICAgIHJldHVybiBjb3B5c2lnbihpbnRlZ2VyICsgKHZhbHVlIC0gaW50ZWdlciA+PSAwLjUpLCB2 YWx1ZSk7CiB9CiAKICNpZiBDQUxMSU5HX0NPTlZFTlRJT05fSVNfU1REQ0FMTCB8fCBDUFUoQVJN X1RIVU1CMikKZGlmZiAtLWdpdCBhL0pTVGVzdHMvQ2hhbmdlTG9nIGIvSlNUZXN0cy9DaGFuZ2VM b2cKaW5kZXggMWJkYjkxYzcxY2U0NGNmN2RlNjBhOGY3OTYwYWU1MzkyZmNjM2EzMy4uMjYyOTU0 YzkwOWFkOGRmMDU0MDBkYmY4OGI3NjJhNzY3Y2Y4NTY0ZCAxMDA2NDQKLS0tIGEvSlNUZXN0cy9D aGFuZ2VMb2cKKysrIGIvSlNUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0w NC0yOCAgUGV0ZXIgQW1tb24gIDxjb3J5ZG9yYXNAcmlkaWN1bG91c2Zpc2guY29tPgorCisgICAg ICAgIFtKU0NdIENvcnJlY3QgTWF0aC5yb3VuZCBmb3IgbGFyZ2VzdCB2YWx1ZSBiZWxvdyAwLjUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTExNQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1hdGgucm91 bmQoKSB0ZXN0cyBmb3IgdmFsdWUgcHJlY2VkaW5nIDAuNQorCisgICAgICAgICogc3RyZXNzL21h dGgtcm91bmQtYmFzaWNzLmpzOgorCiAyMDE4LTA0LTI3ICBDYWlvIExpbWEgIDx0aWNhaW9saW1h QGdtYWlsLmNvbT4KIAogICAgICAgICBbRVNOZXh0XVtCaWdJbnRdIEltcGxlbWVudCBzdXBwb3J0 IGZvciAiKiIgb3BlcmF0aW9uCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3N0cmVzcy9tYXRoLXJvdW5k LWJhc2ljcy5qcyBiL0pTVGVzdHMvc3RyZXNzL21hdGgtcm91bmQtYmFzaWNzLmpzCmluZGV4IGY2 MWE2ZDRmNDc2OTU4NWZlNWI5ZjU2ZmYwZWFiYzQwMjMwMjQxM2MuLmYzMDFlYWU5Njk0NmMyZTBi ODU2YzVkNGQ0ZTQ5Yjg2ZGY0MzBhNzIgMTAwNjQ0Ci0tLSBhL0pTVGVzdHMvc3RyZXNzL21hdGgt cm91bmQtYmFzaWNzLmpzCisrKyBiL0pTVGVzdHMvc3RyZXNzL21hdGgtcm91bmQtYmFzaWNzLmpz CkBAIC02OSw2ICs2OSwxNCBAQCBmb3IgKHZhciBpID0gMDsgaSA8IDFlNDsgKytpKSB7CiAgICAg aWYgKCEocm91bmRlZFZhbHVlID09PSAwICYmICgxL3JvdW5kZWRWYWx1ZSkgPT09IC1JbmZpbml0 eSkpCiAgICAgICAgIHRocm93ICJtYXRoUm91bmRPbkRvdWJsZXMoLTApID0gIiArIHJvdW5kZWRW YWx1ZTsKIAorICAgIHZhciByb3VuZGVkVmFsdWUgPSBtYXRoUm91bmRPbkRvdWJsZXMoMC40OTk5 OTk5OTk5OTk5OTk5NDQpOworICAgIGlmICghKHJvdW5kZWRWYWx1ZSA9PT0gMCAmJiAoMS9yb3Vu ZGVkVmFsdWUpID09PSBJbmZpbml0eSkpCisgICAgICAgIHRocm93ICJtYXRoUm91bmRPbkRvdWJs ZXMoMC40OTk5OTk5OTk5OTk5OTk5NDQpID0gIiArIHJvdW5kZWRWYWx1ZTsKKworICAgIHZhciBy b3VuZGVkVmFsdWUgPSBtYXRoUm91bmRPbkRvdWJsZXMoLTAuNDk5OTk5OTk5OTk5OTk5OTQ0KTsK KyAgICBpZiAoIShyb3VuZGVkVmFsdWUgPT09IDAgJiYgKDEvcm91bmRlZFZhbHVlKSA9PT0gLUlu ZmluaXR5KSkKKyAgICAgICAgdGhyb3cgIm1hdGhSb3VuZE9uRG91YmxlcygtMC40OTk5OTk5OTk5 OTk5OTk5NDQpID0gIiArIHJvdW5kZWRWYWx1ZTsKKwogICAgIHZhciByb3VuZGVkVmFsdWUgPSBt YXRoUm91bmRPbkRvdWJsZXMoTmFOKTsKICAgICBpZiAocm91bmRlZFZhbHVlID09PSByb3VuZGVk VmFsdWUpCiAgICAgICAgIHRocm93ICJtYXRoUm91bmRPbkRvdWJsZXMoTmFOKSA9ICIgKyByb3Vu ZGVkVmFsdWU7Cg== 378145 2019-09-05 18:31:25 -0700 2019-09-06 14:58:56 -0700 Patch bug-185115-20190905183125.patch text/plain 10953 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA5 MzY4ZDQyZDQxNzE3ZjM0MjIyOTNlNDM1MDNmYWE3MmQ5ODYwYWI2Li44MmQzY2U2ODNkZjI3MTc2 YjU4ODgwZDJmNWY2YzkyMDRkMDhjNjI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyMSBAQAorMjAxOS0wOS0wNSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgTWF0aC5yb3VuZCgpIHByb2R1Y2VzIHdyb25nIHJlc3VsdCBmb3Ig dmFsdWUgcHJpb3IgdG8gMC41CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODUxMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBPdXIgTWF0aC5yb3VuZCBpbXBsZW1lbnRhdGlvbiBnb2VzIGluIHRoZSB3cm9u ZyBkaXJlY3Rpb24gZm9yIGRvdWJsZSB2YWx1ZXMgbGlrZSAwLjQ5OTk5OTk5OTk5OTk5OTk0Lgor ICAgICAgICBUaGlzIHJlcXVpcmVzIGp1c3QgYSBzdWJ0bGUgYWRqdXN0bWVudCBmb3IgdGhyZWUg b2Ygb3VyIGZvdXIgdmVyc2lvbnM7IG9ubHkgYmFzZWxpbmUgSklUIG5lZWRlZCBhIGZ1bGwgcmV3 cml0ZS4gCisKKyAgICAgICAgKiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAo SlNDOjpERkc6OlNwZWN1bGF0aXZlSklUOjpjb21waWxlQXJpdGhSb3VuZGluZyk6CisgICAgICAg ICogZnRsL0ZUTExvd2VyREZHVG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dl ckRGR1RvQjM6OmNvbXBpbGVBcml0aFJvdW5kKToKKyAgICAgICAgKiBqaXQvVGh1bmtHZW5lcmF0 b3JzLmNwcDoKKyAgICAgICAgKEpTQzo6cm91bmRUaHVua0dlbmVyYXRvcik6CisgICAgICAgICog cnVudGltZS9NYXRoQ29tbW9uLmNwcDoKKwogMjAxOS0wOS0wNSAgVGFkZXUgWmFnYWxsbyAgPHR6 YWdhbGxvQGFwcGxlLmNvbT4KIAogICAgICAgICBMYXp5Q2xhc3NTdHJ1Y3R1cmU6OnNldENvbnN0 cnVjdG9yIHNob3VsZCBub3Qgc3RvcmUgdGhlIGNvbnN0cnVjdG9yIHRvIHRoZSBnbG9iYWwgb2Jq ZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZl SklULmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3Bw CmluZGV4IDczZWVkYzMwZTkwY2ZhMjlmMzkyYzUxNDM0MTlkMzdjYWRhMjFjYjAuLjRlYjdkNDcx ZmU2ZTkzMjhiNGJkZWU2NTIxNzNhMzcyNjMzNzliY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCkBAIC01NjA0LDE2ICs1NjA0LDE0IEBA IHZvaWQgU3BlY3VsYXRpdmVKSVQ6OmNvbXBpbGVBcml0aFJvdW5kaW5nKE5vZGUqIG5vZGUpCiAg ICAgICAgICAgICAgICAgICAgIG1faml0LmZsb29yRG91YmxlKHJlc3VsdEZQUiwgcmVzdWx0RlBS KTsKICAgICAgICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBtX2ppdC5j ZWlsRG91YmxlKHZhbHVlRlBSLCByZXN1bHRGUFIpOwotICAgICAgICAgICAgICAgICAgICBGUFJU ZW1wb3JhcnkgcmVhbFBhcnQodGhpcyk7Ci0gICAgICAgICAgICAgICAgICAgIEZQUlJlZyByZWFs UGFydEZQUiA9IHJlYWxQYXJ0LmZwcigpOwotICAgICAgICAgICAgICAgICAgICBtX2ppdC5zdWJE b3VibGUocmVzdWx0RlBSLCB2YWx1ZUZQUiwgcmVhbFBhcnRGUFIpOwogCiAgICAgICAgICAgICAg ICAgICAgIEZQUlRlbXBvcmFyeSBzY3JhdGNoKHRoaXMpOwogICAgICAgICAgICAgICAgICAgICBG UFJSZWcgc2NyYXRjaEZQUiA9IHNjcmF0Y2guZnByKCk7Ci0gICAgICAgICAgICAgICAgICAgIHN0 YXRpYyBjb25zdCBkb3VibGUgaGFsZkNvbnN0YW50ID0gMC41OworICAgICAgICAgICAgICAgICAg ICBzdGF0aWMgY29uc3QgZG91YmxlIGhhbGZDb25zdGFudCA9IC0wLjU7CiAgICAgICAgICAgICAg ICAgICAgIG1faml0LmxvYWREb3VibGUoVHJ1c3RlZEltbVB0cigmaGFsZkNvbnN0YW50KSwgc2Ny YXRjaEZQUik7CisgICAgICAgICAgICAgICAgICAgIG1faml0LmFkZERvdWJsZShyZXN1bHRGUFIs IHNjcmF0Y2hGUFIpOwogCi0gICAgICAgICAgICAgICAgICAgIEpJVENvbXBpbGVyOjpKdW1wIHNo b3VsZFVzZUNlaWxlZCA9IG1faml0LmJyYW5jaERvdWJsZShKSVRDb21waWxlcjo6RG91YmxlTGVz c1RoYW5PckVxdWFsLCByZWFsUGFydEZQUiwgc2NyYXRjaEZQUik7CisgICAgICAgICAgICAgICAg ICAgIEpJVENvbXBpbGVyOjpKdW1wIHNob3VsZFVzZUNlaWxlZCA9IG1faml0LmJyYW5jaERvdWJs ZShKSVRDb21waWxlcjo6RG91YmxlTGVzc1RoYW5PckVxdWFsLCBzY3JhdGNoRlBSLCB2YWx1ZUZQ Uik7CiAgICAgICAgICAgICAgICAgICAgIHN0YXRpYyBjb25zdCBkb3VibGUgb25lQ29uc3RhbnQg PSAtMS4wOwogICAgICAgICAgICAgICAgICAgICBtX2ppdC5sb2FkRG91YmxlKFRydXN0ZWRJbW1Q dHIoJm9uZUNvbnN0YW50KSwgc2NyYXRjaEZQUik7CiAgICAgICAgICAgICAgICAgICAgIG1faml0 LmFkZERvdWJsZShzY3JhdGNoRlBSLCByZXN1bHRGUFIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2Z0bC9GVExMb3dlckRGR1RvQjMuY3BwCmluZGV4IDY3NTY4NjM4YWRjZTkzMTRmZmZlZmE1 ZWVhZjdkYzliMzc0MDliNjQuLmUxYzBkOTc0ZTVjZTI2NDBjZTU4YjA5ZGI4NTJiMTMyMTUyNTZi N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0Iz LmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAK QEAgLTI5NDUsMTggKzI5NDUsMTcgQEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBMVmFsdWUg dmFsdWUgPSBsb3dEb3VibGUobV9ub2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICAgICAgcmVz dWx0ID0gbV9vdXQuZG91YmxlRmxvb3IobV9vdXQuZG91YmxlQWRkKHZhbHVlLCBtX291dC5jb25z dERvdWJsZSgwLjUpKSk7CiAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIExC YXNpY0Jsb2NrIHJlYWxQYXJ0SXNNb3JlVGhhbkhhbGYgPSBtX291dC5uZXdCbG9jaygpOworICAg ICAgICAgICAgICAgIExCYXNpY0Jsb2NrIHNob3VsZFJvdW5kRG93biA9IG1fb3V0Lm5ld0Jsb2Nr KCk7CiAgICAgICAgICAgICAgICAgTEJhc2ljQmxvY2sgY29udGludWF0aW9uID0gbV9vdXQubmV3 QmxvY2soKTsKIAogICAgICAgICAgICAgICAgIExWYWx1ZSB2YWx1ZSA9IGxvd0RvdWJsZShtX25v ZGUtPmNoaWxkMSgpKTsKICAgICAgICAgICAgICAgICBMVmFsdWUgaW50ZWdlclZhbHVlID0gbV9v dXQuZG91YmxlQ2VpbCh2YWx1ZSk7CiAgICAgICAgICAgICAgICAgVmFsdWVGcm9tQmxvY2sgaW50 ZWdlclZhbHVlUmVzdWx0ID0gbV9vdXQuYW5jaG9yKGludGVnZXJWYWx1ZSk7CiAKLSAgICAgICAg ICAgICAgICBMVmFsdWUgcmVhbFBhcnQgPSBtX291dC5kb3VibGVTdWIoaW50ZWdlclZhbHVlLCB2 YWx1ZSk7CisgICAgICAgICAgICAgICAgTFZhbHVlIHNjcmF0Y2ggPSBtX291dC5kb3VibGVTdWIo aW50ZWdlclZhbHVlLCBtX291dC5jb25zdERvdWJsZSgwLjUpKTsKKyAgICAgICAgICAgICAgICBt X291dC5icmFuY2gobV9vdXQuZG91YmxlR3JlYXRlclRoYW5PclVub3JkZXJlZChzY3JhdGNoLCB2 YWx1ZSksIHVuc3VyZShzaG91bGRSb3VuZERvd24pLCB1bnN1cmUoY29udGludWF0aW9uKSk7CiAK LSAgICAgICAgICAgICAgICBtX291dC5icmFuY2gobV9vdXQuZG91YmxlR3JlYXRlclRoYW5PclVu b3JkZXJlZChyZWFsUGFydCwgbV9vdXQuY29uc3REb3VibGUoMC41KSksIHVuc3VyZShyZWFsUGFy dElzTW9yZVRoYW5IYWxmKSwgdW5zdXJlKGNvbnRpbnVhdGlvbikpOwotCi0gICAgICAgICAgICAg ICAgTEJhc2ljQmxvY2sgbGFzdE5leHQgPSBtX291dC5hcHBlbmRUbyhyZWFsUGFydElzTW9yZVRo YW5IYWxmLCBjb250aW51YXRpb24pOworICAgICAgICAgICAgICAgIExCYXNpY0Jsb2NrIGxhc3RO ZXh0ID0gbV9vdXQuYXBwZW5kVG8oc2hvdWxkUm91bmREb3duLCBjb250aW51YXRpb24pOwogICAg ICAgICAgICAgICAgIExWYWx1ZSBpbnRlZ2VyVmFsdWVSb3VuZGVkRG93biA9IG1fb3V0LmRvdWJs ZVN1YihpbnRlZ2VyVmFsdWUsIG1fb3V0LmNvbnN0RG91YmxlKDEpKTsKICAgICAgICAgICAgICAg ICBWYWx1ZUZyb21CbG9jayBpbnRlZ2VyVmFsdWVSb3VuZGVkRG93blJlc3VsdCA9IG1fb3V0LmFu Y2hvcihpbnRlZ2VyVmFsdWVSb3VuZGVkRG93bik7CiAgICAgICAgICAgICAgICAgbV9vdXQuanVt cChjb250aW51YXRpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9U aHVua0dlbmVyYXRvcnMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVy YXRvcnMuY3BwCmluZGV4IDA1NWUzMjRiMzk5YjUyYzlmMThkZDI5NzEyZjE2Nzg0MjIwNDY3YmQu LjhiZTkxZWI4MTFlOTJlOTFjODA4ZWU1NTgxMjExOWI3MTBhMTA3MGEgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9qaXQvVGh1bmtHZW5lcmF0b3JzLmNwcAorKysgYi9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvaml0L1RodW5rR2VuZXJhdG9ycy5jcHAKQEAgLTg5NSw4ICs4OTUsNiBA QCBkZWZpbmVVbmFyeURvdWJsZU9wV3JhcHBlcihsb2cpOwogZGVmaW5lVW5hcnlEb3VibGVPcFdy YXBwZXIoZmxvb3IpOwogZGVmaW5lVW5hcnlEb3VibGVPcFdyYXBwZXIoY2VpbCk7CiBkZWZpbmVV bmFyeURvdWJsZU9wV3JhcHBlcih0cnVuYyk7Ci0KLXN0YXRpYyBjb25zdCBkb3VibGUgaGFsZkNv bnN0YW50ID0gMC41OwogICAgIAogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmPEpJVFRodW5rUHRyVGFn PiBmbG9vclRodW5rR2VuZXJhdG9yKFZNJiB2bSkKIHsKQEAgLTk5NywyNCArOTk1LDIxIEBAIE1h Y3JvQXNzZW1ibGVyQ29kZVJlZjxKSVRUaHVua1B0clRhZz4gcm91bmRUaHVua0dlbmVyYXRvcihW TSYgdm0pCiAgICAgaml0LnJldHVybkludDMyKFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwKTsK ICAgICBub25JbnRKdW1wLmxpbmsoJmppdCk7CiAgICAgaml0LmxvYWREb3VibGVBcmd1bWVudCgw LCBTcGVjaWFsaXplZFRodW5rSklUOjpmcFJlZ1QwLCBTcGVjaWFsaXplZFRodW5rSklUOjpyZWdU MCk7Ci0gICAgU3BlY2lhbGl6ZWRUaHVua0pJVDo6SnVtcCBpbnRSZXN1bHQ7CiAgICAgU3BlY2lh bGl6ZWRUaHVua0pJVDo6SnVtcExpc3QgZG91YmxlUmVzdWx0OwotICAgIGlmIChqaXQuc3VwcG9y dHNGbG9hdGluZ1BvaW50VHJ1bmNhdGUoKSkgeworICAgIGlmIChqaXQuc3VwcG9ydHNGbG9hdGlu Z1BvaW50Um91bmRpbmcoKSkgewogICAgICAgICBqaXQubW92ZVplcm9Ub0RvdWJsZShTcGVjaWFs aXplZFRodW5rSklUOjpmcFJlZ1QxKTsKICAgICAgICAgZG91YmxlUmVzdWx0LmFwcGVuZChqaXQu YnJhbmNoRG91YmxlKE1hY3JvQXNzZW1ibGVyOjpEb3VibGVFcXVhbCwgU3BlY2lhbGl6ZWRUaHVu a0pJVDo6ZnBSZWdUMCwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMSkpOwotICAgICAgICBT cGVjaWFsaXplZFRodW5rSklUOjpKdW1wTGlzdCBzbG93UGF0aDsKLSAgICAgICAgLy8gSGFuZGxl IHRoZSBuZWdhdGl2ZSBkb3VibGVzIGluIHRoZSBzbG93IHBhdGggZm9yIG5vdy4KLSAgICAgICAg c2xvd1BhdGguYXBwZW5kKGppdC5icmFuY2hEb3VibGUoTWFjcm9Bc3NlbWJsZXI6OkRvdWJsZUxl c3NUaGFuT3JVbm9yZGVyZWQsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDAsIFNwZWNpYWxp emVkVGh1bmtKSVQ6OmZwUmVnVDEpKTsKLSAgICAgICAgaml0LmxvYWREb3VibGUoTWFjcm9Bc3Nl bWJsZXI6OlRydXN0ZWRJbW1QdHIoJmhhbGZDb25zdGFudCksIFNwZWNpYWxpemVkVGh1bmtKSVQ6 OmZwUmVnVDEpOwotICAgICAgICBqaXQuYWRkRG91YmxlKFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZw UmVnVDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDEpOwotICAgICAgICBzbG93UGF0aC5h cHBlbmQoaml0LmJyYW5jaFRydW5jYXRlRG91YmxlVG9JbnQzMihTcGVjaWFsaXplZFRodW5rSklU OjpmcFJlZ1QxLCBTcGVjaWFsaXplZFRodW5rSklUOjpyZWdUMCkpOwotICAgICAgICBpbnRSZXN1 bHQgPSBqaXQuanVtcCgpOwotICAgICAgICBzbG93UGF0aC5saW5rKCZqaXQpOwotICAgIH0KLSAg ICBqaXQuY2FsbERvdWJsZVRvRG91YmxlUHJlc2VydmluZ1JldHVybihVbmFyeURvdWJsZU9wV3Jh cHBlcihqc1JvdW5kKSk7CisKKyAgICAgICAgaml0LmNlaWxEb3VibGUoU3BlY2lhbGl6ZWRUaHVu a0pJVDo6ZnBSZWdUMCwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMSk7CisgICAgICAgIHN0 YXRpYyBjb25zdCBkb3VibGUgaGFsZkNvbnN0YW50ID0gLTAuNTsKKyAgICAgICAgaml0LmxvYWRE b3VibGUoTWFjcm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoJmhhbGZDb25zdGFudCksIFNwZWNp YWxpemVkVGh1bmtKSVQ6OmZwUmVnVDIpOworICAgICAgICBqaXQuYWRkRG91YmxlKFNwZWNpYWxp emVkVGh1bmtKSVQ6OmZwUmVnVDEsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDIpOworICAg ICAgICBqaXQuY29tcGFyZURvdWJsZShNYWNyb0Fzc2VtYmxlcjo6RG91YmxlR3JlYXRlclRoYW4s IFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDIsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVn VDAsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwKTsKKyAgICAgICAgaml0LmNvbnZlcnRJbnQz MlRvRG91YmxlKFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwLCBTcGVjaWFsaXplZFRodW5rSklU OjpmcFJlZ1QyKTsKKyAgICAgICAgaml0LnN1YkRvdWJsZShTcGVjaWFsaXplZFRodW5rSklUOjpm cFJlZ1QxLCBTcGVjaWFsaXplZFRodW5rSklUOjpmcFJlZ1QyLCBTcGVjaWFsaXplZFRodW5rSklU OjpmcFJlZ1QwKTsKKyAgICB9IGVsc2UKKyAgICAgICAgaml0LmNhbGxEb3VibGVUb0RvdWJsZVBy ZXNlcnZpbmdSZXR1cm4oVW5hcnlEb3VibGVPcFdyYXBwZXIoanNSb3VuZCkpOwogICAgIGppdC5i cmFuY2hDb252ZXJ0RG91YmxlVG9JbnQzMihTcGVjaWFsaXplZFRodW5rSklUOjpmcFJlZ1QwLCBT cGVjaWFsaXplZFRodW5rSklUOjpyZWdUMCwgZG91YmxlUmVzdWx0LCBTcGVjaWFsaXplZFRodW5r SklUOjpmcFJlZ1QxKTsKLSAgICBpZiAoaml0LnN1cHBvcnRzRmxvYXRpbmdQb2ludFRydW5jYXRl KCkpCi0gICAgICAgIGludFJlc3VsdC5saW5rKCZqaXQpOwogICAgIGppdC5yZXR1cm5JbnQzMihT cGVjaWFsaXplZFRodW5rSklUOjpyZWdUMCk7CiAgICAgZG91YmxlUmVzdWx0LmxpbmsoJmppdCk7 CiAgICAgaml0LnJldHVybkRvdWJsZShTcGVjaWFsaXplZFRodW5rSklUOjpmcFJlZ1QwKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9ydW50aW1lL01hdGhDb21tb24uY3BwIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWF0aENvbW1vbi5jcHAKaW5kZXggZTJiNzYx ZjYwZTRhZjVkNzM3NDEzMzU1OWJlOTM2MzA3NjFmYWMxMC4uNWFiNWFkOTg2ZDI4YjIyODc4MTE3 M2ZiOWI3ZGNiNjczNzAxZGNjNSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1 bnRpbWUvTWF0aENvbW1vbi5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUv TWF0aENvbW1vbi5jcHAKQEAgLTQ3OSw3ICs0NzksNyBAQCBleHRlcm4gIkMiIHsKIGRvdWJsZSBq c1JvdW5kKGRvdWJsZSB2YWx1ZSkKIHsKICAgICBkb3VibGUgaW50ZWdlciA9IGNlaWwodmFsdWUp OwotICAgIHJldHVybiBpbnRlZ2VyIC0gKGludGVnZXIgLSB2YWx1ZSA+IDAuNSk7CisgICAgcmV0 dXJuIGludGVnZXIgLSAoaW50ZWdlciAtIDAuNSA+IHZhbHVlKTsKIH0KIAogI2lmIENBTExJTkdf Q09OVkVOVElPTl9JU19TVERDQUxMIHx8IENQVShBUk1fVEhVTUIyKQpkaWZmIC0tZ2l0IGEvSlNU ZXN0cy9DaGFuZ2VMb2cgYi9KU1Rlc3RzL0NoYW5nZUxvZwppbmRleCBlZDM0N2Q4NjIyZjU0ZDZl YjYxYjdkMTE4MGRmMjhiZWI0NDNjNDBlLi41ZjMyNzBkOWRlYTJjYmUzOWFhZWIwYjlmNTg5NTQ4 NzgwMWQ4NGIxIDEwMDY0NAotLS0gYS9KU1Rlc3RzL0NoYW5nZUxvZworKysgYi9KU1Rlc3RzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA5LTA1ICBSb3NzIEtpcnNsaW5nICA8cm9z cy5raXJzbGluZ0Bzb255LmNvbT4KKworICAgICAgICBNYXRoLnJvdW5kKCkgcHJvZHVjZXMgd3Jv bmcgcmVzdWx0IGZvciB2YWx1ZSBwcmlvciB0byAwLjUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NTExNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogc3RyZXNzL21hdGgtcm91bmQtYmFzaWNzLmpzOgor ICAgICAgICBBZGQgcG9zaXRpdmUvbmVnYXRpdmUgdGVzdCBjYXNlcy4KKworICAgICAgICAqIHRl c3QyNjIvZXhwZWN0YXRpb25zLnlhbWw6CisgICAgICAgIE1hcmsgdGVzdCBwYXNzaW5nLgorCiAy MDE5LTA5LTA1ICBUYWRldSBaYWdhbGxvICA8dHphZ2FsbG9AYXBwbGUuY29tPgogCiAgICAgICAg IExhenlDbGFzc1N0cnVjdHVyZTo6c2V0Q29uc3RydWN0b3Igc2hvdWxkIG5vdCBzdG9yZSB0aGUg Y29uc3RydWN0b3IgdG8gdGhlIGdsb2JhbCBvYmplY3QKZGlmZiAtLWdpdCBhL0pTVGVzdHMvc3Ry ZXNzL21hdGgtcm91bmQtYmFzaWNzLmpzIGIvSlNUZXN0cy9zdHJlc3MvbWF0aC1yb3VuZC1iYXNp Y3MuanMKaW5kZXggZjYxYTZkNGY0NzY5NTg1ZmU1YjlmNTZmZjBlYWJjNDAyMzAyNDEzYy4uMjhl NjgzMGI5OWRlZDJkMzY4Y2Q0OTQ4MWYzMzIyZjhmZjZlOTM5ZCAxMDA2NDQKLS0tIGEvSlNUZXN0 cy9zdHJlc3MvbWF0aC1yb3VuZC1iYXNpY3MuanMKKysrIGIvSlNUZXN0cy9zdHJlc3MvbWF0aC1y b3VuZC1iYXNpY3MuanMKQEAgLTgxLDYgKzgxLDE0IEBAIGZvciAodmFyIGkgPSAwOyBpIDwgMWU0 OyArK2kpIHsKICAgICBpZiAocm91bmRlZFZhbHVlICE9PSBOdW1iZXIuTkVHQVRJVkVfSU5GSU5J VFkpCiAgICAgICAgIHRocm93ICJtYXRoUm91bmRPbkRvdWJsZXMoTnVtYmVyLk5FR0FUSVZFX0lO RklOSVRZKSA9ICIgKyByb3VuZGVkVmFsdWU7CiAKKyAgICB2YXIgcm91bmRlZFZhbHVlID0gbWF0 aFJvdW5kT25Eb3VibGVzKDAuNSAtIE51bWJlci5FUFNJTE9OIC8gNCk7CisgICAgaWYgKHJvdW5k ZWRWYWx1ZSAhPT0gMCB8fCAoMSAvIHJvdW5kZWRWYWx1ZSkgIT09IEluZmluaXR5KQorICAgICAg ICB0aHJvdyAibWF0aFJvdW5kT25Eb3VibGVzKDAuNSAtIE51bWJlci5FUFNJTE9OIC8gNCkgPSAi ICsgcm91bmRlZFZhbHVlOworCisgICAgdmFyIHJvdW5kZWRWYWx1ZSA9IG1hdGhSb3VuZE9uRG91 YmxlcygtMC41ICsgTnVtYmVyLkVQU0lMT04gLyA0KTsKKyAgICBpZiAocm91bmRlZFZhbHVlICE9 PSAwIHx8ICgxIC8gcm91bmRlZFZhbHVlKSAhPT0gLUluZmluaXR5KQorICAgICAgICB0aHJvdyAi bWF0aFJvdW5kT25Eb3VibGVzKC0wLjUgKyBOdW1iZXIuRVBTSUxPTiAvIDQpID0gIiArIHJvdW5k ZWRWYWx1ZTsKKwogICAgIHZhciBib29sZWFuID0gISEoaSAlIDIpOwogICAgIHZhciByb3VuZGVk Qm9vbGVhbiA9IG1hdGhSb3VuZE9uQm9vbGVhbnMoYm9vbGVhbik7CiAgICAgaWYgKHJvdW5kZWRC b29sZWFuICE9IGJvb2xlYW4pCmRpZmYgLS1naXQgYS9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRp b25zLnlhbWwgYi9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwKaW5kZXggYjdjYmI1 Y2Q5MzFjMmQ1YjhhOGVlMmUzODYzMjFmOGUwMzBiMGYwNS4uNzY2Yjk1ZjlmNWU4ODY0YTE3NDRh NWEwODQzMjBjZjNjYTUwNzFiOSAxMDA2NDQKLS0tIGEvSlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0 aW9ucy55YW1sCisrKyBiL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbApAQCAtMTIx Miw5ICsxMjEyLDYgQEAgdGVzdC9idWlsdC1pbnMvSlNPTi9wYXJzZS9yZXZpdmVyLWFycmF5LWxl bmd0aC1nZXQtZXJyLmpzOgogdGVzdC9idWlsdC1pbnMvTWFwL3Byb3RvLWZyb20tY3Rvci1yZWFs bS5qczoKICAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgU2FtZVZhbHVlKMOCwqtb b2JqZWN0IE1hcF3DgsK7LCDDgsKrW29iamVjdCBNYXBdw4LCuykgdG8gYmUgdHJ1ZScKICAgc3Ry aWN0IG1vZGU6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFNhbWVWYWx1ZSjDgsKrW29iamVjdCBN YXBdw4LCuywgw4LCq1tvYmplY3QgTWFwXcOCwrspIHRvIGJlIHRydWUnCi10ZXN0L2J1aWx0LWlu cy9NYXRoL3JvdW5kL1MxNS44LjIuMTVfQTcuanM6Ci0gIGRlZmF1bHQ6ICJUZXN0MjYyRXJyb3I6 ICM0OiAnMSAvIE1hdGgucm91bmQoMC40OTk5OTk5OTk5OTk5OTk5NCkgIT09IDEgLyAwJyIKLSAg c3RyaWN0IG1vZGU6ICJUZXN0MjYyRXJyb3I6ICM0OiAnMSAvIE1hdGgucm91bmQoMC40OTk5OTk5 OTk5OTk5OTk5NCkgIT09IDEgLyAwJyIKIHRlc3QvYnVpbHQtaW5zL051bWJlci9wcm90by1mcm9t LWN0b3ItcmVhbG0uanM6CiAgIGRlZmF1bHQ6ICdUZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFNhbWVW YWx1ZSjDgsKrMMOCwrssIMOCwqsww4LCuykgdG8gYmUgdHJ1ZScKICAgc3RyaWN0IG1vZGU6ICdU ZXN0MjYyRXJyb3I6IEV4cGVjdGVkIFNhbWVWYWx1ZSjDgsKrMMOCwrssIMOCwqsww4LCuykgdG8g YmUgdHJ1ZScK 378241 2019-09-06 14:58:58 -0700 2019-09-06 15:50:03 -0700 Patch for landing bug-185115-20190906145857.patch text/plain 11681 ross.kirsling U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5NTc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA0 OWY2YWU4MWU0YzQwY2QwN2QwNGJkN2JlZTViOGMxN2ZhM2VhMzkyLi5lYTY0NmQ0ZmM4ZjcyZDA3 M2IwMDM1MGNhNmJhOGExODk5MTU1NmE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyNyBAQAorMjAxOS0wOS0wNiAgUm9zcyBLaXJzbGluZyAgPHJvc3Mua2lyc2xpbmdAc29u eS5jb20+CisKKyAgICAgICAgTWF0aC5yb3VuZCgpIHByb2R1Y2VzIHdyb25nIHJlc3VsdCBmb3Ig dmFsdWUgcHJpb3IgdG8gMC41CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODUxMTUKKworICAgICAgICBSZXZpZXdlZCBieSBTYWFtIEJhcmF0aS4KKwor ICAgICAgICBPdXIgTWF0aC5yb3VuZCBpbXBsZW1lbnRhdGlvbiBnb2VzIGluIHRoZSB3cm9uZyBk aXJlY3Rpb24gZm9yIGRvdWJsZSB2YWx1ZXMgbGlrZSAwLjQ5OTk5OTk5OTk5OTk5OTk0LgorICAg ICAgICBUaGlzIHJlcXVpcmVzIGp1c3QgYSBzdWJ0bGUgYWRqdXN0bWVudCBmb3IgdGhyZWUgb2Yg b3VyIGZvdXIgdmVyc2lvbnM7IG9ubHkgYmFzZWxpbmUgSklUIG5lZWRlZCBhIGZ1bGwgcmV3cml0 ZS4KKworICAgICAgICBTcGVjaWZpY2FsbHk6CisgICAgICAgICAgLSBXaGlsZSAwLjQ5OTk5OTk5 OTk5OTk5OTk0IGlzIHJlcHJlc2VudGFibGUsIDEgLSAwLjQ5OTk5OTk5OTk5OTk5OTk0IGlzIG5v dCAoaXQgdHVybnMgaW50byAwLjUpLAorICAgICAgICAgICAgc28gdGFraW5nIHRoZSBkaWZmZXJl bmNlIGJldHdlZW4gY2VpbCh2YWx1ZSlgIGFuZCBgdmFsdWVgIGlzIHByb2JsZW1hdGljLgorICAg ICAgICAgIC0gVGhlIGJhc2VsaW5lIGltcGxlbWVudGF0aW9uIHdhcyBkb2luZyBgZmxvb3IoeCAr IDAuNSlgIGZvciBwb3NpdGl2ZSBkb3VibGVzIGFuZCBzbG93cGF0aGluZyBuZWdhdGl2ZSBvbmVz CisgICAgICAgICAgICAoYnkgZmFsbGluZyBiYWNrIHRvIGpzUm91bmQpLiBUaGlzIHBhdGNoIGdp dmVzIGJhc2VsaW5lIGEgbGVnaXRpbWF0ZSBpbXBsZW1lbnRhdGlvbiB0b28uCisKKyAgICAgICAg KiBkZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwOgorICAgICAgICAoSlNDOjpERkc6OlNwZWN1bGF0 aXZlSklUOjpjb21waWxlQXJpdGhSb3VuZGluZyk6CisgICAgICAgICogZnRsL0ZUTExvd2VyREZH VG9CMy5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6REZHOjpMb3dlckRGR1RvQjM6OmNvbXBpbGVB cml0aFJvdW5kKToKKyAgICAgICAgKiBqaXQvVGh1bmtHZW5lcmF0b3JzLmNwcDoKKyAgICAgICAg KEpTQzo6cm91bmRUaHVua0dlbmVyYXRvcik6CisgICAgICAgICogcnVudGltZS9NYXRoQ29tbW9u LmNwcDoKKwogMjAxOS0wOS0wNSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29t PgogCiAgICAgICAgIFRhaWwgRGVsZXRlZCBGcmFtZXMgc2hvd24gaW4gV2ViIEluc3BlY3RvciBh cmUgc29tZXRpbWVzIGluY29ycmVjdCAoU2hhZG93IENoaWNrZW4pCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR1NwZWN1bGF0aXZlSklULmNwcCBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9kZmcvREZHU3BlY3VsYXRpdmVKSVQuY3BwCmluZGV4IGMzZmU1YTQ5YjAwMzBj NjQwMDEzNzMwYzFiMzBkZTVkMGZkOTRkZWMuLjI3Y2MxYjQ1N2E4OWYzZDQzNTMwMmVhMDczMTI1 ZmYxM2YzOGVjZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3Bl Y3VsYXRpdmVKSVQuY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHU3BlY3Vs YXRpdmVKSVQuY3BwCkBAIC01NjA0LDE2ICs1NjA0LDE0IEBAIHZvaWQgU3BlY3VsYXRpdmVKSVQ6 OmNvbXBpbGVBcml0aFJvdW5kaW5nKE5vZGUqIG5vZGUpCiAgICAgICAgICAgICAgICAgICAgIG1f aml0LmZsb29yRG91YmxlKHJlc3VsdEZQUiwgcmVzdWx0RlBSKTsKICAgICAgICAgICAgICAgICB9 IGVsc2UgewogICAgICAgICAgICAgICAgICAgICBtX2ppdC5jZWlsRG91YmxlKHZhbHVlRlBSLCBy ZXN1bHRGUFIpOwotICAgICAgICAgICAgICAgICAgICBGUFJUZW1wb3JhcnkgcmVhbFBhcnQodGhp cyk7Ci0gICAgICAgICAgICAgICAgICAgIEZQUlJlZyByZWFsUGFydEZQUiA9IHJlYWxQYXJ0LmZw cigpOwotICAgICAgICAgICAgICAgICAgICBtX2ppdC5zdWJEb3VibGUocmVzdWx0RlBSLCB2YWx1 ZUZQUiwgcmVhbFBhcnRGUFIpOwogCiAgICAgICAgICAgICAgICAgICAgIEZQUlRlbXBvcmFyeSBz Y3JhdGNoKHRoaXMpOwogICAgICAgICAgICAgICAgICAgICBGUFJSZWcgc2NyYXRjaEZQUiA9IHNj cmF0Y2guZnByKCk7Ci0gICAgICAgICAgICAgICAgICAgIHN0YXRpYyBjb25zdCBkb3VibGUgaGFs ZkNvbnN0YW50ID0gMC41OworICAgICAgICAgICAgICAgICAgICBzdGF0aWMgY29uc3QgZG91Ymxl IGhhbGZDb25zdGFudCA9IC0wLjU7CiAgICAgICAgICAgICAgICAgICAgIG1faml0LmxvYWREb3Vi bGUoVHJ1c3RlZEltbVB0cigmaGFsZkNvbnN0YW50KSwgc2NyYXRjaEZQUik7CisgICAgICAgICAg ICAgICAgICAgIG1faml0LmFkZERvdWJsZShyZXN1bHRGUFIsIHNjcmF0Y2hGUFIpOwogCi0gICAg ICAgICAgICAgICAgICAgIEpJVENvbXBpbGVyOjpKdW1wIHNob3VsZFVzZUNlaWxlZCA9IG1faml0 LmJyYW5jaERvdWJsZShKSVRDb21waWxlcjo6RG91YmxlTGVzc1RoYW5PckVxdWFsLCByZWFsUGFy dEZQUiwgc2NyYXRjaEZQUik7CisgICAgICAgICAgICAgICAgICAgIEpJVENvbXBpbGVyOjpKdW1w IHNob3VsZFVzZUNlaWxlZCA9IG1faml0LmJyYW5jaERvdWJsZShKSVRDb21waWxlcjo6RG91Ymxl TGVzc1RoYW5PckVxdWFsLCBzY3JhdGNoRlBSLCB2YWx1ZUZQUik7CiAgICAgICAgICAgICAgICAg ICAgIHN0YXRpYyBjb25zdCBkb3VibGUgb25lQ29uc3RhbnQgPSAtMS4wOwogICAgICAgICAgICAg ICAgICAgICBtX2ppdC5sb2FkRG91YmxlKFRydXN0ZWRJbW1QdHIoJm9uZUNvbnN0YW50KSwgc2Ny YXRjaEZQUik7CiAgICAgICAgICAgICAgICAgICAgIG1faml0LmFkZERvdWJsZShzY3JhdGNoRlBS LCByZXN1bHRGUFIpOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExM b3dlckRGR1RvQjMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1Rv QjMuY3BwCmluZGV4IGU0MGUyYzBlMDFiMTRhMmFhMmEyNTBmNmVhNzM1NDEyYTNhYTVlOTEuLjhj MDkxYzY2NDUxYzAxNTUzMDBiNTJmNDlhMmE4MmU1MDI1MjQ0MjUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0IzLmNwcAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9CMy5jcHAKQEAgLTI5NDUsMTggKzI5NDUsMTcg QEAgcHJpdmF0ZToKICAgICAgICAgICAgICAgICBMVmFsdWUgdmFsdWUgPSBsb3dEb3VibGUobV9u b2RlLT5jaGlsZDEoKSk7CiAgICAgICAgICAgICAgICAgcmVzdWx0ID0gbV9vdXQuZG91YmxlRmxv b3IobV9vdXQuZG91YmxlQWRkKHZhbHVlLCBtX291dC5jb25zdERvdWJsZSgwLjUpKSk7CiAgICAg ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgIExCYXNpY0Jsb2NrIHJlYWxQYXJ0SXNN b3JlVGhhbkhhbGYgPSBtX291dC5uZXdCbG9jaygpOworICAgICAgICAgICAgICAgIExCYXNpY0Js b2NrIHNob3VsZFJvdW5kRG93biA9IG1fb3V0Lm5ld0Jsb2NrKCk7CiAgICAgICAgICAgICAgICAg TEJhc2ljQmxvY2sgY29udGludWF0aW9uID0gbV9vdXQubmV3QmxvY2soKTsKIAogICAgICAgICAg ICAgICAgIExWYWx1ZSB2YWx1ZSA9IGxvd0RvdWJsZShtX25vZGUtPmNoaWxkMSgpKTsKICAgICAg ICAgICAgICAgICBMVmFsdWUgaW50ZWdlclZhbHVlID0gbV9vdXQuZG91YmxlQ2VpbCh2YWx1ZSk7 CiAgICAgICAgICAgICAgICAgVmFsdWVGcm9tQmxvY2sgaW50ZWdlclZhbHVlUmVzdWx0ID0gbV9v dXQuYW5jaG9yKGludGVnZXJWYWx1ZSk7CiAKLSAgICAgICAgICAgICAgICBMVmFsdWUgcmVhbFBh cnQgPSBtX291dC5kb3VibGVTdWIoaW50ZWdlclZhbHVlLCB2YWx1ZSk7CisgICAgICAgICAgICAg ICAgTFZhbHVlIGNlaWxNaW51c0hhbGYgPSBtX291dC5kb3VibGVTdWIoaW50ZWdlclZhbHVlLCBt X291dC5jb25zdERvdWJsZSgwLjUpKTsKKyAgICAgICAgICAgICAgICBtX291dC5icmFuY2gobV9v dXQuZG91YmxlR3JlYXRlclRoYW5PclVub3JkZXJlZChjZWlsTWludXNIYWxmLCB2YWx1ZSksIHVu c3VyZShzaG91bGRSb3VuZERvd24pLCB1bnN1cmUoY29udGludWF0aW9uKSk7CiAKLSAgICAgICAg ICAgICAgICBtX291dC5icmFuY2gobV9vdXQuZG91YmxlR3JlYXRlclRoYW5PclVub3JkZXJlZChy ZWFsUGFydCwgbV9vdXQuY29uc3REb3VibGUoMC41KSksIHVuc3VyZShyZWFsUGFydElzTW9yZVRo YW5IYWxmKSwgdW5zdXJlKGNvbnRpbnVhdGlvbikpOwotCi0gICAgICAgICAgICAgICAgTEJhc2lj QmxvY2sgbGFzdE5leHQgPSBtX291dC5hcHBlbmRUbyhyZWFsUGFydElzTW9yZVRoYW5IYWxmLCBj b250aW51YXRpb24pOworICAgICAgICAgICAgICAgIExCYXNpY0Jsb2NrIGxhc3ROZXh0ID0gbV9v dXQuYXBwZW5kVG8oc2hvdWxkUm91bmREb3duLCBjb250aW51YXRpb24pOwogICAgICAgICAgICAg ICAgIExWYWx1ZSBpbnRlZ2VyVmFsdWVSb3VuZGVkRG93biA9IG1fb3V0LmRvdWJsZVN1YihpbnRl Z2VyVmFsdWUsIG1fb3V0LmNvbnN0RG91YmxlKDEpKTsKICAgICAgICAgICAgICAgICBWYWx1ZUZy b21CbG9jayBpbnRlZ2VyVmFsdWVSb3VuZGVkRG93blJlc3VsdCA9IG1fb3V0LmFuY2hvcihpbnRl Z2VyVmFsdWVSb3VuZGVkRG93bik7CiAgICAgICAgICAgICAgICAgbV9vdXQuanVtcChjb250aW51 YXRpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVy YXRvcnMuY3BwIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2ppdC9UaHVua0dlbmVyYXRvcnMuY3Bw CmluZGV4IDA1NWUzMjRiMzk5YjUyYzlmMThkZDI5NzEyZjE2Nzg0MjIwNDY3YmQuLmIwNzA5ZTMx ZGZjNTllZmI1NTlhMTYyYzVmZDg2ZDAxZTEwMWM2NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9qaXQvVGh1bmtHZW5lcmF0b3JzLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvaml0L1RodW5rR2VuZXJhdG9ycy5jcHAKQEAgLTg5NSw4ICs4OTUsNiBAQCBkZWZpbmVV bmFyeURvdWJsZU9wV3JhcHBlcihsb2cpOwogZGVmaW5lVW5hcnlEb3VibGVPcFdyYXBwZXIoZmxv b3IpOwogZGVmaW5lVW5hcnlEb3VibGVPcFdyYXBwZXIoY2VpbCk7CiBkZWZpbmVVbmFyeURvdWJs ZU9wV3JhcHBlcih0cnVuYyk7Ci0KLXN0YXRpYyBjb25zdCBkb3VibGUgaGFsZkNvbnN0YW50ID0g MC41OwogICAgIAogTWFjcm9Bc3NlbWJsZXJDb2RlUmVmPEpJVFRodW5rUHRyVGFnPiBmbG9vclRo dW5rR2VuZXJhdG9yKFZNJiB2bSkKIHsKQEAgLTk5NywyNCArOTk1LDI5IEBAIE1hY3JvQXNzZW1i bGVyQ29kZVJlZjxKSVRUaHVua1B0clRhZz4gcm91bmRUaHVua0dlbmVyYXRvcihWTSYgdm0pCiAg ICAgaml0LnJldHVybkludDMyKFNwZWNpYWxpemVkVGh1bmtKSVQ6OnJlZ1QwKTsKICAgICBub25J bnRKdW1wLmxpbmsoJmppdCk7CiAgICAgaml0LmxvYWREb3VibGVBcmd1bWVudCgwLCBTcGVjaWFs aXplZFRodW5rSklUOjpmcFJlZ1QwLCBTcGVjaWFsaXplZFRodW5rSklUOjpyZWdUMCk7Ci0gICAg U3BlY2lhbGl6ZWRUaHVua0pJVDo6SnVtcCBpbnRSZXN1bHQ7CiAgICAgU3BlY2lhbGl6ZWRUaHVu a0pJVDo6SnVtcExpc3QgZG91YmxlUmVzdWx0OwotICAgIGlmIChqaXQuc3VwcG9ydHNGbG9hdGlu Z1BvaW50VHJ1bmNhdGUoKSkgeworICAgIGlmIChqaXQuc3VwcG9ydHNGbG9hdGluZ1BvaW50Um91 bmRpbmcoKSkgewogICAgICAgICBqaXQubW92ZVplcm9Ub0RvdWJsZShTcGVjaWFsaXplZFRodW5r SklUOjpmcFJlZ1QxKTsKICAgICAgICAgZG91YmxlUmVzdWx0LmFwcGVuZChqaXQuYnJhbmNoRG91 YmxlKE1hY3JvQXNzZW1ibGVyOjpEb3VibGVFcXVhbCwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBS ZWdUMCwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMSkpOwotICAgICAgICBTcGVjaWFsaXpl ZFRodW5rSklUOjpKdW1wTGlzdCBzbG93UGF0aDsKLSAgICAgICAgLy8gSGFuZGxlIHRoZSBuZWdh dGl2ZSBkb3VibGVzIGluIHRoZSBzbG93IHBhdGggZm9yIG5vdy4KLSAgICAgICAgc2xvd1BhdGgu YXBwZW5kKGppdC5icmFuY2hEb3VibGUoTWFjcm9Bc3NlbWJsZXI6OkRvdWJsZUxlc3NUaGFuT3JV bm9yZGVyZWQsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDAsIFNwZWNpYWxpemVkVGh1bmtK SVQ6OmZwUmVnVDEpKTsKLSAgICAgICAgaml0LmxvYWREb3VibGUoTWFjcm9Bc3NlbWJsZXI6OlRy dXN0ZWRJbW1QdHIoJmhhbGZDb25zdGFudCksIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDEp OwotICAgICAgICBqaXQuYWRkRG91YmxlKFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDAsIFNw ZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDEpOwotICAgICAgICBzbG93UGF0aC5hcHBlbmQoaml0 LmJyYW5jaFRydW5jYXRlRG91YmxlVG9JbnQzMihTcGVjaWFsaXplZFRodW5rSklUOjpmcFJlZ1Qx LCBTcGVjaWFsaXplZFRodW5rSklUOjpyZWdUMCkpOwotICAgICAgICBpbnRSZXN1bHQgPSBqaXQu anVtcCgpOwotICAgICAgICBzbG93UGF0aC5saW5rKCZqaXQpOwotICAgIH0KLSAgICBqaXQuY2Fs bERvdWJsZVRvRG91YmxlUHJlc2VydmluZ1JldHVybihVbmFyeURvdWJsZU9wV3JhcHBlcihqc1Jv dW5kKSk7CisKKyAgICAgICAgaml0LmNlaWxEb3VibGUoU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBS ZWdUMCwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMSk7CisgICAgICAgIHN0YXRpYyBjb25z dCBkb3VibGUgaGFsZkNvbnN0YW50ID0gLTAuNTsKKyAgICAgICAgaml0LmxvYWREb3VibGUoTWFj cm9Bc3NlbWJsZXI6OlRydXN0ZWRJbW1QdHIoJmhhbGZDb25zdGFudCksIFNwZWNpYWxpemVkVGh1 bmtKSVQ6OmZwUmVnVDIpOworICAgICAgICBqaXQuYWRkRG91YmxlKFNwZWNpYWxpemVkVGh1bmtK SVQ6OmZwUmVnVDEsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDIpOworICAgICAgICBNYWNy b0Fzc2VtYmxlcjo6SnVtcCBzaG91bGRSb3VuZERvd24gPSBqaXQuYnJhbmNoRG91YmxlKE1hY3Jv QXNzZW1ibGVyOjpEb3VibGVHcmVhdGVyVGhhbiwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdU MiwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMCk7CisKKyAgICAgICAgaml0Lm1vdmVEb3Vi bGUoU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBSZWdUMSwgU3BlY2lhbGl6ZWRUaHVua0pJVDo6ZnBS ZWdUMCk7CisgICAgICAgIE1hY3JvQXNzZW1ibGVyOjpKdW1wIGNvbnRpbnVhdGlvbiA9IGppdC5q dW1wKCk7CisKKyAgICAgICAgc2hvdWxkUm91bmREb3duLmxpbmsoJmppdCk7CisgICAgICAgIHN0 YXRpYyBjb25zdCBkb3VibGUgb25lQ29uc3RhbnQgPSAxLjA7CisgICAgICAgIGppdC5sb2FkRG91 YmxlKE1hY3JvQXNzZW1ibGVyOjpUcnVzdGVkSW1tUHRyKCZvbmVDb25zdGFudCksIFNwZWNpYWxp emVkVGh1bmtKSVQ6OmZwUmVnVDIpOworICAgICAgICBqaXQuc3ViRG91YmxlKFNwZWNpYWxpemVk VGh1bmtKSVQ6OmZwUmVnVDEsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDIsIFNwZWNpYWxp emVkVGh1bmtKSVQ6OmZwUmVnVDApOworCisgICAgICAgIGNvbnRpbnVhdGlvbi5saW5rKCZqaXQp OworICAgIH0gZWxzZQorICAgICAgICBqaXQuY2FsbERvdWJsZVRvRG91YmxlUHJlc2VydmluZ1Jl dHVybihVbmFyeURvdWJsZU9wV3JhcHBlcihqc1JvdW5kKSk7CiAgICAgaml0LmJyYW5jaENvbnZl cnREb3VibGVUb0ludDMyKFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDAsIFNwZWNpYWxpemVk VGh1bmtKSVQ6OnJlZ1QwLCBkb3VibGVSZXN1bHQsIFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVn VDEpOwotICAgIGlmIChqaXQuc3VwcG9ydHNGbG9hdGluZ1BvaW50VHJ1bmNhdGUoKSkKLSAgICAg ICAgaW50UmVzdWx0LmxpbmsoJmppdCk7CiAgICAgaml0LnJldHVybkludDMyKFNwZWNpYWxpemVk VGh1bmtKSVQ6OnJlZ1QwKTsKICAgICBkb3VibGVSZXN1bHQubGluaygmaml0KTsKICAgICBqaXQu cmV0dXJuRG91YmxlKFNwZWNpYWxpemVkVGh1bmtKSVQ6OmZwUmVnVDApOwpkaWZmIC0tZ2l0IGEv U291cmNlL0phdmFTY3JpcHRDb3JlL3J1bnRpbWUvTWF0aENvbW1vbi5jcHAgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvcnVudGltZS9NYXRoQ29tbW9uLmNwcAppbmRleCBlMmI3NjFmNjBlNGFmNWQ3 Mzc0MTMzNTU5YmU5MzYzMDc2MWZhYzEwLi41YWI1YWQ5ODZkMjhiMjI4NzgxMTczZmI5YjdkY2I2 NzM3MDFkY2M1IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXRo Q29tbW9uLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9NYXRoQ29tbW9u LmNwcApAQCAtNDc5LDcgKzQ3OSw3IEBAIGV4dGVybiAiQyIgewogZG91YmxlIGpzUm91bmQoZG91 YmxlIHZhbHVlKQogewogICAgIGRvdWJsZSBpbnRlZ2VyID0gY2VpbCh2YWx1ZSk7Ci0gICAgcmV0 dXJuIGludGVnZXIgLSAoaW50ZWdlciAtIHZhbHVlID4gMC41KTsKKyAgICByZXR1cm4gaW50ZWdl ciAtIChpbnRlZ2VyIC0gMC41ID4gdmFsdWUpOwogfQogCiAjaWYgQ0FMTElOR19DT05WRU5USU9O X0lTX1NURENBTEwgfHwgQ1BVKEFSTV9USFVNQjIpCmRpZmYgLS1naXQgYS9KU1Rlc3RzL0NoYW5n ZUxvZyBiL0pTVGVzdHMvQ2hhbmdlTG9nCmluZGV4IGVkMzQ3ZDg2MjJmNTRkNmViNjFiN2QxMTgw ZGYyOGJlYjQ0M2M0MGUuLjliYTljNTg5MGEzOGIzNjcxYWRjY2Y1NzJmZGYyNGNlY2IxNmQ1MTMg MTAwNjQ0Ci0tLSBhL0pTVGVzdHMvQ2hhbmdlTG9nCisrKyBiL0pTVGVzdHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTktMDktMDYgIFJvc3MgS2lyc2xpbmcgIDxyb3NzLmtpcnNsaW5n QHNvbnkuY29tPgorCisgICAgICAgIE1hdGgucm91bmQoKSBwcm9kdWNlcyB3cm9uZyByZXN1bHQg Zm9yIHZhbHVlIHByaW9yIHRvIDAuNQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg1MTE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgU2FhbSBCYXJhdGku CisKKyAgICAgICAgKiBzdHJlc3MvbWF0aC1yb3VuZC1iYXNpY3MuanM6CisgICAgICAgIEFkZCBw b3NpdGl2ZS9uZWdhdGl2ZSB0ZXN0IGNhc2VzLgorCisgICAgICAgICogdGVzdDI2Mi9leHBlY3Rh dGlvbnMueWFtbDoKKyAgICAgICAgTWFyayB0ZXN0IHBhc3NpbmcuCisKIDIwMTktMDktMDUgIFRh ZGV1IFphZ2FsbG8gIDx0emFnYWxsb0BhcHBsZS5jb20+CiAKICAgICAgICAgTGF6eUNsYXNzU3Ry dWN0dXJlOjpzZXRDb25zdHJ1Y3RvciBzaG91bGQgbm90IHN0b3JlIHRoZSBjb25zdHJ1Y3RvciB0 byB0aGUgZ2xvYmFsIG9iamVjdApkaWZmIC0tZ2l0IGEvSlNUZXN0cy9zdHJlc3MvbWF0aC1yb3Vu ZC1iYXNpY3MuanMgYi9KU1Rlc3RzL3N0cmVzcy9tYXRoLXJvdW5kLWJhc2ljcy5qcwppbmRleCBm NjFhNmQ0ZjQ3Njk1ODVmZTViOWY1NmZmMGVhYmM0MDIzMDI0MTNjLi4yOGU2ODMwYjk5ZGVkMmQz NjhjZDQ5NDgxZjMzMjJmOGZmNmU5MzlkIDEwMDY0NAotLS0gYS9KU1Rlc3RzL3N0cmVzcy9tYXRo LXJvdW5kLWJhc2ljcy5qcworKysgYi9KU1Rlc3RzL3N0cmVzcy9tYXRoLXJvdW5kLWJhc2ljcy5q cwpAQCAtODEsNiArODEsMTQgQEAgZm9yICh2YXIgaSA9IDA7IGkgPCAxZTQ7ICsraSkgewogICAg IGlmIChyb3VuZGVkVmFsdWUgIT09IE51bWJlci5ORUdBVElWRV9JTkZJTklUWSkKICAgICAgICAg dGhyb3cgIm1hdGhSb3VuZE9uRG91YmxlcyhOdW1iZXIuTkVHQVRJVkVfSU5GSU5JVFkpID0gIiAr IHJvdW5kZWRWYWx1ZTsKIAorICAgIHZhciByb3VuZGVkVmFsdWUgPSBtYXRoUm91bmRPbkRvdWJs ZXMoMC41IC0gTnVtYmVyLkVQU0lMT04gLyA0KTsKKyAgICBpZiAocm91bmRlZFZhbHVlICE9PSAw IHx8ICgxIC8gcm91bmRlZFZhbHVlKSAhPT0gSW5maW5pdHkpCisgICAgICAgIHRocm93ICJtYXRo Um91bmRPbkRvdWJsZXMoMC41IC0gTnVtYmVyLkVQU0lMT04gLyA0KSA9ICIgKyByb3VuZGVkVmFs dWU7CisKKyAgICB2YXIgcm91bmRlZFZhbHVlID0gbWF0aFJvdW5kT25Eb3VibGVzKC0wLjUgKyBO dW1iZXIuRVBTSUxPTiAvIDQpOworICAgIGlmIChyb3VuZGVkVmFsdWUgIT09IDAgfHwgKDEgLyBy b3VuZGVkVmFsdWUpICE9PSAtSW5maW5pdHkpCisgICAgICAgIHRocm93ICJtYXRoUm91bmRPbkRv dWJsZXMoLTAuNSArIE51bWJlci5FUFNJTE9OIC8gNCkgPSAiICsgcm91bmRlZFZhbHVlOworCiAg ICAgdmFyIGJvb2xlYW4gPSAhIShpICUgMik7CiAgICAgdmFyIHJvdW5kZWRCb29sZWFuID0gbWF0 aFJvdW5kT25Cb29sZWFucyhib29sZWFuKTsKICAgICBpZiAocm91bmRlZEJvb2xlYW4gIT0gYm9v bGVhbikKZGlmZiAtLWdpdCBhL0pTVGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbCBiL0pT VGVzdHMvdGVzdDI2Mi9leHBlY3RhdGlvbnMueWFtbAppbmRleCBiN2NiYjVjZDkzMWMyZDViOGE4 ZWUyZTM4NjMyMWY4ZTAzMGIwZjA1Li43NjZiOTVmOWY1ZTg4NjRhMTc0NGE1YTA4NDMyMGNmM2Nh NTA3MWI5IDEwMDY0NAotLS0gYS9KU1Rlc3RzL3Rlc3QyNjIvZXhwZWN0YXRpb25zLnlhbWwKKysr IGIvSlNUZXN0cy90ZXN0MjYyL2V4cGVjdGF0aW9ucy55YW1sCkBAIC0xMjEyLDkgKzEyMTIsNiBA QCB0ZXN0L2J1aWx0LWlucy9KU09OL3BhcnNlL3Jldml2ZXItYXJyYXktbGVuZ3RoLWdldC1lcnIu anM6CiB0ZXN0L2J1aWx0LWlucy9NYXAvcHJvdG8tZnJvbS1jdG9yLXJlYWxtLmpzOgogICBkZWZh dWx0OiAnVGVzdDI2MkVycm9yOiBFeHBlY3RlZCBTYW1lVmFsdWUow4LCq1tvYmplY3QgTWFwXcOC wrssIMOCwqtbb2JqZWN0IE1hcF3DgsK7KSB0byBiZSB0cnVlJwogICBzdHJpY3QgbW9kZTogJ1Rl c3QyNjJFcnJvcjogRXhwZWN0ZWQgU2FtZVZhbHVlKMOCwqtbb2JqZWN0IE1hcF3DgsK7LCDDgsKr W29iamVjdCBNYXBdw4LCuykgdG8gYmUgdHJ1ZScKLXRlc3QvYnVpbHQtaW5zL01hdGgvcm91bmQv UzE1LjguMi4xNV9BNy5qczoKLSAgZGVmYXVsdDogIlRlc3QyNjJFcnJvcjogIzQ6ICcxIC8gTWF0 aC5yb3VuZCgwLjQ5OTk5OTk5OTk5OTk5OTk0KSAhPT0gMSAvIDAnIgotICBzdHJpY3QgbW9kZTog IlRlc3QyNjJFcnJvcjogIzQ6ICcxIC8gTWF0aC5yb3VuZCgwLjQ5OTk5OTk5OTk5OTk5OTk0KSAh PT0gMSAvIDAnIgogdGVzdC9idWlsdC1pbnMvTnVtYmVyL3Byb3RvLWZyb20tY3Rvci1yZWFsbS5q czoKICAgZGVmYXVsdDogJ1Rlc3QyNjJFcnJvcjogRXhwZWN0ZWQgU2FtZVZhbHVlKMOCwqsww4LC uywgw4LCqzDDgsK7KSB0byBiZSB0cnVlJwogICBzdHJpY3QgbW9kZTogJ1Rlc3QyNjJFcnJvcjog RXhwZWN0ZWQgU2FtZVZhbHVlKMOCwqsww4LCuywgw4LCqzDDgsK7KSB0byBiZSB0cnVlJwo=