144465 2015-04-30 12:23:48 -0700 Object allocation not sinking properly through CheckStructure 2015-05-04 11:39:22 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 basile_clement basile_clement commit-queue fpizlo ggaren mark.lam msaboff oldest_to_newest 1090534 0 252079 basile_clement 2015-04-30 12:23:48 -0700 Created attachment 252079 Example of the bug When sinking allocations through CheckStructure node, we are just ignoring them, which may cause code that should have been guarded by the CheckStructure to execute unchecked and produce wrong results. 1090538 1 basile_clement 2015-04-30 12:28:15 -0700 According to Filip, the CheckStructureImmediate node was here for that case, I am trying to put up a fix once I understand how it is supposed to work. 1090541 2 252080 basile_clement 2015-04-30 12:44:36 -0700 Created attachment 252080 Good old NaN not being equal to itself The test would have been failing even w/o the bug. 1090672 3 252119 basile_clement 2015-04-30 17:24:08 -0700 Created attachment 252119 Patch 1090901 4 252119 fpizlo 2015-05-01 15:25:30 -0700 Comment on attachment 252119 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252119&action=review > Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4974 > - LValue structureID = lowCell(m_node->child1()); > + LValue structure = lowCell(m_node->child1()); > + LValue structureID = m_out.load32(structure, m_heaps.Structure_structureID); We should do something to eliminate this load. Can we make checkStructure() have a mode where it checks structure pointers instead of IDs? 1090982 5 252200 basile_clement 2015-05-01 16:58:37 -0700 Created attachment 252200 Patch 1090983 6 commit-queue 2015-05-01 17:00:44 -0700 Attachment 252200 did not pass style-queue: ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:1881: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:4980: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1091030 7 252200 fpizlo 2015-05-01 19:04:33 -0700 Comment on attachment 252200 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=252200&action=review > Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:5324 > - LValue structureID, const FormattedValue& formattedValue, ExitKind exitKind, > - const StructureSet& set) > + LValue structureDiscriminant, const FormattedValue& formattedValue, ExitKind exitKind, > + const StructureSet& set, std::function<LValue(Structure*)>&& weakStructureDiscriminant) We usually use a functor instead of std::function. Something like: template<typename Functor> void checkStrcuture(..., const Functor& weakStructureDiscriminant) { ... } In all other ways, it'll work the same as what you have. r=me anyways, it's not a big deal. 1091430 8 basile_clement 2015-05-04 10:38:52 -0700 (In reply to comment #7) > Comment on attachment 252200 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=252200&action=review > > > Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:5324 > > - LValue structureID, const FormattedValue& formattedValue, ExitKind exitKind, > > - const StructureSet& set) > > + LValue structureDiscriminant, const FormattedValue& formattedValue, ExitKind exitKind, > > + const StructureSet& set, std::function<LValue(Structure*)>&& weakStructureDiscriminant) > > We usually use a functor instead of std::function. Something like: > > template<typename Functor> > void checkStrcuture(..., const Functor& weakStructureDiscriminant) { ... } > > In all other ways, it'll work the same as what you have. > > r=me anyways, it's not a big deal. I used std::function due to the habit of writing more precise types ; I will change that to a functor before landing, if only for the sake of consistency. 1091441 9 252321 basile_clement 2015-05-04 11:05:43 -0700 Created attachment 252321 Patch for landing 1091443 10 commit-queue 2015-05-04 11:09:40 -0700 Attachment 252321 did not pass style-queue: ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:1887: Place brace on its own line for function definitions. [whitespace/braces] [4] ERROR: Source/JavaScriptCore/ftl/FTLLowerDFGToLLVM.cpp:5099: Place brace on its own line for function definitions. [whitespace/braces] [4] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1091453 11 252321 commit-queue 2015-05-04 11:39:18 -0700 Comment on attachment 252321 Patch for landing Clearing flags on attachment: 252321 Committed r183752: <http://trac.webkit.org/changeset/183752> 1091454 12 commit-queue 2015-05-04 11:39:22 -0700 All reviewed patches have been landed. Closing bug. 252079 2015-04-30 12:23:48 -0700 2015-04-30 12:44:36 -0700 Example of the bug sink_checkstructure.js application/x-javascript 333 basile_clement ZnVuY3Rpb24gZm9vKHAsIHEpIHsKICAgIHZhciBvID0ge307CiAgICBpZiAocCkgby5mID0gNDI7 CiAgICBpZiAocSkgeyBvLmYrKzsgcmV0dXJuIG87IH0KfQpub0lubGluZShmb28pOwoKdmFyIGV4 cGVjdGVkID0gZm9vKGZhbHNlLCB0cnVlKS5mOwoKZm9yICh2YXIgaSA9IDA7IGkgPCAxMDAwMDAw OyBpKyspIHsKICAgIGZvbyh0cnVlLCB0cnVlKTsKfQoKdmFyIHJlc3VsdCA9IGZvbyhmYWxzZSwg dHJ1ZSkuZjsKCmlmIChyZXN1bHQgIT09IGV4cGVjdGVkKQogICAgdGhyb3cgIkVycm9yOiBleHBl Y3RlZCAiICsgZXhwZWN0ZWQgKyAiOyBGVEwgcHJvZHVjZWQgIiArIHJlc3VsdDsK 252080 2015-04-30 12:44:36 -0700 2015-04-30 12:44:36 -0700 Good old NaN not being equal to itself sink_checkstructure.js application/x-javascript 342 basile_clement ZnVuY3Rpb24gZm9vKHAsIHEpIHsKICAgIHZhciBvID0ge307CiAgICBpZiAocCkgby5mID0gNDI7 CiAgICBpZiAocSkgeyBvLmYrKzsgcmV0dXJuIG87IH0KfQpub0lubGluZShmb28pOwoKdmFyIGV4 cGVjdGVkID0gZm9vKGZhbHNlLCB0cnVlKS5mOwoKZm9yICh2YXIgaSA9IDA7IGkgPCAxMDAwMDAw OyBpKyspIHsKICAgIGZvbyh0cnVlLCB0cnVlKTsKfQoKdmFyIHJlc3VsdCA9IGZvbyhmYWxzZSwg dHJ1ZSkuZjsKCmlmICghT2JqZWN0LmlzKHJlc3VsdCwgZXhwZWN0ZWQpKQogICAgdGhyb3cgIkVy cm9yOiBleHBlY3RlZCAiICsgZXhwZWN0ZWQgKyAiOyBGVEwgcHJvZHVjZWQgIiArIHJlc3VsdDsK 252119 2015-04-30 17:24:08 -0700 2015-05-01 16:58:34 -0700 Patch bug-144465-20150430172258.patch text/plain 5587 basile_clement U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCBj Njk4YzNiNGIzODc3YjMyYzU3NjU1MmIwMTE3MTYxZjkzY2ZiY2Q1Li43NjVhZjFmOGE2NDkxNTNh ZjkxZGZjMDAwZmQzYmE5Yzc5OTE2OWU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwyOSBAQAorMjAxNS0wNC0zMCAgQmFzaWxlIENsZW1lbnQgIDxiYXNpbGVfY2xlbWVudEBh cHBsZS5jb20+CisKKyAgICAgICAgT2JqZWN0IGFsbG9jYXRpb24gbm90IHNpbmtpbmcgcHJvcGVy bHkgdGhyb3VnaCBDaGVja1N0cnVjdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NDY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCBzaW5raW5nIGFuIGFsbG9jYXRpb24gdGhyb3Vn aCBhIENoZWNrU3RydWN0dXJlIHdpbGwKKyAgICAgICAgY29tcGxldGVseSBpZ25vcmUgYWxsIHN0 cnVjdHVyZSBjaGVja2luZywgd2hpY2ggaXMgb2J2aW91c2x5IHdyb25nLgorCisgICAgICAgIEEg Q2hlY2tTdHJ1Y3R1cmVJbW1lZGlhdGUgbm9kZSB0eXBlIHdhcyBwcmVzZW50IGZvciB0aGF0IHB1 cnBvc2UsIGJ1dAorICAgICAgICB0aGUgQ2hlY2tTdHJ1Y3R1cmVzIHdlcmUgbm90IHByb3Blcmx5 IHJlcGxhY2VkLiBUaGlzIGVuc3VyZXMgdGhhdAorICAgICAgICBDaGVja1N0cnVjdHVyZSBub2Rl cyBhcmUgcmVwbGFjZWQgYnkgQ2hlY2tTdHJ1Y3R1cmVJbW1lZGlhdGUgbm9kZXMgd2hlbiBzdW5r CisgICAgICAgIHRocm91Z2gsIGFuZCB0aGF0IHN0cnVjdHVyZSBjaGVja2luZyBoYXBwZW5zIGNv cnJlY3RseS4KKworICAgICAgICAqIGRmZy9ERkdOb2RlLmg6CisgICAgICAgIChKU0M6OkRGRzo6 Tm9kZTo6aGFzU3RydWN0dXJlU2V0KToKKyAgICAgICAgKEpTQzo6REZHOjpOb2RlOjpjb252ZXJ0 VG9DaGVja1N0cnVjdHVyZUltbWVkaWF0ZSk6IEFkZGVkLgorICAgICAgICAqIGRmZy9ERkdPYmpl Y3RBbGxvY2F0aW9uU2lua2luZ1BoYXNlLmNwcDoKKyAgICAgICAgKEpTQzo6REZHOjpPYmplY3RB bGxvY2F0aW9uU2lua2luZ1BoYXNlOjpsb3dlck5vblJlYWRpbmdPcGVyYXRpb25zT25QaGFudG9t QWxsb2NhdGlvbnMpOgorICAgICAgICAoSlNDOjpERkc6Ok9iamVjdEFsbG9jYXRpb25TaW5raW5n UGhhc2U6OnByb21vdGVTdW5rZW5GaWVsZHMpOgorICAgICAgICAqIGZ0bC9GVExMb3dlckRGR1Rv TExWTS5jcHA6CisgICAgICAgIChKU0M6OkZUTDo6TG93ZXJERkdUb0xMVk06OmNvbXBpbGVDaGVj a1N0cnVjdHVyZUltbWVkaWF0ZSk6CisgICAgICAgICogdGVzdHMvc3RyZXNzL3NpbmtfY2hlY2tz dHJ1Y3R1cmUuanM6IEFkZGVkLgorICAgICAgICAoZm9vKToKKwogMjAxNS0wNC0zMCAgRmlsaXAg UGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIGFkZCBhIEZJ WE1FIGNvbW1lbnQgcmVmZXJlbmNpbmcgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE0NDQ1OC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZH Tm9kZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKaW5kZXggZmI0NDVi NzYyZjFjYjU4NGU0OWEzMWIzODY2Y2ZjYmMzMDk4MDBiYS4uOGU2N2RmMjM1NTFhMzMxMDk3YmJi ODcxOGNhMWNlOWQ5ODczMmRiMiAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2Rm Zy9ERkdOb2RlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKQEAg LTQxNCw2ICs0MTQsMTMgQEAgc3RydWN0IE5vZGUgewogICAgICAgICBzZXRPcEFuZERlZmF1bHRG bGFncyhDaGVja1N0cnVjdHVyZSk7CiAgICAgICAgIG1fb3BJbmZvID0gYml0d2lzZV9jYXN0PHVp bnRwdHJfdD4oc2V0KTsgCiAgICAgfQorCisgICAgdm9pZCBjb252ZXJ0VG9DaGVja1N0cnVjdHVy ZUltbWVkaWF0ZShOb2RlKiBzdHJ1Y3R1cmUpCisgICAgeworICAgICAgICBBU1NFUlQob3AoKSA9 PSBDaGVja1N0cnVjdHVyZSk7CisgICAgICAgIG1fb3AgPSBDaGVja1N0cnVjdHVyZUltbWVkaWF0 ZTsKKyAgICAgICAgY2hpbGRyZW4uc2V0Q2hpbGQxKEVkZ2Uoc3RydWN0dXJlLCBDZWxsVXNlKSk7 CisgICAgfQogICAgIAogICAgIHZvaWQgcmVwbGFjZVdpdGgoTm9kZSogb3RoZXIpCiAgICAgewpA QCAtMTMzNCw2ICsxMzQxLDcgQEAgc3RydWN0IE5vZGUgewogICAgIHsKICAgICAgICAgc3dpdGNo IChvcCgpKSB7CiAgICAgICAgIGNhc2UgQ2hlY2tTdHJ1Y3R1cmU6CisgICAgICAgIGNhc2UgQ2hl Y2tTdHJ1Y3R1cmVJbW1lZGlhdGU6CiAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICAgICAg ZGVmYXVsdDoKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5jcHAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09iamVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2Uu Y3BwCmluZGV4IDI5ZDk3NDBjMzMxNjI0ZDY1Mjg4ZjE2NTc4MmQ0NmI3ODI4MDkxOWMuLjQwNGI0 ZGI5MTQzNDkyMTQwZWYzYjEwMzJiY2VmY2U5ZDhlZDFlYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5jcHAKKysr IGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPYmplY3RBbGxvY2F0aW9uU2lua2luZ1Bo YXNlLmNwcApAQCAtNTg0LDcgKzU4NCw2IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgY2Fz ZSBTdG9yZUJhcnJpZXJXaXRoTnVsbENoZWNrOiB7CiAgICAgICAgICAgICAgICAgICAgIE5vZGUq IHRhcmdldCA9IG5vZGUtPmNoaWxkMSgpLm5vZGUoKTsKICAgICAgICAgICAgICAgICAgICAgaWYg KG1fc2lua0NhbmRpZGF0ZXMuY29udGFpbnModGFyZ2V0KSkgewotICAgICAgICAgICAgICAgICAg ICAgICAgQVNTRVJUKHRhcmdldC0+aXNQaGFudG9tT2JqZWN0QWxsb2NhdGlvbigpKTsKICAgICAg ICAgICAgICAgICAgICAgICAgIG5vZGUtPnJlbW92ZSgpOwogICAgICAgICAgICAgICAgICAgICB9 CiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwpAQCAtNzI4LDggKzcyNywxNyBAQCBwcml2YXRl OgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbG9jYWxNYXBwaW5nLnNldChsb2NhdGlv biwgdmFsdWUubm9kZSgpKTsKICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAg ICAgICAgWyZdIChQcm9tb3RlZEhlYXBMb2NhdGlvbiBsb2NhdGlvbikgewotICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKG1fc2lua0NhbmRpZGF0ZXMuY29udGFpbnMobG9jYXRpb24uYmFzZSgp KSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLT5yZXBsYWNlV2l0aChyZXNvbHZl KGJsb2NrLCBsb2NhdGlvbikpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1fc2lua0Nh bmRpZGF0ZXMuY29udGFpbnMobG9jYXRpb24uYmFzZSgpKSkgeworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN3aXRjaCAobm9kZS0+b3AoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNhc2UgQ2hlY2tTdHJ1Y3R1cmU6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5vZGUtPmNvbnZlcnRUb0NoZWNrU3RydWN0dXJlSW1tZWRpYXRlKHJlc29sdmUoYmxvY2ssIGxv Y2F0aW9uKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbm9kZS0+cmVwbGFjZVdpdGgocmVzb2x2ZShibG9jaywgbG9jYXRpb24pKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAg ICB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAppbmRleCBkOTAyYWU3MzQyZThiNDYzYjMz YTFlNWQ5N2RlNmUxODg2ODk5ZTQyLi4wNzZkNDhlNzkyNmY4NzBkYTg2NzU4ZDEwMGRiMDVmOTZh OTk5MzZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZH VG9MTFZNLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9M TFZNLmNwcApAQCAtNDk3MCw3ICs0OTcwLDggQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIGNv bXBpbGVDaGVja1N0cnVjdHVyZUltbWVkaWF0ZSgpCiAgICAgewotICAgICAgICBMVmFsdWUgc3Ry dWN0dXJlSUQgPSBsb3dDZWxsKG1fbm9kZS0+Y2hpbGQxKCkpOworICAgICAgICBMVmFsdWUgc3Ry dWN0dXJlID0gbG93Q2VsbChtX25vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgTFZhbHVlIHN0cnVj dHVyZUlEID0gbV9vdXQubG9hZDMyKHN0cnVjdHVyZSwgbV9oZWFwcy5TdHJ1Y3R1cmVfc3RydWN0 dXJlSUQpOwogICAgICAgICBjaGVja1N0cnVjdHVyZShzdHJ1Y3R1cmVJRCwgbm9WYWx1ZSgpLCBC YWRDYWNoZSwgbV9ub2RlLT5zdHJ1Y3R1cmVTZXQoKSk7CiAgICAgfQogICAgIApkaWZmIC0tZ2l0 IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9zaW5rX2NoZWNrc3RydWN0dXJl LmpzIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9zaW5rX2NoZWNrc3RydWN0 dXJlLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjI0MjdhNjNlYjU2Mjg2NDk5OTA0OGVkMTJlZjFkMzNiN2ZhZmVk MTgKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNz L3NpbmtfY2hlY2tzdHJ1Y3R1cmUuanMKQEAgLTAsMCArMSwxNyBAQAorZnVuY3Rpb24gZm9vKHAs IHEpIHsKKyAgICB2YXIgbyA9IHt9OworICAgIGlmIChwKSBvLmYgPSA0MjsKKyAgICBpZiAocSkg eyBvLmYrKzsgcmV0dXJuIG87IH0KK30KK25vSW5saW5lKGZvbyk7CisKK3ZhciBleHBlY3RlZCA9 IGZvbyhmYWxzZSwgdHJ1ZSkuZjsKKworZm9yICh2YXIgaSA9IDA7IGkgPCAxMDAwMDAwOyBpKysp IHsKKyAgICBmb28odHJ1ZSwgdHJ1ZSk7Cit9CisKK3ZhciByZXN1bHQgPSBmb28oZmFsc2UsIHRy dWUpLmY7CisKK2lmICghT2JqZWN0LmlzKHJlc3VsdCwgZXhwZWN0ZWQpKQorICAgIHRocm93ICJF cnJvcjogZXhwZWN0ZWQgIiArIGV4cGVjdGVkICsgIjsgRlRMIHByb2R1Y2VkICIgKyByZXN1bHQ7 Cg== 252200 2015-05-01 16:58:37 -0700 2015-05-04 11:05:40 -0700 Patch bug-144465-20150501165725.patch text/plain 7407 basile_clement U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNjk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA1 NDViMjIwNGI0ZDVlNDE4YWRhMDAxM2E4MGRlZDhjNzYwZDY4YzZiLi5lN2M3Mzc5NGI5NDU2NDUz MGY4N2RjY2JkYmE3Yzc3YzVjNDUxYzY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxNS0wNS0wMSAgQmFzaWxlIENsZW1lbnQgIDxiYXNpbGVfY2xlbWVudEBh cHBsZS5jb20+CisKKyAgICAgICAgT2JqZWN0IGFsbG9jYXRpb24gbm90IHNpbmtpbmcgcHJvcGVy bHkgdGhyb3VnaCBDaGVja1N0cnVjdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NDY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQ3VycmVudGx5LCBzaW5raW5nIGFuIGFsbG9jYXRpb24gdGhyb3Vn aCBhIENoZWNrU3RydWN0dXJlIHdpbGwKKyAgICAgICAgY29tcGxldGVseSBpZ25vcmUgYWxsIHN0 cnVjdHVyZSBjaGVja2luZywgd2hpY2ggaXMgb2J2aW91c2x5IHdyb25nLgorCisgICAgICAgIEEg Q2hlY2tTdHJ1Y3R1cmVJbW1lZGlhdGUgbm9kZSB0eXBlIHdhcyBwcmVzZW50IGZvciB0aGF0IHB1 cnBvc2UsIGJ1dAorICAgICAgICB0aGUgQ2hlY2tTdHJ1Y3R1cmVzIHdlcmUgbm90IHByb3Blcmx5 IHJlcGxhY2VkLiAgVGhpcyBlbnN1cmVzIHRoYXQKKyAgICAgICAgQ2hlY2tTdHJ1Y3R1cmUgbm9k ZXMgYXJlIHJlcGxhY2VkIGJ5IENoZWNrU3RydWN0dXJlSW1tZWRpYXRlIG5vZGVzIHdoZW4KKyAg ICAgICAgc3VuayB0aHJvdWdoLCBhbmQgdGhhdCBzdHJ1Y3R1cmUgY2hlY2tpbmcgaGFwcGVucyBj b3JyZWN0bHkuCisKKyAgICAgICAgKiBkZmcvREZHTm9kZS5oOgorICAgICAgICAoSlNDOjpERkc6 Ok5vZGU6OmNvbnZlcnRUb0NoZWNrU3RydWN0dXJlSW1tZWRpYXRlKTogQWRkZWQuCisgICAgICAg IChKU0M6OkRGRzo6Tm9kZTo6aGFzU3RydWN0dXJlU2V0KToKKyAgICAgICAgKiBkZmcvREZHT2Jq ZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6T2JqZWN0 QWxsb2NhdGlvblNpbmtpbmdQaGFzZTo6cHJvbW90ZVN1bmtlbkZpZWxkcyk6CisgICAgICAgICog ZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRGR1Rv TExWTTo6Y29tcGlsZUNoZWNrU3RydWN0dXJlKToKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRG R1RvTExWTTo6Y29tcGlsZUNoZWNrU3RydWN0dXJlSW1tZWRpYXRlKToKKyAgICAgICAgKEpTQzo6 RlRMOjpMb3dlckRGR1RvTExWTTo6Y2hlY2tTdHJ1Y3R1cmUpOgorICAgICAgICAqIHRlc3RzL3N0 cmVzcy9zaW5rX2NoZWNrc3RydWN0dXJlLmpzOiBBZGRlZC4KKyAgICAgICAgKGZvbyk6CisKIDIw MTUtMDUtMDEgIEpvcmRhbiBIYXJiYW5kICA8bGpoYXJiQGdtYWlsLmNvbT4KIAogICAgICAgICBT dHJpbmcjc3RhcnRzV2l0aC9lbmRzV2l0aC9pbmNsdWRlcyBkb24ndCBoYW5kbGUgSW5maW5pdHkg cG9zaXRpb24vZW5kUG9zaXRpb24gYXJncyBjb3JyZWN0bHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS9kZmcvREZHTm9kZS5oIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdOb2RlLmgKaW5kZXggZmI0NDViNzYyZjFjYjU4NGU0OWEzMWIzODY2Y2ZjYmMzMDk4MDBiYS4u OGU2N2RmMjM1NTFhMzMxMDk3YmJiODcxOGNhMWNlOWQ5ODczMmRiMiAxMDA2NDQKLS0tIGEvU291 cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmgKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL2RmZy9ERkdOb2RlLmgKQEAgLTQxNCw2ICs0MTQsMTMgQEAgc3RydWN0IE5vZGUgewogICAg ICAgICBzZXRPcEFuZERlZmF1bHRGbGFncyhDaGVja1N0cnVjdHVyZSk7CiAgICAgICAgIG1fb3BJ bmZvID0gYml0d2lzZV9jYXN0PHVpbnRwdHJfdD4oc2V0KTsgCiAgICAgfQorCisgICAgdm9pZCBj b252ZXJ0VG9DaGVja1N0cnVjdHVyZUltbWVkaWF0ZShOb2RlKiBzdHJ1Y3R1cmUpCisgICAgewor ICAgICAgICBBU1NFUlQob3AoKSA9PSBDaGVja1N0cnVjdHVyZSk7CisgICAgICAgIG1fb3AgPSBD aGVja1N0cnVjdHVyZUltbWVkaWF0ZTsKKyAgICAgICAgY2hpbGRyZW4uc2V0Q2hpbGQxKEVkZ2Uo c3RydWN0dXJlLCBDZWxsVXNlKSk7CisgICAgfQogICAgIAogICAgIHZvaWQgcmVwbGFjZVdpdGgo Tm9kZSogb3RoZXIpCiAgICAgewpAQCAtMTMzNCw2ICsxMzQxLDcgQEAgc3RydWN0IE5vZGUgewog ICAgIHsKICAgICAgICAgc3dpdGNoIChvcCgpKSB7CiAgICAgICAgIGNhc2UgQ2hlY2tTdHJ1Y3R1 cmU6CisgICAgICAgIGNhc2UgQ2hlY2tTdHJ1Y3R1cmVJbW1lZGlhdGU6CiAgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlv blNpbmtpbmdQaGFzZS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR09iamVjdEFs bG9jYXRpb25TaW5raW5nUGhhc2UuY3BwCmluZGV4IDhmODczNDJhYWEzOWRhMzM4NWIwN2NmNDNi NjdmNWVjMGU2ZmQ5N2EuLjY2MTEyMzY3OTcyZDE1YzQwMWY3YTg2NDNmMTg5OTRiM2I4ZWQ4N2Ug MTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlv blNpbmtpbmdQaGFzZS5jcHAKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdPYmpl Y3RBbGxvY2F0aW9uU2lua2luZ1BoYXNlLmNwcApAQCAtNzI4LDggKzcyOCwxNyBAQCBwcml2YXRl OgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fbG9jYWxNYXBwaW5nLnNldChsb2NhdGlv biwgdmFsdWUubm9kZSgpKTsKICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAg ICAgICAgWyZdIChQcm9tb3RlZEhlYXBMb2NhdGlvbiBsb2NhdGlvbikgewotICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKG1fc2lua0NhbmRpZGF0ZXMuY29udGFpbnMobG9jYXRpb24uYmFzZSgp KSkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLT5yZXBsYWNlV2l0aChyZXNvbHZl KGJsb2NrLCBsb2NhdGlvbikpOworICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG1fc2lua0Nh bmRpZGF0ZXMuY29udGFpbnMobG9jYXRpb24uYmFzZSgpKSkgeworICAgICAgICAgICAgICAgICAg ICAgICAgICAgIHN3aXRjaCAobm9kZS0+b3AoKSkgeworICAgICAgICAgICAgICAgICAgICAgICAg ICAgIGNhc2UgQ2hlY2tTdHJ1Y3R1cmU6CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IG5vZGUtPmNvbnZlcnRUb0NoZWNrU3RydWN0dXJlSW1tZWRpYXRlKHJlc29sdmUoYmxvY2ssIGxv Y2F0aW9uKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgZGVmYXVsdDoKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgbm9kZS0+cmVwbGFjZVdpdGgocmVzb2x2ZShibG9jaywgbG9jYXRpb24pKTsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYnJlYWs7CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgICAg ICB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIApkaWZmIC0tZ2l0IGEvU291cmNlL0ph dmFTY3JpcHRDb3JlL2Z0bC9GVExMb3dlckRGR1RvTExWTS5jcHAgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcAppbmRleCBkOTAyYWU3MzQyZThiNDYzYjMz YTFlNWQ5N2RlNmUxODg2ODk5ZTQyLi43OTZjODE5ZDJlNGQ4MmMwOTE2NDA2ZGQ5YmNlYzIzZWU3 Yzg3MmY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZH VG9MTFZNLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9M TFZNLmNwcApAQCAtMTg3Niw3ICsxODc2LDExIEBAIHByaXZhdGU6CiAgICAgICAgIAogICAgICAg ICBMVmFsdWUgc3RydWN0dXJlSUQgPSBtX291dC5sb2FkMzIoY2VsbCwgbV9oZWFwcy5KU0NlbGxf c3RydWN0dXJlSUQpOwogICAgICAgICAKLSAgICAgICAgY2hlY2tTdHJ1Y3R1cmUoc3RydWN0dXJl SUQsIGpzVmFsdWVWYWx1ZShjZWxsKSwgZXhpdEtpbmQsIG1fbm9kZS0+c3RydWN0dXJlU2V0KCkp OworICAgICAgICBjaGVja1N0cnVjdHVyZSgKKyAgICAgICAgICAgIHN0cnVjdHVyZUlELCBqc1Zh bHVlVmFsdWUoY2VsbCksIGV4aXRLaW5kLCBtX25vZGUtPnN0cnVjdHVyZVNldCgpLAorICAgICAg ICAgICAgW3RoaXNdIChTdHJ1Y3R1cmUqIHN0cnVjdHVyZSkgeworICAgICAgICAgICAgICAgIHJl dHVybiB3ZWFrU3RydWN0dXJlSUQoc3RydWN0dXJlKTsKKyAgICAgICAgICAgIH0pOwogICAgIH0K ICAgICAKICAgICB2b2lkIGNvbXBpbGVDaGVja0NlbGwoKQpAQCAtNDk3MCw4ICs0OTc0LDEyIEBA IHByaXZhdGU6CiAgICAgCiAgICAgdm9pZCBjb21waWxlQ2hlY2tTdHJ1Y3R1cmVJbW1lZGlhdGUo KQogICAgIHsKLSAgICAgICAgTFZhbHVlIHN0cnVjdHVyZUlEID0gbG93Q2VsbChtX25vZGUtPmNo aWxkMSgpKTsKLSAgICAgICAgY2hlY2tTdHJ1Y3R1cmUoc3RydWN0dXJlSUQsIG5vVmFsdWUoKSwg QmFkQ2FjaGUsIG1fbm9kZS0+c3RydWN0dXJlU2V0KCkpOworICAgICAgICBMVmFsdWUgc3RydWN0 dXJlID0gbG93Q2VsbChtX25vZGUtPmNoaWxkMSgpKTsKKyAgICAgICAgY2hlY2tTdHJ1Y3R1cmUo CisgICAgICAgICAgICBzdHJ1Y3R1cmUsIG5vVmFsdWUoKSwgQmFkQ2FjaGUsIG1fbm9kZS0+c3Ry dWN0dXJlU2V0KCksCisgICAgICAgICAgICBbdGhpc10gKFN0cnVjdHVyZSogc3RydWN0dXJlKSB7 CisgICAgICAgICAgICAgICAgcmV0dXJuIHdlYWtTdHJ1Y3R1cmUoc3RydWN0dXJlKTsKKyAgICAg ICAgICAgIH0pOwogICAgIH0KICAgICAKICAgICB2b2lkIGNvbXBpbGVNYXRlcmlhbGl6ZU5ld09i amVjdCgpCkBAIC01MzEyLDEzICs1MzIwLDEzIEBAIHByaXZhdGU6CiAgICAgfQogICAgIAogICAg IHZvaWQgY2hlY2tTdHJ1Y3R1cmUoCi0gICAgICAgIExWYWx1ZSBzdHJ1Y3R1cmVJRCwgY29uc3Qg Rm9ybWF0dGVkVmFsdWUmIGZvcm1hdHRlZFZhbHVlLCBFeGl0S2luZCBleGl0S2luZCwKLSAgICAg ICAgY29uc3QgU3RydWN0dXJlU2V0JiBzZXQpCisgICAgICAgIExWYWx1ZSBzdHJ1Y3R1cmVEaXNj cmltaW5hbnQsIGNvbnN0IEZvcm1hdHRlZFZhbHVlJiBmb3JtYXR0ZWRWYWx1ZSwgRXhpdEtpbmQg ZXhpdEtpbmQsCisgICAgICAgIGNvbnN0IFN0cnVjdHVyZVNldCYgc2V0LCBzdGQ6OmZ1bmN0aW9u PExWYWx1ZShTdHJ1Y3R1cmUqKT4mJiB3ZWFrU3RydWN0dXJlRGlzY3JpbWluYW50KQogICAgIHsK ICAgICAgICAgaWYgKHNldC5zaXplKCkgPT0gMSkgewogICAgICAgICAgICAgc3BlY3VsYXRlKAog ICAgICAgICAgICAgICAgIGV4aXRLaW5kLCBmb3JtYXR0ZWRWYWx1ZSwgMCwKLSAgICAgICAgICAg ICAgICBtX291dC5ub3RFcXVhbChzdHJ1Y3R1cmVJRCwgd2Vha1N0cnVjdHVyZUlEKHNldFswXSkp KTsKKyAgICAgICAgICAgICAgICBtX291dC5ub3RFcXVhbChzdHJ1Y3R1cmVEaXNjcmltaW5hbnQs IHdlYWtTdHJ1Y3R1cmVEaXNjcmltaW5hbnQoc2V0WzBdKSkpOwogICAgICAgICAgICAgcmV0dXJu OwogICAgICAgICB9CiAgICAgICAgIApAQCAtNTMyOCwxNCArNTMzNiwxNCBAQCBwcml2YXRlOgog ICAgICAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgc2V0LnNpemUoKSAtIDE7ICsraSkgewog ICAgICAgICAgICAgTEJhc2ljQmxvY2sgbmV4dFN0cnVjdHVyZSA9IEZUTF9ORVdfQkxPQ0sobV9v dXQsICgiY2hlY2tTdHJ1Y3R1cmUgbmV4dFN0cnVjdHVyZSIpKTsKICAgICAgICAgICAgIG1fb3V0 LmJyYW5jaCgKLSAgICAgICAgICAgICAgICBtX291dC5lcXVhbChzdHJ1Y3R1cmVJRCwgd2Vha1N0 cnVjdHVyZUlEKHNldFtpXSkpLAorICAgICAgICAgICAgICAgIG1fb3V0LmVxdWFsKHN0cnVjdHVy ZURpc2NyaW1pbmFudCwgd2Vha1N0cnVjdHVyZURpc2NyaW1pbmFudChzZXRbaV0pKSwKICAgICAg ICAgICAgICAgICB1bnN1cmUoY29udGludWF0aW9uKSwgdW5zdXJlKG5leHRTdHJ1Y3R1cmUpKTsK ICAgICAgICAgICAgIG1fb3V0LmFwcGVuZFRvKG5leHRTdHJ1Y3R1cmUpOwogICAgICAgICB9CiAg ICAgICAgIAogICAgICAgICBzcGVjdWxhdGUoCiAgICAgICAgICAgICBleGl0S2luZCwgZm9ybWF0 dGVkVmFsdWUsIDAsCi0gICAgICAgICAgICBtX291dC5ub3RFcXVhbChzdHJ1Y3R1cmVJRCwgd2Vh a1N0cnVjdHVyZUlEKHNldC5sYXN0KCkpKSk7CisgICAgICAgICAgICBtX291dC5ub3RFcXVhbChz dHJ1Y3R1cmVEaXNjcmltaW5hbnQsIHdlYWtTdHJ1Y3R1cmVEaXNjcmltaW5hbnQoc2V0Lmxhc3Qo KSkpKTsKICAgICAgICAgCiAgICAgICAgIG1fb3V0Lmp1bXAoY29udGludWF0aW9uKTsKICAgICAg ICAgbV9vdXQuYXBwZW5kVG8oY29udGludWF0aW9uLCBsYXN0TmV4dCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3NpbmtfY2hlY2tzdHJ1Y3R1cmUuanMg Yi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvdGVzdHMvc3RyZXNzL3NpbmtfY2hlY2tzdHJ1Y3R1cmUu anMKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uMjQyN2E2M2ViNTYyODY0OTk5MDQ4ZWQxMmVmMWQzM2I3ZmFmZWQxOAot LS0gL2Rldi9udWxsCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3Mvc2lu a19jaGVja3N0cnVjdHVyZS5qcwpAQCAtMCwwICsxLDE3IEBACitmdW5jdGlvbiBmb28ocCwgcSkg eworICAgIHZhciBvID0ge307CisgICAgaWYgKHApIG8uZiA9IDQyOworICAgIGlmIChxKSB7IG8u ZisrOyByZXR1cm4gbzsgfQorfQorbm9JbmxpbmUoZm9vKTsKKwordmFyIGV4cGVjdGVkID0gZm9v KGZhbHNlLCB0cnVlKS5mOworCitmb3IgKHZhciBpID0gMDsgaSA8IDEwMDAwMDA7IGkrKykgewor ICAgIGZvbyh0cnVlLCB0cnVlKTsKK30KKwordmFyIHJlc3VsdCA9IGZvbyhmYWxzZSwgdHJ1ZSku ZjsKKworaWYgKCFPYmplY3QuaXMocmVzdWx0LCBleHBlY3RlZCkpCisgICAgdGhyb3cgIkVycm9y OiBleHBlY3RlZCAiICsgZXhwZWN0ZWQgKyAiOyBGVEwgcHJvZHVjZWQgIiArIHJlc3VsdDsK 252321 2015-05-04 11:05:43 -0700 2015-05-04 11:39:18 -0700 Patch for landing bug-144465-20150504110429.patch text/plain 7454 basile_clement U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNzQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCAx ZTJjODhlNTRmMDU0ODM3Yzc0NTU5MDk3ODhjYTQzY2ExNjkxNGY3Li5kZWJiM2YxMWFhM2FlZTkw MGE2ZTY2NzY2ZGQzY2M4ZTgwZGI3Yjg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxNS0wNS0wNCAgQmFzaWxlIENsZW1lbnQgIDxiYXNpbGVfY2xlbWVudEBh cHBsZS5jb20+CisKKyAgICAgICAgT2JqZWN0IGFsbG9jYXRpb24gbm90IHNpbmtpbmcgcHJvcGVy bHkgdGhyb3VnaCBDaGVja1N0cnVjdHVyZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQ0NDY1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRmlsaXAgUGl6 bG8uCisKKyAgICAgICAgQ3VycmVudGx5LCBzaW5raW5nIGFuIGFsbG9jYXRpb24gdGhyb3VnaCBh IENoZWNrU3RydWN0dXJlIHdpbGwKKyAgICAgICAgY29tcGxldGVseSBpZ25vcmUgYWxsIHN0cnVj dHVyZSBjaGVja2luZywgd2hpY2ggaXMgb2J2aW91c2x5IHdyb25nLgorCisgICAgICAgIEEgQ2hl Y2tTdHJ1Y3R1cmVJbW1lZGlhdGUgbm9kZSB0eXBlIHdhcyBwcmVzZW50IGZvciB0aGF0IHB1cnBv c2UsIGJ1dAorICAgICAgICB0aGUgQ2hlY2tTdHJ1Y3R1cmVzIHdlcmUgbm90IHByb3Blcmx5IHJl cGxhY2VkLiAgVGhpcyBlbnN1cmVzIHRoYXQKKyAgICAgICAgQ2hlY2tTdHJ1Y3R1cmUgbm9kZXMg YXJlIHJlcGxhY2VkIGJ5IENoZWNrU3RydWN0dXJlSW1tZWRpYXRlIG5vZGVzIHdoZW4KKyAgICAg ICAgc3VuayB0aHJvdWdoLCBhbmQgdGhhdCBzdHJ1Y3R1cmUgY2hlY2tpbmcgaGFwcGVucyBjb3Jy ZWN0bHkuCisKKyAgICAgICAgKiBkZmcvREZHTm9kZS5oOgorICAgICAgICAoSlNDOjpERkc6Ok5v ZGU6OmNvbnZlcnRUb0NoZWNrU3RydWN0dXJlSW1tZWRpYXRlKTogQWRkZWQuCisgICAgICAgIChK U0M6OkRGRzo6Tm9kZTo6aGFzU3RydWN0dXJlU2V0KToKKyAgICAgICAgKiBkZmcvREZHT2JqZWN0 QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5jcHA6CisgICAgICAgIChKU0M6OkRGRzo6T2JqZWN0QWxs b2NhdGlvblNpbmtpbmdQaGFzZTo6cHJvbW90ZVN1bmtlbkZpZWxkcyk6CisgICAgICAgICogZnRs L0ZUTExvd2VyREZHVG9MTFZNLmNwcDoKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRGR1RvTExW TTo6Y29tcGlsZUNoZWNrU3RydWN0dXJlKToKKyAgICAgICAgKEpTQzo6RlRMOjpMb3dlckRGR1Rv TExWTTo6Y29tcGlsZUNoZWNrU3RydWN0dXJlSW1tZWRpYXRlKToKKyAgICAgICAgKEpTQzo6RlRM OjpMb3dlckRGR1RvTExWTTo6Y2hlY2tTdHJ1Y3R1cmUpOgorICAgICAgICAqIHRlc3RzL3N0cmVz cy9zaW5rX2NoZWNrc3RydWN0dXJlLmpzOiBBZGRlZC4KKyAgICAgICAgKGZvbyk6CisKIDIwMTUt MDUtMDEgIEdlb2ZmcmV5IEdhcmVuICA8Z2dhcmVuQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdS RVNTSU9OKHIxODM1NzApOiBqc2xpYi10cmF2ZXJzZS1qcXVlcnkgaXMgMjIlIHNsb3dlcgpkaWZm IC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9ERkdOb2RlLmggYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAppbmRleCBmYjQ0NWI3NjJmMWNiNTg0ZTQ5YTMxYjM4 NjZjZmNiYzMwOTgwMGJhLi44ZTY3ZGYyMzU1MWEzMzEwOTdiYmI4NzE4Y2ExY2U5ZDk4NzMyZGIy IDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaAorKysgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvZGZnL0RGR05vZGUuaApAQCAtNDE0LDYgKzQxNCwxMyBAQCBz dHJ1Y3QgTm9kZSB7CiAgICAgICAgIHNldE9wQW5kRGVmYXVsdEZsYWdzKENoZWNrU3RydWN0dXJl KTsKICAgICAgICAgbV9vcEluZm8gPSBiaXR3aXNlX2Nhc3Q8dWludHB0cl90PihzZXQpOyAKICAg ICB9CisKKyAgICB2b2lkIGNvbnZlcnRUb0NoZWNrU3RydWN0dXJlSW1tZWRpYXRlKE5vZGUqIHN0 cnVjdHVyZSkKKyAgICB7CisgICAgICAgIEFTU0VSVChvcCgpID09IENoZWNrU3RydWN0dXJlKTsK KyAgICAgICAgbV9vcCA9IENoZWNrU3RydWN0dXJlSW1tZWRpYXRlOworICAgICAgICBjaGlsZHJl bi5zZXRDaGlsZDEoRWRnZShzdHJ1Y3R1cmUsIENlbGxVc2UpKTsKKyAgICB9CiAgICAgCiAgICAg dm9pZCByZXBsYWNlV2l0aChOb2RlKiBvdGhlcikKICAgICB7CkBAIC0xMzM0LDYgKzEzNDEsNyBA QCBzdHJ1Y3QgTm9kZSB7CiAgICAgewogICAgICAgICBzd2l0Y2ggKG9wKCkpIHsKICAgICAgICAg Y2FzZSBDaGVja1N0cnVjdHVyZToKKyAgICAgICAgY2FzZSBDaGVja1N0cnVjdHVyZUltbWVkaWF0 ZToKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICBkZWZhdWx0OgogICAgICAgICAg ICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdPYmplY3RBbGxvY2F0aW9uU2lua2luZ1BoYXNlLmNwcCBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9kZmcvREZHT2JqZWN0QWxsb2NhdGlvblNpbmtpbmdQaGFzZS5jcHAKaW5kZXggOGY4NzM0MmFh YTM5ZGEzMzg1YjA3Y2Y0M2I2N2Y1ZWMwZTZmZDk3YS4uNjYxMTIzNjc5NzJkMTVjNDAxZjdhODY0 M2YxODk5NGIzYjhlZDg3ZSAxMDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2RmZy9E RkdPYmplY3RBbGxvY2F0aW9uU2lua2luZ1BoYXNlLmNwcAorKysgYi9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvZGZnL0RGR09iamVjdEFsbG9jYXRpb25TaW5raW5nUGhhc2UuY3BwCkBAIC03MjgsOCAr NzI4LDE3IEBAIHByaXZhdGU6CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9sb2NhbE1h cHBpbmcuc2V0KGxvY2F0aW9uLCB2YWx1ZS5ub2RlKCkpOwogICAgICAgICAgICAgICAgICAgICB9 LAogICAgICAgICAgICAgICAgICAgICBbJl0gKFByb21vdGVkSGVhcExvY2F0aW9uIGxvY2F0aW9u KSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAobV9zaW5rQ2FuZGlkYXRlcy5jb250YWlu cyhsb2NhdGlvbi5iYXNlKCkpKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgIG5vZGUtPnJl cGxhY2VXaXRoKHJlc29sdmUoYmxvY2ssIGxvY2F0aW9uKSk7CisgICAgICAgICAgICAgICAgICAg ICAgICBpZiAobV9zaW5rQ2FuZGlkYXRlcy5jb250YWlucyhsb2NhdGlvbi5iYXNlKCkpKSB7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3dpdGNoIChub2RlLT5vcCgpKSB7CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgY2FzZSBDaGVja1N0cnVjdHVyZToKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgbm9kZS0+Y29udmVydFRvQ2hlY2tTdHJ1Y3R1cmVJbW1lZGlhdGUo cmVzb2x2ZShibG9jaywgbG9jYXRpb24pKTsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgYnJlYWs7CisKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBkZWZhdWx0OgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBub2RlLT5yZXBsYWNlV2l0aChyZXNvbHZlKGJsb2Nr LCBsb2NhdGlvbikpOworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgICAgICB9CiAg ICAgICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgCmRpZmYg LS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvZnRsL0ZUTExvd2VyREZHVG9MTFZNLmNwcCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCmluZGV4IDMy ZjNlZTBmYmZiODc0ZTAyZGVhNWY2NTZjMmEwOWVmZmQ0MDBjZmQuLmUzZTBlMzBkMjNjZDRlNWI2 NmE1OWRiNGMyNTEzYjYzNGI0YTNkMzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9mdGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9m dGwvRlRMTG93ZXJERkdUb0xMVk0uY3BwCkBAIC0xODgyLDcgKzE4ODIsMTEgQEAgcHJpdmF0ZToK ICAgICAgICAgCiAgICAgICAgIExWYWx1ZSBzdHJ1Y3R1cmVJRCA9IG1fb3V0LmxvYWQzMihjZWxs LCBtX2hlYXBzLkpTQ2VsbF9zdHJ1Y3R1cmVJRCk7CiAgICAgICAgIAotICAgICAgICBjaGVja1N0 cnVjdHVyZShzdHJ1Y3R1cmVJRCwganNWYWx1ZVZhbHVlKGNlbGwpLCBleGl0S2luZCwgbV9ub2Rl LT5zdHJ1Y3R1cmVTZXQoKSk7CisgICAgICAgIGNoZWNrU3RydWN0dXJlKAorICAgICAgICAgICAg c3RydWN0dXJlSUQsIGpzVmFsdWVWYWx1ZShjZWxsKSwgZXhpdEtpbmQsIG1fbm9kZS0+c3RydWN0 dXJlU2V0KCksCisgICAgICAgICAgICBbdGhpc10gKFN0cnVjdHVyZSogc3RydWN0dXJlKSB7Cisg ICAgICAgICAgICAgICAgcmV0dXJuIHdlYWtTdHJ1Y3R1cmVJRChzdHJ1Y3R1cmUpOworICAgICAg ICAgICAgfSk7CiAgICAgfQogICAgIAogICAgIHZvaWQgY29tcGlsZUNoZWNrQ2VsbCgpCkBAIC01 MDg5LDggKzUwOTMsMTIgQEAgcHJpdmF0ZToKICAgICAKICAgICB2b2lkIGNvbXBpbGVDaGVja1N0 cnVjdHVyZUltbWVkaWF0ZSgpCiAgICAgewotICAgICAgICBMVmFsdWUgc3RydWN0dXJlSUQgPSBs b3dDZWxsKG1fbm9kZS0+Y2hpbGQxKCkpOwotICAgICAgICBjaGVja1N0cnVjdHVyZShzdHJ1Y3R1 cmVJRCwgbm9WYWx1ZSgpLCBCYWRDYWNoZSwgbV9ub2RlLT5zdHJ1Y3R1cmVTZXQoKSk7CisgICAg ICAgIExWYWx1ZSBzdHJ1Y3R1cmUgPSBsb3dDZWxsKG1fbm9kZS0+Y2hpbGQxKCkpOworICAgICAg ICBjaGVja1N0cnVjdHVyZSgKKyAgICAgICAgICAgIHN0cnVjdHVyZSwgbm9WYWx1ZSgpLCBCYWRD YWNoZSwgbV9ub2RlLT5zdHJ1Y3R1cmVTZXQoKSwKKyAgICAgICAgICAgIFt0aGlzXSAoU3RydWN0 dXJlKiBzdHJ1Y3R1cmUpIHsKKyAgICAgICAgICAgICAgICByZXR1cm4gd2Vha1N0cnVjdHVyZShz dHJ1Y3R1cmUpOworICAgICAgICAgICAgfSk7CiAgICAgfQogICAgIAogICAgIHZvaWQgY29tcGls ZU1hdGVyaWFsaXplTmV3T2JqZWN0KCkKQEAgLTU0MzAsMTQgKzU0MzgsMTUgQEAgcHJpdmF0ZToK ICAgICAgICAgcmV0dXJuIGdldEFyZ3VtZW50c1N0YXJ0KG1fbm9kZS0+b3JpZ2luLnNlbWFudGlj LmlubGluZUNhbGxGcmFtZSk7CiAgICAgfQogICAgIAorICAgIHRlbXBsYXRlPHR5cGVuYW1lIEZ1 bmN0b3I+CiAgICAgdm9pZCBjaGVja1N0cnVjdHVyZSgKLSAgICAgICAgTFZhbHVlIHN0cnVjdHVy ZUlELCBjb25zdCBGb3JtYXR0ZWRWYWx1ZSYgZm9ybWF0dGVkVmFsdWUsIEV4aXRLaW5kIGV4aXRL aW5kLAotICAgICAgICBjb25zdCBTdHJ1Y3R1cmVTZXQmIHNldCkKKyAgICAgICAgTFZhbHVlIHN0 cnVjdHVyZURpc2NyaW1pbmFudCwgY29uc3QgRm9ybWF0dGVkVmFsdWUmIGZvcm1hdHRlZFZhbHVl LCBFeGl0S2luZCBleGl0S2luZCwKKyAgICAgICAgY29uc3QgU3RydWN0dXJlU2V0JiBzZXQsIGNv bnN0IEZ1bmN0b3ImIHdlYWtTdHJ1Y3R1cmVEaXNjcmltaW5hbnQpCiAgICAgewogICAgICAgICBp ZiAoc2V0LnNpemUoKSA9PSAxKSB7CiAgICAgICAgICAgICBzcGVjdWxhdGUoCiAgICAgICAgICAg ICAgICAgZXhpdEtpbmQsIGZvcm1hdHRlZFZhbHVlLCAwLAotICAgICAgICAgICAgICAgIG1fb3V0 Lm5vdEVxdWFsKHN0cnVjdHVyZUlELCB3ZWFrU3RydWN0dXJlSUQoc2V0WzBdKSkpOworICAgICAg ICAgICAgICAgIG1fb3V0Lm5vdEVxdWFsKHN0cnVjdHVyZURpc2NyaW1pbmFudCwgd2Vha1N0cnVj dHVyZURpc2NyaW1pbmFudChzZXRbMF0pKSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAg IH0KICAgICAgICAgCkBAIC01NDQ3LDE0ICs1NDU2LDE0IEBAIHByaXZhdGU6CiAgICAgICAgIGZv ciAodW5zaWduZWQgaSA9IDA7IGkgPCBzZXQuc2l6ZSgpIC0gMTsgKytpKSB7CiAgICAgICAgICAg ICBMQmFzaWNCbG9jayBuZXh0U3RydWN0dXJlID0gRlRMX05FV19CTE9DSyhtX291dCwgKCJjaGVj a1N0cnVjdHVyZSBuZXh0U3RydWN0dXJlIikpOwogICAgICAgICAgICAgbV9vdXQuYnJhbmNoKAot ICAgICAgICAgICAgICAgIG1fb3V0LmVxdWFsKHN0cnVjdHVyZUlELCB3ZWFrU3RydWN0dXJlSUQo c2V0W2ldKSksCisgICAgICAgICAgICAgICAgbV9vdXQuZXF1YWwoc3RydWN0dXJlRGlzY3JpbWlu YW50LCB3ZWFrU3RydWN0dXJlRGlzY3JpbWluYW50KHNldFtpXSkpLAogICAgICAgICAgICAgICAg IHVuc3VyZShjb250aW51YXRpb24pLCB1bnN1cmUobmV4dFN0cnVjdHVyZSkpOwogICAgICAgICAg ICAgbV9vdXQuYXBwZW5kVG8obmV4dFN0cnVjdHVyZSk7CiAgICAgICAgIH0KICAgICAgICAgCiAg ICAgICAgIHNwZWN1bGF0ZSgKICAgICAgICAgICAgIGV4aXRLaW5kLCBmb3JtYXR0ZWRWYWx1ZSwg MCwKLSAgICAgICAgICAgIG1fb3V0Lm5vdEVxdWFsKHN0cnVjdHVyZUlELCB3ZWFrU3RydWN0dXJl SUQoc2V0Lmxhc3QoKSkpKTsKKyAgICAgICAgICAgIG1fb3V0Lm5vdEVxdWFsKHN0cnVjdHVyZURp c2NyaW1pbmFudCwgd2Vha1N0cnVjdHVyZURpc2NyaW1pbmFudChzZXQubGFzdCgpKSkpOwogICAg ICAgICAKICAgICAgICAgbV9vdXQuanVtcChjb250aW51YXRpb24pOwogICAgICAgICBtX291dC5h cHBlbmRUbyhjb250aW51YXRpb24sIGxhc3ROZXh0KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS90ZXN0cy9zdHJlc3Mvc2lua19jaGVja3N0cnVjdHVyZS5qcyBiL1NvdXJjZS9K YXZhU2NyaXB0Q29yZS90ZXN0cy9zdHJlc3Mvc2lua19jaGVja3N0cnVjdHVyZS5qcwpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4yNDI3YTYzZWI1NjI4NjQ5OTkwNDhlZDEyZWYxZDMzYjdmYWZlZDE4Ci0tLSAvZGV2L251 bGwKKysrIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL3Rlc3RzL3N0cmVzcy9zaW5rX2NoZWNrc3Ry dWN0dXJlLmpzCkBAIC0wLDAgKzEsMTcgQEAKK2Z1bmN0aW9uIGZvbyhwLCBxKSB7CisgICAgdmFy IG8gPSB7fTsKKyAgICBpZiAocCkgby5mID0gNDI7CisgICAgaWYgKHEpIHsgby5mKys7IHJldHVy biBvOyB9Cit9Citub0lubGluZShmb28pOworCit2YXIgZXhwZWN0ZWQgPSBmb28oZmFsc2UsIHRy dWUpLmY7CisKK2ZvciAodmFyIGkgPSAwOyBpIDwgMTAwMDAwMDsgaSsrKSB7CisgICAgZm9vKHRy dWUsIHRydWUpOworfQorCit2YXIgcmVzdWx0ID0gZm9vKGZhbHNlLCB0cnVlKS5mOworCitpZiAo IU9iamVjdC5pcyhyZXN1bHQsIGV4cGVjdGVkKSkKKyAgICB0aHJvdyAiRXJyb3I6IGV4cGVjdGVk ICIgKyBleHBlY3RlZCArICI7IEZUTCBwcm9kdWNlZCAiICsgcmVzdWx0Owo=