128440 2014-02-07 21:18:51 -0800 Clean up MarkupAccumulator::appendCharactersReplacingEntities 2014-02-10 18:42:53 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin oldest_to_newest 978275 0 benjamin 2014-02-07 21:18:51 -0800 Clean up MarkupAccumulator::appendCharactersReplacingEntities 978277 1 223546 benjamin 2014-02-07 21:23:23 -0800 Created attachment 223546 Patch 978691 2 223665 benjamin 2014-02-09 19:30:46 -0800 Created attachment 223665 Patch 978702 3 223669 benjamin 2014-02-09 20:37:27 -0800 Created attachment 223669 Patch 978760 4 223669 darin 2014-02-09 23:51:03 -0800 Comment on attachment 223669 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=223669&action=review > Source/WebCore/editing/MarkupAccumulator.cpp:55 > +static EntityDescription entitySubstitutionList[] = { const > Source/WebCore/editing/MarkupAccumulator.cpp:74 > +static uint8_t entityMap[maximumEscapedentityCharacter + 1] = { const 979196 5 benjamin 2014-02-10 18:42:53 -0800 Committed r163854: <http://trac.webkit.org/changeset/163854> 223546 2014-02-07 21:23:23 -0800 2014-02-09 19:30:38 -0800 Patch bug-128440-20140207212322.patch text/plain 7526 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzNjQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTdjNjVjMGIxZTYzOTI2 MGNkNWEwNGE1NTQzODk4Y2EwY2RjM2EzZS4uMTNmMWU5NzEwMTRjNjY4YTI0OWQzODZiZTkxOWRm NWNmZjE1NWY2OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAyLTA3ICBCZW5q YW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBDbGVhbiB1cCBN YXJrdXBBY2N1bXVsYXRvcjo6YXBwZW5kQ2hhcmFjdGVyc1JlcGxhY2luZ0VudGl0aWVzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg0NDAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTb21lIGNsZWFudXA6 CisgICAgICAgIC1SZW1vdmUgdGhlIGNvcGllZCBjb2RlIGZvciB0aGUgbG9vcHMuIEluc3RlYWQs IHVzZSBhIHRlbXBsYXRlIHdpdGggdGhlIGxvb3AKKyAgICAgICAgIHBhcmFtZXRyaXplZCBieSB0 aGUgY2hhcmFjdGVycyB0eXBlLgorICAgICAgICAtTW92ZSBFbnRpdHlEZXNjcmlwdGlvbiBmcm9t IHRoZSBoZWFkZXIgdG8gdGhlIGltcGxlbWVudGF0aW9uLgorICAgICAgICAtTWFrZSB0aGUgNSBz dWJzdGl0dXRpb24gc3RyaW5ncyBjb21waWxlLXRpbWUgbGl0ZXJhbHMuIFJlcGxhY2VtZW50IGlz IG5vdCBob3QgZW5vdWdoCisgICAgICAgICB0byBqdXN0aWZ5IHRoZSBzdGF0aWMgaGVyZS4KKwor ICAgICAgICAqIGVkaXRpbmcvTWFya3VwQWNjdW11bGF0b3IuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6YXBwZW5kQ2hhcmFjdGVyc1JlcGxhY2luZ0VudGl0aWVzSW50ZXJuYWwpOgorICAgICAgICAo V2ViQ29yZTo6TWFya3VwQWNjdW11bGF0b3I6OmFwcGVuZENoYXJhY3RlcnNSZXBsYWNpbmdFbnRp dGllcyk6CisgICAgICAgICogZWRpdGluZy9NYXJrdXBBY2N1bXVsYXRvci5oOgorCiAyMDE0LTAy LTA3ICBKZXIgTm9ibGUgIDxqZXIubm9ibGVAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQgYnVpbGQgZml4IGZvciAzMi1iaXQgaU9TLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZWRpdGluZy9NYXJrdXBBY2N1bXVsYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01h cmt1cEFjY3VtdWxhdG9yLmNwcAppbmRleCAwOWI3ZjA3MTdmYzViODllYzhkZTc5MDQ0MTU0YThh YjY2N2U2ZjMwLi4xYzdmZGMzZDc0MDY4NDU3ZTExNDhmMGJmNDY3MzU0MGVmY2UyNmE3IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01hcmt1cEFjY3VtdWxhdG9yLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01hcmt1cEFjY3VtdWxhdG9yLmNwcApAQCAtNDYsNTgg KzQ2LDczIEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogdXNpbmcgbmFtZXNwYWNlIEhUTUxOYW1l czsKIAorc3RydWN0IEVudGl0eURlc2NyaXB0aW9uIHsKKyAgICBjb25zdCBjaGFyKiBjaGFyYWN0 ZXJzOworICAgIHVuc2lnbmVkIGNoYXIgbGVuZ3RoOworICAgIHVuc2lnbmVkIGNoYXIgbWFzazsK K307CisKK3N0YXRpYyBFbnRpdHlEZXNjcmlwdGlvbiBlbnRpdHlTdWJzdGl0dXRpb25MaXN0W10g eworICAgIHsgIiIsIDAgLCAwIH0sCisgICAgeyAiJmFtcDsiLCA1ICwgRW50aXR5QW1wIH0sCisg ICAgeyAiJmx0OyIsIDQsIEVudGl0eUx0IH0sCisgICAgeyAiJmd0OyIsIDQsIEVudGl0eUd0IH0s CisgICAgeyAiJnF1b3Q7IiwgNiwgRW50aXR5UXVvdCB9LAorICAgIHsgIiZuYnNwOyIsIDYsIEVu dGl0eU5ic3AgfSwKK307CisKK2VudW0gRW50aXR5U3Vic3RpdHV0aW9uSW5kZXggeworICAgIEVu dGl0eVN1YnN0aXR1dGlvbk51bGxJbmRleCA9IDAsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uQW1w SW5kZXggPSAxLAorICAgIEVudGl0eVN1YnN0aXR1dGlvbkx0SW5kZXggPSAyLAorICAgIEVudGl0 eVN1YnN0aXR1dGlvbkd0SW5kZXggPSAzLAorICAgIEVudGl0eVN1YnN0aXR1dGlvblF1b3RJbmRl eCA9IDQsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uTmJzcEluZGV4ID0gNSwKK307CisKK3N0YXRp YyBjb25zdCB1bnNpZ25lZCBtYXhpbXVtRXNjYXBlZGVudGl0eUNoYXJhY3RlciA9IG5vQnJlYWtT cGFjZTsKK3N0YXRpYyB1aW50OF90IGVudGl0eU1hcFttYXhpbXVtRXNjYXBlZGVudGl0eUNoYXJh Y3RlciArIDFdID0geworICAgIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uUXVvdEluZGV4LCAvLyAnIicuCisgICAgMCwg MCwgMCwKKyAgICBFbnRpdHlTdWJzdGl0dXRpb25BbXBJbmRleCwgLy8gJyYnLgorICAgIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs CisgICAgRW50aXR5U3Vic3RpdHV0aW9uTHRJbmRleCwgLy8gJzwnLgorICAgIDAsCisgICAgRW50 aXR5U3Vic3RpdHV0aW9uR3RJbmRleCwgLy8gJz4nLgorICAgIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsCisgICAgRW50aXR5U3Vi c3RpdHV0aW9uTmJzcEluZGV4IC8vIG5vQnJlYWtTcGFjZS4KK307CisKK3RlbXBsYXRlPHR5cGVu YW1lIENoYXJhY3RlclR5cGU+CitzdGF0aWMgaW5saW5lIHZvaWQgYXBwZW5kQ2hhcmFjdGVyc1Jl cGxhY2luZ0VudGl0aWVzSW50ZXJuYWwoU3RyaW5nQnVpbGRlciYgcmVzdWx0LCBjb25zdCBTdHJp bmcmIHNvdXJjZSwgdW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIEVudGl0eU1hc2sg ZW50aXR5TWFzaykKK3sKKyAgICBjb25zdCBDaGFyYWN0ZXJUeXBlKiB0ZXh0ID0gc291cmNlLmNo YXJhY3RlcnM8Q2hhcmFjdGVyVHlwZT4oKSArIG9mZnNldDsKKworICAgIHNpemVfdCBwb3NpdGlv bkFmdGVyTGFzdEVudGl0eSA9IDA7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsZW5ndGg7 ICsraSkgeworICAgICAgICBDaGFyYWN0ZXJUeXBlIGNoYXJhY3RlciA9IHRleHRbaV07CisgICAg ICAgIHVpbnQ4X3Qgc3Vic3RpdHV0aW9uID0gY2hhcmFjdGVyIDwgV1RGX0FSUkFZX0xFTkdUSChl bnRpdHlNYXApID8gZW50aXR5TWFwW2NoYXJhY3Rlcl0gOiBFbnRpdHlTdWJzdGl0dXRpb25OdWxs SW5kZXg7CisgICAgICAgIGlmIChVTkxJS0VMWShzdWJzdGl0dXRpb24gIT0gRW50aXR5U3Vic3Rp dHV0aW9uTnVsbEluZGV4KSAmJiBlbnRpdHlTdWJzdGl0dXRpb25MaXN0W3N1YnN0aXR1dGlvbl0u bWFzayAmIGVudGl0eU1hc2spIHsKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQodGV4dCArIHBv c2l0aW9uQWZ0ZXJMYXN0RW50aXR5LCBpIC0gcG9zaXRpb25BZnRlckxhc3RFbnRpdHkpOworICAg ICAgICAgICAgcmVzdWx0LmFwcGVuZChlbnRpdHlTdWJzdGl0dXRpb25MaXN0W3N1YnN0aXR1dGlv bl0uY2hhcmFjdGVycywgZW50aXR5U3Vic3RpdHV0aW9uTGlzdFtzdWJzdGl0dXRpb25dLmxlbmd0 aCk7CisgICAgICAgICAgICBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSA9IGkgKyAxOworICAgICAg ICB9CisgICAgfQorICAgIHJlc3VsdC5hcHBlbmQodGV4dCArIHBvc2l0aW9uQWZ0ZXJMYXN0RW50 aXR5LCBsZW5ndGggLSBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Cit9CisKIHZvaWQgTWFya3Vw QWNjdW11bGF0b3I6OmFwcGVuZENoYXJhY3RlcnNSZXBsYWNpbmdFbnRpdGllcyhTdHJpbmdCdWls ZGVyJiByZXN1bHQsIGNvbnN0IFN0cmluZyYgc291cmNlLCB1bnNpZ25lZCBvZmZzZXQsIHVuc2ln bmVkIGxlbmd0aCwgRW50aXR5TWFzayBlbnRpdHlNYXNrKQogewotICAgIERFRklORV9TVEFUSUNf TE9DQUwoY29uc3QgU3RyaW5nLCBhbXBSZWZlcmVuY2UsIChBU0NJSUxpdGVyYWwoIiZhbXA7Iikp KTsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgbHRSZWZlcmVuY2UsIChB U0NJSUxpdGVyYWwoIiZsdDsiKSkpOwotICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3Ry aW5nLCBndFJlZmVyZW5jZSwgKEFTQ0lJTGl0ZXJhbCgiJmd0OyIpKSk7Ci0gICAgREVGSU5FX1NU QVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIHF1b3RSZWZlcmVuY2UsIChBU0NJSUxpdGVyYWwoIiZx dW90OyIpKSk7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBTdHJpbmcsIG5ic3BSZWZl cmVuY2UsIChBU0NJSUxpdGVyYWwoIiZuYnNwOyIpKSk7Ci0KLSAgICBzdGF0aWMgY29uc3QgRW50 aXR5RGVzY3JpcHRpb24gZW50aXR5TWFwc1tdID0gewotICAgICAgICB7ICcmJywgYW1wUmVmZXJl bmNlLCBFbnRpdHlBbXAgfSwKLSAgICAgICAgeyAnPCcsIGx0UmVmZXJlbmNlLCBFbnRpdHlMdCB9 LAotICAgICAgICB7ICc+JywgZ3RSZWZlcmVuY2UsIEVudGl0eUd0IH0sCi0gICAgICAgIHsgJyIn LCBxdW90UmVmZXJlbmNlLCBFbnRpdHlRdW90IH0sCi0gICAgICAgIHsgbm9CcmVha1NwYWNlLCBu YnNwUmVmZXJlbmNlLCBFbnRpdHlOYnNwIH0sCi0gICAgfTsKLQogICAgIGlmICghKG9mZnNldCAr IGxlbmd0aCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIEFTU0VSVChvZmZzZXQgKyBsZW5ndGgg PD0gc291cmNlLmxlbmd0aCgpKTsKIAotICAgIGlmIChzb3VyY2UuaXM4Qml0KCkpIHsKLSAgICAg ICAgY29uc3QgTENoYXIqIHRleHQgPSBzb3VyY2UuY2hhcmFjdGVyczgoKSArIG9mZnNldDsKLQot ICAgICAgICBzaXplX3QgcG9zaXRpb25BZnRlckxhc3RFbnRpdHkgPSAwOwotICAgICAgICBmb3Ig KHNpemVfdCBpID0gMDsgaSA8IGxlbmd0aDsgKytpKSB7Ci0gICAgICAgICAgICBmb3IgKHNpemVf dCBlbnRpdHlJbmRleCA9IDA7IGVudGl0eUluZGV4IDwgV1RGX0FSUkFZX0xFTkdUSChlbnRpdHlN YXBzKTsgKytlbnRpdHlJbmRleCkgewotICAgICAgICAgICAgICAgIGlmICh0ZXh0W2ldID09IGVu dGl0eU1hcHNbZW50aXR5SW5kZXhdLmVudGl0eSAmJiBlbnRpdHlNYXBzW2VudGl0eUluZGV4XS5t YXNrICYgZW50aXR5TWFzaykgewotICAgICAgICAgICAgICAgICAgICByZXN1bHQuYXBwZW5kKHRl eHQgKyBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSwgaSAtIHBvc2l0aW9uQWZ0ZXJMYXN0RW50aXR5 KTsKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVuZChlbnRpdHlNYXBzW2VudGl0eUlu ZGV4XS5yZWZlcmVuY2UpOwotICAgICAgICAgICAgICAgICAgICBwb3NpdGlvbkFmdGVyTGFzdEVu dGl0eSA9IGkgKyAxOwotICAgICAgICAgICAgICAgICAgICBicmVhazsKLSAgICAgICAgICAgICAg ICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0KLSAgICAgICAgcmVzdWx0LmFwcGVuZCh0ZXh0 ICsgcG9zaXRpb25BZnRlckxhc3RFbnRpdHksIGxlbmd0aCAtIHBvc2l0aW9uQWZ0ZXJMYXN0RW50 aXR5KTsKLSAgICB9IGVsc2UgewotICAgICAgICBjb25zdCBVQ2hhciogdGV4dCA9IHNvdXJjZS5j aGFyYWN0ZXJzMTYoKSArIG9mZnNldDsKLQotICAgICAgICBzaXplX3QgcG9zaXRpb25BZnRlckxh c3RFbnRpdHkgPSAwOwotICAgICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IGxlbmd0aDsgKytp KSB7Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBlbnRpdHlJbmRleCA9IDA7IGVudGl0eUluZGV4 IDwgV1RGX0FSUkFZX0xFTkdUSChlbnRpdHlNYXBzKTsgKytlbnRpdHlJbmRleCkgewotICAgICAg ICAgICAgICAgIGlmICh0ZXh0W2ldID09IGVudGl0eU1hcHNbZW50aXR5SW5kZXhdLmVudGl0eSAm JiBlbnRpdHlNYXBzW2VudGl0eUluZGV4XS5tYXNrICYgZW50aXR5TWFzaykgewotICAgICAgICAg ICAgICAgICAgICByZXN1bHQuYXBwZW5kKHRleHQgKyBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSwg aSAtIHBvc2l0aW9uQWZ0ZXJMYXN0RW50aXR5KTsKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0 LmFwcGVuZChlbnRpdHlNYXBzW2VudGl0eUluZGV4XS5yZWZlcmVuY2UpOwotICAgICAgICAgICAg ICAgICAgICBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSA9IGkgKyAxOwotICAgICAgICAgICAgICAg ICAgICBicmVhazsKLSAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICB9Ci0gICAgICAgIH0K LSAgICAgICAgcmVzdWx0LmFwcGVuZCh0ZXh0ICsgcG9zaXRpb25BZnRlckxhc3RFbnRpdHksIGxl bmd0aCAtIHBvc2l0aW9uQWZ0ZXJMYXN0RW50aXR5KTsKLSAgICB9CisgICAgaWYgKHNvdXJjZS5p czhCaXQoKSkKKyAgICAgICAgYXBwZW5kQ2hhcmFjdGVyc1JlcGxhY2luZ0VudGl0aWVzSW50ZXJu YWw8TENoYXI+KHJlc3VsdCwgc291cmNlLCBvZmZzZXQsIGxlbmd0aCwgZW50aXR5TWFzayk7Cisg ICAgZWxzZQorICAgICAgICBhcHBlbmRDaGFyYWN0ZXJzUmVwbGFjaW5nRW50aXRpZXNJbnRlcm5h bDxVQ2hhcj4ocmVzdWx0LCBzb3VyY2UsIG9mZnNldCwgbGVuZ3RoLCBlbnRpdHlNYXNrKTsKIH0K IAogTWFya3VwQWNjdW11bGF0b3I6Ok1hcmt1cEFjY3VtdWxhdG9yKFZlY3RvcjxOb2RlKj4qIG5v ZGVzLCBFQWJzb2x1dGVVUkxzIHJlc29sdmVVcmxzTWV0aG9kLCBjb25zdCBSYW5nZSogcmFuZ2Us IEVGcmFnbWVudFNlcmlhbGl6YXRpb24gZnJhZ21lbnRTZXJpYWxpemF0aW9uKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZWRpdGluZy9NYXJrdXBBY2N1bXVsYXRvci5oIGIvU291cmNlL1dl YkNvcmUvZWRpdGluZy9NYXJrdXBBY2N1bXVsYXRvci5oCmluZGV4IDg0MjMzN2UxNDAyMGZhNGM4 MmFlN2FmOTkxMWFlODg5MDNhNjUzYzIuLjA4MDgzMmI1YmU0ZGI0YWEwM2U5Y2FjODllN2FhODJj MzBkN2NhNWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvTWFya3VwQWNjdW11 bGF0b3IuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01hcmt1cEFjY3VtdWxhdG9yLmgK QEAgLTU2LDEyICs1Niw2IEBAIGVudW0gRW50aXR5TWFzayB7CiAgICAgRW50aXR5TWFza0luSFRN TEF0dHJpYnV0ZVZhbHVlID0gRW50aXR5TWFza0luQXR0cmlidXRlVmFsdWUgfCBFbnRpdHlOYnNw LAogfTsKIAotc3RydWN0IEVudGl0eURlc2NyaXB0aW9uIHsKLSAgICBVQ2hhciBlbnRpdHk7Ci0g ICAgY29uc3QgU3RyaW5nJiByZWZlcmVuY2U7Ci0gICAgRW50aXR5TWFzayBtYXNrOwotfTsKLQog Ly8gRklYTUU6IE5vbmNvcHlhYmxlPwogY2xhc3MgTWFya3VwQWNjdW11bGF0b3IgewogcHVibGlj Ogo= 223665 2014-02-09 19:30:46 -0800 2014-02-09 20:37:23 -0800 Patch bug-128440-20140209193040.patch text/plain 7441 benjamin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Mzc2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAyLTA5ICBCZW5qYW1p biBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBDbGVhbiB1cCBNYXJr dXBBY2N1bXVsYXRvcjo6YXBwZW5kQ2hhcmFjdGVyc1JlcGxhY2luZ0VudGl0aWVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg0NDAKKworICAgICAg ICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgU29tZSBjbGVhbnVwOgorICAg ICAgICAtUmVtb3ZlIHRoZSBjb3BpZWQgY29kZSBmb3IgdGhlIGxvb3BzLiBJbnN0ZWFkLCB1c2Ug YSB0ZW1wbGF0ZSB3aXRoIHRoZSBsb29wCisgICAgICAgICBwYXJhbWV0cml6ZWQgYnkgdGhlIGNo YXJhY3RlcnMgdHlwZS4KKyAgICAgICAgLU1vdmUgRW50aXR5RGVzY3JpcHRpb24gZnJvbSB0aGUg aGVhZGVyIHRvIHRoZSBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgLU1ha2UgdGhlIDUgc3Vic3Rp dHV0aW9uIHN0cmluZ3MgY29tcGlsZS10aW1lIGxpdGVyYWxzLiBSZXBsYWNlbWVudCBpcyBub3Qg aG90IGVub3VnaAorICAgICAgICAgdG8ganVzdGlmeSB0aGUgc3RhdGljIGhlcmUuCisKKyAgICAg ICAgKiBlZGl0aW5nL01hcmt1cEFjY3VtdWxhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFw cGVuZENoYXJhY3RlcnNSZXBsYWNpbmdFbnRpdGllc0ludGVybmFsKToKKyAgICAgICAgKFdlYkNv cmU6Ok1hcmt1cEFjY3VtdWxhdG9yOjphcHBlbmRDaGFyYWN0ZXJzUmVwbGFjaW5nRW50aXRpZXMp OgorICAgICAgICAqIGVkaXRpbmcvTWFya3VwQWNjdW11bGF0b3IuaDoKKwogMjAxNC0wMi0wOSAg VGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVt3 azJdIEFTU0VSVChXZWJUaHJlYWRJc0N1cnJlbnQoKSkgaW4gW1dlYkRpc3BsYXlMaW5rSGFuZGxl ciBoYW5kbGVEaXNwbGF5TGluazpdCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01hcmt1 cEFjY3VtdWxhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01h cmt1cEFjY3VtdWxhdG9yLmNwcAkocmV2aXNpb24gMTYzNzYwKQorKysgU291cmNlL1dlYkNvcmUv ZWRpdGluZy9NYXJrdXBBY2N1bXVsYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDU4ICs0 Niw3MyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7 CiAKK3N0cnVjdCBFbnRpdHlEZXNjcmlwdGlvbiB7CisgICAgY29uc3QgY2hhciogY2hhcmFjdGVy czsKKyAgICB1bnNpZ25lZCBjaGFyIGxlbmd0aDsKKyAgICB1bnNpZ25lZCBjaGFyIG1hc2s7Cit9 OworCitzdGF0aWMgRW50aXR5RGVzY3JpcHRpb24gZW50aXR5U3Vic3RpdHV0aW9uTGlzdFtdID0g eworICAgIHsgIiIsIDAgLCAwIH0sCisgICAgeyAiJmFtcDsiLCA1ICwgRW50aXR5QW1wIH0sCisg ICAgeyAiJmx0OyIsIDQsIEVudGl0eUx0IH0sCisgICAgeyAiJmd0OyIsIDQsIEVudGl0eUd0IH0s CisgICAgeyAiJnF1b3Q7IiwgNiwgRW50aXR5UXVvdCB9LAorICAgIHsgIiZuYnNwOyIsIDYsIEVu dGl0eU5ic3AgfSwKK307CisKK2VudW0gRW50aXR5U3Vic3RpdHV0aW9uSW5kZXggeworICAgIEVu dGl0eVN1YnN0aXR1dGlvbk51bGxJbmRleCA9IDAsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uQW1w SW5kZXggPSAxLAorICAgIEVudGl0eVN1YnN0aXR1dGlvbkx0SW5kZXggPSAyLAorICAgIEVudGl0 eVN1YnN0aXR1dGlvbkd0SW5kZXggPSAzLAorICAgIEVudGl0eVN1YnN0aXR1dGlvblF1b3RJbmRl eCA9IDQsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uTmJzcEluZGV4ID0gNSwKK307CisKK3N0YXRp YyBjb25zdCB1bnNpZ25lZCBtYXhpbXVtRXNjYXBlZGVudGl0eUNoYXJhY3RlciA9IG5vQnJlYWtT cGFjZTsKK3N0YXRpYyB1aW50OF90IGVudGl0eU1hcFttYXhpbXVtRXNjYXBlZGVudGl0eUNoYXJh Y3RlciArIDFdID0geworICAgIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uUXVvdEluZGV4LCAvLyAnIicuCisgICAgMCwg MCwgMCwKKyAgICBFbnRpdHlTdWJzdGl0dXRpb25BbXBJbmRleCwgLy8gJyYnLgorICAgIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs CisgICAgRW50aXR5U3Vic3RpdHV0aW9uTHRJbmRleCwgLy8gJzwnLgorICAgIDAsCisgICAgRW50 aXR5U3Vic3RpdHV0aW9uR3RJbmRleCwgLy8gJz4nLgorICAgIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsCisgICAgRW50aXR5U3Vi c3RpdHV0aW9uTmJzcEluZGV4IC8vIG5vQnJlYWtTcGFjZS4KK307CisKK3RlbXBsYXRlPHR5cGVu YW1lIENoYXJhY3RlclR5cGU+CitzdGF0aWMgaW5saW5lIHZvaWQgYXBwZW5kQ2hhcmFjdGVyc1Jl cGxhY2luZ0VudGl0aWVzSW50ZXJuYWwoU3RyaW5nQnVpbGRlciYgcmVzdWx0LCBjb25zdCBTdHJp bmcmIHNvdXJjZSwgdW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIEVudGl0eU1hc2sg ZW50aXR5TWFzaykKK3sKKyAgICBjb25zdCBDaGFyYWN0ZXJUeXBlKiB0ZXh0ID0gc291cmNlLmNo YXJhY3RlcnM8Q2hhcmFjdGVyVHlwZT4oKSArIG9mZnNldDsKKworICAgIHNpemVfdCBwb3NpdGlv bkFmdGVyTGFzdEVudGl0eSA9IDA7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsZW5ndGg7 ICsraSkgeworICAgICAgICBDaGFyYWN0ZXJUeXBlIGNoYXJhY3RlciA9IHRleHRbaV07CisgICAg ICAgIHVpbnQ4X3Qgc3Vic3RpdHV0aW9uID0gY2hhcmFjdGVyIDwgV1RGX0FSUkFZX0xFTkdUSChl bnRpdHlNYXApID8gZW50aXR5TWFwW2NoYXJhY3Rlcl0gOiBFbnRpdHlTdWJzdGl0dXRpb25OdWxs SW5kZXg7CisgICAgICAgIGlmIChVTkxJS0VMWShzdWJzdGl0dXRpb24gIT0gc3RhdGljX2Nhc3Q8 dWludDhfdD4oRW50aXR5U3Vic3RpdHV0aW9uTnVsbEluZGV4KSkgJiYgZW50aXR5U3Vic3RpdHV0 aW9uTGlzdFtzdWJzdGl0dXRpb25dLm1hc2sgJiBlbnRpdHlNYXNrKSB7CisgICAgICAgICAgICBy ZXN1bHQuYXBwZW5kKHRleHQgKyBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSwgaSAtIHBvc2l0aW9u QWZ0ZXJMYXN0RW50aXR5KTsKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoZW50aXR5U3Vic3Rp dHV0aW9uTGlzdFtzdWJzdGl0dXRpb25dLmNoYXJhY3RlcnMsIGVudGl0eVN1YnN0aXR1dGlvbkxp c3Rbc3Vic3RpdHV0aW9uXS5sZW5ndGgpOworICAgICAgICAgICAgcG9zaXRpb25BZnRlckxhc3RF bnRpdHkgPSBpICsgMTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXN1bHQuYXBwZW5kKHRleHQg KyBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSwgbGVuZ3RoIC0gcG9zaXRpb25BZnRlckxhc3RFbnRp dHkpOworfQorCiB2b2lkIE1hcmt1cEFjY3VtdWxhdG9yOjphcHBlbmRDaGFyYWN0ZXJzUmVwbGFj aW5nRW50aXRpZXMoU3RyaW5nQnVpbGRlciYgcmVzdWx0LCBjb25zdCBTdHJpbmcmIHNvdXJjZSwg dW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIEVudGl0eU1hc2sgZW50aXR5TWFzaykK IHsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgYW1wUmVmZXJlbmNlLCAo QVNDSUlMaXRlcmFsKCImYW1wOyIpKSk7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBT dHJpbmcsIGx0UmVmZXJlbmNlLCAoQVNDSUlMaXRlcmFsKCImbHQ7IikpKTsKLSAgICBERUZJTkVf U1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgZ3RSZWZlcmVuY2UsIChBU0NJSUxpdGVyYWwoIiZn dDsiKSkpOwotICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBxdW90UmVmZXJl bmNlLCAoQVNDSUlMaXRlcmFsKCImcXVvdDsiKSkpOwotICAgIERFRklORV9TVEFUSUNfTE9DQUwo Y29uc3QgU3RyaW5nLCBuYnNwUmVmZXJlbmNlLCAoQVNDSUlMaXRlcmFsKCImbmJzcDsiKSkpOwot Ci0gICAgc3RhdGljIGNvbnN0IEVudGl0eURlc2NyaXB0aW9uIGVudGl0eU1hcHNbXSA9IHsKLSAg ICAgICAgeyAnJicsIGFtcFJlZmVyZW5jZSwgRW50aXR5QW1wIH0sCi0gICAgICAgIHsgJzwnLCBs dFJlZmVyZW5jZSwgRW50aXR5THQgfSwKLSAgICAgICAgeyAnPicsIGd0UmVmZXJlbmNlLCBFbnRp dHlHdCB9LAotICAgICAgICB7ICciJywgcXVvdFJlZmVyZW5jZSwgRW50aXR5UXVvdCB9LAotICAg ICAgICB7IG5vQnJlYWtTcGFjZSwgbmJzcFJlZmVyZW5jZSwgRW50aXR5TmJzcCB9LAotICAgIH07 Ci0KICAgICBpZiAoIShvZmZzZXQgKyBsZW5ndGgpKQogICAgICAgICByZXR1cm47CiAKICAgICBB U1NFUlQob2Zmc2V0ICsgbGVuZ3RoIDw9IHNvdXJjZS5sZW5ndGgoKSk7CiAKLSAgICBpZiAoc291 cmNlLmlzOEJpdCgpKSB7Ci0gICAgICAgIGNvbnN0IExDaGFyKiB0ZXh0ID0gc291cmNlLmNoYXJh Y3RlcnM4KCkgKyBvZmZzZXQ7Ci0KLSAgICAgICAgc2l6ZV90IHBvc2l0aW9uQWZ0ZXJMYXN0RW50 aXR5ID0gMDsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewot ICAgICAgICAgICAgZm9yIChzaXplX3QgZW50aXR5SW5kZXggPSAwOyBlbnRpdHlJbmRleCA8IFdU Rl9BUlJBWV9MRU5HVEgoZW50aXR5TWFwcyk7ICsrZW50aXR5SW5kZXgpIHsKLSAgICAgICAgICAg ICAgICBpZiAodGV4dFtpXSA9PSBlbnRpdHlNYXBzW2VudGl0eUluZGV4XS5lbnRpdHkgJiYgZW50 aXR5TWFwc1tlbnRpdHlJbmRleF0ubWFzayAmIGVudGl0eU1hc2spIHsKLSAgICAgICAgICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZCh0ZXh0ICsgcG9zaXRpb25BZnRlckxhc3RFbnRpdHksIGkgLSBw b3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Ci0gICAgICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBl bmQoZW50aXR5TWFwc1tlbnRpdHlJbmRleF0ucmVmZXJlbmNlKTsKLSAgICAgICAgICAgICAgICAg ICAgcG9zaXRpb25BZnRlckxhc3RFbnRpdHkgPSBpICsgMTsKLSAgICAgICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAg ICAgIHJlc3VsdC5hcHBlbmQodGV4dCArIHBvc2l0aW9uQWZ0ZXJMYXN0RW50aXR5LCBsZW5ndGgg LSBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgY29uc3Qg VUNoYXIqIHRleHQgPSBzb3VyY2UuY2hhcmFjdGVyczE2KCkgKyBvZmZzZXQ7Ci0KLSAgICAgICAg c2l6ZV90IHBvc2l0aW9uQWZ0ZXJMYXN0RW50aXR5ID0gMDsKLSAgICAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewotICAgICAgICAgICAgZm9yIChzaXplX3QgZW50aXR5 SW5kZXggPSAwOyBlbnRpdHlJbmRleCA8IFdURl9BUlJBWV9MRU5HVEgoZW50aXR5TWFwcyk7ICsr ZW50aXR5SW5kZXgpIHsKLSAgICAgICAgICAgICAgICBpZiAodGV4dFtpXSA9PSBlbnRpdHlNYXBz W2VudGl0eUluZGV4XS5lbnRpdHkgJiYgZW50aXR5TWFwc1tlbnRpdHlJbmRleF0ubWFzayAmIGVu dGl0eU1hc2spIHsKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCh0ZXh0ICsgcG9z aXRpb25BZnRlckxhc3RFbnRpdHksIGkgLSBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Ci0gICAg ICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoZW50aXR5TWFwc1tlbnRpdHlJbmRleF0ucmVm ZXJlbmNlKTsKLSAgICAgICAgICAgICAgICAgICAgcG9zaXRpb25BZnRlckxhc3RFbnRpdHkgPSBp ICsgMTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIHJlc3VsdC5hcHBlbmQodGV4dCArIHBvc2l0 aW9uQWZ0ZXJMYXN0RW50aXR5LCBsZW5ndGggLSBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Ci0g ICAgfQorICAgIGlmIChzb3VyY2UuaXM4Qml0KCkpCisgICAgICAgIGFwcGVuZENoYXJhY3RlcnNS ZXBsYWNpbmdFbnRpdGllc0ludGVybmFsPExDaGFyPihyZXN1bHQsIHNvdXJjZSwgb2Zmc2V0LCBs ZW5ndGgsIGVudGl0eU1hc2spOworICAgIGVsc2UKKyAgICAgICAgYXBwZW5kQ2hhcmFjdGVyc1Jl cGxhY2luZ0VudGl0aWVzSW50ZXJuYWw8VUNoYXI+KHJlc3VsdCwgc291cmNlLCBvZmZzZXQsIGxl bmd0aCwgZW50aXR5TWFzayk7CiB9CiAKIE1hcmt1cEFjY3VtdWxhdG9yOjpNYXJrdXBBY2N1bXVs YXRvcihWZWN0b3I8Tm9kZSo+KiBub2RlcywgRUFic29sdXRlVVJMcyByZXNvbHZlVXJsc01ldGhv ZCwgY29uc3QgUmFuZ2UqIHJhbmdlLCBFRnJhZ21lbnRTZXJpYWxpemF0aW9uIGZyYWdtZW50U2Vy aWFsaXphdGlvbikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvTWFya3VwQWNjdW11bGF0 b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01hcmt1cEFjY3VtdWxh dG9yLmgJKHJldmlzaW9uIDE2Mzc2MCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvTWFya3Vw QWNjdW11bGF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNTYsMTIgKzU2LDYgQEAgZW51bSBFbnRp dHlNYXNrIHsKICAgICBFbnRpdHlNYXNrSW5IVE1MQXR0cmlidXRlVmFsdWUgPSBFbnRpdHlNYXNr SW5BdHRyaWJ1dGVWYWx1ZSB8IEVudGl0eU5ic3AsCiB9OwogCi1zdHJ1Y3QgRW50aXR5RGVzY3Jp cHRpb24gewotICAgIFVDaGFyIGVudGl0eTsKLSAgICBjb25zdCBTdHJpbmcmIHJlZmVyZW5jZTsK LSAgICBFbnRpdHlNYXNrIG1hc2s7Ci19OwotCiAvLyBGSVhNRTogTm9uY29weWFibGU/CiBjbGFz cyBNYXJrdXBBY2N1bXVsYXRvciB7CiBwdWJsaWM6Cg== 223669 2014-02-09 20:37:27 -0800 2014-02-09 23:51:03 -0800 Patch bug-128440-20140209203725.patch text/plain 7441 benjamin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2Mzc2MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE0LTAyLTA5ICBCZW5qYW1p biBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBDbGVhbiB1cCBNYXJr dXBBY2N1bXVsYXRvcjo6YXBwZW5kQ2hhcmFjdGVyc1JlcGxhY2luZ0VudGl0aWVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjg0NDAKKworICAgICAg ICBSZXZpZXdlZCBieSBSeW9zdWtlIE5pd2EuCisKKyAgICAgICAgU29tZSBjbGVhbnVwOgorICAg ICAgICAtUmVtb3ZlIHRoZSBjb3BpZWQgY29kZSBmb3IgdGhlIGxvb3BzLiBJbnN0ZWFkLCB1c2Ug YSB0ZW1wbGF0ZSB3aXRoIHRoZSBsb29wCisgICAgICAgICBwYXJhbWV0cml6ZWQgYnkgdGhlIGNo YXJhY3RlcnMgdHlwZS4KKyAgICAgICAgLU1vdmUgRW50aXR5RGVzY3JpcHRpb24gZnJvbSB0aGUg aGVhZGVyIHRvIHRoZSBpbXBsZW1lbnRhdGlvbi4KKyAgICAgICAgLU1ha2UgdGhlIDUgc3Vic3Rp dHV0aW9uIHN0cmluZ3MgY29tcGlsZS10aW1lIGxpdGVyYWxzLiBSZXBsYWNlbWVudCBpcyBub3Qg aG90IGVub3VnaAorICAgICAgICAgdG8ganVzdGlmeSB0aGUgc3RhdGljIGhlcmUuCisKKyAgICAg ICAgKiBlZGl0aW5nL01hcmt1cEFjY3VtdWxhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFw cGVuZENoYXJhY3RlcnNSZXBsYWNpbmdFbnRpdGllc0ludGVybmFsKToKKyAgICAgICAgKFdlYkNv cmU6Ok1hcmt1cEFjY3VtdWxhdG9yOjphcHBlbmRDaGFyYWN0ZXJzUmVwbGFjaW5nRW50aXRpZXMp OgorICAgICAgICAqIGVkaXRpbmcvTWFya3VwQWNjdW11bGF0b3IuaDoKKwogMjAxNC0wMi0wOSAg VGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXVt3 azJdIEFTU0VSVChXZWJUaHJlYWRJc0N1cnJlbnQoKSkgaW4gW1dlYkRpc3BsYXlMaW5rSGFuZGxl ciBoYW5kbGVEaXNwbGF5TGluazpdCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01hcmt1 cEFjY3VtdWxhdG9yLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01h cmt1cEFjY3VtdWxhdG9yLmNwcAkocmV2aXNpb24gMTYzNzYwKQorKysgU291cmNlL1dlYkNvcmUv ZWRpdGluZy9NYXJrdXBBY2N1bXVsYXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDU4ICs0 Niw3MyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHVzaW5nIG5hbWVzcGFjZSBIVE1MTmFtZXM7 CiAKK3N0cnVjdCBFbnRpdHlEZXNjcmlwdGlvbiB7CisgICAgY29uc3QgY2hhciogY2hhcmFjdGVy czsKKyAgICB1bnNpZ25lZCBjaGFyIGxlbmd0aDsKKyAgICB1bnNpZ25lZCBjaGFyIG1hc2s7Cit9 OworCitzdGF0aWMgRW50aXR5RGVzY3JpcHRpb24gZW50aXR5U3Vic3RpdHV0aW9uTGlzdFtdID0g eworICAgIHsgIiIsIDAgLCAwIH0sCisgICAgeyAiJmFtcDsiLCA1ICwgRW50aXR5QW1wIH0sCisg ICAgeyAiJmx0OyIsIDQsIEVudGl0eUx0IH0sCisgICAgeyAiJmd0OyIsIDQsIEVudGl0eUd0IH0s CisgICAgeyAiJnF1b3Q7IiwgNiwgRW50aXR5UXVvdCB9LAorICAgIHsgIiZuYnNwOyIsIDYsIEVu dGl0eU5ic3AgfSwKK307CisKK2VudW0gRW50aXR5U3Vic3RpdHV0aW9uSW5kZXggeworICAgIEVu dGl0eVN1YnN0aXR1dGlvbk51bGxJbmRleCA9IDAsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uQW1w SW5kZXggPSAxLAorICAgIEVudGl0eVN1YnN0aXR1dGlvbkx0SW5kZXggPSAyLAorICAgIEVudGl0 eVN1YnN0aXR1dGlvbkd0SW5kZXggPSAzLAorICAgIEVudGl0eVN1YnN0aXR1dGlvblF1b3RJbmRl eCA9IDQsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uTmJzcEluZGV4ID0gNSwKK307CisKK3N0YXRp YyBjb25zdCB1bnNpZ25lZCBtYXhpbXVtRXNjYXBlZGVudGl0eUNoYXJhY3RlciA9IG5vQnJlYWtT cGFjZTsKK3N0YXRpYyB1aW50OF90IGVudGl0eU1hcFttYXhpbXVtRXNjYXBlZGVudGl0eUNoYXJh Y3RlciArIDFdID0geworICAgIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsCisgICAgRW50aXR5U3Vic3RpdHV0aW9uUXVvdEluZGV4LCAvLyAnIicuCisgICAgMCwg MCwgMCwKKyAgICBFbnRpdHlTdWJzdGl0dXRpb25BbXBJbmRleCwgLy8gJyYnLgorICAgIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs CisgICAgRW50aXR5U3Vic3RpdHV0aW9uTHRJbmRleCwgLy8gJzwnLgorICAgIDAsCisgICAgRW50 aXR5U3Vic3RpdHV0aW9uR3RJbmRleCwgLy8gJz4nLgorICAgIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAs IDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsIDAsCisgICAgRW50aXR5U3Vi c3RpdHV0aW9uTmJzcEluZGV4IC8vIG5vQnJlYWtTcGFjZS4KK307CisKK3RlbXBsYXRlPHR5cGVu YW1lIENoYXJhY3RlclR5cGU+CitzdGF0aWMgaW5saW5lIHZvaWQgYXBwZW5kQ2hhcmFjdGVyc1Jl cGxhY2luZ0VudGl0aWVzSW50ZXJuYWwoU3RyaW5nQnVpbGRlciYgcmVzdWx0LCBjb25zdCBTdHJp bmcmIHNvdXJjZSwgdW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIEVudGl0eU1hc2sg ZW50aXR5TWFzaykKK3sKKyAgICBjb25zdCBDaGFyYWN0ZXJUeXBlKiB0ZXh0ID0gc291cmNlLmNo YXJhY3RlcnM8Q2hhcmFjdGVyVHlwZT4oKSArIG9mZnNldDsKKworICAgIHNpemVfdCBwb3NpdGlv bkFmdGVyTGFzdEVudGl0eSA9IDA7CisgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsZW5ndGg7 ICsraSkgeworICAgICAgICBDaGFyYWN0ZXJUeXBlIGNoYXJhY3RlciA9IHRleHRbaV07CisgICAg ICAgIHVpbnQ4X3Qgc3Vic3RpdHV0aW9uID0gY2hhcmFjdGVyIDwgV1RGX0FSUkFZX0xFTkdUSChl bnRpdHlNYXApID8gZW50aXR5TWFwW2NoYXJhY3Rlcl0gOiBzdGF0aWNfY2FzdDx1aW50OF90PihF bnRpdHlTdWJzdGl0dXRpb25OdWxsSW5kZXgpOworICAgICAgICBpZiAoVU5MSUtFTFkoc3Vic3Rp dHV0aW9uICE9IEVudGl0eVN1YnN0aXR1dGlvbk51bGxJbmRleCkgJiYgZW50aXR5U3Vic3RpdHV0 aW9uTGlzdFtzdWJzdGl0dXRpb25dLm1hc2sgJiBlbnRpdHlNYXNrKSB7CisgICAgICAgICAgICBy ZXN1bHQuYXBwZW5kKHRleHQgKyBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSwgaSAtIHBvc2l0aW9u QWZ0ZXJMYXN0RW50aXR5KTsKKyAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoZW50aXR5U3Vic3Rp dHV0aW9uTGlzdFtzdWJzdGl0dXRpb25dLmNoYXJhY3RlcnMsIGVudGl0eVN1YnN0aXR1dGlvbkxp c3Rbc3Vic3RpdHV0aW9uXS5sZW5ndGgpOworICAgICAgICAgICAgcG9zaXRpb25BZnRlckxhc3RF bnRpdHkgPSBpICsgMTsKKyAgICAgICAgfQorICAgIH0KKyAgICByZXN1bHQuYXBwZW5kKHRleHQg KyBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSwgbGVuZ3RoIC0gcG9zaXRpb25BZnRlckxhc3RFbnRp dHkpOworfQorCiB2b2lkIE1hcmt1cEFjY3VtdWxhdG9yOjphcHBlbmRDaGFyYWN0ZXJzUmVwbGFj aW5nRW50aXRpZXMoU3RyaW5nQnVpbGRlciYgcmVzdWx0LCBjb25zdCBTdHJpbmcmIHNvdXJjZSwg dW5zaWduZWQgb2Zmc2V0LCB1bnNpZ25lZCBsZW5ndGgsIEVudGl0eU1hc2sgZW50aXR5TWFzaykK IHsKLSAgICBERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgYW1wUmVmZXJlbmNlLCAo QVNDSUlMaXRlcmFsKCImYW1wOyIpKSk7Ci0gICAgREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBT dHJpbmcsIGx0UmVmZXJlbmNlLCAoQVNDSUlMaXRlcmFsKCImbHQ7IikpKTsKLSAgICBERUZJTkVf U1RBVElDX0xPQ0FMKGNvbnN0IFN0cmluZywgZ3RSZWZlcmVuY2UsIChBU0NJSUxpdGVyYWwoIiZn dDsiKSkpOwotICAgIERFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgU3RyaW5nLCBxdW90UmVmZXJl bmNlLCAoQVNDSUlMaXRlcmFsKCImcXVvdDsiKSkpOwotICAgIERFRklORV9TVEFUSUNfTE9DQUwo Y29uc3QgU3RyaW5nLCBuYnNwUmVmZXJlbmNlLCAoQVNDSUlMaXRlcmFsKCImbmJzcDsiKSkpOwot Ci0gICAgc3RhdGljIGNvbnN0IEVudGl0eURlc2NyaXB0aW9uIGVudGl0eU1hcHNbXSA9IHsKLSAg ICAgICAgeyAnJicsIGFtcFJlZmVyZW5jZSwgRW50aXR5QW1wIH0sCi0gICAgICAgIHsgJzwnLCBs dFJlZmVyZW5jZSwgRW50aXR5THQgfSwKLSAgICAgICAgeyAnPicsIGd0UmVmZXJlbmNlLCBFbnRp dHlHdCB9LAotICAgICAgICB7ICciJywgcXVvdFJlZmVyZW5jZSwgRW50aXR5UXVvdCB9LAotICAg ICAgICB7IG5vQnJlYWtTcGFjZSwgbmJzcFJlZmVyZW5jZSwgRW50aXR5TmJzcCB9LAotICAgIH07 Ci0KICAgICBpZiAoIShvZmZzZXQgKyBsZW5ndGgpKQogICAgICAgICByZXR1cm47CiAKICAgICBB U1NFUlQob2Zmc2V0ICsgbGVuZ3RoIDw9IHNvdXJjZS5sZW5ndGgoKSk7CiAKLSAgICBpZiAoc291 cmNlLmlzOEJpdCgpKSB7Ci0gICAgICAgIGNvbnN0IExDaGFyKiB0ZXh0ID0gc291cmNlLmNoYXJh Y3RlcnM4KCkgKyBvZmZzZXQ7Ci0KLSAgICAgICAgc2l6ZV90IHBvc2l0aW9uQWZ0ZXJMYXN0RW50 aXR5ID0gMDsKLSAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewot ICAgICAgICAgICAgZm9yIChzaXplX3QgZW50aXR5SW5kZXggPSAwOyBlbnRpdHlJbmRleCA8IFdU Rl9BUlJBWV9MRU5HVEgoZW50aXR5TWFwcyk7ICsrZW50aXR5SW5kZXgpIHsKLSAgICAgICAgICAg ICAgICBpZiAodGV4dFtpXSA9PSBlbnRpdHlNYXBzW2VudGl0eUluZGV4XS5lbnRpdHkgJiYgZW50 aXR5TWFwc1tlbnRpdHlJbmRleF0ubWFzayAmIGVudGl0eU1hc2spIHsKLSAgICAgICAgICAgICAg ICAgICAgcmVzdWx0LmFwcGVuZCh0ZXh0ICsgcG9zaXRpb25BZnRlckxhc3RFbnRpdHksIGkgLSBw b3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Ci0gICAgICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBl bmQoZW50aXR5TWFwc1tlbnRpdHlJbmRleF0ucmVmZXJlbmNlKTsKLSAgICAgICAgICAgICAgICAg ICAgcG9zaXRpb25BZnRlckxhc3RFbnRpdHkgPSBpICsgMTsKLSAgICAgICAgICAgICAgICAgICAg YnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgfQotICAgICAgICB9Ci0gICAg ICAgIHJlc3VsdC5hcHBlbmQodGV4dCArIHBvc2l0aW9uQWZ0ZXJMYXN0RW50aXR5LCBsZW5ndGgg LSBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgY29uc3Qg VUNoYXIqIHRleHQgPSBzb3VyY2UuY2hhcmFjdGVyczE2KCkgKyBvZmZzZXQ7Ci0KLSAgICAgICAg c2l6ZV90IHBvc2l0aW9uQWZ0ZXJMYXN0RW50aXR5ID0gMDsKLSAgICAgICAgZm9yIChzaXplX3Qg aSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewotICAgICAgICAgICAgZm9yIChzaXplX3QgZW50aXR5 SW5kZXggPSAwOyBlbnRpdHlJbmRleCA8IFdURl9BUlJBWV9MRU5HVEgoZW50aXR5TWFwcyk7ICsr ZW50aXR5SW5kZXgpIHsKLSAgICAgICAgICAgICAgICBpZiAodGV4dFtpXSA9PSBlbnRpdHlNYXBz W2VudGl0eUluZGV4XS5lbnRpdHkgJiYgZW50aXR5TWFwc1tlbnRpdHlJbmRleF0ubWFzayAmIGVu dGl0eU1hc2spIHsKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0LmFwcGVuZCh0ZXh0ICsgcG9z aXRpb25BZnRlckxhc3RFbnRpdHksIGkgLSBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Ci0gICAg ICAgICAgICAgICAgICAgIHJlc3VsdC5hcHBlbmQoZW50aXR5TWFwc1tlbnRpdHlJbmRleF0ucmVm ZXJlbmNlKTsKLSAgICAgICAgICAgICAgICAgICAgcG9zaXRpb25BZnRlckxhc3RFbnRpdHkgPSBp ICsgMTsKLSAgICAgICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICAgICAgfQotICAg ICAgICAgICAgfQotICAgICAgICB9Ci0gICAgICAgIHJlc3VsdC5hcHBlbmQodGV4dCArIHBvc2l0 aW9uQWZ0ZXJMYXN0RW50aXR5LCBsZW5ndGggLSBwb3NpdGlvbkFmdGVyTGFzdEVudGl0eSk7Ci0g ICAgfQorICAgIGlmIChzb3VyY2UuaXM4Qml0KCkpCisgICAgICAgIGFwcGVuZENoYXJhY3RlcnNS ZXBsYWNpbmdFbnRpdGllc0ludGVybmFsPExDaGFyPihyZXN1bHQsIHNvdXJjZSwgb2Zmc2V0LCBs ZW5ndGgsIGVudGl0eU1hc2spOworICAgIGVsc2UKKyAgICAgICAgYXBwZW5kQ2hhcmFjdGVyc1Jl cGxhY2luZ0VudGl0aWVzSW50ZXJuYWw8VUNoYXI+KHJlc3VsdCwgc291cmNlLCBvZmZzZXQsIGxl bmd0aCwgZW50aXR5TWFzayk7CiB9CiAKIE1hcmt1cEFjY3VtdWxhdG9yOjpNYXJrdXBBY2N1bXVs YXRvcihWZWN0b3I8Tm9kZSo+KiBub2RlcywgRUFic29sdXRlVVJMcyByZXNvbHZlVXJsc01ldGhv ZCwgY29uc3QgUmFuZ2UqIHJhbmdlLCBFRnJhZ21lbnRTZXJpYWxpemF0aW9uIGZyYWdtZW50U2Vy aWFsaXphdGlvbikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvTWFya3VwQWNjdW11bGF0 b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9lZGl0aW5nL01hcmt1cEFjY3VtdWxh dG9yLmgJKHJldmlzaW9uIDE2Mzc2MCkKKysrIFNvdXJjZS9XZWJDb3JlL2VkaXRpbmcvTWFya3Vw QWNjdW11bGF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNTYsMTIgKzU2LDYgQEAgZW51bSBFbnRp dHlNYXNrIHsKICAgICBFbnRpdHlNYXNrSW5IVE1MQXR0cmlidXRlVmFsdWUgPSBFbnRpdHlNYXNr SW5BdHRyaWJ1dGVWYWx1ZSB8IEVudGl0eU5ic3AsCiB9OwogCi1zdHJ1Y3QgRW50aXR5RGVzY3Jp cHRpb24gewotICAgIFVDaGFyIGVudGl0eTsKLSAgICBjb25zdCBTdHJpbmcmIHJlZmVyZW5jZTsK LSAgICBFbnRpdHlNYXNrIG1hc2s7Ci19OwotCiAvLyBGSVhNRTogTm9uY29weWFibGU/CiBjbGFz cyBNYXJrdXBBY2N1bXVsYXRvciB7CiBwdWJsaWM6Cg==