143470 2015-04-07 02:16:31 -0700 [Content Filtering] Add logging 2015-04-07 13:49:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 128858 1 aestes aestes commit-queue dbates japhet oldest_to_newest 1083273 0 aestes 2015-04-07 02:16:31 -0700 [Content Filtering] Add logging 1083274 1 250261 aestes 2015-04-07 02:18:01 -0700 Created attachment 250261 Patch 1083408 2 250261 dbates 2015-04-07 13:39:21 -0700 Comment on attachment 250261 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=250261&action=review > Source/WebCore/testing/MockContentFilter.cpp:136 > + LOG(ContentFiltering, "MockContentFilter stopped buffering with status %du at decision point %du.\n", m_status, decisionPoint); Is %du a valid format specifier? 1083409 3 aestes 2015-04-07 13:41:35 -0700 (In reply to comment #2) > Comment on attachment 250261 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=250261&action=review > > > Source/WebCore/testing/MockContentFilter.cpp:136 > > + LOG(ContentFiltering, "MockContentFilter stopped buffering with status %du at decision point %du.\n", m_status, decisionPoint); > > Is %du a valid format specifier? Eh, I probably just want %u. 1083413 4 aestes 2015-04-07 13:49:28 -0700 Committed r182489: <http://trac.webkit.org/changeset/182489> 250261 2015-04-07 02:18:01 -0700 2015-04-07 13:39:21 -0700 Patch bug-143470-20150407021712.patch text/plain 15453 aestes U3VidmVyc2lvbiBSZXZpc2lvbjogMTgyNDQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjg2ODBhYzViYmM0YzBl MWQ3MDhjM2U2MTljMWFhMzg0ZGEyYjEyMS4uMGU5NzA3MmJmNDQ4NWY4NzM3ZDY3OGJlYmQxYjM2 OTM1MDBhZDE3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE1LTA0LTA3ICBBbmR5 IEVzdGVzICA8YWVzdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBbQ29udGVudCBGaWx0ZXJpbmdd IEFkZCBsb2dnaW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDM0NzAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBBZGRlZCBhIG5ldyBDb250ZW50RmlsdGVyaW5nIGxvZ2dpbmcgY2hhbm5lbCwgYW5kIHN0 YXJ0ZWQgbG9nZ2luZyBzb21lIHVzZWZ1bCBkaWFnbm9zdGljIG1lc3NhZ2VzLgorCisgICAgICAg ICogbG9hZGVyL0NvbnRlbnRGaWx0ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEZp bHRlcjo6fkNvbnRlbnRGaWx0ZXIpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEZpbHRlcjo6 d2lsbFNlbmRSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRGaWx0ZXI6OnN0YXJ0 RmlsdGVyaW5nTWFpblJlc291cmNlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRGaWx0ZXI6 OnJlc3BvbnNlUmVjZWl2ZWQpOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVudEZpbHRlcjo6ZGF0 YVJlY2VpdmVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRGaWx0ZXI6Om5vdGlmeUZpbmlz aGVkKToKKyAgICAgICAgKFdlYkNvcmU6OkNvbnRlbnRGaWx0ZXI6OmRpZERlY2lkZSk6CisgICAg ICAgICogcGxhdGZvcm0vTG9nZ2luZy5oOgorICAgICAgICAqIHBsYXRmb3JtL2NvY29hL0NvbnRl bnRGaWx0ZXJVbmJsb2NrSGFuZGxlckNvY29hLm1tOgorICAgICAgICAoV2ViQ29yZTo6Q29udGVu dEZpbHRlclVuYmxvY2tIYW5kbGVyOjpjYW5IYW5kbGVSZXF1ZXN0KToKKyAgICAgICAgKFdlYkNv cmU6OkNvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcjo6cmVxdWVzdFVuYmxvY2tBc3luYyk6Cisg ICAgICAgICogcGxhdGZvcm0vY29jb2EvTmV0d29ya0V4dGVuc2lvbkNvbnRlbnRGaWx0ZXIubW06 CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrRXh0ZW5zaW9uQ29udGVudEZpbHRlcjo6ZW5hYmxl ZCk6CisgICAgICAgIChXZWJDb3JlOjpOZXR3b3JrRXh0ZW5zaW9uQ29udGVudEZpbHRlcjo6dW5i bG9ja0hhbmRsZXIpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0V4dGVuc2lvbkNvbnRlbnRG aWx0ZXI6OmhhbmRsZURlY2lzaW9uKToKKyAgICAgICAgKiBwbGF0Zm9ybS9jb2NvYS9QYXJlbnRh bENvbnRyb2xzQ29udGVudEZpbHRlci5tbToKKyAgICAgICAgKFdlYkNvcmU6OlBhcmVudGFsQ29u dHJvbHNDb250ZW50RmlsdGVyOjplbmFibGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlBhcmVudGFs Q29udHJvbHNDb250ZW50RmlsdGVyOjp1cGRhdGVGaWx0ZXJTdGF0ZSk6CisgICAgICAgICogdGVz dGluZy9Nb2NrQ29udGVudEZpbHRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNb2NrQ29udGVu dEZpbHRlcjo6ZW5hYmxlZCk6CisgICAgICAgIChXZWJDb3JlOjpNb2NrQ29udGVudEZpbHRlcjo6 dW5ibG9ja0hhbmRsZXIpOgorICAgICAgICAoV2ViQ29yZTo6TW9ja0NvbnRlbnRGaWx0ZXI6Om1h eWJlRGV0ZXJtaW5lU3RhdHVzKToKKwogMjAxNS0wNC0wNiAgSmVyIE5vYmxlICA8amVyLm5vYmxl QGFwcGxlLmNvbT4KIAogICAgICAgICBTeW5jaHJvbml6ZSBmdWxsc2NyZWVuIGFuaW1hdGlvbiBi ZXR3ZWVuIHByb2Nlc3Nlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db250 ZW50RmlsdGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Db250ZW50RmlsdGVyLmNwcApp bmRleCAyYjFkNjgxOTZiMDNjMGRjNjhmMTIzZDE2ZGRhYjdjZGRlZTRmOTY5Li42ZDhlODhlNWZk NzY1ODkwYWFjMzY0YTJiYjU5YzRiMDViZThiNDE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvQ29udGVudEZpbHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0Nv bnRlbnRGaWx0ZXIuY3BwCkBAIC0zMCwxMiArMzAsMTcgQEAKIAogI2luY2x1ZGUgIkNhY2hlZFJh d1Jlc291cmNlLmgiCiAjaW5jbHVkZSAiQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyLmgiCisj aW5jbHVkZSAiTG9nZ2luZy5oIgogI2luY2x1ZGUgIk5ldHdvcmtFeHRlbnNpb25Db250ZW50Rmls dGVyLmgiCiAjaW5jbHVkZSAiUGFyZW50YWxDb250cm9sc0NvbnRlbnRGaWx0ZXIuaCIKICNpbmNs dWRlICJTaGFyZWRCdWZmZXIuaCIKICNpbmNsdWRlIDx3dGYvTmV2ZXJEZXN0cm95ZWQuaD4KICNp bmNsdWRlIDx3dGYvVmVjdG9yLmg+CiAKKyNpZiAhTE9HX0RJU0FCTEVECisjaW5jbHVkZSA8d3Rm L3RleHQvQ1N0cmluZy5oPgorI2VuZGlmCisKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogVmVjdG9y PENvbnRlbnRGaWx0ZXI6OlR5cGU+JiBDb250ZW50RmlsdGVyOjp0eXBlcygpCkBAIC03MywxMSAr NzgsMTMgQEAgQ29udGVudEZpbHRlcjo6Q29udGVudEZpbHRlcihDb250YWluZXIgY29udGVudEZp bHRlcnMsIERlY2lzaW9uRnVuY3Rpb24gZGVjaXNpb24KICAgICA6IG1fY29udGVudEZpbHRlcnMg eyBXVEY6Om1vdmUoY29udGVudEZpbHRlcnMpIH0KICAgICAsIG1fZGVjaXNpb25GdW5jdGlvbiB7 IFdURjo6bW92ZShkZWNpc2lvbkZ1bmN0aW9uKSB9CiB7CisgICAgTE9HKENvbnRlbnRGaWx0ZXJp bmcsICJDcmVhdGluZyBDb250ZW50RmlsdGVyIHdpdGggJXp1IHBsYXRmb3JtIGNvbnRlbnQgZmls dGVyKHMpLlxuIiwgbV9jb250ZW50RmlsdGVycy5zaXplKCkpOwogICAgIEFTU0VSVCghbV9jb250 ZW50RmlsdGVycy5pc0VtcHR5KCkpOwogfQogCiBDb250ZW50RmlsdGVyOjp+Q29udGVudEZpbHRl cigpCiB7CisgICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJEZXN0cm95aW5nIENvbnRlbnRGaWx0 ZXIuXG4iKTsKICAgICBpZiAoIW1fbWFpblJlc291cmNlKQogICAgICAgICByZXR1cm47CiAgICAg QVNTRVJUKG1fbWFpblJlc291cmNlLT5oYXNDbGllbnQodGhpcykpOwpAQCAtODYsNiArOTMsNyBA QCBDb250ZW50RmlsdGVyOjp+Q29udGVudEZpbHRlcigpCiAKIHZvaWQgQ29udGVudEZpbHRlcjo6 d2lsbFNlbmRSZXF1ZXN0KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VS ZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKIHsKKyAgICBMT0coQ29udGVudEZpbHRlcmluZywg IkNvbnRlbnRGaWx0ZXIgcmVjZWl2ZWQgcmVxdWVzdCBmb3IgPCVzPiB3aXRoIHJlZGlyZWN0IHJl c3BvbnNlIGZyb20gPCVzPi5cbiIsIHJlcXVlc3QudXJsKCkuc3RyaW5nKCkuYXNjaWkoKS5kYXRh KCksIHJlZGlyZWN0UmVzcG9uc2UudXJsKCkuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkpOwogICAg IFJlc291cmNlUmVxdWVzdCByZXF1ZXN0Q29weSB7IHJlcXVlc3QgfTsKICAgICBBU1NFUlQobV9z dGF0ZSA9PSBTdGF0ZTo6SW5pdGlhbGl6ZWQgfHwgbV9zdGF0ZSA9PSBTdGF0ZTo6RmlsdGVyaW5n KTsKICAgICBmb3JFYWNoQ29udGVudEZpbHRlclVudGlsQmxvY2tlZChbJnJlcXVlc3RDb3B5LCAm cmVkaXJlY3RSZXNwb25zZV0oUGxhdGZvcm1Db250ZW50RmlsdGVyJiBjb250ZW50RmlsdGVyKSB7 CkBAIC05MywxMSArMTAxLDE2IEBAIHZvaWQgQ29udGVudEZpbHRlcjo6d2lsbFNlbmRSZXF1ZXN0 KFJlc291cmNlUmVxdWVzdCYgcmVxdWVzdCwgY29uc3QgUmVzb3VyY2VSZXNwCiAgICAgICAgIGlm IChjb250ZW50RmlsdGVyLmRpZEJsb2NrRGF0YSgpKQogICAgICAgICAgICAgcmVxdWVzdENvcHkg PSBSZXNvdXJjZVJlcXVlc3QoKTsKICAgICB9KTsKKyNpZiAhTE9HX0RJU0FCTEVECisgICAgaWYg KHJlcXVlc3QgIT0gcmVxdWVzdENvcHkpCisgICAgICAgIExPRyhDb250ZW50RmlsdGVyaW5nLCAi Q29udGVudEZpbHRlciBjaGFuZ2VkIHJlcXVlc3QgdXJsIHRvIDwlcz4uXG4iLCByZXF1ZXN0Q29w eS51cmwoKS5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7CisjZW5kaWYKICAgICByZXF1ZXN0ID0g cmVxdWVzdENvcHk7CiB9CiAKIHZvaWQgQ29udGVudEZpbHRlcjo6c3RhcnRGaWx0ZXJpbmdNYWlu UmVzb3VyY2UoQ2FjaGVkUmF3UmVzb3VyY2UmIHJlc291cmNlKQogeworICAgIExPRyhDb250ZW50 RmlsdGVyaW5nLCAiQ29udGVudEZpbHRlciB3aWxsIHN0YXJ0IGZpbHRlcmluZyBtYWluIHJlc291 cmNlIGF0IDwlcz4uXG4iLCByZXNvdXJjZS51cmwoKS5zdHJpbmcoKS5hc2NpaSgpLmRhdGEoKSk7 CiAgICAgQVNTRVJUKG1fc3RhdGUgPT0gU3RhdGU6OkluaXRpYWxpemVkKTsKICAgICBtX3N0YXRl ID0gU3RhdGU6OkZpbHRlcmluZzsKICAgICBBU1NFUlQoIW1fbWFpblJlc291cmNlKTsKQEAgLTEz Miw2ICsxNDUsNyBAQCBTdHJpbmcgQ29udGVudEZpbHRlcjo6dW5ibG9ja1JlcXVlc3REZW5pZWRT Y3JpcHQoKSBjb25zdAogCiB2b2lkIENvbnRlbnRGaWx0ZXI6OnJlc3BvbnNlUmVjZWl2ZWQoQ2Fj aGVkUmVzb3VyY2UqIHJlc291cmNlLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZXNwb25zZSkK IHsKKyAgICBMT0coQ29udGVudEZpbHRlcmluZywgIkNvbnRlbnRGaWx0ZXIgcmVjZWl2ZWQgcmVz cG9uc2UgZnJvbSA8JXM+LlxuIiwgcmVzcG9uc2UudXJsKCkuc3RyaW5nKCkuYXNjaWkoKS5kYXRh KCkpOwogICAgIEFTU0VSVChtX3N0YXRlID09IFN0YXRlOjpGaWx0ZXJpbmcpOwogICAgIEFTU0VS VF9VTlVTRUQocmVzb3VyY2UsIHJlc291cmNlID09IG1fbWFpblJlc291cmNlLmdldCgpKTsKICAg ICBmb3JFYWNoQ29udGVudEZpbHRlclVudGlsQmxvY2tlZChbJnJlc3BvbnNlXShQbGF0Zm9ybUNv bnRlbnRGaWx0ZXImIGNvbnRlbnRGaWx0ZXIpIHsKQEAgLTE0MSw2ICsxNTUsNyBAQCB2b2lkIENv bnRlbnRGaWx0ZXI6OnJlc3BvbnNlUmVjZWl2ZWQoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlLCBj b25zdCBSZXNvdXJjZVJlcwogCiB2b2lkIENvbnRlbnRGaWx0ZXI6OmRhdGFSZWNlaXZlZChDYWNo ZWRSZXNvdXJjZSogcmVzb3VyY2UsIGNvbnN0IGNoYXIqIGRhdGEsIGludCBsZW5ndGgpCiB7Cisg ICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJDb250ZW50RmlsdGVyIHJlY2VpdmVkICVkIGJ5dGVz IG9mIGRhdGEgZnJvbSA8JXM+LlxuIiwgbGVuZ3RoLCByZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCku YXNjaWkoKS5kYXRhKCkpOwogICAgIEFTU0VSVChtX3N0YXRlID09IFN0YXRlOjpGaWx0ZXJpbmcp OwogICAgIEFTU0VSVF9VTlVTRUQocmVzb3VyY2UsIHJlc291cmNlID09IG1fbWFpblJlc291cmNl LmdldCgpKTsKICAgICBmb3JFYWNoQ29udGVudEZpbHRlclVudGlsQmxvY2tlZChbZGF0YSwgbGVu Z3RoXShQbGF0Zm9ybUNvbnRlbnRGaWx0ZXImIGNvbnRlbnRGaWx0ZXIpIHsKQEAgLTE1Nyw2ICsx NzIsNyBAQCB2b2lkIENvbnRlbnRGaWx0ZXI6OnJlZGlyZWN0UmVjZWl2ZWQoQ2FjaGVkUmVzb3Vy Y2UqIHJlc291cmNlLCBSZXNvdXJjZVJlcXVlc3QmCiAKIHZvaWQgQ29udGVudEZpbHRlcjo6bm90 aWZ5RmluaXNoZWQoQ2FjaGVkUmVzb3VyY2UqIHJlc291cmNlKQogeworICAgIExPRyhDb250ZW50 RmlsdGVyaW5nLCAiQ29udGVudEZpbHRlciB3aWxsIGZpbmlzaCBmaWx0ZXJpbmcgbWFpbiByZXNv dXJjZSBhdCA8JXM+LlxuIiwgcmVzb3VyY2UtPnVybCgpLnN0cmluZygpLmFzY2lpKCkuZGF0YSgp KTsKICAgICBBU1NFUlQobV9zdGF0ZSA9PSBTdGF0ZTo6RmlsdGVyaW5nKTsKICAgICBBU1NFUlRf VU5VU0VEKHJlc291cmNlLCByZXNvdXJjZSA9PSBtX21haW5SZXNvdXJjZS5nZXQoKSk7CiAgICAg Zm9yRWFjaENvbnRlbnRGaWx0ZXJVbnRpbEJsb2NrZWQoW10oUGxhdGZvcm1Db250ZW50RmlsdGVy JiBjb250ZW50RmlsdGVyKSB7CkBAIC0xOTMsNiArMjA5LDcgQEAgdm9pZCBDb250ZW50RmlsdGVy OjpkaWREZWNpZGUoU3RhdGUgc3RhdGUpCiAgICAgQVNTRVJUKG1fc3RhdGUgIT0gU3RhdGU6OkFs bG93ZWQpOwogICAgIEFTU0VSVChtX3N0YXRlICE9IFN0YXRlOjpCbG9ja2VkKTsKICAgICBBU1NF UlQoc3RhdGUgPT0gU3RhdGU6OkFsbG93ZWQgfHwgc3RhdGUgPT0gU3RhdGU6OkJsb2NrZWQpOwor ICAgIExPRyhDb250ZW50RmlsdGVyaW5nLCAiQ29udGVudEZpbHRlciBkZWNpZGVkIGxvYWQgc2hv dWxkIGJlICVzIGZvciBtYWluIHJlc291cmNlIGF0IDwlcz4uXG4iLCBzdGF0ZSA9PSBTdGF0ZTo6 QWxsb3dlZCA/ICJhbGxvd2VkIiA6ICJibG9ja2VkIiwgbV9tYWluUmVzb3VyY2UgPyBtX21haW5S ZXNvdXJjZS0+dXJsKCkuc3RyaW5nKCkuYXNjaWkoKS5kYXRhKCkgOiAiIik7CiAgICAgbV9zdGF0 ZSA9IHN0YXRlOwogCiAgICAgLy8gQ2FsbGluZyBtX2RlY2lzaW9uRnVuY3Rpb24gbWlnaHQgZGVs ZXRlIHx0aGlzfC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcu aCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0xvZ2dpbmcuaAppbmRleCAxMjZiZTczZjMwOGEz NDVlNTdjOWE2NTA2OWRiN2NlMTRhNmVlZGQ3Li5iNzY0ZTA1MzBiZWNlZjlmNDczMmZlMjE4Y2Ji OGVjNTkwNzk5MzNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Mb2dnaW5n LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTG9nZ2luZy5oCkBAIC00Miw2ICs0Miw3 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICBNKEFyY2hpdmVzKSBcCiAgICAgTShCYWNrRm9y d2FyZCkgXAogICAgIE0oQ29tcG9zaXRpbmcpIFwKKyAgICBNKENvbnRlbnRGaWx0ZXJpbmcpIFwK ICAgICBNKERPTVRpbWVycykgXAogICAgIE0oRWRpdGluZykgXAogICAgIE0oRXZlbnRzKSBcCkBA IC02NywxMyArNjgsMTMgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgIE0oUmVtb3RlSW5zcGVj dG9yKSBcCiAgICAgTShSZXNvdXJjZUxvYWRpbmcpIFwKICAgICBNKFNRTERhdGFiYXNlKSBcCisg ICAgTShTZXJ2aWNlcykgXAogICAgIE0oU3BlbGxpbmdBbmRHcmFtbWFyKSBcCiAgICAgTShTdG9y YWdlQVBJKSBcCiAgICAgTShUaHJlYWRpbmcpIFwKICAgICBNKFdlYkF1ZGlvKSBcCiAgICAgTShX ZWJHTCkgXAogICAgIE0oV2ViUmVwbGF5KSBcCi0gICAgTShTZXJ2aWNlcykgXAogCiAjZGVmaW5l IERFQ0xBUkVfTE9HX0NIQU5ORUwobmFtZSkgXAogICAgIFdFQkNPUkVfRVhQT1JUIGV4dGVybiBX VEZMb2dDaGFubmVsIEpPSU5fTE9HX0NIQU5ORUxfV0lUSF9QUkVGSVgoTE9HX0NIQU5ORUxfUFJF RklYLCBuYW1lKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL0Nv bnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlckNvY29hLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vY29jb2EvQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyQ29jb2EubW0KaW5kZXggYjQ2Y2Zm ODc4ZDY5MTE3ZTA1N2VlZjkyNTcyMTU5YTUwNjQ1NzFlZS4uZTFjYTEzN2FlMWQzZWExOGIyYmNj ODQ3NDMxZTk2OTk5MjIyM2M5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Y29jb2EvQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyQ29jb2EubW0KKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vY29jb2EvQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyQ29jb2EubW0K QEAgLTMwLDggKzMwLDEzIEBACiAKICNpbXBvcnQgIkJsb2NrRXhjZXB0aW9ucy5oIgogI2ltcG9y dCAiQ29udGVudEZpbHRlci5oIgorI2ltcG9ydCAiTG9nZ2luZy5oIgogI2ltcG9ydCAiUmVzb3Vy Y2VSZXF1ZXN0LmgiCiAKKyNpZiAhTE9HX0RJU0FCTEVECisjaW1wb3J0IDx3dGYvdGV4dC9DU3Ry aW5nLmg+CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKElPUykKICNpbXBvcnQgIlNvZnRMaW5raW5n LmgiCiAjaW1wb3J0ICJXZWJDb3JlVGhyZWFkUnVuLmgiCkBAIC01Miw2ICs1Nyw3IEBAIENvbnRl bnRGaWx0ZXJVbmJsb2NrSGFuZGxlcjo6Q29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyKFN0cmlu ZyB1bmJsb2NrVVJMSG9zdCwKICAgICA6IG1fdW5ibG9ja1VSTEhvc3QgeyBXVEY6Om1vdmUodW5i bG9ja1VSTEhvc3QpIH0KICAgICAsIG1fdW5ibG9ja1JlcXVlc3RlciB7IFdURjo6bW92ZSh1bmJs b2NrUmVxdWVzdGVyKSB9CiB7CisgICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJDcmVhdGluZyBD b250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIgd2l0aCBhbiB1bmJsb2NrIHJlcXVlc3RlciBhbmQg dW5ibG9jayBVUkwgaG9zdCA8JXM+LlxuIiwgdW5ibG9ja1VSTEhvc3QuYXNjaWkoKS5kYXRhKCkp OwogfQogCiAjaWYgUExBVEZPUk0oSU9TKQpAQCAtNTksNiArNjUsNyBAQCBDb250ZW50RmlsdGVy VW5ibG9ja0hhbmRsZXI6OkNvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcihTdHJpbmcgdW5ibG9j a1VSTEhvc3QsCiAgICAgOiBtX3VuYmxvY2tVUkxIb3N0IHsgV1RGOjptb3ZlKHVuYmxvY2tVUkxI b3N0KSB9CiAgICAgLCBtX3dlYkZpbHRlckV2YWx1YXRvciB7IFdURjo6bW92ZShldmFsdWF0b3Ip IH0KIHsKKyAgICBMT0coQ29udGVudEZpbHRlcmluZywgIkNyZWF0aW5nIENvbnRlbnRGaWx0ZXJV bmJsb2NrSGFuZGxlciB3aXRoIGEgV2ViRmlsdGVyRXZhbHVhdG9yIGFuZCB1bmJsb2NrIFVSTCBo b3N0IDwlcz4uXG4iLCB1bmJsb2NrVVJMSG9zdC5hc2NpaSgpLmRhdGEoKSk7CiB9CiAjZW5kaWYK IApAQCAtMTIzLDcgKzEzMCwxMiBAQCBib29sIENvbnRlbnRGaWx0ZXJVbmJsb2NrSGFuZGxlcjo6 Y2FuSGFuZGxlUmVxdWVzdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmIHJlcXVlcwogI2VuZGlmCiAg ICAgfQogCi0gICAgcmV0dXJuIHJlcXVlc3QudXJsKCkucHJvdG9jb2xJcyhDb250ZW50RmlsdGVy Ojp1cmxTY2hlbWUoKSkgJiYgZXF1YWxJZ25vcmluZ0Nhc2UocmVxdWVzdC51cmwoKS5ob3N0KCks IG1fdW5ibG9ja1VSTEhvc3QpOworICAgIGJvb2wgaXNVbmJsb2NrUmVxdWVzdCA9IHJlcXVlc3Qu dXJsKCkucHJvdG9jb2xJcyhDb250ZW50RmlsdGVyOjp1cmxTY2hlbWUoKSkgJiYgZXF1YWxJZ25v cmluZ0Nhc2UocmVxdWVzdC51cmwoKS5ob3N0KCksIG1fdW5ibG9ja1VSTEhvc3QpOworI2lmICFM T0dfRElTQUJMRUQKKyAgICBpZiAoaXNVbmJsb2NrUmVxdWVzdCkKKyAgICAgICAgTE9HKENvbnRl bnRGaWx0ZXJpbmcsICJDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRsZXIgd2lsbCBoYW5kbGUgPCVz PiBhcyBhbiB1bmJsb2NrIHJlcXVlc3QuXG4iLCByZXF1ZXN0LnVybCgpLnN0cmluZygpLmFzY2lp KCkuZGF0YSgpKTsKKyNlbmRpZgorICAgIHJldHVybiBpc1VuYmxvY2tSZXF1ZXN0OwogfQogCiBz dGF0aWMgaW5saW5lIHZvaWQgZGlzcGF0Y2hUb01haW5UaHJlYWQodm9pZCAoXmJsb2NrKSgpKQpA QCAtMTQzLDYgKzE1NSw3IEBAIHZvaWQgQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyOjpyZXF1 ZXN0VW5ibG9ja0FzeW5jKERlY2lzaW9uSGFuZGxlckZ1bmN0aW9uIGRlCiAgICAgaWYgKG1fd2Vi RmlsdGVyRXZhbHVhdG9yKSB7CiAgICAgICAgIFttX3dlYkZpbHRlckV2YWx1YXRvciB1bmJsb2Nr V2l0aENvbXBsZXRpb246W2RlY2lzaW9uSGFuZGxlcl0oQk9PTCB1bmJsb2NrZWQsIE5TRXJyb3Ig KikgewogICAgICAgICAgICAgZGlzcGF0Y2hUb01haW5UaHJlYWQoW2RlY2lzaW9uSGFuZGxlciwg dW5ibG9ja2VkXSB7CisgICAgICAgICAgICAgICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJXZWJG aWx0ZXJFdmFsdWF0b3IgJXMgdGhlIHVuYmxvY2sgcmVxdWVzdC5cbiIsIHVuYmxvY2tlZCA/ICJh bGxvd2VkIiA6ICJkaWQgbm90IGFsbG93Iik7CiAgICAgICAgICAgICAgICAgZGVjaXNpb25IYW5k bGVyKHVuYmxvY2tlZCk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfV07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9OZXR3b3JrRXh0ZW5zaW9uQ29udGVudEZp bHRlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL05ldHdvcmtFeHRlbnNpb25D b250ZW50RmlsdGVyLm1tCmluZGV4IDU5MzY4MDFjMDdkNmQyN2ZjODhiYzlhODNhMGEyYjBjNzY1 MWJkMWEuLjJlMWVhNTNhNWIyNzBkYTNmNWI3Y2ZhMWIyYzEwOWM4ZGEzMWY5YmUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL05ldHdvcmtFeHRlbnNpb25Db250ZW50 RmlsdGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL05ldHdvcmtFeHRl bnNpb25Db250ZW50RmlsdGVyLm1tCkBAIC0yOSw2ICsyOSw3IEBACiAjaWYgSEFWRShORVRXT1JL X0VYVEVOU0lPTikKIAogI2ltcG9ydCAiQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyLmgiCisj aW1wb3J0ICJMb2dnaW5nLmgiCiAjaW1wb3J0ICJORUZpbHRlclNvdXJjZVNQSS5oIgogI2ltcG9y dCAiUmVzb3VyY2VSZXF1ZXN0LmgiCiAjaW1wb3J0ICJSZXNvdXJjZVJlc3BvbnNlLmgiCkBAIC01 Myw3ICs1NCw5IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogYm9vbCBOZXR3b3JrRXh0ZW5zaW9u Q29udGVudEZpbHRlcjo6ZW5hYmxlZCgpCiB7Ci0gICAgcmV0dXJuIFtnZXRORUZpbHRlclNvdXJj ZUNsYXNzKCkgZmlsdGVyUmVxdWlyZWRdOworICAgIGJvb2wgZW5hYmxlZCA9IFtnZXRORUZpbHRl clNvdXJjZUNsYXNzKCkgZmlsdGVyUmVxdWlyZWRdOworICAgIExPRyhDb250ZW50RmlsdGVyaW5n LCAiTmV0d29ya0V4dGVuc2lvbkNvbnRlbnRGaWx0ZXIgaXMgJXMuXG4iLCBlbmFibGVkID8gImVu YWJsZWQiIDogIm5vdCBlbmFibGVkIik7CisgICAgcmV0dXJuIGVuYWJsZWQ7CiB9CiAKIHN0ZDo6 dW5pcXVlX3B0cjxOZXR3b3JrRXh0ZW5zaW9uQ29udGVudEZpbHRlcj4gTmV0d29ya0V4dGVuc2lv bkNvbnRlbnRGaWx0ZXI6OmNyZWF0ZSgpCkBAIC0xODgsNiArMTkxLDcgQEAgQ29udGVudEZpbHRl clVuYmxvY2tIYW5kbGVyIE5ldHdvcmtFeHRlbnNpb25Db250ZW50RmlsdGVyOjp1bmJsb2NrSGFu ZGxlcigpIGNvbnMKICAgICByZXR1cm4gQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyIHsKICAg ICAgICAgQVNDSUlMaXRlcmFsKCJuZWZpbHRlci11bmJsb2NrIiksIFtuZUZpbHRlclNvdXJjZV0o RGVjaXNpb25IYW5kbGVyRnVuY3Rpb24gZGVjaXNpb25IYW5kbGVyKSB7CiAgICAgICAgICAgICBb bmVGaWx0ZXJTb3VyY2UgcmVtZWRpYXRlV2l0aERlY2lzaW9uSGFuZGxlcjpbZGVjaXNpb25IYW5k bGVyXShORUZpbHRlclNvdXJjZVN0YXR1cyBzdGF0dXMsIE5TRGljdGlvbmFyeSAqKSB7CisgICAg ICAgICAgICAgICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJORUZpbHRlclNvdXJjZSAlcyB0aGUg dW5ibG9jayByZXF1ZXN0LlxuIiwgc3RhdHVzID09IE5FRmlsdGVyU291cmNlU3RhdHVzUGFzcyA/ ICJhbGxvd2VkIiA6ICJkaWQgbm90IGFsbG93Iik7CiAgICAgICAgICAgICAgICAgZGVjaXNpb25I YW5kbGVyKHN0YXR1cyA9PSBORUZpbHRlclNvdXJjZVN0YXR1c1Bhc3MpOwogICAgICAgICAgICAg fV07CiAgICAgICAgIH0KQEAgLTIwMiw2ICsyMDYsMTAgQEAgdm9pZCBOZXR3b3JrRXh0ZW5zaW9u Q29udGVudEZpbHRlcjo6aGFuZGxlRGVjaXNpb24oTkVGaWx0ZXJTb3VyY2VTdGF0dXMgc3RhdHVz LAogICAgIG1fc3RhdHVzID0gc3RhdHVzOwogICAgIGlmIChzdGF0dXMgPT0gTkVGaWx0ZXJTb3Vy Y2VTdGF0dXNCbG9jaykKICAgICAgICAgbV9yZXBsYWNlbWVudERhdGEgPSByZXBsYWNlbWVudERh dGE7CisjaWYgIUxPR19ESVNBQkxFRAorICAgIGlmICghbmVlZHNNb3JlRGF0YSgpKQorICAgICAg ICBMT0coQ29udGVudEZpbHRlcmluZywgIk5ldHdvcmtFeHRlbnNpb25Db250ZW50RmlsdGVyIHN0 b3BwZWQgYnVmZmVyaW5nIHdpdGggc3RhdHVzICV6ZCBhbmQgcmVwbGFjZW1lbnQgZGF0YSBsZW5n dGggJXp1LlxuIiwgc3RhdHVzLCByZXBsYWNlbWVudERhdGEubGVuZ3RoKTsKKyNlbmRpZgogICAg IGRpc3BhdGNoX3NlbWFwaG9yZV9zaWduYWwobV9zZW1hcGhvcmUuZ2V0KCkpOwogfQogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jb2NvYS9QYXJlbnRhbENvbnRyb2xzQ29u dGVudEZpbHRlci5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1BhcmVudGFsQ29u dHJvbHNDb250ZW50RmlsdGVyLm1tCmluZGV4IGY1MGQ3MTA0YzViZGM0ZGQ2ODA4YWY3YWUwY2M4 ZTk3MDBiYTNlOTkuLmNkYzFmNTEzYjljMGFmMTU2MWQ1NDBiMGYxZTg5ZDc3ZTU1OWI5NTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1BhcmVudGFsQ29udHJvbHND b250ZW50RmlsdGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2NvY29hL1BhcmVu dGFsQ29udHJvbHNDb250ZW50RmlsdGVyLm1tCkBAIC0yNyw2ICsyNyw3IEBACiAjaW1wb3J0ICJQ YXJlbnRhbENvbnRyb2xzQ29udGVudEZpbHRlci5oIgogCiAjaW1wb3J0ICJDb250ZW50RmlsdGVy VW5ibG9ja0hhbmRsZXIuaCIKKyNpbXBvcnQgIkxvZ2dpbmcuaCIKICNpbXBvcnQgIlJlc291cmNl UmVzcG9uc2UuaCIKICNpbXBvcnQgIlNoYXJlZEJ1ZmZlci5oIgogI2ltcG9ydCAiU29mdExpbmtp bmcuaCIKQEAgLTQwLDcgKzQxLDkgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBib29sIFBhcmVu dGFsQ29udHJvbHNDb250ZW50RmlsdGVyOjplbmFibGVkKCkKIHsKLSAgICByZXR1cm4gW2dldFdl YkZpbHRlckV2YWx1YXRvckNsYXNzKCkgaXNNYW5hZ2VkU2Vzc2lvbl07CisgICAgYm9vbCBlbmFi bGVkID0gW2dldFdlYkZpbHRlckV2YWx1YXRvckNsYXNzKCkgaXNNYW5hZ2VkU2Vzc2lvbl07Cisg ICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJQYXJlbnRhbENvbnRyb2xzQ29udGVudEZpbHRlciBp cyAlcy5cbiIsIGVuYWJsZWQgPyAiZW5hYmxlZCIgOiAibm90IGVuYWJsZWQiKTsKKyAgICByZXR1 cm4gZW5hYmxlZDsKIH0KIAogc3RkOjp1bmlxdWVfcHRyPFBhcmVudGFsQ29udHJvbHNDb250ZW50 RmlsdGVyPiBQYXJlbnRhbENvbnRyb2xzQ29udGVudEZpbHRlcjo6Y3JlYXRlKCkKQEAgLTExOSw2 ICsxMjIsMTAgQEAgQ29udGVudEZpbHRlclVuYmxvY2tIYW5kbGVyIFBhcmVudGFsQ29udHJvbHND b250ZW50RmlsdGVyOjp1bmJsb2NrSGFuZGxlcigpIGNvbnMKIHZvaWQgUGFyZW50YWxDb250cm9s c0NvbnRlbnRGaWx0ZXI6OnVwZGF0ZUZpbHRlclN0YXRlKCkKIHsKICAgICBtX2ZpbHRlclN0YXRl ID0gW21fd2ViRmlsdGVyRXZhbHVhdG9yIGZpbHRlclN0YXRlXTsKKyNpZiAhTE9HX0RJU0FCTEVE CisgICAgaWYgKCFuZWVkc01vcmVEYXRhKCkpCisgICAgICAgIExPRyhDb250ZW50RmlsdGVyaW5n LCAiUGFyZW50YWxDb250cm9sc0NvbnRlbnRGaWx0ZXIgc3RvcHBlZCBidWZmZXJpbmcgd2l0aCBz dGF0ZSAlZCBhbmQgcmVwbGFjZW1lbnQgZGF0YSBsZW5ndGggJXp1LlxuIiwgbV9maWx0ZXJTdGF0 ZSwgW21fcmVwbGFjZW1lbnREYXRhIGxlbmd0aF0pOworI2VuZGlmCiB9CiAKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvTW9ja0NvbnRl bnRGaWx0ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9Nb2NrQ29udGVudEZpbHRlci5j cHAKaW5kZXggZjI3ZWU3ZGFmM2ZjYTg0NTc4NzdjYmY0ZTFmNmIxZjEwODJjY2ViOC4uOWJkMDBj NmU5N2I3Yjk2M2RlMTcxMWMzMTQ0MDY4MTk2NDE3Yzk1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvdGVzdGluZy9Nb2NrQ29udGVudEZpbHRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv dGVzdGluZy9Nb2NrQ29udGVudEZpbHRlci5jcHAKQEAgLTMwLDYgKzMwLDcgQEAKIAogI2luY2x1 ZGUgIkNvbnRlbnRGaWx0ZXIuaCIKICNpbmNsdWRlICJDb250ZW50RmlsdGVyVW5ibG9ja0hhbmRs ZXIuaCIKKyNpbmNsdWRlICJMb2dnaW5nLmgiCiAjaW5jbHVkZSAiUmVzb3VyY2VSZXF1ZXN0Lmgi CiAjaW5jbHVkZSAiUmVzb3VyY2VSZXNwb25zZS5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZlci5o IgpAQCAtNTcsNyArNTgsOSBAQCBzdGF0aWMgaW5saW5lIE1vY2tDb250ZW50RmlsdGVyU2V0dGlu Z3MmIHNldHRpbmdzKCkKIAogYm9vbCBNb2NrQ29udGVudEZpbHRlcjo6ZW5hYmxlZCgpCiB7Ci0g ICAgcmV0dXJuIHNldHRpbmdzKCkuZW5hYmxlZCgpOworICAgIGJvb2wgZW5hYmxlZCA9IHNldHRp bmdzKCkuZW5hYmxlZCgpOworICAgIExPRyhDb250ZW50RmlsdGVyaW5nLCAiTW9ja0NvbnRlbnRG aWx0ZXIgaXMgJXMuXG4iLCBlbmFibGVkID8gImVuYWJsZWQiIDogIm5vdCBlbmFibGVkIik7Cisg ICAgcmV0dXJuIGVuYWJsZWQ7CiB9CiAKIHN0ZDo6dW5pcXVlX3B0cjxNb2NrQ29udGVudEZpbHRl cj4gTW9ja0NvbnRlbnRGaWx0ZXI6OmNyZWF0ZSgpCkBAIC0xMTQsNiArMTE3LDcgQEAgQ29udGVu dEZpbHRlclVuYmxvY2tIYW5kbGVyIE1vY2tDb250ZW50RmlsdGVyOjp1bmJsb2NrSGFuZGxlcigp IGNvbnN0CiAgICAgICAgICAgICBib29sIHNob3VsZEFsbG93IHsgc2V0dGluZ3MoKS51bmJsb2Nr UmVxdWVzdERlY2lzaW9uKCkgPT0gRGVjaXNpb246OkFsbG93IH07CiAgICAgICAgICAgICBpZiAo c2hvdWxkQWxsb3cpCiAgICAgICAgICAgICAgICAgc2V0dGluZ3MoKS5zZXREZWNpc2lvbihEZWNp c2lvbjo6QWxsb3cpOworICAgICAgICAgICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJNb2NrQ29u dGVudEZpbHRlciAlcyB0aGUgdW5ibG9jayByZXF1ZXN0LlxuIiwgc2hvdWxkQWxsb3cgPyAiYWxs b3dlZCIgOiAiZGlkIG5vdCBhbGxvdyIpOwogICAgICAgICAgICAgZGVjaXNpb25IYW5kbGVyKHNo b3VsZEFsbG93KTsKICAgICAgICAgfQogICAgIH07CkBAIC0xMjksNiArMTMzLDggQEAgdm9pZCBN b2NrQ29udGVudEZpbHRlcjo6bWF5YmVEZXRlcm1pbmVTdGF0dXMoRGVjaXNpb25Qb2ludCBkZWNp c2lvblBvaW50KQogICAgIGlmIChtX3N0YXR1cyAhPSBTdGF0dXM6Ok5lZWRzTW9yZURhdGEgfHwg ZGVjaXNpb25Qb2ludCAhPSBzZXR0aW5ncygpLmRlY2lzaW9uUG9pbnQoKSkKICAgICAgICAgcmV0 dXJuOwogCisgICAgTE9HKENvbnRlbnRGaWx0ZXJpbmcsICJNb2NrQ29udGVudEZpbHRlciBzdG9w cGVkIGJ1ZmZlcmluZyB3aXRoIHN0YXR1cyAlZHUgYXQgZGVjaXNpb24gcG9pbnQgJWR1LlxuIiwg bV9zdGF0dXMsIGRlY2lzaW9uUG9pbnQpOworCiAgICAgbV9zdGF0dXMgPSBzZXR0aW5ncygpLmRl Y2lzaW9uKCkgPT0gRGVjaXNpb246OkFsbG93ID8gU3RhdHVzOjpBbGxvd2VkIDogU3RhdHVzOjpC bG9ja2VkOwogICAgIGlmIChtX3N0YXR1cyAhPSBTdGF0dXM6OkJsb2NrZWQpCiAgICAgICAgIHJl dHVybjsK