218543 2020-11-03 16:15:48 -0800 Add back the removed assertion from r269338 and add a test 2020-11-03 18:51:25 -0800 1 1 1 Unclassified WebKit JavaScriptCore Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 saam saam ews-watchlist fpizlo keith_miller mark.lam msaboff tzagallo webkit-bug-importer oldest_to_newest 1704267 0 saam 2020-11-03 16:15:48 -0800 ... 1704270 1 413118 saam 2020-11-03 16:20:40 -0800 Created attachment 413118 patch 1704307 2 ews-feeder 2020-11-03 18:50:30 -0800 Committed r269350: <https://trac.webkit.org/changeset/269350> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413118. 1704308 3 webkit-bug-importer 2020-11-03 18:51:25 -0800 <rdar://problem/71020429> 413118 2020-11-03 16:20:40 -0800 2020-11-03 18:50:31 -0800 patch c-backup.diff text/plain 4601 saam SW5kZXg6IEpTVGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIEpTVGVzdHMvQ2hhbmdlTG9n CShyZXZpc2lvbiAyNjkzNDQpCisrKyBKU1Rlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDIwLTExLTAzICBTYWFtIEJhcmF0aSAgPHNiYXJhdGlAYXBwbGUu Y29tPgorCisgICAgICAgIEFkZCBiYWNrIHRoZSByZW1vdmVkIGFzc2VydGlvbiBmcm9tIHIyNjkz MzggYW5kIGFkZCBhIHRlc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIxODU0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogc3RyZXNzL2JhZC1vc3ItZXhpdC1jaGVja3BvaW50LXN0YXRlLWFzc2VydGlv bi1kdXJpbmctanMtbG9jay1kZXN0cnVjdGlvbi5qczogQWRkZWQuCisgICAgICAgIChmb28pOgor ICAgICAgICAobGV0LmEuZ2V0IGxlbmd0aCk6CisKIDIwMjAtMTEtMDMgIFl1c3VrZSBTdXp1a2kg IDx5c3V6dWtpQGFwcGxlLmNvbT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjU0MDM4KTogU2lt cGxlLmNvbSBtb25leSB0cmFuc2ZlciBVSSBpcyB2ZXJ5IGxhZ2d5IChtdWx0aXBsZSBzZWNvbmRz IHBlciBrZXlwcmVzcykKSW5kZXg6IEpTVGVzdHMvc3RyZXNzL2JhZC1vc3ItZXhpdC1jaGVja3Bv aW50LXN0YXRlLWFzc2VydGlvbi1kdXJpbmctanMtbG9jay1kZXN0cnVjdGlvbi5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBKU1Rlc3RzL3N0cmVzcy9iYWQtb3NyLWV4aXQtY2hlY2twb2ludC1zdGF0ZS1hc3Nl cnRpb24tZHVyaW5nLWpzLWxvY2stZGVzdHJ1Y3Rpb24uanMJKG5vbmV4aXN0ZW50KQorKysgSlNU ZXN0cy9zdHJlc3MvYmFkLW9zci1leGl0LWNoZWNrcG9pbnQtc3RhdGUtYXNzZXJ0aW9uLWR1cmlu Zy1qcy1sb2NrLWRlc3RydWN0aW9uLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMjMgQEAK Ky8vQCBydW5EZWZhdWx0KCItLW1heGltdW1JbmxpbmluZ1JlY3Vyc2lvbj0xMCIsICItLW1heGlt dW1JbmxpbmluZ0RlcHRoPTEwIiwgIi0tbWF4aW11bUZ1bmN0aW9uRm9yQ29uc3RydWN0SW5saW5l Q2FuZGlkYXRlQnl0ZWNvb2RlQ29zdD0xMDAwIiwgIi0tbWF4aW11bUZ1bmN0aW9uRm9yQ2xvc3Vy ZUNhbGxJbmxpbmVDYW5kaWRhdGVCeXRlY29kZUNvc3Q9MTAwMCIsICItLW1heGltdW1GdW5jdGlv bkZvckNhbGxJbmxpbmVDYW5kaWRhdGVCeXRlY29kZUNvc3Q9MTAwMCIsICItLXVzZUNvbmN1cnJl bnRKSVQ9MCIpCisKK2xldCBkZXB0aDsKK2NvbnN0IGxpbWl0ID0gNTsKK2Z1bmN0aW9uIGZvbygp IHsKKyAgICBpZiAoZGVwdGggPj0gbGltaXQpIHsKKyAgICAgICAgT1NSRXhpdCgpOworICAgICAg ICBkcm9wQWxsTG9ja3MoKTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorICAgICsrZGVwdGg7 CisgICAgZm9vLmFwcGx5KG51bGwsIGEpOworfQorbGV0IGEgPSB7CisgICAgZ2V0IGxlbmd0aCgp IHsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorfTsKKworZm9yIChsZXQgaSA9IDA7IGkgPCAx ZTU7ICsraSkgeworICAgIGRlcHRoID0gMDsKKyAgICBmb28uYXBwbHkobnVsbCwgYSk7Cit9Cklu ZGV4OiBTb3VyY2UvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2OTM0MSkKKysrIFNvdXJjZS9K YXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxOCBAQAor MjAyMC0xMS0wMyAgU2FhbSBCYXJhdGkgIDxzYmFyYXRpQGFwcGxlLmNvbT4KKworICAgICAgICBB ZGQgYmFjayB0aGUgcmVtb3ZlZCBhc3NlcnRpb24gZnJvbSByMjY5MzM4IGFuZCBhZGQgYSB0ZXN0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTg1NDMK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgYXNz ZXJ0aW9uIGZyb20gcjI2OTMzOCB3YXMgd3JvbmcgaW4gSlNMb2NrOjp3aWxsUmVsZWFzZUxvY2sg YmVjYXVzZQorICAgICAgICBvZiBvdXIgdXNlIG9mIERyb3BBbGxMb2Nrcy4gSG93ZXZlciwgaXQg aXMgY29ycmVjdCBpbnNpZGUgdGhlIHRvcG1vc3QgflZNRW50cnlTY29wZS4KKworICAgICAgICAq IGpzYy5jcHA6CisgICAgICAgIChKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04pOgorICAgICAgICAq IHJ1bnRpbWUvVk1FbnRyeVNjb3BlLmNwcDoKKyAgICAgICAgKEpTQzo6Vk1FbnRyeVNjb3BlOjp+ Vk1FbnRyeVNjb3BlKToKKwogMjAyMC0xMS0wMyAgWXVzdWtlIFN1enVraSAgPHlzdXp1a2lAYXBw bGUuY29tPgogCiAgICAgICAgIFtKU0NdIE9idGFpbiBkZWZhdWx0IHRpbWV6b25lIElEIGZyb20g Y2FjaGVkIGljdTo6VGltZVpvbmUKSW5kZXg6IFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9KYXZhU2NyaXB0Q29yZS9qc2MuY3BwCShyZXZpc2lvbiAy NjkzNDEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvanNjLmNwcAkod29ya2luZyBjb3B5KQpA QCAtMzYzLDYgKzM2Myw4IEBAIHN0YXRpYyBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9OKGZ1bmN0 aW8KIHN0YXRpYyBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9OKGZ1bmN0aW9uU2V0VW5oYW5kbGVk UmVqZWN0aW9uQ2FsbGJhY2spOwogc3RhdGljIEpTQ19ERUNMQVJFX0hPU1RfRlVOQ1RJT04oZnVu Y3Rpb25Bc0RvdWJsZU51bWJlcik7CiAKK3N0YXRpYyBKU0NfREVDTEFSRV9IT1NUX0ZVTkNUSU9O KGZ1bmN0aW9uRHJvcEFsbExvY2tzKTsKKwogc3RydWN0IFNjcmlwdCB7CiAgICAgZW51bSBjbGFz cyBTdHJpY3RNb2RlIHsKICAgICAgICAgU3RyaWN0LApAQCAtNjUzLDYgKzY1NSw4IEBAIHByaXZh dGU6CiAKICAgICAgICAgYWRkRnVuY3Rpb24odm0sICJhc0RvdWJsZU51bWJlciIsIGZ1bmN0aW9u QXNEb3VibGVOdW1iZXIsIDEpOwogCisgICAgICAgIGFkZEZ1bmN0aW9uKHZtLCAiZHJvcEFsbExv Y2tzIiwgZnVuY3Rpb25Ecm9wQWxsTG9ja3MsIDEpOworCiAgICAgICAgIGlmIChPcHRpb25zOjpl eHBvc2VDdXN0b21TZXR0ZXJzT25HbG9iYWxPYmplY3RGb3JUZXN0aW5nKCkpIHsKICAgICAgICAg ICAgIHsKICAgICAgICAgICAgICAgICBDdXN0b21HZXR0ZXJTZXR0ZXIqIGN1c3RvbSA9IEN1c3Rv bUdldHRlclNldHRlcjo6Y3JlYXRlKHZtLCBudWxscHRyLCB0ZXN0Q3VzdG9tQWNjZXNzb3JTZXR0 ZXIpOwpAQCAtMjYwNSw2ICsyNjA5LDEyIEBAIEpTQ19ERUZJTkVfSE9TVF9GVU5DVElPTihmdW5j dGlvbkFzRG91YmwKICAgICByZXR1cm4gSlNWYWx1ZTo6ZW5jb2RlKGpzRG91YmxlTnVtYmVyKG51 bSkpOwogfQogCitKU0NfREVGSU5FX0hPU1RfRlVOQ1RJT04oZnVuY3Rpb25Ecm9wQWxsTG9ja3Ms IChKU0dsb2JhbE9iamVjdCogZ2xvYmFsT2JqZWN0LCBDYWxsRnJhbWUqKSkKK3sKKyAgICBKU0xv Y2s6OkRyb3BBbGxMb2NrcyBkcm9wQWxsTG9ja3MoZ2xvYmFsT2JqZWN0KTsKKyAgICByZXR1cm4g SlNWYWx1ZTo6ZW5jb2RlKGpzVW5kZWZpbmVkKCkpOworfQorCiAvLyBVc2UgU0VIIGZvciBSZWxl YXNlIGJ1aWxkcyBvbmx5IHRvIGdldCByaWQgb2YgdGhlIGNyYXNoIHJlcG9ydCBkaWFsb2cKIC8v IChsdWNraWx5IHRoZSBzYW1lIHRlc3RzIGZhaWwgaW4gUmVsZWFzZSBhbmQgRGVidWcgYnVpbGRz IHNvIGZhcikuIE5lZWQgdG8KIC8vIGJlIGluIGEgc2VwYXJhdGUgbWFpbiBmdW5jdGlvbiBiZWNh dXNlIHRoZSBqc2NtYWluIGZ1bmN0aW9uIHJlcXVpcmVzIG9iamVjdApJbmRleDogU291cmNlL0ph dmFTY3JpcHRDb3JlL3J1bnRpbWUvVk1FbnRyeVNjb3BlLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTUVudHJ5U2NvcGUuY3BwCShyZXZpc2lvbiAyNjkz NDEpCisrKyBTb3VyY2UvSmF2YVNjcmlwdENvcmUvcnVudGltZS9WTUVudHJ5U2NvcGUuY3BwCSh3 b3JraW5nIGNvcHkpCkBAIC03MSw2ICs3MSw4IEBAIFZNRW50cnlTY29wZTo6flZNRW50cnlTY29w ZSgpCiAgICAgaWYgKG1fdm0uZW50cnlTY29wZSAhPSB0aGlzKQogICAgICAgICByZXR1cm47CiAK KyAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFtX3ZtLmhhc0NoZWNrcG9pbnRPU1JTaWRlU3RhdGUo KSwgIkV4aXR0aW5nIHRoZSBWTSBidXQgcGVuZGluZyBjaGVja3BvaW50IHNpZGUgc3RhdGUgc3Rp bGwgYXZhaWxhYmxlIik7CisKICAgICBpZiAoT3B0aW9uczo6dXNlVHJhY2VQb2ludHMoKSkKICAg ICAgICAgdHJhY2VQb2ludChWTUVudHJ5U2NvcGVFbmQpOwogICAgIAo=