225980 2021-05-19 13:29:02 -0700 Simplify and make InjectedBundle::initialize() more robust 2021-05-19 16:11:22 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez ggaren kkinnunen webkit-bug-importer oldest_to_newest 1761672 0 cdumez 2021-05-19 13:29:02 -0700 Simplify and make InjectedBundle::initialize() more robust as we are seeing some flaky crashes in this area (rdar://33894266) 1761678 1 429091 cdumez 2021-05-19 13:38:35 -0700 Created attachment 429091 Patch 1761737 2 429091 ggaren 2021-05-19 15:39:46 -0700 Comment on attachment 429091 Patch r=me 1761753 3 ews-feeder 2021-05-19 16:10:21 -0700 Committed r277761 (237926@main): <https://commits.webkit.org/237926@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 429091. 1761754 4 webkit-bug-importer 2021-05-19 16:11:22 -0700 <rdar://problem/78229879> 429091 2021-05-19 13:38:35 -0700 2021-05-19 16:10:22 -0700 Patch bug-225980-20210519133835.patch text/plain 6579 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDhlZDU4N2M4MzkzMWEzNWFh ZGY2ZWI0Y2RjNDg3OTE3ZDBiZTUyYmEuLjJjMTk5YjQzY2Q0YzU5ZTMyMDhkMWI4NjQ2YThmMGY4 NmE2YTViNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjEtMDUtMTkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBhbmQgbWFrZSBJbmpl Y3RlZEJ1bmRsZTo6aW5pdGlhbGl6ZSgpIG1vcmUgcm9idXN0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU5ODAKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGlmeSBhbmQgbWFrZSBJbmplY3RlZEJ1 bmRsZTo6aW5pdGlhbGl6ZSgpIG1vcmUgcm9idXN0IGFzIHdlIGFyZSBzZWVpbmcgc29tZSBmbGFr eQorICAgICAgICBjcmFzaGVzIGluIHRoaXMgYXJlYSAocmRhcjovLzMzODk0MjY2KS4KKworICAg ICAgICBJbiBwYXJ0aWN1bGFyLCB0aGUgZm9sbG93aW5nIGNoYW5nZXMgd2VyZSBtYWRlOgorICAg ICAgICAtIENhbGwgZGxvcGVuX3ByZWZsaWdodCgpIGJlZm9yZSBkbG9wZW4oKSBmb3IgZXh0cmEg cm9idXN0bmVzcyBhcyB3ZSBzZWUgc29tZSBjcmFzaGVzIHVuZGVyIGRsb3BlbigpLgorICAgICAg ICAtIENhbGwgW05TQnVuZGxlIHByZWZsaWdodEFuZFJldHVybkVycm9yOl0gYmVmb3JlIFtOU0J1 bmRsZSBsb2FkQW5kUmV0dXJuRXJyb3I6XSBmb3IgZXh0cmEgcm9idXN0bmVzcworICAgICAgICAg IGFzIHdlIHNlZSBzb21lIGNyYXNoZXMgdW5kZXIgW05TQnVuZGxlIGxvYWRBbmRSZXR1cm5FcnJv cjpdLgorICAgICAgICAtIENhbGwgW05TQnVuZGxlIGxvYWRBbmRSZXR1cm5FcnJvcjpdIGluc3Rl YWQgb2YgW05TQnVuZGxlIGxvYWRdIHNvIHRoYXQgd2UgZ2V0IGEgdXNlZnVsIE5TRXJyb3IgZm9y CisgICAgICAgICAgbG9nZ2luZy4KKyAgICAgICAgLSBDYWxsIFtOU0J1bmRsZSBpbml0V2l0aFBh dGg6XSBpbnN0ZWFkIG9mIFtOU0J1bmRsZSBpbml0V2l0aFVSTDpdIHNpbmNlIHdlIGhhdmUgYSBw YXRoIGFuZCBzaW5jZQorICAgICAgICAgIFtOU0J1bmRsZSBpbml0V2l0aFVSTDpdIGVuZHMgdXAg Y2FsbGluZyBbTlNCdW5kbGUgaW5pdFdpdGhQYXRoOl0gYW55d2F5LiBUaGlzIGF2b2lkcyB1cyBo YXZpbmcgdG8KKyAgICAgICAgICBjb25zdHJ1Y3QgYSBOU1VSTCBmcm9tIG91ciBwYXRoLgorICAg ICAgICAtIFVzZSBOU0J1bmRsZS5leGVjdXRhYmxlUGF0aCBpbnN0ZWFkIG9mIENGQnVuZGxlQ29w eUV4ZWN1dGFibGVVUkwoKSBzaW5jZSBpdCBpcyBuaWNlciBhbmQgd2UgaGF2ZQorICAgICAgICAg IGEgTlNCdW5kbGUuCisgICAgICAgIC0gVXNlIFtOU1N0cmluZyBmaWxlU3lzdGVtUmVwcmVzZW50 YXRpb25dIHRvIGdldHMgYSBmaWxlIHN5c3RlbSByZXByZXNlbnRhdGlvbiBvZiBOU0J1bmRsZS5l eGVjdXRhYmxlUGF0aC4KKyAgICAgICAgICBQcmV2aW91c2x5LCB3ZSB3ZXJlIHJlbHlpbmcgb24g Q0ZVUkxHZXRGaWxlU3lzdGVtUmVwcmVzZW50YXRpb24oKS4KKworICAgICAgICAqIFdlYlByb2Nl c3MvSW5qZWN0ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLm1tOgorICAgICAgICAoV2Vi S2l0OjpJbmplY3RlZEJ1bmRsZTo6aW5pdGlhbGl6ZSk6CisKIDIwMjEtMDUtMTkgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBEcm9wICJnZXQiIHByZWZpeCBmcm9t IFNRTGl0ZVN0YXRlbWVudCBtZW1iZXIgZnVuY3Rpb25zIGFzIHdlbGwgYXMgb3V0LXBhcmFtZXRl cnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1bmRsZS9t YWMvSW5qZWN0ZWRCdW5kbGVNYWMubW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvSW5qZWN0 ZWRCdW5kbGUvbWFjL0luamVjdGVkQnVuZGxlTWFjLm1tCmluZGV4IDg4ZDI1MDg4NjE3ZjYyNzg3 NWY0MGU4YzVmM2EwMTJkYTU3MDhmNzQuLmY1MzgzNmFhZDJjNzk3YzNjOGI0NGYwZjAyOTQ5MGI3 ZWYzODA0NmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9JbmplY3RlZEJ1 bmRsZS9tYWMvSW5qZWN0ZWRCdW5kbGVNYWMubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL21hYy9JbmplY3RlZEJ1bmRsZU1hYy5tbQpAQCAtMTE3LDI4ICsx MTcsMTQgQEAgYm9vbCBJbmplY3RlZEJ1bmRsZTo6ZGVjb2RlQnVuZGxlUGFyYW1ldGVycyhBUEk6 OkRhdGEqIGJ1bmRsZVBhcmFtZXRlckRhdGFQdHIpCiAKIGJvb2wgSW5qZWN0ZWRCdW5kbGU6Omlu aXRpYWxpemUoY29uc3QgV2ViUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycywg QVBJOjpPYmplY3QqIGluaXRpYWxpemF0aW9uVXNlckRhdGEpCiB7Ci0gICAgaWYgKG1fc2FuZGJv eEV4dGVuc2lvbikgewotICAgICAgICBpZiAoIW1fc2FuZGJveEV4dGVuc2lvbi0+Y29uc3VtZVBl cm1hbmVudGx5KCkpIHsKKyAgICBpZiAoYXV0byBzYW5kYm94RXh0ZW5zaW9uID0gc3RkOjpleGNo YW5nZShtX3NhbmRib3hFeHRlbnNpb24sIG51bGxwdHIpKSB7CisgICAgICAgIGlmICghc2FuZGJv eEV4dGVuc2lvbi0+Y29uc3VtZVBlcm1hbmVudGx5KCkpIHsKICAgICAgICAgICAgIFdURkxvZ0Fs d2F5cygiSW5qZWN0ZWRCdW5kbGU6OmxvYWQgZmFpbGVkIC0gQ291bGQgbm90IGNvbnN1bWUgYnVu ZGxlIHNhbmRib3ggZXh0ZW5zaW9uIGZvciBbJXNdLlxuIiwgbV9wYXRoLnV0ZjgoKS5kYXRhKCkp OwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9Ci0KLSAgICAgICAgbV9zYW5k Ym94RXh0ZW5zaW9uID0gbnVsbHB0cjsKLSAgICB9Ci0gICAgCi0gICAgUmV0YWluUHRyPENGU3Ry aW5nUmVmPiBpbmplY3RlZEJ1bmRsZVBhdGhTdHIgPSBtX3BhdGguY3JlYXRlQ0ZTdHJpbmcoKTsK LSAgICBpZiAoIWluamVjdGVkQnVuZGxlUGF0aFN0cikgewotICAgICAgICBXVEZMb2dBbHdheXMo IkluamVjdGVkQnVuZGxlOjpsb2FkIGZhaWxlZCAtIENvdWxkIG5vdCBjcmVhdGUgdGhlIHBhdGgg c3RyaW5nLlxuIik7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKLSAgICB9Ci0gICAgCi0gICAgUmV0 YWluUHRyPENGVVJMUmVmPiBidW5kbGVVUkwgPSBhZG9wdENGKENGVVJMQ3JlYXRlV2l0aEZpbGVT eXN0ZW1QYXRoKDAsIGluamVjdGVkQnVuZGxlUGF0aFN0ci5nZXQoKSwga0NGVVJMUE9TSVhQYXRo U3R5bGUsIGZhbHNlKSk7Ci0gICAgaWYgKCFidW5kbGVVUkwpIHsKLSAgICAgICAgV1RGTG9nQWx3 YXlzKCJJbmplY3RlZEJ1bmRsZTo6bG9hZCBmYWlsZWQgLSBDb3VsZCBub3QgY3JlYXRlIHRoZSB1 cmwgZnJvbSB0aGUgcGF0aCBzdHJpbmcuXG4iKTsKLSAgICAgICAgcmV0dXJuIGZhbHNlOwogICAg IH0KIAotICAgIG1fcGxhdGZvcm1CdW5kbGUgPSBbW05TQnVuZGxlIGFsbG9jXSBpbml0V2l0aFVS TDooX19icmlkZ2UgTlNVUkwgKilidW5kbGVVUkwuZ2V0KCldOworICAgIG1fcGxhdGZvcm1CdW5k bGUgPSBbW05TQnVuZGxlIGFsbG9jXSBpbml0V2l0aFBhdGg6bV9wYXRoXTsKICAgICBpZiAoIW1f cGxhdGZvcm1CdW5kbGUpIHsKICAgICAgICAgV1RGTG9nQWx3YXlzKCJJbmplY3RlZEJ1bmRsZTo6 bG9hZCBmYWlsZWQgLSBDb3VsZCBub3QgY3JlYXRlIHRoZSBidW5kbGUuXG4iKTsKICAgICAgICAg cmV0dXJuIGZhbHNlOwpAQCAtMTQ2LDEyICsxMzIsMTAgQEAgYm9vbCBJbmplY3RlZEJ1bmRsZTo6 aW5pdGlhbGl6ZShjb25zdCBXZWJQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJz LAogCiAgICAgV0tCdW5kbGVBZGRpdGlvbmFsQ2xhc3Nlc0ZvclBhcmFtZXRlckNvZGVyRnVuY3Rp b25QdHIgYWRkaXRpb25hbENsYXNzZXNGb3JQYXJhbWV0ZXJDb2RlckZ1bmN0aW9uID0gbnVsbHB0 cjsKICAgICBXS0J1bmRsZUluaXRpYWxpemVGdW5jdGlvblB0ciBpbml0aWFsaXplRnVuY3Rpb24g PSBudWxscHRyOwotICAgIGlmIChSZXRhaW5QdHI8Q0ZVUkxSZWY+IGV4ZWN1dGFibGVVUkwgPSBh ZG9wdENGKENGQnVuZGxlQ29weUV4ZWN1dGFibGVVUkwoW21fcGxhdGZvcm1CdW5kbGUgX2NmQnVu ZGxlXSkpKSB7Ci0gICAgICAgIHN0YXRpYyBjb25zdGV4cHIgc2l6ZV90IG1heFBhdGhTaXplID0g NDA5NjsKLSAgICAgICAgY2hhciBwYXRoVG9FeGVjdXRhYmxlW21heFBhdGhTaXplXTsKLSAgICAg ICAgaWYgKENGVVJMR2V0RmlsZVN5c3RlbVJlcHJlc2VudGF0aW9uKGV4ZWN1dGFibGVVUkwuZ2V0 KCksIHRydWUsIGJpdHdpc2VfY2FzdDx1aW50OF90Kj4ocGF0aFRvRXhlY3V0YWJsZSksIG1heFBh dGhTaXplKSkgewotICAgICAgICAgICAgLy8gV2UgZG9uJ3QgaG9sZCBvbnRvIHRoaXMgaGFuZGxl IGFueXdoZXJlIG1vcmUgcGVybWFuZW50IHNpbmNlIHdlIG5ldmVyIGRsY29zZS4KLSAgICAgICAg ICAgIGlmICh2b2lkKiBoYW5kbGUgPSBkbG9wZW4ocGF0aFRvRXhlY3V0YWJsZSwgUlRMRF9MQVpZ IHwgUlRMRF9HTE9CQUwgfCBSVExEX0ZJUlNUKSkgeworICAgIGlmIChOU1N0cmluZyAqZXhlY3V0 YWJsZVBhdGggPSBtX3BsYXRmb3JtQnVuZGxlLmV4ZWN1dGFibGVQYXRoKSB7CisgICAgICAgIGlm IChkbG9wZW5fcHJlZmxpZ2h0KGV4ZWN1dGFibGVQYXRoLmZpbGVTeXN0ZW1SZXByZXNlbnRhdGlv bikpIHsKKyAgICAgICAgICAgIC8vIFdlIGRvbid0IGhvbGQgb250byB0aGlzIGhhbmRsZSBhbnl3 aGVyZSBtb3JlIHBlcm1hbmVudCBzaW5jZSB3ZSBuZXZlciBkbGNsb3NlLgorICAgICAgICAgICAg aWYgKHZvaWQqIGhhbmRsZSA9IGRsb3BlbihleGVjdXRhYmxlUGF0aC5maWxlU3lzdGVtUmVwcmVz ZW50YXRpb24sIFJUTERfTEFaWSB8IFJUTERfR0xPQkFMIHwgUlRMRF9GSVJTVCkpIHsKICAgICAg ICAgICAgICAgICBhZGRpdGlvbmFsQ2xhc3Nlc0ZvclBhcmFtZXRlckNvZGVyRnVuY3Rpb24gPSBi aXR3aXNlX2Nhc3Q8V0tCdW5kbGVBZGRpdGlvbmFsQ2xhc3Nlc0ZvclBhcmFtZXRlckNvZGVyRnVu Y3Rpb25QdHI+KGRsc3ltKGhhbmRsZSwgIldLQnVuZGxlQWRkaXRpb25hbENsYXNzZXNGb3JQYXJh bWV0ZXJDb2RlciIpKTsKICAgICAgICAgICAgICAgICBpbml0aWFsaXplRnVuY3Rpb24gPSBiaXR3 aXNlX2Nhc3Q8V0tCdW5kbGVJbml0aWFsaXplRnVuY3Rpb25QdHI+KGRsc3ltKGhhbmRsZSwgIldL QnVuZGxlSW5pdGlhbGl6ZSIpKTsKICAgICAgICAgICAgIH0KQEAgLTE1OSwxNCArMTQzLDE3IEBA IGJvb2wgSW5qZWN0ZWRCdW5kbGU6OmluaXRpYWxpemUoY29uc3QgV2ViUHJvY2Vzc0NyZWF0aW9u UGFyYW1ldGVycyYgcGFyYW1ldGVycywKICAgICB9CiAgICAgICAgIAogICAgIGlmICghaW5pdGlh bGl6ZUZ1bmN0aW9uKSB7Ci0gICAgICAgIGlmICghW21fcGxhdGZvcm1CdW5kbGUgbG9hZF0pIHsK LSAgICAgICAgICAgIFdURkxvZ0Fsd2F5cygiSW5qZWN0ZWRCdW5kbGU6OmxvYWQgZmFpbGVkIC0g Q291bGQgbm90IGxvYWQgdGhlIGV4ZWN1dGFibGUgZnJvbSB0aGUgYnVuZGxlLlxuIik7CisgICAg ICAgIE5TRXJyb3IgKmVycm9yOworICAgICAgICBpZiAoIVttX3BsYXRmb3JtQnVuZGxlIHByZWZs aWdodEFuZFJldHVybkVycm9yOiZlcnJvcl0pIHsKKyAgICAgICAgICAgIE5TTG9nKEAiSW5qZWN0 ZWRCdW5kbGU6OmxvYWQgZmFpbGVkIC0gcHJlZmxpZ2h0QW5kUmV0dXJuRXJyb3IgZmFpbGVkLCBl cnJvcjogJUAiLCBlcnJvcik7CisgICAgICAgICAgICByZXR1cm4gbmlsOworICAgICAgICB9Cisg ICAgICAgIGlmICghW21fcGxhdGZvcm1CdW5kbGUgbG9hZEFuZFJldHVybkVycm9yOiZlcnJvcl0p IHsKKyAgICAgICAgICAgIE5TTG9nKEAiSW5qZWN0ZWRCdW5kbGU6OmxvYWQgZmFpbGVkIC0gbG9h ZEFuZFJldHVybkVycm9yIGZhaWxlZCwgZXJyb3I6ICVAIiwgZXJyb3IpOwogICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwogICAgICAgICB9Ci0gICAgfQotCi0gICAgaWYgKCFpbml0aWFsaXplRnVu Y3Rpb24pCiAgICAgICAgIGluaXRpYWxpemVGdW5jdGlvbiA9IGJpdHdpc2VfY2FzdDxXS0J1bmRs ZUluaXRpYWxpemVGdW5jdGlvblB0cj4oQ0ZCdW5kbGVHZXRGdW5jdGlvblBvaW50ZXJGb3JOYW1l KFttX3BsYXRmb3JtQnVuZGxlIF9jZkJ1bmRsZV0sIENGU1RSKCJXS0J1bmRsZUluaXRpYWxpemUi KSkpOworICAgIH0KIAogICAgIGlmICghYWRkaXRpb25hbENsYXNzZXNGb3JQYXJhbWV0ZXJDb2Rl ckZ1bmN0aW9uKQogICAgICAgICBhZGRpdGlvbmFsQ2xhc3Nlc0ZvclBhcmFtZXRlckNvZGVyRnVu Y3Rpb24gPSBiaXR3aXNlX2Nhc3Q8V0tCdW5kbGVBZGRpdGlvbmFsQ2xhc3Nlc0ZvclBhcmFtZXRl ckNvZGVyRnVuY3Rpb25QdHI+KENGQnVuZGxlR2V0RnVuY3Rpb25Qb2ludGVyRm9yTmFtZShbbV9w bGF0Zm9ybUJ1bmRsZSBfY2ZCdW5kbGVdLCBDRlNUUigiV0tCdW5kbGVBZGRpdGlvbmFsQ2xhc3Nl c0ZvclBhcmFtZXRlckNvZGVyIikpKTsK