155500 2016-03-15 12:01:24 -0700 Change some release asserts in CodeBlock linking into debug asserts 2016-03-30 17:47:17 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 saam saam benjamin commit-queue fpizlo ggaren gskachkov keith_miller mark.lam msaboff oliver sukolsak ysuzuki oldest_to_newest 1175028 0 saam 2016-03-15 12:01:24 -0700 ... 1175086 1 274122 saam 2016-03-15 13:44:57 -0700 Created attachment 274122 patch 1175088 2 274122 fpizlo 2016-03-15 13:46:39 -0700 Comment on attachment 274122 patch View in context: https://bugs.webkit.org/attachment.cgi?id=274122&action=review > Source/JavaScriptCore/bytecode/CodeBlock.cpp:1865 > +#ifndef NDEBUG #if !ASSERT_DISABLED > Source/JavaScriptCore/bytecode/CodeBlock.cpp:1869 > +#ifndef NDEBUG Ditto. > Source/JavaScriptCore/bytecode/CodeBlock.cpp:1883 > +#ifndef NDEBUG Ditto. > Source/JavaScriptCore/bytecode/CodeBlock.cpp:2085 > +#ifndef NDEBUG Ditto. 1175090 3 274123 saam 2016-03-15 13:49:44 -0700 Created attachment 274123 patch 1179257 4 274123 commit-queue 2016-03-30 17:47:13 -0700 Comment on attachment 274123 patch Clearing flags on attachment: 274123 Committed r198868: <http://trac.webkit.org/changeset/198868> 1179258 5 commit-queue 2016-03-30 17:47:17 -0700 All reviewed patches have been landed. Closing bug. 274122 2016-03-15 13:44:57 -0700 2016-03-15 13:49:44 -0700 patch b-backup.diff text/plain 6315 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk4MjI4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE2LTAzLTE1ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IENoYW5nZSBzb21lIHJlbGVhc2UgYXNzZXJ0cyBpbiBDb2RlQmxvY2sgbGlua2luZyBpbnRvIGRl YnVnIGFzc2VydHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1NTUwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpm aW5pc2hDcmVhdGlvbik6CisKIDIwMTYtMDMtMTUgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBs ZS5jb20+CiAKICAgICAgICAgV2Ugc2hvdWxkIGhhdmUgZGlmZmVyZW50IEpTVHlwZXMgZm9yIEpT R2xvYmFsTGV4aWNhbEVudmlyb25tZW50IGFuZCBKU0xleGljYWxFbnZpcm9ubWVudCBhbmQgSlNN b2R1bGVFbnZpcm9ubWVudApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0Nv ZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE5ODIxOSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODYyLDIwICsxODYy LDI3IEBAIHZvaWQgQ29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFMKICAgICAgICAg ICAgIG1fY29uc3RhbnRSZWdpc3RlcnNbcmVnaXN0ZXJJbmRleF0uc2V0KCptX3ZtLCB0aGlzLCBt X2dsb2JhbE9iamVjdC0+anNDZWxsRm9yTGlua1RpbWVDb25zdGFudCh0eXBlKSk7CiAgICAgfQog CisjaWZuZGVmIE5ERUJVRwogICAgIEhhc2hTZXQ8aW50LCBXVEY6OkludEhhc2g8aW50PiwgV1RG OjpVbnNpZ25lZFdpdGhaZXJvS2V5SGFzaFRyYWl0czxpbnQ+PiBjbG9uZWRDb25zdGFudFN5bWJv bFRhYmxlczsKKyNlbmRpZgogICAgIHsKKyNpZm5kZWYgTkRFQlVHCiAgICAgICAgIEhhc2hTZXQ8 U3ltYm9sVGFibGUqPiBjbG9uZWRTeW1ib2xUYWJsZXM7CisjZW5kaWYKKyAgICAgICAgYm9vbCBo YXNUeXBlUHJvZmlsZXIgPSAhIXZtLnR5cGVQcm9maWxlcigpOwogICAgICAgICBmb3IgKHVuc2ln bmVkIGkgPSAwOyBpIDwgbV9jb25zdGFudFJlZ2lzdGVycy5zaXplKCk7IGkrKykgewogICAgICAg ICAgICAgaWYgKG1fY29uc3RhbnRSZWdpc3RlcnNbaV0uZ2V0KCkuaXNFbXB0eSgpKQogICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgaWYgKFN5bWJvbFRhYmxlKiBzeW1ib2xU YWJsZSA9IGpzRHluYW1pY0Nhc3Q8U3ltYm9sVGFibGUqPihtX2NvbnN0YW50UmVnaXN0ZXJzW2ld LmdldCgpKSkgewotICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKGNsb25lZFN5bWJvbFRh Ymxlcy5hZGQoc3ltYm9sVGFibGUpLmlzTmV3RW50cnkpOwotICAgICAgICAgICAgICAgIGlmICht X3ZtLT50eXBlUHJvZmlsZXIoKSkgeworICAgICAgICAgICAgICAgIEFTU0VSVChjbG9uZWRTeW1i b2xUYWJsZXMuYWRkKHN5bWJvbFRhYmxlKS5pc05ld0VudHJ5KTsKKyAgICAgICAgICAgICAgICBp ZiAoaGFzVHlwZVByb2ZpbGVyKSB7CiAgICAgICAgICAgICAgICAgICAgIENvbmN1cnJlbnRKSVRM b2NrZXIgbG9ja2VyKHN5bWJvbFRhYmxlLT5tX2xvY2spOwogICAgICAgICAgICAgICAgICAgICBz eW1ib2xUYWJsZS0+cHJlcGFyZUZvclR5cGVQcm9maWxpbmcobG9ja2VyKTsKICAgICAgICAgICAg ICAgICB9CiAgICAgICAgICAgICAgICAgbV9jb25zdGFudFJlZ2lzdGVyc1tpXS5zZXQoKm1fdm0s IHRoaXMsIHN5bWJvbFRhYmxlLT5jbG9uZVNjb3BlUGFydCgqbV92bSkpOworI2lmbmRlZiBOREVC VUcKICAgICAgICAgICAgICAgICBjbG9uZWRDb25zdGFudFN5bWJvbFRhYmxlcy5hZGQoaSArIEZp cnN0Q29uc3RhbnRSZWdpc3RlckluZGV4KTsKKyNlbmRpZgogICAgICAgICAgICAgfQogICAgICAg ICB9CiAgICAgfQpAQCAtMTg5MSwxMCArMTg5OCwxMSBAQCB2b2lkIENvZGVCbG9jazo6ZmluaXNo Q3JlYXRpb24oVk0mIHZtLCBTCiAgICAgICAgIHJlcGxhY2VDb25zdGFudCh1bmxpbmtlZE1vZHVs ZVByb2dyYW1Db2RlQmxvY2stPm1vZHVsZUVudmlyb25tZW50U3ltYm9sVGFibGVDb25zdGFudFJl Z2lzdGVyT2Zmc2V0KCksIGNsb25lZFN5bWJvbFRhYmxlKTsKICAgICB9CiAKKyAgICBib29sIHNo b3VsZFVwZGF0ZUZ1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZSA9IHZtLnR5cGVQcm9maWxlcigpIHx8 IHZtLmNvbnRyb2xGbG93UHJvZmlsZXIoKTsKICAgICBtX2Z1bmN0aW9uRGVjbHMgPSBSZWZDb3Vu dGVkQXJyYXk8V3JpdGVCYXJyaWVyPEZ1bmN0aW9uRXhlY3V0YWJsZT4+KHVubGlua2VkQ29kZUJs b2NrLT5udW1iZXJPZkZ1bmN0aW9uRGVjbHMoKSk7CiAgICAgZm9yIChzaXplX3QgY291bnQgPSB1 bmxpbmtlZENvZGVCbG9jay0+bnVtYmVyT2ZGdW5jdGlvbkRlY2xzKCksIGkgPSAwOyBpIDwgY291 bnQ7ICsraSkgewogICAgICAgICBVbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZSogdW5saW5rZWRF eGVjdXRhYmxlID0gdW5saW5rZWRDb2RlQmxvY2stPmZ1bmN0aW9uRGVjbChpKTsKLSAgICAgICAg aWYgKHZtLnR5cGVQcm9maWxlcigpIHx8IHZtLmNvbnRyb2xGbG93UHJvZmlsZXIoKSkKKyAgICAg ICAgaWYgKHNob3VsZFVwZGF0ZUZ1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZSkKICAgICAgICAgICAg IHZtLmZ1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZSgpLT5pbnNlcnRVbmV4ZWN1dGVkUmFuZ2Uob3du ZXJFeGVjdXRhYmxlLT5zb3VyY2VJRCgpLCB1bmxpbmtlZEV4ZWN1dGFibGUtPnR5cGVQcm9maWxp bmdTdGFydE9mZnNldCgpLCB1bmxpbmtlZEV4ZWN1dGFibGUtPnR5cGVQcm9maWxpbmdFbmRPZmZz ZXQoKSk7CiAgICAgICAgIG1fZnVuY3Rpb25EZWNsc1tpXS5zZXQoKm1fdm0sIHRoaXMsIHVubGlu a2VkRXhlY3V0YWJsZS0+bGluaygqbV92bSwgb3duZXJFeGVjdXRhYmxlLT5zb3VyY2UoKSkpOwog ICAgIH0KQEAgLTE5MDIsNyArMTkxMCw3IEBAIHZvaWQgQ29kZUJsb2NrOjpmaW5pc2hDcmVhdGlv bihWTSYgdm0sIFMKICAgICBtX2Z1bmN0aW9uRXhwcnMgPSBSZWZDb3VudGVkQXJyYXk8V3JpdGVC YXJyaWVyPEZ1bmN0aW9uRXhlY3V0YWJsZT4+KHVubGlua2VkQ29kZUJsb2NrLT5udW1iZXJPZkZ1 bmN0aW9uRXhwcnMoKSk7CiAgICAgZm9yIChzaXplX3QgY291bnQgPSB1bmxpbmtlZENvZGVCbG9j ay0+bnVtYmVyT2ZGdW5jdGlvbkV4cHJzKCksIGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewogICAg ICAgICBVbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZSogdW5saW5rZWRFeGVjdXRhYmxlID0gdW5s aW5rZWRDb2RlQmxvY2stPmZ1bmN0aW9uRXhwcihpKTsKLSAgICAgICAgaWYgKHZtLnR5cGVQcm9m aWxlcigpIHx8IHZtLmNvbnRyb2xGbG93UHJvZmlsZXIoKSkKKyAgICAgICAgaWYgKHNob3VsZFVw ZGF0ZUZ1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZSkKICAgICAgICAgICAgIHZtLmZ1bmN0aW9uSGFz RXhlY3V0ZWRDYWNoZSgpLT5pbnNlcnRVbmV4ZWN1dGVkUmFuZ2Uob3duZXJFeGVjdXRhYmxlLT5z b3VyY2VJRCgpLCB1bmxpbmtlZEV4ZWN1dGFibGUtPnR5cGVQcm9maWxpbmdTdGFydE9mZnNldCgp LCB1bmxpbmtlZEV4ZWN1dGFibGUtPnR5cGVQcm9maWxpbmdFbmRPZmZzZXQoKSk7CiAgICAgICAg IG1fZnVuY3Rpb25FeHByc1tpXS5zZXQoKm1fdm0sIHRoaXMsIHVubGlua2VkRXhlY3V0YWJsZS0+ bGluaygqbV92bSwgb3duZXJFeGVjdXRhYmxlLT5zb3VyY2UoKSkpOwogICAgIH0KQEAgLTIwNzQs MTEgKzIwODIsMTMgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgUwog ICAgICAgICBjYXNlIG9wX2dldF9hcnJheV9sZW5ndGg6CiAgICAgICAgICAgICBDUkFTSCgpOwog CisjaWZuZGVmIE5ERUJVRwogICAgICAgICBjYXNlIG9wX2NyZWF0ZV9sZXhpY2FsX2Vudmlyb25t ZW50OiB7CiAgICAgICAgICAgICBpbnQgc3ltYm9sVGFibGVJbmRleCA9IHBjWzNdLnUub3BlcmFu ZDsKLSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKGNsb25lZENvbnN0YW50U3ltYm9sVGFibGVz LmNvbnRhaW5zKHN5bWJvbFRhYmxlSW5kZXgpKTsKKyAgICAgICAgICAgIEFTU0VSVChjbG9uZWRD b25zdGFudFN5bWJvbFRhYmxlcy5jb250YWlucyhzeW1ib2xUYWJsZUluZGV4KSk7CiAgICAgICAg ICAgICBicmVhazsKICAgICAgICAgfQorI2VuZGlmCiAKICAgICAgICAgY2FzZSBvcF9yZXNvbHZl X3Njb3BlOiB7CiAgICAgICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudCA9IGlkZW50aWZp ZXIocGNbM10udS5vcGVyYW5kKTsKQEAgLTIxNDMsMTIgKzIxNTMsMTIgQEAgdm9pZCBDb2RlQmxv Y2s6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgUwogICAgICAgICAgICAgICAgIC8vIE9ubHkgZG8g d2F0Y2hpbmcgaWYgdGhlIHByb3BlcnR5IHdlJ3JlIHB1dHRpbmcgdG8gaXMgbm90IGFub255bW91 cy4KICAgICAgICAgICAgICAgICBpZiAoc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHBjWzJdLnUub3Bl cmFuZCkgIT0gVUlOVF9NQVgpIHsKICAgICAgICAgICAgICAgICAgICAgaW50IHN5bWJvbFRhYmxl SW5kZXggPSBwY1s1XS51Lm9wZXJhbmQ7Ci0gICAgICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNT RVJUKGNsb25lZENvbnN0YW50U3ltYm9sVGFibGVzLmNvbnRhaW5zKHN5bWJvbFRhYmxlSW5kZXgp KTsKKyAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGNsb25lZENvbnN0YW50U3ltYm9sVGFibGVz LmNvbnRhaW5zKHN5bWJvbFRhYmxlSW5kZXgpKTsKICAgICAgICAgICAgICAgICAgICAgU3ltYm9s VGFibGUqIHN5bWJvbFRhYmxlID0ganNDYXN0PFN5bWJvbFRhYmxlKj4oZ2V0Q29uc3RhbnQoc3lt Ym9sVGFibGVJbmRleCkpOwogICAgICAgICAgICAgICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBp ZGVudCA9IGlkZW50aWZpZXIocGNbMl0udS5vcGVyYW5kKTsKICAgICAgICAgICAgICAgICAgICAg Q29uY3VycmVudEpJVExvY2tlciBsb2NrZXIoc3ltYm9sVGFibGUtPm1fbG9jayk7CiAgICAgICAg ICAgICAgICAgICAgIGF1dG8gaXRlciA9IHN5bWJvbFRhYmxlLT5maW5kKGxvY2tlciwgaWRlbnQu aW1wbCgpKTsKLSAgICAgICAgICAgICAgICAgICAgUkVMRUFTRV9BU1NFUlQoaXRlciAhPSBzeW1i b2xUYWJsZS0+ZW5kKGxvY2tlcikpOworICAgICAgICAgICAgICAgICAgICBBU1NFUlQoaXRlciAh PSBzeW1ib2xUYWJsZS0+ZW5kKGxvY2tlcikpOwogICAgICAgICAgICAgICAgICAgICBpdGVyLT52 YWx1ZS5wcmVwYXJlVG9XYXRjaCgpOwogICAgICAgICAgICAgICAgICAgICBpbnN0cnVjdGlvbnNb aSArIDVdLnUud2F0Y2hwb2ludFNldCA9IGl0ZXItPnZhbHVlLndhdGNocG9pbnRTZXQoKTsKICAg ICAgICAgICAgICAgICB9IGVsc2UKQEAgLTIyMTQsNyArMjIyNCw3IEBAIHZvaWQgQ29kZUJsb2Nr OjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFMKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIGNh c2UgUHJvZmlsZVR5cGVCeXRlY29kZUxvY2FsbHlSZXNvbHZlZDogewogICAgICAgICAgICAgICAg IGludCBzeW1ib2xUYWJsZUluZGV4ID0gcGNbMl0udS5vcGVyYW5kOwotICAgICAgICAgICAgICAg IFJFTEVBU0VfQVNTRVJUKGNsb25lZENvbnN0YW50U3ltYm9sVGFibGVzLmNvbnRhaW5zKHN5bWJv bFRhYmxlSW5kZXgpKTsKKyAgICAgICAgICAgICAgICBBU1NFUlQoY2xvbmVkQ29uc3RhbnRTeW1i b2xUYWJsZXMuY29udGFpbnMoc3ltYm9sVGFibGVJbmRleCkpOwogICAgICAgICAgICAgICAgIFN5 bWJvbFRhYmxlKiBzeW1ib2xUYWJsZSA9IGpzQ2FzdDxTeW1ib2xUYWJsZSo+KGdldENvbnN0YW50 KHN5bWJvbFRhYmxlSW5kZXgpKTsKICAgICAgICAgICAgICAgICBjb25zdCBJZGVudGlmaWVyJiBp ZGVudCA9IGlkZW50aWZpZXIocGNbNF0udS5vcGVyYW5kKTsKICAgICAgICAgICAgICAgICBDb25j dXJyZW50SklUTG9ja2VyIGxvY2tlcihzeW1ib2xUYWJsZS0+bV9sb2NrKTsK 274123 2016-03-15 13:49:44 -0700 2016-03-30 17:47:13 -0700 patch b-backup.diff text/plain 6339 saam SW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291 cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMTk4MjI4KQorKysgU291cmNl L0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBA CisyMDE2LTAzLTE1ICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUuY29tPgorCisgICAgICAg IENoYW5nZSBzb21lIHJlbGVhc2UgYXNzZXJ0cyBpbiBDb2RlQmxvY2sgbGlua2luZyBpbnRvIGRl YnVnIGFzc2VydHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE1NTUwMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogYnl0ZWNvZGUvQ29kZUJsb2NrLmNwcDoKKyAgICAgICAgKEpTQzo6Q29kZUJsb2NrOjpm aW5pc2hDcmVhdGlvbik6CisKIDIwMTYtMDMtMTUgIFNhYW0gQmFyYXRpICA8c2JhcmF0aUBhcHBs ZS5jb20+CiAKICAgICAgICAgV2Ugc2hvdWxkIGhhdmUgZGlmZmVyZW50IEpTVHlwZXMgZm9yIEpT R2xvYmFsTGV4aWNhbEVudmlyb25tZW50IGFuZCBKU0xleGljYWxFbnZpcm9ubWVudCBhbmQgSlNN b2R1bGVFbnZpcm9ubWVudApJbmRleDogU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2RlL0Nv ZGVCbG9jay5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL0phdmFTY3JpcHRDb3JlL2J5dGVjb2Rl L0NvZGVCbG9jay5jcHAJKHJldmlzaW9uIDE5ODIxOSkKKysrIFNvdXJjZS9KYXZhU2NyaXB0Q29y ZS9ieXRlY29kZS9Db2RlQmxvY2suY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xODYyLDIwICsxODYy LDI3IEBAIHZvaWQgQ29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFMKICAgICAgICAg ICAgIG1fY29uc3RhbnRSZWdpc3RlcnNbcmVnaXN0ZXJJbmRleF0uc2V0KCptX3ZtLCB0aGlzLCBt X2dsb2JhbE9iamVjdC0+anNDZWxsRm9yTGlua1RpbWVDb25zdGFudCh0eXBlKSk7CiAgICAgfQog CisjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgIEhhc2hTZXQ8aW50LCBXVEY6OkludEhhc2g8aW50 PiwgV1RGOjpVbnNpZ25lZFdpdGhaZXJvS2V5SGFzaFRyYWl0czxpbnQ+PiBjbG9uZWRDb25zdGFu dFN5bWJvbFRhYmxlczsKKyNlbmRpZgogICAgIHsKKyNpZiAhQVNTRVJUX0RJU0FCTEVECiAgICAg ICAgIEhhc2hTZXQ8U3ltYm9sVGFibGUqPiBjbG9uZWRTeW1ib2xUYWJsZXM7CisjZW5kaWYKKyAg ICAgICAgYm9vbCBoYXNUeXBlUHJvZmlsZXIgPSAhIXZtLnR5cGVQcm9maWxlcigpOwogICAgICAg ICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgbV9jb25zdGFudFJlZ2lzdGVycy5zaXplKCk7IGkr KykgewogICAgICAgICAgICAgaWYgKG1fY29uc3RhbnRSZWdpc3RlcnNbaV0uZ2V0KCkuaXNFbXB0 eSgpKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICAgICAgaWYgKFN5bWJvbFRh YmxlKiBzeW1ib2xUYWJsZSA9IGpzRHluYW1pY0Nhc3Q8U3ltYm9sVGFibGUqPihtX2NvbnN0YW50 UmVnaXN0ZXJzW2ldLmdldCgpKSkgewotICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKGNs b25lZFN5bWJvbFRhYmxlcy5hZGQoc3ltYm9sVGFibGUpLmlzTmV3RW50cnkpOwotICAgICAgICAg ICAgICAgIGlmIChtX3ZtLT50eXBlUHJvZmlsZXIoKSkgeworICAgICAgICAgICAgICAgIEFTU0VS VChjbG9uZWRTeW1ib2xUYWJsZXMuYWRkKHN5bWJvbFRhYmxlKS5pc05ld0VudHJ5KTsKKyAgICAg ICAgICAgICAgICBpZiAoaGFzVHlwZVByb2ZpbGVyKSB7CiAgICAgICAgICAgICAgICAgICAgIENv bmN1cnJlbnRKSVRMb2NrZXIgbG9ja2VyKHN5bWJvbFRhYmxlLT5tX2xvY2spOwogICAgICAgICAg ICAgICAgICAgICBzeW1ib2xUYWJsZS0+cHJlcGFyZUZvclR5cGVQcm9maWxpbmcobG9ja2VyKTsK ICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgbV9jb25zdGFudFJlZ2lzdGVyc1tp XS5zZXQoKm1fdm0sIHRoaXMsIHN5bWJvbFRhYmxlLT5jbG9uZVNjb3BlUGFydCgqbV92bSkpOwor I2lmICFBU1NFUlRfRElTQUJMRUQKICAgICAgICAgICAgICAgICBjbG9uZWRDb25zdGFudFN5bWJv bFRhYmxlcy5hZGQoaSArIEZpcnN0Q29uc3RhbnRSZWdpc3RlckluZGV4KTsKKyNlbmRpZgogICAg ICAgICAgICAgfQogICAgICAgICB9CiAgICAgfQpAQCAtMTg5MSwxMCArMTg5OCwxMSBAQCB2b2lk IENvZGVCbG9jazo6ZmluaXNoQ3JlYXRpb24oVk0mIHZtLCBTCiAgICAgICAgIHJlcGxhY2VDb25z dGFudCh1bmxpbmtlZE1vZHVsZVByb2dyYW1Db2RlQmxvY2stPm1vZHVsZUVudmlyb25tZW50U3lt Ym9sVGFibGVDb25zdGFudFJlZ2lzdGVyT2Zmc2V0KCksIGNsb25lZFN5bWJvbFRhYmxlKTsKICAg ICB9CiAKKyAgICBib29sIHNob3VsZFVwZGF0ZUZ1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZSA9IHZt LnR5cGVQcm9maWxlcigpIHx8IHZtLmNvbnRyb2xGbG93UHJvZmlsZXIoKTsKICAgICBtX2Z1bmN0 aW9uRGVjbHMgPSBSZWZDb3VudGVkQXJyYXk8V3JpdGVCYXJyaWVyPEZ1bmN0aW9uRXhlY3V0YWJs ZT4+KHVubGlua2VkQ29kZUJsb2NrLT5udW1iZXJPZkZ1bmN0aW9uRGVjbHMoKSk7CiAgICAgZm9y IChzaXplX3QgY291bnQgPSB1bmxpbmtlZENvZGVCbG9jay0+bnVtYmVyT2ZGdW5jdGlvbkRlY2xz KCksIGkgPSAwOyBpIDwgY291bnQ7ICsraSkgewogICAgICAgICBVbmxpbmtlZEZ1bmN0aW9uRXhl Y3V0YWJsZSogdW5saW5rZWRFeGVjdXRhYmxlID0gdW5saW5rZWRDb2RlQmxvY2stPmZ1bmN0aW9u RGVjbChpKTsKLSAgICAgICAgaWYgKHZtLnR5cGVQcm9maWxlcigpIHx8IHZtLmNvbnRyb2xGbG93 UHJvZmlsZXIoKSkKKyAgICAgICAgaWYgKHNob3VsZFVwZGF0ZUZ1bmN0aW9uSGFzRXhlY3V0ZWRD YWNoZSkKICAgICAgICAgICAgIHZtLmZ1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZSgpLT5pbnNlcnRV bmV4ZWN1dGVkUmFuZ2Uob3duZXJFeGVjdXRhYmxlLT5zb3VyY2VJRCgpLCB1bmxpbmtlZEV4ZWN1 dGFibGUtPnR5cGVQcm9maWxpbmdTdGFydE9mZnNldCgpLCB1bmxpbmtlZEV4ZWN1dGFibGUtPnR5 cGVQcm9maWxpbmdFbmRPZmZzZXQoKSk7CiAgICAgICAgIG1fZnVuY3Rpb25EZWNsc1tpXS5zZXQo Km1fdm0sIHRoaXMsIHVubGlua2VkRXhlY3V0YWJsZS0+bGluaygqbV92bSwgb3duZXJFeGVjdXRh YmxlLT5zb3VyY2UoKSkpOwogICAgIH0KQEAgLTE5MDIsNyArMTkxMCw3IEBAIHZvaWQgQ29kZUJs b2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFMKICAgICBtX2Z1bmN0aW9uRXhwcnMgPSBSZWZD b3VudGVkQXJyYXk8V3JpdGVCYXJyaWVyPEZ1bmN0aW9uRXhlY3V0YWJsZT4+KHVubGlua2VkQ29k ZUJsb2NrLT5udW1iZXJPZkZ1bmN0aW9uRXhwcnMoKSk7CiAgICAgZm9yIChzaXplX3QgY291bnQg PSB1bmxpbmtlZENvZGVCbG9jay0+bnVtYmVyT2ZGdW5jdGlvbkV4cHJzKCksIGkgPSAwOyBpIDwg Y291bnQ7ICsraSkgewogICAgICAgICBVbmxpbmtlZEZ1bmN0aW9uRXhlY3V0YWJsZSogdW5saW5r ZWRFeGVjdXRhYmxlID0gdW5saW5rZWRDb2RlQmxvY2stPmZ1bmN0aW9uRXhwcihpKTsKLSAgICAg ICAgaWYgKHZtLnR5cGVQcm9maWxlcigpIHx8IHZtLmNvbnRyb2xGbG93UHJvZmlsZXIoKSkKKyAg ICAgICAgaWYgKHNob3VsZFVwZGF0ZUZ1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZSkKICAgICAgICAg ICAgIHZtLmZ1bmN0aW9uSGFzRXhlY3V0ZWRDYWNoZSgpLT5pbnNlcnRVbmV4ZWN1dGVkUmFuZ2Uo b3duZXJFeGVjdXRhYmxlLT5zb3VyY2VJRCgpLCB1bmxpbmtlZEV4ZWN1dGFibGUtPnR5cGVQcm9m aWxpbmdTdGFydE9mZnNldCgpLCB1bmxpbmtlZEV4ZWN1dGFibGUtPnR5cGVQcm9maWxpbmdFbmRP ZmZzZXQoKSk7CiAgICAgICAgIG1fZnVuY3Rpb25FeHByc1tpXS5zZXQoKm1fdm0sIHRoaXMsIHVu bGlua2VkRXhlY3V0YWJsZS0+bGluaygqbV92bSwgb3duZXJFeGVjdXRhYmxlLT5zb3VyY2UoKSkp OwogICAgIH0KQEAgLTIwNzQsMTEgKzIwODIsMTMgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENy ZWF0aW9uKFZNJiB2bSwgUwogICAgICAgICBjYXNlIG9wX2dldF9hcnJheV9sZW5ndGg6CiAgICAg ICAgICAgICBDUkFTSCgpOwogCisjaWYgIUFTU0VSVF9ESVNBQkxFRAogICAgICAgICBjYXNlIG9w X2NyZWF0ZV9sZXhpY2FsX2Vudmlyb25tZW50OiB7CiAgICAgICAgICAgICBpbnQgc3ltYm9sVGFi bGVJbmRleCA9IHBjWzNdLnUub3BlcmFuZDsKLSAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKGNs b25lZENvbnN0YW50U3ltYm9sVGFibGVzLmNvbnRhaW5zKHN5bWJvbFRhYmxlSW5kZXgpKTsKKyAg ICAgICAgICAgIEFTU0VSVChjbG9uZWRDb25zdGFudFN5bWJvbFRhYmxlcy5jb250YWlucyhzeW1i b2xUYWJsZUluZGV4KSk7CiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgfQorI2VuZGlmCiAK ICAgICAgICAgY2FzZSBvcF9yZXNvbHZlX3Njb3BlOiB7CiAgICAgICAgICAgICBjb25zdCBJZGVu dGlmaWVyJiBpZGVudCA9IGlkZW50aWZpZXIocGNbM10udS5vcGVyYW5kKTsKQEAgLTIxNDMsMTIg KzIxNTMsMTIgQEAgdm9pZCBDb2RlQmxvY2s6OmZpbmlzaENyZWF0aW9uKFZNJiB2bSwgUwogICAg ICAgICAgICAgICAgIC8vIE9ubHkgZG8gd2F0Y2hpbmcgaWYgdGhlIHByb3BlcnR5IHdlJ3JlIHB1 dHRpbmcgdG8gaXMgbm90IGFub255bW91cy4KICAgICAgICAgICAgICAgICBpZiAoc3RhdGljX2Nh c3Q8dW5zaWduZWQ+KHBjWzJdLnUub3BlcmFuZCkgIT0gVUlOVF9NQVgpIHsKICAgICAgICAgICAg ICAgICAgICAgaW50IHN5bWJvbFRhYmxlSW5kZXggPSBwY1s1XS51Lm9wZXJhbmQ7Ci0gICAgICAg ICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKGNsb25lZENvbnN0YW50U3ltYm9sVGFibGVzLmNv bnRhaW5zKHN5bWJvbFRhYmxlSW5kZXgpKTsKKyAgICAgICAgICAgICAgICAgICAgQVNTRVJUKGNs b25lZENvbnN0YW50U3ltYm9sVGFibGVzLmNvbnRhaW5zKHN5bWJvbFRhYmxlSW5kZXgpKTsKICAg ICAgICAgICAgICAgICAgICAgU3ltYm9sVGFibGUqIHN5bWJvbFRhYmxlID0ganNDYXN0PFN5bWJv bFRhYmxlKj4oZ2V0Q29uc3RhbnQoc3ltYm9sVGFibGVJbmRleCkpOwogICAgICAgICAgICAgICAg ICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudCA9IGlkZW50aWZpZXIocGNbMl0udS5vcGVyYW5k KTsKICAgICAgICAgICAgICAgICAgICAgQ29uY3VycmVudEpJVExvY2tlciBsb2NrZXIoc3ltYm9s VGFibGUtPm1fbG9jayk7CiAgICAgICAgICAgICAgICAgICAgIGF1dG8gaXRlciA9IHN5bWJvbFRh YmxlLT5maW5kKGxvY2tlciwgaWRlbnQuaW1wbCgpKTsKLSAgICAgICAgICAgICAgICAgICAgUkVM RUFTRV9BU1NFUlQoaXRlciAhPSBzeW1ib2xUYWJsZS0+ZW5kKGxvY2tlcikpOworICAgICAgICAg ICAgICAgICAgICBBU1NFUlQoaXRlciAhPSBzeW1ib2xUYWJsZS0+ZW5kKGxvY2tlcikpOwogICAg ICAgICAgICAgICAgICAgICBpdGVyLT52YWx1ZS5wcmVwYXJlVG9XYXRjaCgpOwogICAgICAgICAg ICAgICAgICAgICBpbnN0cnVjdGlvbnNbaSArIDVdLnUud2F0Y2hwb2ludFNldCA9IGl0ZXItPnZh bHVlLndhdGNocG9pbnRTZXQoKTsKICAgICAgICAgICAgICAgICB9IGVsc2UKQEAgLTIyMTQsNyAr MjIyNCw3IEBAIHZvaWQgQ29kZUJsb2NrOjpmaW5pc2hDcmVhdGlvbihWTSYgdm0sIFMKICAgICAg ICAgICAgIH0KICAgICAgICAgICAgIGNhc2UgUHJvZmlsZVR5cGVCeXRlY29kZUxvY2FsbHlSZXNv bHZlZDogewogICAgICAgICAgICAgICAgIGludCBzeW1ib2xUYWJsZUluZGV4ID0gcGNbMl0udS5v cGVyYW5kOwotICAgICAgICAgICAgICAgIFJFTEVBU0VfQVNTRVJUKGNsb25lZENvbnN0YW50U3lt Ym9sVGFibGVzLmNvbnRhaW5zKHN5bWJvbFRhYmxlSW5kZXgpKTsKKyAgICAgICAgICAgICAgICBB U1NFUlQoY2xvbmVkQ29uc3RhbnRTeW1ib2xUYWJsZXMuY29udGFpbnMoc3ltYm9sVGFibGVJbmRl eCkpOwogICAgICAgICAgICAgICAgIFN5bWJvbFRhYmxlKiBzeW1ib2xUYWJsZSA9IGpzQ2FzdDxT eW1ib2xUYWJsZSo+KGdldENvbnN0YW50KHN5bWJvbFRhYmxlSW5kZXgpKTsKICAgICAgICAgICAg ICAgICBjb25zdCBJZGVudGlmaWVyJiBpZGVudCA9IGlkZW50aWZpZXIocGNbNF0udS5vcGVyYW5k KTsKICAgICAgICAgICAgICAgICBDb25jdXJyZW50SklUTG9ja2VyIGxvY2tlcihzeW1ib2xUYWJs ZS0+bV9sb2NrKTsK